diff options
Diffstat (limited to 'src/emu/machine')
51 files changed, 206 insertions, 209 deletions
diff --git a/src/emu/machine/53c810.h b/src/emu/machine/53c810.h index a5f3d86acae..c8ee4f80dce 100644 --- a/src/emu/machine/53c810.h +++ b/src/emu/machine/53c810.h @@ -22,7 +22,7 @@ public: static void set_irq_callback(device_t &device, lsi53c810_irq_delegate callback) { downcast<lsi53c810_device &>(device).m_irq_cb = callback; } static void set_dma_callback(device_t &device, lsi53c810_dma_delegate callback) { downcast<lsi53c810_device &>(device).m_dma_cb = callback; } static void set_fetch_callback(device_t &device, lsi53c810_fetch_delegate callback) { downcast<lsi53c810_device &>(device).m_fetch_cb = callback; } - + void lsi53c810_read_data(int bytes, UINT8 *pData); void lsi53c810_write_data(int bytes, UINT8 *pData); diff --git a/src/emu/machine/6525tpi.h b/src/emu/machine/6525tpi.h index 87deba13e7d..40dadbd4ee9 100644 --- a/src/emu/machine/6525tpi.h +++ b/src/emu/machine/6525tpi.h @@ -49,7 +49,7 @@ public: template<class _Object> static devcb_base &set_out_pc_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_pc_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_ca_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_ca_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_cb_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_cb_cb.set_callback(object); } - + DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/emu/machine/6532riot.h b/src/emu/machine/6532riot.h index a2b2ce715f3..49dc2bfc000 100644 --- a/src/emu/machine/6532riot.h +++ b/src/emu/machine/6532riot.h @@ -50,7 +50,7 @@ public: template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_in_pb_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_out_pb_cb.set_callback(object); } template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_irq_cb.set_callback(object); } - + DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -75,8 +75,8 @@ protected: UINT8 m_in; UINT8 m_out; UINT8 m_ddr; - devcb_read8 *m_in_cb; - devcb_write8 *m_out_cb; + devcb_read8 *m_in_cb; + devcb_write8 *m_out_cb; }; // device-level overrides @@ -100,7 +100,7 @@ private: devcb_read8 m_in_pb_cb; devcb_write8 m_out_pb_cb; devcb_write_line m_irq_cb; - + UINT8 m_irqstate; UINT8 m_irqenable; int m_irq; diff --git a/src/emu/machine/68307.h b/src/emu/machine/68307.h index 82f5ea25169..35cf8fc4362 100644 --- a/src/emu/machine/68307.h +++ b/src/emu/machine/68307.h @@ -45,7 +45,7 @@ public: template<class _Object> static devcb_base &set_b_tx_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_b_tx.set_callback(object); } template<class _Object> static devcb_base &set_inport_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).read_inport.set_callback(object); } template<class _Object> static devcb_base &set_outport_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_outport.set_callback(object); } - + DECLARE_WRITE_LINE_MEMBER(m68307_duart_irq_handler); DECLARE_WRITE_LINE_MEMBER(m68307_duart_txa){ write_a_tx(state); } DECLARE_WRITE_LINE_MEMBER(m68307_duart_txb){ write_b_tx(state); } @@ -69,7 +69,7 @@ public: /* 68307 peripheral modules */ m68307_sim* m68307SIM; m68307_mbus* m68307MBUS; -// m68307_serial* m68307SERIAL; +// m68307_serial* m68307SERIAL; m68307_timer* m68307TIMER; UINT16 m68307_base; @@ -94,7 +94,7 @@ public: /* callbacks for internal ports */ void set_port_callbacks(m68307_porta_read_delegate porta_r, m68307_porta_write_delegate porta_w, m68307_portb_read_delegate portb_r, m68307_portb_write_delegate portb_w); void set_interrupt(int level, int vector); - UINT16 get_cs(offs_t address); + UINT16 get_cs(offs_t address); void timer0_interrupt(); void timer1_interrupt(); void serial_interrupt(int vector); diff --git a/src/emu/machine/6840ptm.h b/src/emu/machine/6840ptm.h index c5075a24144..d5e8851fae4 100644 --- a/src/emu/machine/6840ptm.h +++ b/src/emu/machine/6840ptm.h @@ -49,13 +49,13 @@ public: // construction/destruction ptm6840_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void set_internal_clock(device_t &device, double clock) { downcast<ptm6840_device &>(device).m_internal_clock = clock; } + static void set_internal_clock(device_t &device, double clock) { downcast<ptm6840_device &>(device).m_internal_clock = clock; } static void set_external_clocks(device_t &device, double clock0, double clock1, double clock2) { downcast<ptm6840_device &>(device).m_external_clock[0] = clock0; downcast<ptm6840_device &>(device).m_external_clock[1] = clock1; downcast<ptm6840_device &>(device).m_external_clock[2] = clock2; } template<class _Object> static devcb_base &set_out0_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_out0_cb.set_callback(object); } template<class _Object> static devcb_base &set_out1_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_out1_cb.set_callback(object); } template<class _Object> static devcb_base &set_out2_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_out2_cb.set_callback(object); } template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_irq_cb.set_callback(object); } - + int status(int clock) const { return m_enabled[clock]; } // get whether timer is enabled int irq_state() const { return m_IRQ; } // get IRQ state UINT16 count(int counter) const { return compute_counter(counter); } // get counter value diff --git a/src/emu/machine/74123.h b/src/emu/machine/74123.h index c051c3ce4e5..8b9391988a2 100644 --- a/src/emu/machine/74123.h +++ b/src/emu/machine/74123.h @@ -61,13 +61,13 @@ #define MCFG_TTL74123_RESISTOR_VALUE(_value) \ ttl74123_device::set_resistor_value(*device, _value); - + #define MCFG_TTL74123_CAPACITOR_VALUE(_value) \ ttl74123_device::set_capacitor_value(*device, _value); #define MCFG_TTL74123_A_PIN_VALUE(_value) \ ttl74123_device::set_a_pin_value(*device, _value); - + #define MCFG_TTL74123_B_PIN_VALUE(_value) \ ttl74123_device::set_b_pin_value(*device, _value); @@ -75,7 +75,7 @@ ttl74123_device::set_clear_pin_value(*device, _value); #define MCFG_TTL74123_OUTPUT_CHANGED_CB(_devcb) \ - devcb = &ttl74123_device::set_output_changed_callback(*device, DEVCB_##_devcb); + devcb = &ttl74123_device::set_output_changed_callback(*device, DEVCB_##_devcb); /* constants for the different ways the cap/res can be connected. This determines the formula for calculating the pulse width */ @@ -103,7 +103,7 @@ public: static void set_b_pin_value(device_t &device, int value) { downcast<ttl74123_device &>(device).m_b = value; } static void set_clear_pin_value(device_t &device, int value) { downcast<ttl74123_device &>(device).m_clear = value; } template<class _Object> static devcb_base &set_output_changed_callback(device_t &device, _Object object) { return downcast<ttl74123_device &>(device).m_output_changed_cb.set_callback(object); } - + DECLARE_WRITE8_MEMBER(a_w); DECLARE_WRITE8_MEMBER(b_w); DECLARE_WRITE8_MEMBER(clear_w); diff --git a/src/emu/machine/8042kbdc.h b/src/emu/machine/8042kbdc.h index ec0180833d1..a2311e1924d 100644 --- a/src/emu/machine/8042kbdc.h +++ b/src/emu/machine/8042kbdc.h @@ -40,7 +40,7 @@ enum kbdc8042_type_t devcb = &kbdc8042_device::set_output_buffer_empty_callback(*device, DEVCB_##_devcb); #define MCFG_KBDC8042_SPEAKER_CB(_devcb) \ - devcb = &kbdc8042_device::set_speaker_callback(*device, DEVCB_##_devcb); + devcb = &kbdc8042_device::set_speaker_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -55,7 +55,7 @@ public: kbdc8042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const; - + static void set_keyboard_type(device_t &device, kbdc8042_type_t keybtype) { downcast<kbdc8042_device &>(device).m_keybtype = keybtype; } template<class _Object> static devcb_base &set_system_reset_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_system_reset_cb.set_callback(object); } template<class _Object> static devcb_base &set_gate_a20_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_gate_a20_cb.set_callback(object); } @@ -109,7 +109,7 @@ protected: required_device<at_keyboard_device> m_keyboard_dev; kbdc8042_type_t m_keybtype; - + devcb_write_line m_system_reset_cb; devcb_write_line m_gate_a20_cb; devcb_write_line m_input_buffer_full_cb; diff --git a/src/emu/machine/aakart.h b/src/emu/machine/aakart.h index 35d27f5bf41..97b2c1b4727 100644 --- a/src/emu/machine/aakart.h +++ b/src/emu/machine/aakart.h @@ -20,7 +20,7 @@ Acorn Archimedes KART interface #define MCFG_AAKART_OUT_RX_CB(_devcb) \ devcb = &aakart_device::set_out_rx_callback(*device, DEVCB_##_devcb); - + enum{ STATUS_NORMAL = 0, @@ -42,15 +42,15 @@ class aakart_device : public device_t public: // construction/destruction aakart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + template<class _Object> static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<aakart_device &>(device).m_out_tx_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_rx_callback(device_t &device, _Object object) { return downcast<aakart_device &>(device).m_out_rx_cb.set_callback(object); } // I/O operations DECLARE_WRITE8_MEMBER( write ); DECLARE_READ8_MEMBER( read ); - void send_keycode_down(UINT8 row, UINT8 col); - void send_keycode_up(UINT8 row, UINT8 col); + void send_keycode_down(UINT8 row, UINT8 col); + void send_keycode_up(UINT8 row, UINT8 col); protected: // device-level overrides virtual void device_validity_check(validity_checker &valid) const; @@ -77,9 +77,9 @@ private: UINT8 m_status; UINT8 m_mouse_enable; UINT8 m_keyb_enable; - UINT8 m_keyb_row; - UINT8 m_keyb_col; - UINT8 m_keyb_state; + UINT8 m_keyb_row; + UINT8 m_keyb_col; + UINT8 m_keyb_state; }; diff --git a/src/emu/machine/adc0808.h b/src/emu/machine/adc0808.h index 1ba210ffdc0..cd0247b8c44 100644 --- a/src/emu/machine/adc0808.h +++ b/src/emu/machine/adc0808.h @@ -49,34 +49,34 @@ typedef device_delegate<double ()> adc0808_analog_read_delegate; #define MCFG_ADC0808_IN_VREF_POS_CB(_class, _method) \ adc0808_device::set_in_vref_pos_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); - + #define MCFG_ADC0808_IN_VREF_NEG_CB(_class, _method) \ adc0808_device::set_in_vref_neg_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); - + #define MCFG_ADC0808_IN_IN_0_CB(_class, _method) \ adc0808_device::set_in_in_0_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); - + #define MCFG_ADC0808_IN_IN_1_CB(_class, _method) \ adc0808_device::set_in_in_1_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); - + #define MCFG_ADC0808_IN_IN_2_CB(_class, _method) \ adc0808_device::set_in_in_2_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); - + #define MCFG_ADC0808_IN_IN_3_CB(_class, _method) \ adc0808_device::set_in_in_3_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); - + #define MCFG_ADC0808_IN_IN_4_CB(_class, _method) \ adc0808_device::set_in_in_4_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); - + #define MCFG_ADC0808_IN_IN_5_CB(_class, _method) \ adc0808_device::set_in_in_5_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); #define MCFG_ADC0808_IN_IN_6_CB(_class, _method) \ adc0808_device::set_in_in_6_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); - + #define MCFG_ADC0808_IN_IN_7_CB(_class, _method) \ adc0808_device::set_in_in_7_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); - + // ======================> adc0808_device class adc0808_device : public device_t @@ -84,7 +84,7 @@ class adc0808_device : public device_t public: // construction/destruction adc0808_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + template<class _Object> static devcb_base &set_out_eoc_callback(device_t &device, _Object object) { return downcast<adc0808_device &>(device).m_out_eoc_cb.set_callback(object); } static void set_in_vref_pos_callback(device_t &device, adc0808_analog_read_delegate callback) { downcast<adc0808_device &>(device).m_in_vref_pos_cb = callback; } static void set_in_vref_neg_callback(device_t &device, adc0808_analog_read_delegate callback) { downcast<adc0808_device &>(device).m_in_vref_neg_cb = callback; } diff --git a/src/emu/machine/adc1038.h b/src/emu/machine/adc1038.h index 45a134e04ab..8e22fd6face 100644 --- a/src/emu/machine/adc1038.h +++ b/src/emu/machine/adc1038.h @@ -49,7 +49,7 @@ private: int m_data_out; int m_adc_data; int m_sars; - + int m_gticlub_hack; adc1038_input_delegate m_input_cb; }; diff --git a/src/emu/machine/akiko.h b/src/emu/machine/akiko.h index e3657d9d815..1fa5e46f6ef 100644 --- a/src/emu/machine/akiko.h +++ b/src/emu/machine/akiko.h @@ -1,12 +1,12 @@ /*************************************************************************** - Akiko + Akiko - Used in the Amiga CD32 + Used in the Amiga CD32 - - CD-ROM controller - - Builtin 1KB NVRAM - - Chunky to planar converter + - CD-ROM controller + - Builtin 1KB NVRAM + - Chunky to planar converter ***************************************************************************/ @@ -74,7 +74,7 @@ protected: virtual machine_config_constructor device_mconfig_additions() const; private: - // 1X CDROM sector time in msec (300KBps) + // 1X CDROM sector time in msec (300KBps) static const int CD_SECTOR_TIME = (1000/((150*1024)/2048)); // internal state diff --git a/src/emu/machine/am9517a.h b/src/emu/machine/am9517a.h index c4aa7383039..ab2cdd3d60c 100644 --- a/src/emu/machine/am9517a.h +++ b/src/emu/machine/am9517a.h @@ -73,7 +73,7 @@ public: template<class _Object> static devcb_base &set_out_dack_1_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_dack_1_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_dack_2_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_dack_2_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_dack_3_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_dack_3_cb.set_callback(object); } - + DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/emu/machine/at_keybc.h b/src/emu/machine/at_keybc.h index 5ce533cc9f7..65ef24e2d1b 100644 --- a/src/emu/machine/at_keybc.h +++ b/src/emu/machine/at_keybc.h @@ -53,7 +53,7 @@ public: template<class _Object> static devcb_base &set_output_buffer_empty_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_output_buffer_empty_cb.set_callback(object); } template<class _Object> static devcb_base &set_keyboard_clock_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_keyboard_clock_cb.set_callback(object); } template<class _Object> static devcb_base &set_keyboard_data_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_keyboard_data_cb.set_callback(object); } - + // internal 8042 interface DECLARE_READ8_MEMBER( t0_r ); DECLARE_READ8_MEMBER( t1_r ); @@ -78,7 +78,7 @@ protected: virtual const rom_entry *device_rom_region() const; virtual machine_config_constructor device_mconfig_additions() const; - + private: // internal state upi41_cpu_device *m_cpu; diff --git a/src/emu/machine/autoconfig.h b/src/emu/machine/autoconfig.h index 5183f474af9..f86e7577c7a 100644 --- a/src/emu/machine/autoconfig.h +++ b/src/emu/machine/autoconfig.h @@ -1,6 +1,6 @@ /*************************************************************************** - Amiga Autoconfig + Amiga Autoconfig ***************************************************************************/ diff --git a/src/emu/machine/ay31015.h b/src/emu/machine/ay31015.h index 3745cc7deac..2f46e925fda 100644 --- a/src/emu/machine/ay31015.h +++ b/src/emu/machine/ay31015.h @@ -68,7 +68,7 @@ public: template<class _Object> static devcb_base &set_read_si_callback(device_t &device, _Object object) { return downcast<ay31015_device &>(device).m_read_si_cb.set_callback(object); } template<class _Object> static devcb_base &set_write_so_callback(device_t &device, _Object object) { return downcast<ay31015_device &>(device).m_write_so_cb.set_callback(object); } template<class _Object> static devcb_base &set_status_changed_callback(device_t &device, _Object object) { return downcast<ay31015_device &>(device).m_status_changed_cb.set_callback(object); } - + /* Set an input pin */ void set_input_pin( ay31015_input_pin_t pin, int data ); @@ -164,7 +164,7 @@ extern const device_type AY51013; // For AY-3-1014, AY-5-1013 and AY-6-1013 va #define MCFG_AY31015_TX_CLOCK(_txclk) \ ay31015_device::set_tx_clock(*device, _txclk); - + #define MCFG_AY31015_RX_CLOCK(_rxclk) \ ay31015_device::set_rx_clock(*device, _rxclk); @@ -175,12 +175,12 @@ extern const device_type AY51013; // For AY-3-1014, AY-5-1013 and AY-6-1013 va devcb = &ay31015_device::set_write_so_callback(*device, DEVCB_##_devcb); #define MCFG_AY31015_STATUS_CHANGED_CB(_devcb) \ - devcb = &ay31015_device::set_status_changed_callback(*device, DEVCB_##_devcb); - + devcb = &ay31015_device::set_status_changed_callback(*device, DEVCB_##_devcb); + #define MCFG_AY51013_TX_CLOCK(_txclk) \ ay51013_device::set_tx_clock(*device, _txclk); - + #define MCFG_AY51013_RX_CLOCK(_rxclk) \ ay51013_device::set_rx_clock(*device, _rxclk); @@ -191,6 +191,6 @@ extern const device_type AY51013; // For AY-3-1014, AY-5-1013 and AY-6-1013 va devcb = &ay51013_device::set_write_so_callback(*device, DEVCB_##_devcb); #define MCFG_AY51013_STATUS_CHANGED_CB(_devcb) \ - devcb = &ay51013_device::set_status_changed_callback(*device, DEVCB_##_devcb); + devcb = &ay51013_device::set_status_changed_callback(*device, DEVCB_##_devcb); #endif diff --git a/src/emu/machine/corvushd.h b/src/emu/machine/corvushd.h index 7b51be5fa68..56bf0cf45b8 100644 --- a/src/emu/machine/corvushd.h +++ b/src/emu/machine/corvushd.h @@ -405,9 +405,9 @@ private: // Put drive into prep mode command (0x11) // struct { - UINT8 code; // Command code - UINT8 drive; // Drive number (starts at 1) - UINT8 prep_block[512]; // Machine code payload + UINT8 code; // Command code + UINT8 drive; // Drive number (starts at 1) + UINT8 prep_block[512]; // Machine code payload } prep_mode_command; // // Read Firmware command (Prep Mode 0x32) @@ -439,15 +439,15 @@ private: // // Verify Drive command (Prep Mode 0x07) // - // On the real Corvus controller, this is a variable length response. If the - // number of bad sectors is greater than zero, an additional four bytes will - // follow for each bad sector. We don't emulate bad sectors, so we always + // On the real Corvus controller, this is a variable length response. If the + // number of bad sectors is greater than zero, an additional four bytes will + // follow for each bad sector. We don't emulate bad sectors, so we always // return a count of 0. That makes this a fixed length response of 2 bytes. // struct { UINT8 status; // Disk access status UINT8 bad_sectors; // Number of bad sectors (always zero) - } verify_drive_response; + } verify_drive_response; } m_buffer; // Structure of Block #1, the Disk Parameter Block diff --git a/src/emu/machine/cr511b.h b/src/emu/machine/cr511b.h index 98380826de7..08ee9056901 100644 --- a/src/emu/machine/cr511b.h +++ b/src/emu/machine/cr511b.h @@ -1,33 +1,33 @@ /*************************************************************************** - CR-511-B CD-ROM drive + CR-511-B CD-ROM drive license: MAME, GPL-2.0+ copyright-holders: Dirk Best - CD-ROM drive with a custom MKE/Panasonic interface as used in the - Commodore CDTV and early SoundBlaster cards. - - 1 _RESET 2 GND - 3 EFFK 4 SCCK - 5 SBCP 6 SCOR - 7 GND 8 GND - 9 C16M 10 GND - 11 _XAEN 12 GND - 13 EMPASIS 14 D0 - 15 LRCK 16 DSCK - 17 _MUTE 18 GND - 19 _BUSY 20 _STCH - 21 _ENABLE 22 DRQ - 23 _HWR 24 GND - 25 _DTEN 26 _HRD - 27 _STEN 28 _CMD - 29 _EOP 30 GND - 31 DB7 32 GND - 33 DB6 34 DB5 - 35 DB4 36 GND - 37 DB3 38 DB2 - 39 DB1 40 DB0 + CD-ROM drive with a custom MKE/Panasonic interface as used in the + Commodore CDTV and early SoundBlaster cards. + + 1 _RESET 2 GND + 3 EFFK 4 SCCK + 5 SBCP 6 SCOR + 7 GND 8 GND + 9 C16M 10 GND + 11 _XAEN 12 GND + 13 EMPASIS 14 D0 + 15 LRCK 16 DSCK + 17 _MUTE 18 GND + 19 _BUSY 20 _STCH + 21 _ENABLE 22 DRQ + 23 _HWR 24 GND + 25 _DTEN 26 _HRD + 27 _STEN 28 _CMD + 29 _EOP 30 GND + 31 DB7 32 GND + 33 DB6 34 DB5 + 35 DB4 36 GND + 37 DB3 38 DB2 + 39 DB1 40 DB0 ***************************************************************************/ @@ -46,8 +46,7 @@ //************************************************************************** #define MCFG_CR511B_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, CR511B, 0) \ - + MCFG_DEVICE_ADD(_tag, CR511B, 0) #define MCFG_CR511B_STCH_HANDLER(_devcb) \ devcb = &cr511b_device::set_stch_handler(*device, DEVCB_##_devcb); diff --git a/src/emu/machine/dmac.h b/src/emu/machine/dmac.h index aff36e3f0c3..e87930ad7df 100644 --- a/src/emu/machine/dmac.h +++ b/src/emu/machine/dmac.h @@ -23,8 +23,7 @@ //************************************************************************** #define MCFG_DMAC_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, DMAC, _clock) \ - + MCFG_DEVICE_ADD(_tag, DMAC, _clock) #define MCFG_DMAC_CFGOUT_HANDLER(_devcb) \ devcb = &dmac_device::set_cfgout_handler(*device, DEVCB_##_devcb); @@ -109,25 +108,25 @@ private: // control register flags enum { - CNTR_TCEN = 0x80, // terminal count enable - CNTR_PREST = 0x40, // peripheral reset - CNTR_PDMD = 0x20, // peripheral device mode select (1=scsi, 0=xt) - CNTR_INTEN = 0x10, // interrupt enable - CNTR_DDIR = 0x08 // device direction (1=rd host, wr to peripheral) + CNTR_TCEN = 0x80, // terminal count enable + CNTR_PREST = 0x40, // peripheral reset + CNTR_PDMD = 0x20, // peripheral device mode select (1=scsi, 0=xt) + CNTR_INTEN = 0x10, // interrupt enable + CNTR_DDIR = 0x08 // device direction (1=rd host, wr to peripheral) }; // interrupt status register enum { - ISTR_INTX = 0x100, // xt interrupt pending - ISTR_INT_F = 0x080, // interrupt follow - ISTR_INTS = 0x040, // scsi peripheral interrupt - ISTR_E_INT = 0x020, // end-of-process interrupt - ISTR_INT_P = 0x010, // interrupt pending - ISTR_UE_INT = 0x008, // under-run fifo error interrupt - ISTR_OE_INT = 0x004, // over-run fifo error interrupt - ISTR_FF_FLG = 0x002, // fifo-full flag - ISTR_FE_FLG = 0x001 // fifo-empty flag + ISTR_INTX = 0x100, // xt interrupt pending + ISTR_INT_F = 0x080, // interrupt follow + ISTR_INTS = 0x040, // scsi peripheral interrupt + ISTR_E_INT = 0x020, // end-of-process interrupt + ISTR_INT_P = 0x010, // interrupt pending + ISTR_UE_INT = 0x008, // under-run fifo error interrupt + ISTR_OE_INT = 0x004, // over-run fifo error interrupt + ISTR_FF_FLG = 0x002, // fifo-full flag + ISTR_FE_FLG = 0x001 // fifo-empty flag }; static const int ISTR_INT_MASK = 0x1fc; @@ -153,10 +152,10 @@ private: int m_rst; // register - UINT16 m_cntr; // control register - UINT16 m_istr; // interrupt status register - UINT32 m_wtc; // word transfer count - UINT32 m_acr; // address control register + UINT16 m_cntr; // control register + UINT16 m_istr; // interrupt status register + UINT32 m_wtc; // word transfer count + UINT32 m_acr; // address control register bool m_dma_active; diff --git a/src/emu/machine/dp8390.h b/src/emu/machine/dp8390.h index 8a3fe0d7441..c4699ff7aab 100644 --- a/src/emu/machine/dp8390.h +++ b/src/emu/machine/dp8390.h @@ -17,7 +17,7 @@ #define MCFG_DP8390D_MEM_WRITE_CB(_devcb) \ devcb = &dp8390d_device::set_mem_write_callback(*device, DEVCB_##_devcb); - + #define MCFG_RTL8019A_IRQ_CB(_devcb) \ devcb = &rtl8019a_device::set_irq_callback(*device, DEVCB_##_devcb); @@ -37,7 +37,7 @@ class dp8390_device : public device_t, public: // construction/destruction dp8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source); - + template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_irq_cb.set_callback(object); } template<class _Object> static devcb_base &set_breq_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_breq_cb.set_callback(object); } template<class _Object> static devcb_base &set_mem_read_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_mem_read_cb.set_callback(object); } diff --git a/src/emu/machine/eepromser.h b/src/emu/machine/eepromser.h index e3683ee34ef..ace9f253f1b 100644 --- a/src/emu/machine/eepromser.h +++ b/src/emu/machine/eepromser.h @@ -59,7 +59,7 @@ // X24c44 16 bit ram/eeprom combo #define MCFG_EEPROM_SERIAL_X24C44_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, EEPROM_SERIAL_X24C44_16BIT, 0) - + // optional enable for streaming reads #define MCFG_EEPROM_SERIAL_ENABLE_STREAMING() \ eeprom_serial_base_device::static_enable_streaming(*device); @@ -144,7 +144,7 @@ protected: virtual void handle_event(eeprom_event event); virtual void parse_command_and_address() = 0; virtual void execute_command(); - + // configuration state UINT8 m_command_address_bits; // number of address bits in a command @@ -219,7 +219,7 @@ protected: class eeprom_serial_x24c44_device : public eeprom_serial_base_device { //async recall not implemented - //async store not implemented + //async store not implemented protected: // construction/destruction eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file); @@ -227,7 +227,7 @@ protected: public: // read handlers DECLARE_READ_LINE_MEMBER(do_read); // DO - + // write handlers DECLARE_WRITE_LINE_MEMBER(cs_write); // CS signal (active high) DECLARE_WRITE_LINE_MEMBER(clk_write); // CLK signal (active high) @@ -283,6 +283,6 @@ DECLARE_SERIAL_EEPROM_DEVICE(93cxx, 93c86, 93C86, 8) DECLARE_SERIAL_EEPROM_DEVICE(er5911, er5911, ER5911, 8) DECLARE_SERIAL_EEPROM_DEVICE(er5911, er5911, ER5911, 16) -// X24c44 8 bit 32byte ram/eeprom combo +// X24c44 8 bit 32byte ram/eeprom combo DECLARE_SERIAL_EEPROM_DEVICE(x24c44, x24c44, X24C44, 16) #endif diff --git a/src/emu/machine/gayle.h b/src/emu/machine/gayle.h index d125cec0720..df9a0e043d4 100644 --- a/src/emu/machine/gayle.h +++ b/src/emu/machine/gayle.h @@ -1,11 +1,11 @@ /*************************************************************************** - GAYLE + GAYLE license: MAME, GPL-2.0+ copyright-holders: Dirk Best - Gate array used in the Amiga 600 and Amiga 1200 computers. + Gate array used in the Amiga 600 and Amiga 1200 computers. ***************************************************************************/ @@ -87,10 +87,10 @@ protected: private: enum { - GAYLE_CS = 0, // interrupt status - GAYLE_IRQ, // interrupt change - GAYLE_INTEN, // interrupt enable register - GAYLE_CFG // config register + GAYLE_CS = 0, // interrupt status + GAYLE_IRQ, // interrupt change + GAYLE_INTEN, // interrupt enable register + GAYLE_CFG // config register }; devcb_write_line m_int2_w; diff --git a/src/emu/machine/hd63450.h b/src/emu/machine/hd63450.h index 227c970c259..dd4c96d7cda 100644 --- a/src/emu/machine/hd63450.h +++ b/src/emu/machine/hd63450.h @@ -100,7 +100,7 @@ public: dev.m_burst_clock[2] = clk3; dev.m_burst_clock[3] = clk4; } - + DECLARE_READ16_MEMBER( read ); DECLARE_WRITE16_MEMBER( write ); DECLARE_WRITE_LINE_MEMBER(drq0_w); @@ -133,7 +133,7 @@ private: const char *m_cpu_tag; attotime m_our_clock[4]; attotime m_burst_clock[4]; - + // internal state hd63450_regs m_reg[4]; emu_timer* m_timer[4]; // for timing data reading/writing each channel diff --git a/src/emu/machine/i8255.h b/src/emu/machine/i8255.h index 2b6c3aedf12..ed4b2f39ad2 100644 --- a/src/emu/machine/i8255.h +++ b/src/emu/machine/i8255.h @@ -79,7 +79,7 @@ public: template<class _Object> static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_out_pa_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_out_pb_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_pc_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_out_pc_cb.set_callback(object); } - + DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -125,7 +125,7 @@ private: devcb_read8 m_in_pa_cb; devcb_read8 m_in_pb_cb; devcb_read8 m_in_pc_cb; - + devcb_write8 m_out_pa_cb; devcb_write8 m_out_pb_cb; devcb_write8 m_out_pc_cb; diff --git a/src/emu/machine/i8271.h b/src/emu/machine/i8271.h index 97712511d8a..e69baee004f 100644 --- a/src/emu/machine/i8271.h +++ b/src/emu/machine/i8271.h @@ -31,8 +31,8 @@ public: template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i8271_device &>(device).m_write_irq.set_callback(object); } template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<i8271_device &>(device).m_write_drq.set_callback(object); } - static void set_floppy_tags(device_t &device, const char *tag1, const char *tag2) - { + static void set_floppy_tags(device_t &device, const char *tag1, const char *tag2) + { i8271_device &dev = downcast<i8271_device &>(device); dev.m_floppy_tag1 = tag1; dev.m_floppy_tag2 = tag2; diff --git a/src/emu/machine/i8279.h b/src/emu/machine/i8279.h index 162e50585d5..0f0cbccbd8a 100644 --- a/src/emu/machine/i8279.h +++ b/src/emu/machine/i8279.h @@ -84,7 +84,7 @@ public: template<class _Object> static devcb_base &set_in_rl_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_in_rl_cb.set_callback(object); } template<class _Object> static devcb_base &set_in_shift_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_in_shift_cb.set_callback(object); } template<class _Object> static devcb_base &set_in_ctrl_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_in_ctrl_cb.set_callback(object); } - + // read & write handlers DECLARE_READ8_MEMBER(status_r); DECLARE_READ8_MEMBER(data_r); @@ -115,7 +115,7 @@ private: devcb_write8 m_out_sl_cb; // Scanlines SL0-3 devcb_write8 m_out_disp_cb; // B0-3,A0-3 devcb_write_line m_out_bd_cb; // BD - devcb_read8 m_in_rl_cb; // kbd readlines RL0-7 + devcb_read8 m_in_rl_cb; // kbd readlines RL0-7 devcb_read_line m_in_shift_cb; // Shift key devcb_read_line m_in_ctrl_cb; // Ctrl-Strobe line diff --git a/src/emu/machine/ins8250.h b/src/emu/machine/ins8250.h index 1b80ddf646d..cc32242d60c 100644 --- a/src/emu/machine/ins8250.h +++ b/src/emu/machine/ins8250.h @@ -18,14 +18,14 @@ class ins8250_uart_device : public device_t, { public: ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); - + template<class _Object> static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_tx_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_dtr_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_dtr_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_rts_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_rts_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_int_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_out1_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_out1_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_out2_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_out2_cb.set_callback(object); } - + DECLARE_WRITE8_MEMBER( ins8250_w ); DECLARE_READ8_MEMBER( ins8250_r ); DECLARE_WRITE_LINE_MEMBER( dcd_w ); diff --git a/src/emu/machine/kb3600.h b/src/emu/machine/kb3600.h index b9f7c02624d..5775508d3cc 100644 --- a/src/emu/machine/kb3600.h +++ b/src/emu/machine/kb3600.h @@ -137,7 +137,7 @@ private: int m_b; // output buffer int m_ako; // any key down - int m_x_mask[9]; // mask of what keys are down + int m_x_mask[9]; // mask of what keys are down // timers emu_timer *m_scan_timer; // keyboard scan timer diff --git a/src/emu/machine/keyboard.h b/src/emu/machine/keyboard.h index 9c5091b5fc3..73eaf160f2a 100644 --- a/src/emu/machine/keyboard.h +++ b/src/emu/machine/keyboard.h @@ -16,12 +16,12 @@ INPUT_PORTS_EXTERN( generic_keyboard ); -class generic_keyboard_device : public device_t +class generic_keyboard_device : public device_t { public: generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); generic_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + template<class _Object> static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<generic_keyboard_device &>(device).m_keyboard_cb.set_callback(object); } virtual ioport_constructor device_input_ports() const; diff --git a/src/emu/machine/mb89352.h b/src/emu/machine/mb89352.h index 1e76def92e4..3c4952b2b2e 100644 --- a/src/emu/machine/mb89352.h +++ b/src/emu/machine/mb89352.h @@ -50,7 +50,7 @@ #define MCFG_MB89352A_IRQ_CB(_devcb) \ devcb = &mb89352_device::set_irq_callback(*device, DEVCB_##_devcb); - + #define MCFG_MB89352A_DRQ_CB(_devcb) \ devcb = &mb89352_device::set_drq_callback(*device, DEVCB_##_devcb); @@ -62,7 +62,7 @@ public: template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<mb89352_device &>(device).m_irq_cb.set_callback(object); } template<class _Object> static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast<mb89352_device &>(device).m_drq_cb.set_callback(object); } - + // any publically accessible interfaces needed for runtime DECLARE_READ8_MEMBER( mb89352_r ); DECLARE_WRITE8_MEMBER( mb89352_w ); diff --git a/src/emu/machine/mb89363b.h b/src/emu/machine/mb89363b.h index 43aa03e1e60..0b2f32a304a 100644 --- a/src/emu/machine/mb89363b.h +++ b/src/emu/machine/mb89363b.h @@ -113,7 +113,7 @@ private: devcb_read8 m_in_a_pa_cb; devcb_read8 m_in_a_pb_cb; devcb_read8 m_in_a_pc_cb; - + devcb_write8 m_out_a_pa_cb; devcb_write8 m_out_a_pb_cb; devcb_write8 m_out_a_pc_cb; @@ -121,7 +121,7 @@ private: devcb_read8 m_in_b_pa_cb; devcb_read8 m_in_b_pb_cb; devcb_read8 m_in_b_pc_cb; - + devcb_write8 m_out_b_pa_cb; devcb_write8 m_out_b_pb_cb; devcb_write8 m_out_b_pc_cb; diff --git a/src/emu/machine/mc6854.h b/src/emu/machine/mc6854.h index 40a7c694232..baa16636cc4 100644 --- a/src/emu/machine/mc6854.h +++ b/src/emu/machine/mc6854.h @@ -47,7 +47,7 @@ public: static void set_out_frame_callback(device_t &device, mc6854_out_frame_delegate callback) { downcast<mc6854_device &>(device).m_out_frame_cb = callback; } template<class _Object> static devcb_base &set_out_rts_callback(device_t &device, _Object object) { return downcast<mc6854_device &>(device).m_out_rts_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_dtr_callback(device_t &device, _Object object) { return downcast<mc6854_device &>(device).m_out_dtr_cb.set_callback(object); } - + /* interface to CPU via address/data bus*/ DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -74,13 +74,13 @@ protected: private: // internal state devcb_write_line m_out_irq_cb; /* interrupt request */ - + /* low-level, bit-based interface */ devcb_write_line m_out_txd_cb; /* transmit bit */ - - /* high-level, frame-based interface */ - mc6854_out_frame_delegate m_out_frame_cb; - + + /* high-level, frame-based interface */ + mc6854_out_frame_delegate m_out_frame_cb; + /* control lines */ devcb_write_line m_out_rts_cb; /* 1 = transmitting, 0 = idle */ devcb_write_line m_out_dtr_cb; /* 1 = data transmit ready, 0 = busy */ diff --git a/src/emu/machine/mos6530.h b/src/emu/machine/mos6530.h index a9753235772..33af24cf993 100644 --- a/src/emu/machine/mos6530.h +++ b/src/emu/machine/mos6530.h @@ -79,10 +79,10 @@ private: // internal state devcb_read8 m_in_pa_cb; devcb_write8 m_out_pa_cb; - + devcb_read8 m_in_pb_cb; devcb_write8 m_out_pb_cb; - + mos6530_port m_port[2]; UINT8 m_irqstate; diff --git a/src/emu/machine/ncr539x.h b/src/emu/machine/ncr539x.h index ec8eb1112f3..76f081c8c28 100644 --- a/src/emu/machine/ncr539x.h +++ b/src/emu/machine/ncr539x.h @@ -17,16 +17,16 @@ #define MCFG_NCR539X_OUT_IRQ_CB(_devcb) \ devcb = &ncr539x_device::set_out_irq_callback(*device, DEVCB_##_devcb); - + #define MCFG_NCR539X_OUT_DRQ_CB(_devcb) \ devcb = &ncr539x_device::set_out_drq_callback(*device, DEVCB_##_devcb); - + class ncr539x_device : public legacy_scsi_host_adapter { public: // construction/destruction ncr539x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<ncr539x_device &>(device).m_out_irq_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_drq_callback(device_t &device, _Object object) { return downcast<ncr539x_device &>(device).m_out_drq_cb.set_callback(object); } diff --git a/src/emu/machine/roc10937.h b/src/emu/machine/roc10937.h index 120cd33bddb..a8c5130b75a 100644 --- a/src/emu/machine/roc10937.h +++ b/src/emu/machine/roc10937.h @@ -1,7 +1,7 @@ /********************************************************************** - Rockwell 10937/10957 interface and simlar chips - Emulation by J.Wallace + Rockwell 10937/10957 interface and simlar chips + Emulation by J.Wallace OKI MSC1937 is a clone of this chip, with many others. **********************************************************************/ @@ -12,7 +12,7 @@ #define MCFG_ROC10937_ADD(_tag,_val) \ MCFG_DEVICE_ADD(_tag, ROC10937,60)\ - MCFG_ROC10937_PORT(_val) + MCFG_ROC10937_PORT(_val) #define MCFG_ROC10937_PORT(_val) \ roc10937_t::static_set_value(*device, _val); @@ -21,8 +21,8 @@ #define MCFG_ROC10957_ADD(_tag,_val) \ MCFG_DEVICE_ADD(_tag, ROC10957,60)\ - MCFG_ROC10957_PORT(_val) - + MCFG_ROC10957_PORT(_val) + #define MCFG_ROC10957_PORT(_val) \ roc10957_t::static_set_value(*device, _val); #define MCFG_ROC10957_REMOVE(_tag) \ @@ -30,8 +30,8 @@ #define MCFG_MSC1937_ADD(_tag,_val) \ MCFG_DEVICE_ADD(_tag, ROC10937,60)\ - MCFG_MSC1937_PORT(_val) - + MCFG_MSC1937_PORT(_val) + #define MCFG_MSC1937_PORT(_val) \ MCFG_ROC10937_PORT(_val) @@ -40,7 +40,7 @@ #define MCFG_S16LF01_ADD(_tag,_val) \ MCFG_DEVICE_ADD(_tag, S16LF01,60)\ - MCFG_S16LF01_PORT(_val) + MCFG_S16LF01_PORT(_val) #define MCFG_S16LF01_PORT(_val) \ MCFG_ROC10937_PORT(_val) diff --git a/src/emu/machine/s2636.h b/src/emu/machine/s2636.h index 53688f6bcd2..3be2d6e8093 100644 --- a/src/emu/machine/s2636.h +++ b/src/emu/machine/s2636.h @@ -32,7 +32,7 @@ public: dev.m_x_offset = x_offset; dev.m_y_offset = y_offset; } - + // returns a BITMAP_FORMAT_IND16 bitmap the size of the screen // D0-D2 of each pixel is the pixel color // D3 indicates whether the S2636 drew this pixel - 0 = not drawn, 1 = drawn @@ -65,7 +65,7 @@ private: int m_work_ram_size; int m_y_offset; int m_x_offset; - + int check_collision( int spriteno1, int spriteno2, const rectangle &cliprect ); }; diff --git a/src/emu/machine/s3c2400.h b/src/emu/machine/s3c2400.h index b456b080095..db4bc567392 100644 --- a/src/emu/machine/s3c2400.h +++ b/src/emu/machine/s3c2400.h @@ -19,16 +19,16 @@ #define MCFG_S3C2400_CORE_PIN_R_CB(_devcb) \ devcb = &s3c2400_device::set_core_pin_r_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2400_CORE_PIN_W_CB(_devcb) \ devcb = &s3c2400_device::set_core_pin_w_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2400_GPIO_PORT_R_CB(_devcb) \ devcb = &s3c2400_device::set_gpio_port_r_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2400_GPIO_PORT_W_CB(_devcb) \ devcb = &s3c2400_device::set_gpio_port_w_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2400_I2C_SCL_W_CB(_devcb) \ devcb = &s3c2400_device::set_i2c_scl_w_callback(*device, DEVCB_##_devcb); @@ -43,7 +43,7 @@ #define MCFG_S3C2400_I2S_DATA_W_CB(_devcb) \ devcb = &s3c2400_device::set_i2s_data_w_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2400_LCD_FLAGS(_flags) \ s3c2400_device::set_lcd_flags(*device, _flags); diff --git a/src/emu/machine/s3c2410.h b/src/emu/machine/s3c2410.h index da42c393ae7..802eb1cc52a 100644 --- a/src/emu/machine/s3c2410.h +++ b/src/emu/machine/s3c2410.h @@ -19,16 +19,16 @@ #define MCFG_S3C2410_CORE_PIN_R_CB(_devcb) \ devcb = &s3c2410_device::set_core_pin_r_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2410_CORE_PIN_W_CB(_devcb) \ devcb = &s3c2410_device::set_core_pin_w_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2410_GPIO_PORT_R_CB(_devcb) \ devcb = &s3c2410_device::set_gpio_port_r_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2410_GPIO_PORT_W_CB(_devcb) \ devcb = &s3c2410_device::set_gpio_port_w_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2410_I2C_SCL_W_CB(_devcb) \ devcb = &s3c2410_device::set_i2c_scl_w_callback(*device, DEVCB_##_devcb); @@ -43,7 +43,7 @@ #define MCFG_S3C2410_I2S_DATA_W_CB(_devcb) \ devcb = &s3c2410_device::set_i2s_data_w_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2410_NAND_COMMAND_W_CB(_devcb) \ devcb = &s3c2410_device::set_nand_command_w_callback(*device, DEVCB_##_devcb); @@ -55,7 +55,7 @@ #define MCFG_S3C2410_NAND_DATA_W_CB(_devcb) \ devcb = &s3c2410_device::set_nand_data_w_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2410_LCD_FLAGS(_flags) \ s3c2410_device::set_lcd_flags(*device, _flags); diff --git a/src/emu/machine/s3c2440.h b/src/emu/machine/s3c2440.h index b4a737b3776..4c333de06f7 100644 --- a/src/emu/machine/s3c2440.h +++ b/src/emu/machine/s3c2440.h @@ -18,16 +18,16 @@ #define MCFG_S3C2440_CORE_PIN_R_CB(_devcb) \ devcb = &s3c2440_device::set_core_pin_r_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2440_CORE_PIN_W_CB(_devcb) \ devcb = &s3c2440_device::set_core_pin_w_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2440_GPIO_PORT_R_CB(_devcb) \ devcb = &s3c2440_device::set_gpio_port_r_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2440_GPIO_PORT_W_CB(_devcb) \ devcb = &s3c2440_device::set_gpio_port_w_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2440_I2C_SCL_W_CB(_devcb) \ devcb = &s3c2440_device::set_i2c_scl_w_callback(*device, DEVCB_##_devcb); @@ -54,7 +54,7 @@ #define MCFG_S3C2440_NAND_DATA_W_CB(_devcb) \ devcb = &s3c2440_device::set_nand_data_w_callback(*device, DEVCB_##_devcb); - + #define MCFG_S3C2440_LCD_FLAGS(_flags) \ s3c2440_device::set_lcd_flags(*device, _flags); diff --git a/src/emu/machine/s3c44b0.h b/src/emu/machine/s3c44b0.h index 96b86240160..dc13e086f77 100644 --- a/src/emu/machine/s3c44b0.h +++ b/src/emu/machine/s3c44b0.h @@ -600,7 +600,7 @@ class s3c44b0_device : public device_t public: s3c44b0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~s3c44b0_device() {} - + template<class _Object> static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_port_r_cb.set_callback(object); } template<class _Object> static devcb_base &set_gpio_port_w_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_port_w_cb.set_callback(object); } template<class _Object> static devcb_base &set_i2c_scl_w_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_scl_w_cb.set_callback(object); } diff --git a/src/emu/machine/terminal.h b/src/emu/machine/terminal.h index 9684cb691db..9e2944e8806 100644 --- a/src/emu/machine/terminal.h +++ b/src/emu/machine/terminal.h @@ -21,14 +21,14 @@ INPUT_PORTS_EXTERN( generic_terminal ); -class generic_terminal_device : public device_t +class generic_terminal_device : public device_t { public: generic_terminal_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); generic_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + template<class _Object> static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<generic_terminal_device &>(device).m_keyboard_cb.set_callback(object); } - + DECLARE_WRITE8_MEMBER(write) { term_write(data); } DECLARE_WRITE8_MEMBER(kbd_put); UINT32 update(screen_device &device, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/emu/machine/tms9902.h b/src/emu/machine/tms9902.h index 9d34a48a240..ba775d3caa1 100644 --- a/src/emu/machine/tms9902.h +++ b/src/emu/machine/tms9902.h @@ -48,12 +48,12 @@ class tms9902_device : public device_t { public: tms9902_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + template<class _Object> static devcb_base &set_int_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_int_cb.set_callback(object); } template<class _Object> static devcb_base &set_rcv_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_rcv_cb.set_callback(object); } template<class _Object> static devcb_base &set_xmit_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_xmit_cb.set_callback(object); } template<class _Object> static devcb_base &set_ctrl_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_ctrl_cb.set_callback(object); } - + void set_clock(bool state); void rcv_cts(line_state state); diff --git a/src/emu/machine/upd71071.h b/src/emu/machine/upd71071.h index 3f8f11bb3ed..61e254b3e7e 100644 --- a/src/emu/machine/upd71071.h +++ b/src/emu/machine/upd71071.h @@ -26,7 +26,7 @@ class upd71071_device : public device_t public: upd71071_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~upd71071_device() {} - + static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<upd71071_device &>(device).m_cpu.set_tag(tag); } static void set_clock(device_t &device, int clock) { downcast<upd71071_device &>(device).m_upd_clock = clock; } template<class _Object> static devcb_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_hreq_cb.set_callback(object); } @@ -98,7 +98,7 @@ extern const device_type UPD71071; #define MCFG_UPD71071_CLOCK(_clk) \ upd71071_device::set_clock(*device, _clk); - + #define MCFG_UPD71071_OUT_HREQ_CB(_devcb) \ devcb = &upd71071_device::set_out_hreq_callback(*device, DEVCB_##_devcb); diff --git a/src/emu/machine/wd11c00_17.h b/src/emu/machine/wd11c00_17.h index fb6f702b0b4..9a49f252563 100644 --- a/src/emu/machine/wd11c00_17.h +++ b/src/emu/machine/wd11c00_17.h @@ -79,7 +79,7 @@ public: template<class _Object> static devcb_base &set_out_ramwr_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_ramwr_cb.set_callback(object); } template<class _Object> static devcb_base &set_in_cs1010_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_in_cs1010_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_cs1010_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_cs1010_cb.set_callback(object); } - + DECLARE_READ8_MEMBER( io_r ); DECLARE_WRITE8_MEMBER( io_w ); diff --git a/src/emu/machine/wd17xx.h b/src/emu/machine/wd17xx.h index 2aa7e39cb28..ac5844fb49a 100644 --- a/src/emu/machine/wd17xx.h +++ b/src/emu/machine/wd17xx.h @@ -1,6 +1,6 @@ /********************************************************************* - !!! DEPRECATED, USE src/emu/wd_fdc.h FOR NEW DRIVERS !!! + !!! DEPRECATED, USE src/emu/wd_fdc.h FOR NEW DRIVERS !!! wd17xx.h @@ -54,7 +54,7 @@ public: template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_out_intrq_func.set_callback(object); } template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_out_drq_func.set_callback(object); } template<class _Object> static devcb_base &set_dden_rd_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_in_dden_func.set_callback(object); } - + static void set_drive_tags(device_t &device, const char *tag1, const char *tag2, const char *tag3, const char *tag4) { wd1770_device &dev = downcast<wd1770_device &>(device); @@ -63,7 +63,7 @@ public: dev.m_floppy_drive_tags[2] = tag3; dev.m_floppy_drive_tags[3] = tag4; } - + /* the following are not strictly part of the wd179x hardware/emulation but will be put here for now until the flopdrv code has been finalised more */ void set_drive(UINT8); /* set drive wd179x is accessing */ @@ -130,7 +130,7 @@ protected: devcb_write_line m_out_intrq_func; devcb_write_line m_out_drq_func; devcb_read_line m_in_dden_func; - + const char *m_floppy_drive_tags[4]; /* input lines */ diff --git a/src/emu/machine/wd2010.h b/src/emu/machine/wd2010.h index 8e18254f30b..61f6b23497e 100644 --- a/src/emu/machine/wd2010.h +++ b/src/emu/machine/wd2010.h @@ -87,7 +87,7 @@ public: template<class _Object> static devcb_base &set_in_wf_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_wf_cb.set_callback(object); } template<class _Object> static devcb_base &set_in_tk000_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_tk000_cb.set_callback(object); } template<class _Object> static devcb_base &set_in_sc_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_sc_cb.set_callback(object); } - + DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/emu/machine/ym2148.h b/src/emu/machine/ym2148.h index 3757d75c75a..e92b0c6738a 100644 --- a/src/emu/machine/ym2148.h +++ b/src/emu/machine/ym2148.h @@ -89,4 +89,3 @@ extern const device_type YM2148; #endif - diff --git a/src/emu/machine/z80ctc.h b/src/emu/machine/z80ctc.h index d8ead13548f..4e395517092 100644 --- a/src/emu/machine/z80ctc.h +++ b/src/emu/machine/z80ctc.h @@ -65,7 +65,7 @@ public: template<class _Object> static devcb_base &set_zc0_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_zc0_cb.set_callback(object); } template<class _Object> static devcb_base &set_zc1_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_zc1_cb.set_callback(object); } template<class _Object> static devcb_base &set_zc2_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_zc2_cb.set_callback(object); } - + // read/write handlers DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -124,7 +124,7 @@ private: devcb_write_line m_zc1_cb; // channel 1 zero crossing callbacks devcb_write_line m_zc2_cb; // channel 2 zero crossing callbacks devcb_write_line m_zc3_cb; // channel 3 zero crossing callbacks = NULL ? - + UINT8 m_vector; // interrupt vector attotime m_period16; // 16/system clock attotime m_period256; // 256/system clock diff --git a/src/emu/machine/z80dart.h b/src/emu/machine/z80dart.h index 1e0114c120c..27376cddde0 100644 --- a/src/emu/machine/z80dart.h +++ b/src/emu/machine/z80dart.h @@ -485,10 +485,10 @@ public: template<class _Object> static devcb_base &set_out_syncb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_syncb_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_int_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_rxdrqa_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_rxdrqa_cb.set_callback(object); } - template<class _Object> static devcb_base &set_out_txdrqa_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txdrqa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_txdrqa_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txdrqa_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_rxdrqb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_rxdrqb_cb.set_callback(object); } - template<class _Object> static devcb_base &set_out_txdrqb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txdrqb_cb.set_callback(object); } - + template<class _Object> static devcb_base &set_out_txdrqb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txdrqb_cb.set_callback(object); } + static void configure_channels(device_t &device, int rxa, int txa, int rxb, int txb) { z80dart_device &dev = downcast<z80dart_device &>(device); @@ -497,7 +497,7 @@ public: dev.m_rxcb = rxb; dev.m_txcb = txb; } - + DECLARE_READ8_MEMBER( cd_ba_r ); DECLARE_WRITE8_MEMBER( cd_ba_w ); DECLARE_READ8_MEMBER( ba_cd_r ); @@ -565,19 +565,19 @@ protected: int m_txca; int m_rxcb; int m_txcb; - + devcb_write_line m_out_txda_cb; devcb_write_line m_out_dtra_cb; devcb_write_line m_out_rtsa_cb; devcb_write_line m_out_wrdya_cb; devcb_write_line m_out_synca_cb; - + devcb_write_line m_out_txdb_cb; devcb_write_line m_out_dtrb_cb; devcb_write_line m_out_rtsb_cb; devcb_write_line m_out_wrdyb_cb; devcb_write_line m_out_syncb_cb; - + devcb_write_line m_out_int_cb; devcb_write_line m_out_rxdrqa_cb; devcb_write_line m_out_txdrqa_cb; diff --git a/src/emu/machine/z80dma.h b/src/emu/machine/z80dma.h index 93641ff17c5..f16812ef07b 100644 --- a/src/emu/machine/z80dma.h +++ b/src/emu/machine/z80dma.h @@ -83,7 +83,7 @@ public: template<class _Object> static devcb_base &set_out_mreq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_mreq_cb.set_callback(object); } template<class _Object> static devcb_base &set_in_iorq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_in_iorq_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_iorq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_iorq_cb.set_callback(object); } - + UINT8 read(); void write(UINT8 data); DECLARE_READ8_MEMBER( read ) { return read(); } diff --git a/src/emu/machine/z80pio.h b/src/emu/machine/z80pio.h index 3dc71316126..91285fbc73a 100644 --- a/src/emu/machine/z80pio.h +++ b/src/emu/machine/z80pio.h @@ -92,7 +92,7 @@ public: template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_in_pb_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_pb_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_brdy_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_brdy_cb.set_callback(object); } - + // I/O line access int rdy(int which) { return m_port[which].rdy(); } void strobe(int which, bool state) { m_port[which].strobe(state); } @@ -206,7 +206,7 @@ private: devcb_read8 m_in_pa_cb; devcb_write8 m_out_pa_cb; devcb_write_line m_out_ardy_cb; - + devcb_read8 m_in_pb_cb; devcb_write8 m_out_pb_cb; devcb_write_line m_out_brdy_cb; diff --git a/src/emu/machine/z80sti.h b/src/emu/machine/z80sti.h index 2d156706c69..4065bf6bdcb 100644 --- a/src/emu/machine/z80sti.h +++ b/src/emu/machine/z80sti.h @@ -94,7 +94,7 @@ public: template<class _Object> static devcb_base &set_out_tbo_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_tbo_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_tco_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_tco_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_tdo_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_tdo_cb.set_callback(object); } - + static void set_rx_clock(device_t &device, int clock) { downcast<z80sti_device &>(device).m_rx_clock = clock; } static void set_tx_clock(device_t &device, int clock) { downcast<z80sti_device &>(device).m_tx_clock = clock; } @@ -201,15 +201,15 @@ private: void gpip_input(int bit, int state); // device callbacks - devcb_write_line m_out_int_cb; // this gets called on each change of the _INT pin (pin 17) - devcb_read8 m_in_gpio_cb; // this is called on each read of the GPIO pins - devcb_write8 m_out_gpio_cb; // this is called on each write of the GPIO pins - devcb_write_line m_out_so_cb; // this gets called for each change of the SO pin (pin 37) - devcb_write_line m_out_tao_cb; // this gets called for each change of the TAO pin (pin 1) - devcb_write_line m_out_tbo_cb; // this gets called for each change of the TBO pin (pin 2) - devcb_write_line m_out_tco_cb; // this gets called for each change of the TCO pin (pin 3) - devcb_write_line m_out_tdo_cb; // this gets called for each change of the TDO pin (pin 4) - + devcb_write_line m_out_int_cb; // this gets called on each change of the _INT pin (pin 17) + devcb_read8 m_in_gpio_cb; // this is called on each read of the GPIO pins + devcb_write8 m_out_gpio_cb; // this is called on each write of the GPIO pins + devcb_write_line m_out_so_cb; // this gets called for each change of the SO pin (pin 37) + devcb_write_line m_out_tao_cb; // this gets called for each change of the TAO pin (pin 1) + devcb_write_line m_out_tbo_cb; // this gets called for each change of the TBO pin (pin 2) + devcb_write_line m_out_tco_cb; // this gets called for each change of the TCO pin (pin 3) + devcb_write_line m_out_tdo_cb; // this gets called for each change of the TDO pin (pin 4) + int m_rx_clock; // serial receive clock int m_tx_clock; // serial transmit clock |