| Previous | 199869 Revisions | Next |
| r21972 Wednesday 20th March, 2013 at 00:31:11 UTC by Oliver Stöneberg |
|---|
| (MESS) fixed clang 3.2 warnings about unused private fields (nw) |
| [src/emu] | fileio.c fileio.h uiimage.h |
| [src/emu/cpu/dsp56k] | opcode.c opcode.h |
| [src/emu/cpu/psx] | sio.h |
| [src/emu/machine] | 53c7xx.h at29040a.h mc68901.h ncr539x.h upd7201.h |
| [src/emu/sound] | 2151intf.h cdp1869.h disc_cls.h disc_dev.h disc_flt.h disc_wav.h |
| [src/emu/video] | crt9007.h hd61830.h pc_vga.h sed1330.h |
| [src/mess/drivers] | geneve.c ti99_8.c |
| [src/mess/machine] | apollo_kbd.h c64_warp_speed.h cpc_rom.h cs8221.h fm_scsi.h isa_gus.h isa_wdxt_gen.h kc_d004.h midioutport.h ncr5380n.h psxcd.h psxcddrv.c sns_spc7110.h vic1112.h x68k_hdc.h |
| [src/mess/machine/ti99] | gromport.c gromport.h |
| [src/mess/video] | nubus_spec8.h zx8301.h |
| r21971 | r21972 | |
|---|---|---|
| 75 | 75 | s_pgm_t m_pgm; /* programming state */ |
| 76 | 76 | bool m_enabling_sdb; /* set when a sdp enable command is in progress */ |
| 77 | 77 | bool m_disabling_sdb; /* set when a sdp disable command is in progress */ |
| 78 | bool m_dirty; /* set when the memory contents should be set */ | |
| 78 | //bool m_dirty; /* set when the memory contents should be set */ | |
| 79 | 79 | bool m_toggle_bit; // indicates flashing in progress (toggles for each query) |
| 80 | 80 | UINT8* m_programming_buffer; |
| 81 | 81 | int m_programming_last_offset; |
| r21971 | r21972 | |
|---|---|---|
| 211 | 211 | emu_timer *m_tm; |
| 212 | 212 | |
| 213 | 213 | int m_scripts_state; |
| 214 | int m_scripts_substate; | |
| 214 | //int m_scripts_substate; | |
| 215 | 215 | void (ncr53c7xx_device::*m_scripts_op)(); |
| 216 | 216 | |
| 217 | 217 | // callbacks |
| r21971 | r21972 | |
|---|---|---|
| 136 | 136 | devcb_resolved_write_line m_out_int_func; |
| 137 | 137 | |
| 138 | 138 | // timers |
| 139 | emu_timer *m_rx_a_timer; | |
| 140 | emu_timer *m_tx_a_timer; | |
| 141 | emu_timer *m_rx_b_timer; | |
| 142 | emu_timer *m_tx_b_timer; | |
| 139 | //emu_timer *m_rx_a_timer; | |
| 140 | //emu_timer *m_tx_a_timer; | |
| 141 | //emu_timer *m_rx_b_timer; | |
| 142 | //emu_timer *m_tx_b_timer; | |
| 143 | 143 | }; |
| 144 | 144 | |
| 145 | 145 |
| r21971 | r21972 | |
|---|---|---|
| 165 | 165 | devcb_resolved_write_line m_out_tdo_func; |
| 166 | 166 | devcb_resolved_write_line m_out_irq_func; |
| 167 | 167 | |
| 168 | int m_device_type; /* device type */ | |
| 168 | //int m_device_type; /* device type */ | |
| 169 | 169 | |
| 170 | 170 | /* registers */ |
| 171 | 171 | UINT8 m_gpip; /* general purpose I/O register */ |
| r21971 | r21972 | |
| 195 | 195 | int m_to[4]; /* timer out latch */ |
| 196 | 196 | |
| 197 | 197 | /* interrupt state */ |
| 198 | int m_irqlevel; /* interrupt level latch */ | |
| 198 | //int m_irqlevel; /* interrupt level latch */ | |
| 199 | 199 | |
| 200 | 200 | /* serial state */ |
| 201 | 201 | UINT8 m_next_rsr; /* receiver status register latch */ |
| r21971 | r21972 | |
|---|---|---|
| 71 | 71 | static const int m_fifo_size = 16; |
| 72 | 72 | UINT8 m_fifo_ptr, m_fifo[m_fifo_size]; |
| 73 | 73 | |
| 74 | int m_xfer_remaining; // amount in the FIFO when we're in data in phase | |
| 74 | //int m_xfer_remaining; // amount in the FIFO when we're in data in phase | |
| 75 | 75 | |
| 76 | 76 | // read-only registers |
| 77 | 77 | UINT8 m_status, m_irq_status, m_internal_state, m_fifo_internal_state; |
| r21971 | r21972 | |
|---|---|---|
| 110 | 110 | |
| 111 | 111 | file_enumerator::file_enumerator(const char *searchpath) |
| 112 | 112 | : m_iterator(searchpath), |
| 113 | m_curdir(NULL), | |
| 114 | m_buflen(0) | |
| 113 | m_curdir(NULL)/*, | |
| 114 | m_buflen(0)*/ | |
| 115 | 115 | { |
| 116 | 116 | } |
| 117 | 117 |
| r21971 | r21972 | |
|---|---|---|
| 103 | 103 | path_iterator m_iterator; |
| 104 | 104 | osd_directory * m_curdir; |
| 105 | 105 | astring m_pathbuffer; |
| 106 | int m_buflen; | |
| 106 | //int m_buflen; | |
| 107 | 107 | }; |
| 108 | 108 | |
| 109 | 109 |
| r21971 | r21972 | |
|---|---|---|
| 82 | 82 | int deviceCount; |
| 83 | 83 | |
| 84 | 84 | int m_outputdata; |
| 85 | int m_inputdata; | |
| 85 | //int m_inputdata; | |
| 86 | 86 | }; |
| 87 | 87 | |
| 88 | 88 | class psxsio0_device : public psxsio_device |
| r21971 | r21972 | |
|---|---|---|
| 4 | 4 | |
| 5 | 5 | namespace DSP56K |
| 6 | 6 | { |
| 7 | Opcode::Opcode(UINT16 w0, UINT16 w1) : m_word0(w0), m_word1(w1) | |
| 7 | Opcode::Opcode(UINT16 w0, UINT16 w1) : m_word0(w0)/*, m_word1(w1)*/ | |
| 8 | 8 | { |
| 9 | 9 | m_instruction = Instruction::decodeInstruction(this, w0, w1); |
| 10 | 10 | m_parallelMove = ParallelMove::decodeParallelMove(this, w0, w1); |
| r21971 | r21972 | |
|---|---|---|
| 36 | 36 | ParallelMove* m_parallelMove; |
| 37 | 37 | |
| 38 | 38 | UINT16 m_word0; |
| 39 | UINT16 m_word1; | |
| 39 | //UINT16 m_word1; | |
| 40 | 40 | |
| 41 | 41 | astring dcString() const; |
| 42 | 42 | }; |
| r21971 | r21972 | |
|---|---|---|
| 341 | 341 | |
| 342 | 342 | vga_device* m_vga; // for pass-through |
| 343 | 343 | astring m_vga_tag; // pass-through device tag |
| 344 | UINT8* m_vram; // the original 8514/A has it's own VRAM, but most VGA+8514 combination cards will have | |
| 344 | //UINT8* m_vram; // the original 8514/A has it's own VRAM, but most VGA+8514 combination cards will have | |
| 345 | 345 | // only one set of VRAM, so this will only be needed in standalone 8514/A cards |
| 346 | UINT32 m_vramsize; | |
| 346 | //UINT32 m_vramsize; | |
| 347 | 347 | }; |
| 348 | 348 | |
| 349 | 349 | // device type definition |
| r21971 | r21972 | |
|---|---|---|
| 96 | 96 | |
| 97 | 97 | screen_device *m_screen; |
| 98 | 98 | emu_timer *m_busy_timer; |
| 99 | address_space *m_data; | |
| 99 | //address_space *m_data; | |
| 100 | 100 | |
| 101 | 101 | bool m_bf; // busy flag |
| 102 | 102 |
| r21971 | r21972 | |
|---|---|---|
| 118 | 118 | int m_ov; // graphics mode layer composition |
| 119 | 119 | |
| 120 | 120 | // devices |
| 121 | screen_device *m_screen; | |
| 121 | //screen_device *m_screen; | |
| 122 | 122 | |
| 123 | 123 | // address space configurations |
| 124 | 124 | const address_space_config m_space_config; |
| r21971 | r21972 | |
|---|---|---|
| 176 | 176 | int m_vlt; |
| 177 | 177 | int m_drb; |
| 178 | 178 | int m_wben; |
| 179 | int m_slg; | |
| 180 | int m_sld; | |
| 179 | //int m_slg; | |
| 180 | //int m_sld; | |
| 181 | 181 | int m_lpstb; |
| 182 | 182 | |
| 183 | 183 | // DMA |
| r21971 | r21972 | |
|---|---|---|
| 207 | 207 | void reset(void); |
| 208 | 208 | void input_write(int sub_node, UINT8 data ); |
| 209 | 209 | private: |
| 210 | double m_gain; /* node gain */ | |
| 211 | double m_offset; /* node offset */ | |
| 210 | //double m_gain; /* node gain */ | |
| 211 | //double m_offset; /* node offset */ | |
| 212 | 212 | UINT8 m_data; /* data written */ |
| 213 | 213 | }; |
| 214 | 214 |
| r21971 | r21972 | |
|---|---|---|
| 269 | 269 | cdp1869_char_ram_write_func m_out_char_ram_func; |
| 270 | 270 | |
| 271 | 271 | screen_device *m_screen; |
| 272 | address_space *m_page_ram; | |
| 272 | //address_space *m_page_ram; | |
| 273 | 273 | emu_timer *m_prd_timer; |
| 274 | 274 | sound_stream *m_stream; |
| 275 | 275 |
| r21971 | r21972 | |
|---|---|---|
| 98 | 98 | ); |
| 99 | 99 | |
| 100 | 100 | DISCRETE_CLASS_STEP_RESET(dsd_566, 1, |
| 101 | unsigned int m_state[2]; /* keeps track of excess flip_flop changes during the current step */ | |
| 101 | //unsigned int m_state[2]; /* keeps track of excess flip_flop changes during the current step */ | |
| 102 | 102 | int m_flip_flop; /* 566 flip/flop output state */ |
| 103 | 103 | double m_cap_voltage; /* voltage on cap */ |
| 104 | 104 | double m_v_sqr_low; /* voltage for a squarewave at low */ |
| r21971 | r21972 | |
|---|---|---|
| 27 | 27 | int m_is_7492; |
| 28 | 28 | int m_last_clock; |
| 29 | 29 | UINT32 m_last_count; |
| 30 | UINT32 m_last; /* Last clock state */ | |
| 30 | //UINT32 m_last; /* Last clock state */ | |
| 31 | 31 | UINT32 m_min; |
| 32 | 32 | UINT32 m_max; |
| 33 | 33 | UINT32 m_diff; |
| r21971 | r21972 | |
| 39 | 39 | int m_last; /* Last clock state */ |
| 40 | 40 | double m_t_clock; /* fixed counter clock in seconds */ |
| 41 | 41 | double m_t_left; /* time unused during last sample in seconds */ |
| 42 | double m_sample_step; | |
| 43 | double m_t; | |
| 42 | //double m_sample_step; | |
| 43 | //double m_t; | |
| 44 | 44 | UINT8 m_reset_on_high; |
| 45 | 45 | UINT8 m_invert_output; |
| 46 | 46 | UINT8 m_out_is_f0; |
| r21971 | r21972 | |
| 184 | 184 | |
| 185 | 185 | /* Not yet implemented */ |
| 186 | 186 | DISCRETE_CLASS_STEP_RESET(dss_adsrenv, 1, |
| 187 | double m_phase; | |
| 187 | //double m_phase; | |
| 188 | 188 | ); |
| 189 | 189 | |
| 190 | 190 |
| r21971 | r21972 | |
|---|---|---|
| 67 | 67 | |
| 68 | 68 | // internal state |
| 69 | 69 | sound_stream * m_stream; |
| 70 | emu_timer * m_timer[2]; | |
| 70 | //emu_timer * m_timer[2]; | |
| 71 | 71 | void * m_chip; |
| 72 | 72 | UINT8 m_lastreg; |
| 73 | 73 | devcb2_write_line m_irqhandler; |
| r21971 | r21972 | |
|---|---|---|
| 48 | 48 | double m_rc; |
| 49 | 49 | double m_exponent; |
| 50 | 50 | UINT8 m_has_rc_nodes; |
| 51 | UINT8 m_is_fast; | |
| 51 | //UINT8 m_is_fast; | |
| 52 | 52 | ); |
| 53 | 53 | |
| 54 | 54 | DISCRETE_CLASS_STEP_RESET(dst_op_amp_filt, 1, |
| r21971 | r21972 | |
| 164 | 164 | double m_x1; /* x[k-1], previous input value */ |
| 165 | 165 | double m_y1; /* y[k-1], previous output value */ |
| 166 | 166 | double m_a1; /* digital filter coefficients, denominator */ |
| 167 | double m_b[2]; /* digital filter coefficients, numerator */ | |
| 167 | //double m_b[2]; /* digital filter coefficients, numerator */ | |
| 168 | 168 | ); |
| 169 | 169 | |
| 170 | 170 | DISCRETE_CLASS_STEP_RESET(dst_rcdisc2N, 1, |
| r21971 | r21972 | |
|---|---|---|
| 84 | 84 | device_image_interface *image; |
| 85 | 85 | astring ¤t_directory, ¤t_file; |
| 86 | 86 | const image_device_format *current_format; |
| 87 | int confirm_save_as_yes; | |
| 87 | //int confirm_save_as_yes; | |
| 88 | 88 | char filename_buffer[1024]; |
| 89 | 89 | }; |
| 90 | 90 |
| r21971 | r21972 | |
|---|---|---|
| 273 | 273 | int m_ready_line, m_ready_line1; |
| 274 | 274 | |
| 275 | 275 | private: |
| 276 | int m_joystick_select; | |
| 276 | //int m_joystick_select; | |
| 277 | 277 | // Some values to keep. Rest is on the geneve_mapper. |
| 278 | 278 | }; |
| 279 | 279 |
| r21971 | r21972 | |
|---|---|---|
| 272 | 272 | /* Keyboard support */ |
| 273 | 273 | void set_keyboard_column(int number, int data); |
| 274 | 274 | int m_keyboard_column; |
| 275 | int m_alphalock_line; | |
| 275 | //int m_alphalock_line; | |
| 276 | 276 | }; |
| 277 | 277 | |
| 278 | 278 | /* |
| r21971 | r21972 | |
|---|---|---|
| 77 | 77 | |
| 78 | 78 | UINT8 m_ram[0x800]; |
| 79 | 79 | |
| 80 | UINT8 m_hdc_addr; | |
| 80 | //UINT8 m_hdc_addr; | |
| 81 | 81 | }; |
| 82 | 82 | |
| 83 | 83 |
| r21971 | r21972 | |
|---|---|---|
| 77 | 77 | virtual void device_config_complete() { m_shortname = "cpc_rom"; } |
| 78 | 78 | |
| 79 | 79 | private: |
| 80 | cpc_expansion_slot_device *m_slot; | |
| 80 | //cpc_expansion_slot_device *m_slot; | |
| 81 | 81 | |
| 82 | 82 | rom_image_device* m_rom[6]; |
| 83 | 83 | }; |
| r21971 | r21972 | |
|---|---|---|
| 1994 | 1994 | Constructor. |
| 1995 | 1995 | */ |
| 1996 | 1996 | rpk::rpk(emu_options& options, const char* sysname) |
| 1997 | :m_options(options), | |
| 1998 | m_system_name(sysname) | |
| 1997 | :m_options(options) | |
| 1998 | //,m_system_name(sysname) | |
| 1999 | 1999 | { |
| 2000 | 2000 | m_sockets.reset(); |
| 2001 | 2001 | }; |
| r21971 | r21972 | |
|---|---|---|
| 437 | 437 | private: |
| 438 | 438 | emu_options& m_options; // need this to find the path to the nvram files |
| 439 | 439 | int m_type; |
| 440 | const char* m_system_name; // need this to find the path to the nvram files | |
| 440 | //const char* m_system_name; // need this to find the path to the nvram files | |
| 441 | 441 | tagged_list<rpk_socket> m_sockets; |
| 442 | 442 | |
| 443 | 443 | void add_socket(const char* id, rpk_socket *newsock); |
| r21971 | r21972 | |
|---|---|---|
| 63 | 63 | |
| 64 | 64 | private: |
| 65 | 65 | running_machine& m_machine; |
| 66 | UINT32 m_rom_size; | |
| 66 | //UINT32 m_rom_size; | |
| 67 | 67 | }; |
| 68 | 68 | |
| 69 | 69 | // ======================> sns_rom_spc7110_device |
| r21971 | r21972 | |
|---|---|---|
| 317 | 317 | int num_sectors, num_tracks; |
| 318 | 318 | toc_entry toc[100]; |
| 319 | 319 | int bin_sector_size; |
| 320 | const char *err; | |
| 320 | //const char *err; | |
| 321 | 321 | |
| 322 | 322 | io_status *read_sectors(const unsigned int startsec, const unsigned int numsec, unsigned char *buf); |
| 323 | 323 | |
| r21971 | r21972 | |
| 340 | 340 | }; |
| 341 | 341 | |
| 342 | 342 | mess_cdrom_driver::mess_cdrom_driver() |
| 343 | : err(NULL) | |
| 343 | //: err(NULL) | |
| 344 | 344 | { |
| 345 | 345 | for (int i=0; i<100; i++) |
| 346 | 346 | toc[i].type=track_illegal; |
| r21971 | r21972 | |
|---|---|---|
| 61 | 61 | required_device<via6522_device> m_via1; |
| 62 | 62 | required_device<ieee488_device> m_bus; |
| 63 | 63 | |
| 64 | UINT8 *m_rom; | |
| 64 | //UINT8 *m_rom; | |
| 65 | 65 | |
| 66 | 66 | int m_via0_irq; |
| 67 | 67 | int m_via1_irq; |
| r21971 | r21972 | |
|---|---|---|
| 167 | 167 | void putchar(UINT8 data); |
| 168 | 168 | private: |
| 169 | 169 | apollo_kbd_device *m_device; // pointer back to our device |
| 170 | #if defined(KBD_TTY_NAME) | |
| 170 | 171 | const char *m_tty_name; |
| 171 | 172 | int m_tty_fd; /* File descriptor of keyboard tty */ |
| 173 | #endif | |
| 172 | 174 | int m_connected; |
| 173 | 175 | }; |
| 174 | 176 |
| r21971 | r21972 | |
|---|---|---|
| 73 | 73 | UINT16 m_rom_base; |
| 74 | 74 | UINT8 m_enabled; |
| 75 | 75 | UINT8 m_connected; |
| 76 | UINT8 m_active_fdd; | |
| 76 | //UINT8 m_active_fdd; | |
| 77 | 77 | |
| 78 | 78 | floppy_image_device *m_floppy; |
| 79 | 79 | }; |
| r21971 | r21972 | |
|---|---|---|
| 190 | 190 | |
| 191 | 191 | UINT8 m_current_voice; |
| 192 | 192 | UINT8 m_current_reg; |
| 193 | UINT8 m_port; | |
| 194 | UINT8 m_irq; | |
| 195 | UINT8 m_dma; | |
| 193 | //UINT8 m_port; | |
| 194 | //UINT8 m_irq; | |
| 195 | //UINT8 m_dma; | |
| 196 | 196 | |
| 197 | 197 | UINT8 m_adlib_cmd; |
| 198 | 198 | UINT8 m_mix_ctrl; |
| r21971 | r21972 | |
|---|---|---|
| 45 | 45 | virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); |
| 46 | 46 | |
| 47 | 47 | private: |
| 48 | UINT8 m_bank; | |
| 48 | //UINT8 m_bank; | |
| 49 | 49 | }; |
| 50 | 50 | |
| 51 | 51 |
| r21971 | r21972 | |
|---|---|---|
| 190 | 190 | UINT8 clock_conv, sync_offset, sync_period, bus_id, select_timeout, seq; |
| 191 | 191 | UINT16 tcount; |
| 192 | 192 | int mode; |
| 193 | int state, xfr_phase; | |
| 193 | int state/*, xfr_phase*/; | |
| 194 | 194 | |
| 195 | 195 | bool irq, drq; |
| 196 | 196 |
| r21971 | r21972 | |
|---|---|---|
| 158 | 158 | DECLARE_READ8_MEMBER( read ); |
| 159 | 159 | |
| 160 | 160 | private: |
| 161 | emu_timer *m_timer; | |
| 161 | //emu_timer *m_timer; | |
| 162 | 162 | UINT32 m_sysclock; |
| 163 | 163 | const char *m_devname; |
| 164 | 164 | cdrom_image_device *m_cddevice; |
| r21971 | r21972 | |
|---|---|---|
| 106 | 106 | int m_phase; |
| 107 | 107 | unsigned char m_status_port; // read at 0xe96003 |
| 108 | 108 | unsigned char m_status; // status phase output |
| 109 | unsigned char m_message; | |
| 109 | //unsigned char m_message; | |
| 110 | 110 | unsigned char m_command[10]; |
| 111 | 111 | unsigned char m_sense[4]; |
| 112 | 112 | int m_command_byte_count; |
| r21971 | r21972 | |
|---|---|---|
| 61 | 61 | private: |
| 62 | 62 | |
| 63 | 63 | // internal state |
| 64 | address_space *m_space; | |
| 65 | UINT8 *m_isa; | |
| 66 | UINT8 *m_bios; | |
| 67 | UINT8 *m_ram; | |
| 64 | //address_space *m_space; | |
| 65 | //UINT8 *m_isa; | |
| 66 | //UINT8 *m_bios; | |
| 67 | //UINT8 *m_ram; | |
| 68 | 68 | |
| 69 | 69 | // address selection |
| 70 | 70 | UINT8 m_address; |
| r21971 | r21972 | |
|---|---|---|
| 80 | 80 | |
| 81 | 81 | scsihle_device* m_SCSIdevices[8]; |
| 82 | 82 | UINT8 m_command[32]; |
| 83 | UINT8 m_result[32]; | |
| 83 | //UINT8 m_result[32]; | |
| 84 | 84 | UINT8 m_command_index; |
| 85 | 85 | int m_result_length; |
| 86 | 86 | UINT32 m_result_index; |
| r21971 | r21972 | |
|---|---|---|
| 27 | 27 | virtual void device_reset() { } |
| 28 | 28 | virtual void device_config_complete() { m_shortname = "midiout_port"; } |
| 29 | 29 | private: |
| 30 | serial_port_device *m_owner; | |
| 30 | //serial_port_device *m_owner; | |
| 31 | 31 | required_device<midiout_device> m_midiout; |
| 32 | 32 | }; |
| 33 | 33 |
| r21971 | r21972 | |
|---|---|---|
| 46 | 46 | emu_timer *m_timer; |
| 47 | 47 | |
| 48 | 48 | private: |
| 49 | UINT32 m_7xxxxx_regs[0x100000/4]; | |
| 50 | int m_width, m_height, m_patofsx, m_patofsy; | |
| 51 | UINT32 m_vram_addr, m_vram_src; | |
| 52 | UINT8 m_fillbytes[256]; | |
| 49 | //UINT32 m_7xxxxx_regs[0x100000/4]; | |
| 50 | //int m_width, m_height, m_patofsx, m_patofsy; | |
| 51 | //UINT32 m_vram_addr, m_vram_src; | |
| 52 | //UINT8 m_fillbytes[256]; | |
| 53 | 53 | bool m_vbl_pending; |
| 54 | 54 | int m_parameter; |
| 55 | 55 | }; |
| r21971 | r21972 | |
|---|---|---|
| 116 | 116 | |
| 117 | 117 | cpu_device *m_cpu; |
| 118 | 118 | screen_device *m_screen; |
| 119 | address_space *m_data; | |
| 119 | //address_space *m_data; | |
| 120 | 120 | |
| 121 | 121 | int m_dispoff; // display off |
| 122 | 122 | int m_mode8; // mode8 active |
| Previous | 199869 Revisions | Next |