diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2014-05-14 06:46:50 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2014-05-14 06:46:50 +0000 |
commit | 546fbff34966f4f5f62930dd73c064df90d4e51e (patch) | |
tree | a2e859303874d5ee6cda105c465983e5223d5675 /src/mess | |
parent | c5a60146edfc6d9bf8ff7f398b0c3fa17b94b1e3 (diff) |
devcv2 -> devcb (nw)
Diffstat (limited to 'src/mess')
56 files changed, 312 insertions, 312 deletions
diff --git a/src/mess/audio/dave.h b/src/mess/audio/dave.h index 2387240fa5c..84301682d3f 100644 --- a/src/mess/audio/dave.h +++ b/src/mess/audio/dave.h @@ -36,13 +36,13 @@ #define MCFG_DAVE_IRQ_CALLBACK(_write) \ - devcb = &dave_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &dave_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_DAVE_LH_CALLBACK(_write) \ - devcb = &dave_device::set_lh_wr_callback(*device, DEVCB2_##_write); + devcb = &dave_device::set_lh_wr_callback(*device, DEVCB_##_write); #define MCFG_DAVE_RH_CALLBACK(_write) \ - devcb = &dave_device::set_rh_wr_callback(*device, DEVCB2_##_write); + devcb = &dave_device::set_rh_wr_callback(*device, DEVCB_##_write); @@ -59,9 +59,9 @@ class dave_device : public device_t, public: dave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<dave_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_lh_wr_callback(device_t &device, _Object object) { return downcast<dave_device &>(device).m_write_lh.set_callback(object); } - template<class _Object> static devcb2_base &set_rh_wr_callback(device_t &device, _Object object) { return downcast<dave_device &>(device).m_write_rh.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<dave_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_lh_wr_callback(device_t &device, _Object object) { return downcast<dave_device &>(device).m_write_lh.set_callback(object); } + template<class _Object> static devcb_base &set_rh_wr_callback(device_t &device, _Object object) { return downcast<dave_device &>(device).m_write_rh.set_callback(object); } virtual DECLARE_ADDRESS_MAP(z80_program_map, 8); virtual DECLARE_ADDRESS_MAP(z80_io_map, 8); @@ -112,9 +112,9 @@ private: const address_space_config m_program_space_config; const address_space_config m_io_space_config; - devcb2_write_line m_write_irq; - devcb2_write8 m_write_lh; - devcb2_write8 m_write_rh; + devcb_write_line m_write_irq; + devcb_write8 m_write_lh; + devcb_write8 m_write_rh; UINT8 m_segment[4]; diff --git a/src/mess/audio/mea8000.h b/src/mess/audio/mea8000.h index 534d3eb1d7f..67857c9561a 100644 --- a/src/mess/audio/mea8000.h +++ b/src/mess/audio/mea8000.h @@ -15,7 +15,7 @@ mea8000_device::static_set_dac_tag(*device, "^" _tag); #define MCFG_MEA8000_REQ_CALLBACK(_write) \ - devcb = &mea8000_device::set_reqwr_callback(*device, DEVCB2_##_write); + devcb = &mea8000_device::set_reqwr_callback(*device, DEVCB_##_write); /* table amplitude [-QUANT,QUANT] */ #define QUANT 512 @@ -59,7 +59,7 @@ public: ~mea8000_device() {} static void static_set_dac_tag(device_t &device, const char *tag) { downcast<mea8000_device &>(device).m_dac.set_tag(tag); } - template<class _Object> static devcb2_base &set_req_wr_callback(device_t &device, _Object object) { return downcast<mea8000_device &>(device).m_write_req.set_callback(object); } + template<class _Object> static devcb_base &set_req_wr_callback(device_t &device, _Object object) { return downcast<mea8000_device &>(device).m_write_req.set_callback(object); } DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -96,7 +96,7 @@ private: TIMER_CALLBACK_MEMBER(timer_expire); - devcb2_write8 m_write_req; + devcb_write8 m_write_req; required_device<dac_device> m_dac; diff --git a/src/mess/audio/upd1771.h b/src/mess/audio/upd1771.h index 0395519bee7..f26b3a0b447 100644 --- a/src/mess/audio/upd1771.h +++ b/src/mess/audio/upd1771.h @@ -12,7 +12,7 @@ #define MAX_PACKET_SIZE 0x8000 #define MCFG_UPD1771_ACK_HANDLER(_devcb) \ - devcb = &upd1771c_device::set_ack_handler(*device, DEVCB2_##_devcb); + devcb = &upd1771c_device::set_ack_handler(*device, DEVCB_##_devcb); /*************************************************************************** @@ -26,7 +26,7 @@ public: upd1771c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~upd1771c_device() {} - template<class _Object> static devcb2_base &set_ack_handler(device_t &device, _Object object) { return downcast<upd1771c_device &>(device).m_ack_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ack_handler(device_t &device, _Object object) { return downcast<upd1771c_device &>(device).m_ack_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -43,7 +43,7 @@ protected: private: // internal state sound_stream *m_channel; - devcb2_write_line m_ack_handler; + devcb_write_line m_ack_handler; emu_timer *m_timer; TIMER_CALLBACK_MEMBER(ack_callback); diff --git a/src/mess/includes/tvc.h b/src/mess/includes/tvc.h index 27fd7100a12..68152acc9f0 100644 --- a/src/mess/includes/tvc.h +++ b/src/mess/includes/tvc.h @@ -29,7 +29,7 @@ #define CENTRONICS_TAG "centronics" #define MCFG_TVC_SOUND_SNDINT_CALLBACK(_write) \ - devcb = &tvc_sound_device::set_sndint_wr_callback(*device, DEVCB2_##_write); + devcb = &tvc_sound_device::set_sndint_wr_callback(*device, DEVCB_##_write); //************************************************************************** // TYPE DEFINITIONS @@ -44,7 +44,7 @@ public: // construction/destruction tvc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_sndint_wr_callback(device_t &device, _Object object) { return downcast<tvc_sound_device &>(device).m_write_sndint.set_callback(object); } + template<class _Object> static devcb_base &set_sndint_wr_callback(device_t &device, _Object object) { return downcast<tvc_sound_device &>(device).m_write_sndint.set_callback(object); } DECLARE_WRITE8_MEMBER(write); void reset_divider(); @@ -67,7 +67,7 @@ private: int m_signal; UINT8 m_ports[3]; emu_timer * m_sndint_timer; - devcb2_write_line m_write_sndint; + devcb_write_line m_write_sndint; }; diff --git a/src/mess/machine/6883sam.h b/src/mess/machine/6883sam.h index f8a734c17d4..4d0b4def1ca 100644 --- a/src/mess/machine/6883sam.h +++ b/src/mess/machine/6883sam.h @@ -18,7 +18,7 @@ sam6883_device::configure_cpu(*device, _cputag, _cpuspace); #define MCFG_SAM6883_RES_CALLBACK(_read) \ - devcb = &sam6883_device::set_res_rd_callback(*device, DEVCB2_##_read); + devcb = &sam6883_device::set_res_rd_callback(*device, DEVCB_##_read); //************************************************************************** @@ -87,7 +87,7 @@ class sam6883_device : public device_t, public sam6883_friend_device public: sam6883_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_res_rd_callback(device_t &device, _Object object) { return downcast<sam6883_device &>(device).m_read_res.set_callback(object); } + template<class _Object> static devcb_base &set_res_rd_callback(device_t &device, _Object object) { return downcast<sam6883_device &>(device).m_read_res.set_callback(object); } static void configure_cpu(device_t &device, const char *tag, address_spacenum space) { @@ -172,7 +172,7 @@ private: // incidentals address_space * m_cpu_space; - devcb2_read8 m_read_res; + devcb_read8 m_read_res; sam_bank m_banks[8]; sam_space<0x0000, 0x7FFF> m_space_0000; sam_space<0x8000, 0x9FFF> m_space_8000; diff --git a/src/mess/machine/abc80kb.h b/src/mess/machine/abc80kb.h index 377800a975e..e1f422b18e6 100644 --- a/src/mess/machine/abc80kb.h +++ b/src/mess/machine/abc80kb.h @@ -32,7 +32,7 @@ //************************************************************************** #define MCFG_ABC80_KEYBOARD_KEYDOWN_CALLBACK(_write) \ - devcb = &abc80_keyboard_device::set_keydown_wr_callback(*device, DEVCB2_##_write); + devcb = &abc80_keyboard_device::set_keydown_wr_callback(*device, DEVCB_##_write); @@ -48,7 +48,7 @@ public: // construction/destruction abc80_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_keydown_wr_callback(device_t &device, _Object object) { return downcast<abc80_keyboard_device &>(device).m_write_keydown.set_callback(object); } + template<class _Object> static devcb_base &set_keydown_wr_callback(device_t &device, _Object object) { return downcast<abc80_keyboard_device &>(device).m_write_keydown.set_callback(object); } // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -63,7 +63,7 @@ protected: virtual void device_reset(); private: - devcb2_write_line m_write_keydown; + devcb_write_line m_write_keydown; required_device<cpu_device> m_maincpu; }; diff --git a/src/mess/machine/amigakbd.h b/src/mess/machine/amigakbd.h index bec639c6c35..54a7834f9f1 100644 --- a/src/mess/machine/amigakbd.h +++ b/src/mess/machine/amigakbd.h @@ -7,10 +7,10 @@ //************************************************************************** #define MCFG_AMIGA_KEYBOARD_KCLK_CALLBACK(_write) \ - devcb = &amigakbd_device::set_kclk_wr_callback(*device, DEVCB2_##_write); + devcb = &amigakbd_device::set_kclk_wr_callback(*device, DEVCB_##_write); #define MCFG_AMIGA_KEYBOARD_KDAT_CALLBACK(_write) \ - devcb = &amigakbd_device::set_kdat_wr_callback(*device, DEVCB2_##_write); + devcb = &amigakbd_device::set_kdat_wr_callback(*device, DEVCB_##_write); //************************************************************************** @@ -25,8 +25,8 @@ public: // construction/destruction amigakbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_kclk_wr_callback(device_t &device, _Object object) { return downcast<amigakbd_device &>(device).m_write_kclk.set_callback(object); } - template<class _Object> static devcb2_base &set_kdat_wr_callback(device_t &device, _Object object) { return downcast<amigakbd_device &>(device).m_write_kdat.set_callback(object); } + template<class _Object> static devcb_base &set_kclk_wr_callback(device_t &device, _Object object) { return downcast<amigakbd_device &>(device).m_write_kclk.set_callback(object); } + template<class _Object> static devcb_base &set_kdat_wr_callback(device_t &device, _Object object) { return downcast<amigakbd_device &>(device).m_write_kdat.set_callback(object); } // optional information overrides virtual ioport_constructor device_input_ports() const; @@ -42,8 +42,8 @@ protected: void kbd_sendscancode(UINT8 scancode ); private: - devcb2_write_line m_write_kclk; - devcb2_write_line m_write_kdat; + devcb_write_line m_write_kclk; + devcb_write_line m_write_kdat; UINT8 *m_buf; int m_buf_pos; diff --git a/src/mess/machine/apollo_kbd.h b/src/mess/machine/apollo_kbd.h index eaae4538dc6..b10dfcf8a49 100644 --- a/src/mess/machine/apollo_kbd.h +++ b/src/mess/machine/apollo_kbd.h @@ -31,10 +31,10 @@ //************************************************************************** #define MCFG_APOLLO_KBD_TX_CALLBACK(_cb) \ - devcb = &apollo_kbd_device::set_tx_cb(*device, DEVCB2_##_cb); + devcb = &apollo_kbd_device::set_tx_cb(*device, DEVCB_##_cb); #define MCFG_APOLLO_KBD_GERMAN_CALLBACK(_cb) \ - devcb = &apollo_kbd_device::set_german_cb(*device, DEVCB2_##_cb); + devcb = &apollo_kbd_device::set_german_cb(*device, DEVCB_##_cb); INPUT_PORTS_EXTERN(apollo_kbd); @@ -50,11 +50,11 @@ public: // construction/destruction apollo_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_tx_cb(device_t &device, _Object object) { return downcast<apollo_kbd_device &>(device).m_tx_w.set_callback(object); } - template<class _Object> static devcb2_base &set_german_cb(device_t &device, _Object object) { return downcast<apollo_kbd_device &>(device).m_german_r.set_callback(object); } + template<class _Object> static devcb_base &set_tx_cb(device_t &device, _Object object) { return downcast<apollo_kbd_device &>(device).m_tx_w.set_callback(object); } + template<class _Object> static devcb_base &set_german_cb(device_t &device, _Object object) { return downcast<apollo_kbd_device &>(device).m_german_r.set_callback(object); } - devcb2_write_line m_tx_w; - devcb2_read_line m_german_r; + devcb_write_line m_tx_w; + devcb_read_line m_german_r; private: // device-level overrides diff --git a/src/mess/machine/apricotkb.h b/src/mess/machine/apricotkb.h index bf12f70c664..75c0e98c217 100644 --- a/src/mess/machine/apricotkb.h +++ b/src/mess/machine/apricotkb.h @@ -29,7 +29,7 @@ //************************************************************************** #define MCFG_APRICOT_KEYBOARD_TXD_CALLBACK(_write) \ - devcb = &apricot_keyboard_device::set_tcd_wr_callback(*device, DEVCB2_##_write); + devcb = &apricot_keyboard_device::set_tcd_wr_callback(*device, DEVCB_##_write); @@ -45,7 +45,7 @@ public: // construction/destruction apricot_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_txd_wr_callback(device_t &device, _Object object) { return downcast<apricot_keyboard_device &>(device).m_write_txd.set_callback(object); } + template<class _Object> static devcb_base &set_txd_wr_callback(device_t &device, _Object object) { return downcast<apricot_keyboard_device &>(device).m_write_txd.set_callback(object); } // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -69,7 +69,7 @@ protected: virtual void device_reset(); private: - devcb2_write_line m_write_txd; + devcb_write_line m_write_txd; required_ioport m_y0; required_ioport m_y1; diff --git a/src/mess/machine/compiskb.h b/src/mess/machine/compiskb.h index 3b23b2b3c65..66b6f76dcc5 100644 --- a/src/mess/machine/compiskb.h +++ b/src/mess/machine/compiskb.h @@ -25,7 +25,7 @@ //************************************************************************** #define MCFG_COMPIS_KEYBOARD_OUT_TX_HANDLER(_devcb) \ - devcb = &compis_keyboard_device::set_out_tx_handler(*device, DEVCB2_##_devcb); + devcb = &compis_keyboard_device::set_out_tx_handler(*device, DEVCB_##_devcb); @@ -42,7 +42,7 @@ public: // construction/destruction compis_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_tx_handler(device_t &device, _Object object) { return downcast<compis_keyboard_device &>(device).m_out_tx_handler.set_callback(object); } + template<class _Object> static devcb_base &set_out_tx_handler(device_t &device, _Object object) { return downcast<compis_keyboard_device &>(device).m_out_tx_handler.set_callback(object); } // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -78,7 +78,7 @@ private: required_ioport m_y8; required_ioport m_y9; required_ioport m_special; - devcb2_write_line m_out_tx_handler; + devcb_write_line m_out_tx_handler; UINT8 m_bus; UINT8 m_keylatch; diff --git a/src/mess/machine/cuda.h b/src/mess/machine/cuda.h index d287293a84e..ef03ef02bf5 100644 --- a/src/mess/machine/cuda.h +++ b/src/mess/machine/cuda.h @@ -37,16 +37,16 @@ MCFG_DEVICE_REMOVE(CUDA_TAG) #define MCFG_CUDA_RESET_CALLBACK(_cb) \ - devcb = &cuda_device::set_reset_cb(*device, DEVCB2_##_cb); + devcb = &cuda_device::set_reset_cb(*device, DEVCB_##_cb); #define MCFG_CUDA_LINECHANGE_CALLBACK(_cb) \ - devcb = &cuda_device::set_linechange_cb(*device, DEVCB2_##_cb); + devcb = &cuda_device::set_linechange_cb(*device, DEVCB_##_cb); #define MCFG_CUDA_VIA_CLOCK_CALLBACK(_cb) \ - devcb = &cuda_device::set_via_clock_cb(*device, DEVCB2_##_cb); + devcb = &cuda_device::set_via_clock_cb(*device, DEVCB_##_cb); #define MCFG_CUDA_VIA_DATA_CALLBACK(_cb) \ - devcb = &cuda_device::set_via_data_cb(*device, DEVCB2_##_cb); + devcb = &cuda_device::set_via_data_cb(*device, DEVCB_##_cb); //************************************************************************** // TYPE DEFINITIONS @@ -95,12 +95,12 @@ public: int rom_offset; - template<class _Object> static devcb2_base &set_reset_cb(device_t &device, _Object wr) { return downcast<cuda_device &>(device).write_reset.set_callback(wr); } - template<class _Object> static devcb2_base &set_linechange_cb(device_t &device, _Object wr) { return downcast<cuda_device &>(device).write_linechange.set_callback(wr); } - template<class _Object> static devcb2_base &set_via_clock_cb(device_t &device, _Object wr) { return downcast<cuda_device &>(device).write_via_clock.set_callback(wr); } - template<class _Object> static devcb2_base &set_via_data_cb(device_t &device, _Object wr) { return downcast<cuda_device &>(device).write_via_data.set_callback(wr); } + template<class _Object> static devcb_base &set_reset_cb(device_t &device, _Object wr) { return downcast<cuda_device &>(device).write_reset.set_callback(wr); } + template<class _Object> static devcb_base &set_linechange_cb(device_t &device, _Object wr) { return downcast<cuda_device &>(device).write_linechange.set_callback(wr); } + template<class _Object> static devcb_base &set_via_clock_cb(device_t &device, _Object wr) { return downcast<cuda_device &>(device).write_via_clock.set_callback(wr); } + template<class _Object> static devcb_base &set_via_data_cb(device_t &device, _Object wr) { return downcast<cuda_device &>(device).write_via_data.set_callback(wr); } - devcb2_write_line write_reset, write_linechange, write_via_clock, write_via_data; + devcb_write_line write_reset, write_linechange, write_via_clock, write_via_data; protected: // device-level overrides diff --git a/src/mess/machine/dec_lk201.h b/src/mess/machine/dec_lk201.h index 2943313f525..e275d0955b4 100644 --- a/src/mess/machine/dec_lk201.h +++ b/src/mess/machine/dec_lk201.h @@ -29,7 +29,7 @@ //************************************************************************** #define MCFG_LK201_TX_HANDLER(_cb) \ - devcb = &lk201_device::set_tx_handler(*device, DEVCB2_##_cb); + devcb = &lk201_device::set_tx_handler(*device, DEVCB_##_cb); //************************************************************************** // TYPE DEFINITIONS @@ -52,7 +52,7 @@ public: DECLARE_READ8_MEMBER( spi_r ); DECLARE_WRITE8_MEMBER( spi_w ); - template<class _Object> static devcb2_base &set_tx_handler(device_t &device, _Object wr) { return downcast<lk201_device &>(device).m_tx_handler.set_callback(wr); } + template<class _Object> static devcb_base &set_tx_handler(device_t &device, _Object wr) { return downcast<lk201_device &>(device).m_tx_handler.set_callback(wr); } protected: // device-level overrides @@ -106,7 +106,7 @@ private: void send_port(address_space &space, UINT8 offset, UINT8 data); void update_interrupts(); - devcb2_write_line m_tx_handler; + devcb_write_line m_tx_handler; }; // device type definition diff --git a/src/mess/machine/e05a03.h b/src/mess/machine/e05a03.h index 495ff6b46dc..e1bab778535 100644 --- a/src/mess/machine/e05a03.h +++ b/src/mess/machine/e05a03.h @@ -15,19 +15,19 @@ ***************************************************************************/ #define MCFG_E05A03_NLQ_LP_CALLBACK(_write) \ - devcb = &e05a03_device::set_nlq_lp_wr_callback(*device, DEVCB2_##_write); + devcb = &e05a03_device::set_nlq_lp_wr_callback(*device, DEVCB_##_write); #define MCFG_E05A03_PE_LP_CALLBACK(_write) \ - devcb = &e05a03_device::set_pe_lp_wr_callback(*device, DEVCB2_##_write); + devcb = &e05a03_device::set_pe_lp_wr_callback(*device, DEVCB_##_write); #define MCFG_E05A03_RESO_CALLBACK(_write) \ - devcb = &e05a03_device::set_reso_wr_callback(*device, DEVCB2_##_write); + devcb = &e05a03_device::set_reso_wr_callback(*device, DEVCB_##_write); #define MCFG_E05A03_PE_CALLBACK(_write) \ - devcb = &e05a03_device::set_pe_wr_callback(*device, DEVCB2_##_write); + devcb = &e05a03_device::set_pe_wr_callback(*device, DEVCB_##_write); #define MCFG_E05A03_DATA_CALLBACK(_read) \ - devcb = &e05a03_device::set_data_rd_callback(*device, DEVCB2_##_read); + devcb = &e05a03_device::set_data_rd_callback(*device, DEVCB_##_read); /*************************************************************************** @@ -40,11 +40,11 @@ public: e05a03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~e05a03_device() {} - template<class _Object> static devcb2_base &set_nlq_lp_wr_callback(device_t &device, _Object object) { return downcast<e05a03_device &>(device).m_write_nlq_lp.set_callback(object); } - template<class _Object> static devcb2_base &set_pe_lp_wr_callback(device_t &device, _Object object) { return downcast<e05a03_device &>(device).m_write_pe_lp.set_callback(object); } - template<class _Object> static devcb2_base &set_reso_wr_callback(device_t &device, _Object object) { return downcast<e05a03_device &>(device).m_write_reso.set_callback(object); } - template<class _Object> static devcb2_base &set_pe_wr_callback(device_t &device, _Object object) { return downcast<e05a03_device &>(device).m_write_pe.set_callback(object); } - template<class _Object> static devcb2_base &set_data_rd_callback(device_t &device, _Object object) { return downcast<e05a03_device &>(device).m_read_data.set_callback(object); } + template<class _Object> static devcb_base &set_nlq_lp_wr_callback(device_t &device, _Object object) { return downcast<e05a03_device &>(device).m_write_nlq_lp.set_callback(object); } + template<class _Object> static devcb_base &set_pe_lp_wr_callback(device_t &device, _Object object) { return downcast<e05a03_device &>(device).m_write_pe_lp.set_callback(object); } + template<class _Object> static devcb_base &set_reso_wr_callback(device_t &device, _Object object) { return downcast<e05a03_device &>(device).m_write_reso.set_callback(object); } + template<class _Object> static devcb_base &set_pe_wr_callback(device_t &device, _Object object) { return downcast<e05a03_device &>(device).m_write_pe.set_callback(object); } + template<class _Object> static devcb_base &set_data_rd_callback(device_t &device, _Object object) { return downcast<e05a03_device &>(device).m_read_data.set_callback(object); } DECLARE_WRITE8_MEMBER( write ); DECLARE_READ8_MEMBER( read ); @@ -64,11 +64,11 @@ protected: private: // internal state /* callbacks */ - devcb2_write_line m_write_nlq_lp; /* pin 2, nlq lamp output */ - devcb2_write_line m_write_pe_lp; /* pin 3, paper empty lamp output */ - devcb2_write_line m_write_reso; /* pin 25, reset output */ - devcb2_write_line m_write_pe; /* pin 35, centronics pe output */ - devcb2_read8 m_read_data; /* pin 47-54, centronics data input */ + devcb_write_line m_write_nlq_lp; /* pin 2, nlq lamp output */ + devcb_write_line m_write_pe_lp; /* pin 3, paper empty lamp output */ + devcb_write_line m_write_reso; /* pin 25, reset output */ + devcb_write_line m_write_pe; /* pin 35, centronics pe output */ + devcb_read8 m_read_data; /* pin 47-54, centronics data input */ /* 24-bit shift register, port 0x00, 0x01 and 0x02 */ UINT32 m_shift; diff --git a/src/mess/machine/egret.h b/src/mess/machine/egret.h index e4f3fe38151..2b3749a3482 100644 --- a/src/mess/machine/egret.h +++ b/src/mess/machine/egret.h @@ -36,16 +36,16 @@ MCFG_DEVICE_REMOVE(EGRET_TAG) #define MCFG_EGRET_RESET_CALLBACK(_cb) \ - devcb = &egret_device::set_reset_cb(*device, DEVCB2_##_cb); + devcb = &egret_device::set_reset_cb(*device, DEVCB_##_cb); #define MCFG_EGRET_LINECHANGE_CALLBACK(_cb) \ - devcb = &egret_device::set_linechange_cb(*device, DEVCB2_##_cb); + devcb = &egret_device::set_linechange_cb(*device, DEVCB_##_cb); #define MCFG_EGRET_VIA_CLOCK_CALLBACK(_cb) \ - devcb = &egret_device::set_via_clock_cb(*device, DEVCB2_##_cb); + devcb = &egret_device::set_via_clock_cb(*device, DEVCB_##_cb); #define MCFG_EGRET_VIA_DATA_CALLBACK(_cb) \ - devcb = &egret_device::set_via_data_cb(*device, DEVCB2_##_cb); + devcb = &egret_device::set_via_data_cb(*device, DEVCB_##_cb); //************************************************************************** // TYPE DEFINITIONS @@ -94,12 +94,12 @@ public: int rom_offset; - template<class _Object> static devcb2_base &set_reset_cb(device_t &device, _Object wr) { return downcast<egret_device &>(device).write_reset.set_callback(wr); } - template<class _Object> static devcb2_base &set_linechange_cb(device_t &device, _Object wr) { return downcast<egret_device &>(device).write_linechange.set_callback(wr); } - template<class _Object> static devcb2_base &set_via_clock_cb(device_t &device, _Object wr) { return downcast<egret_device &>(device).write_via_clock.set_callback(wr); } - template<class _Object> static devcb2_base &set_via_data_cb(device_t &device, _Object wr) { return downcast<egret_device &>(device).write_via_data.set_callback(wr); } + template<class _Object> static devcb_base &set_reset_cb(device_t &device, _Object wr) { return downcast<egret_device &>(device).write_reset.set_callback(wr); } + template<class _Object> static devcb_base &set_linechange_cb(device_t &device, _Object wr) { return downcast<egret_device &>(device).write_linechange.set_callback(wr); } + template<class _Object> static devcb_base &set_via_clock_cb(device_t &device, _Object wr) { return downcast<egret_device &>(device).write_via_clock.set_callback(wr); } + template<class _Object> static devcb_base &set_via_data_cb(device_t &device, _Object wr) { return downcast<egret_device &>(device).write_via_data.set_callback(wr); } - devcb2_write_line write_reset, write_linechange, write_via_clock, write_via_data; + devcb_write_line write_reset, write_linechange, write_via_clock, write_via_data; protected: // device-level overrides diff --git a/src/mess/machine/esqpanel.h b/src/mess/machine/esqpanel.h index d1f86028221..06715bac67f 100644 --- a/src/mess/machine/esqpanel.h +++ b/src/mess/machine/esqpanel.h @@ -38,10 +38,10 @@ MCFG_DEVICE_REMOVE(_tag) #define MCFG_ESQPANEL_TX_CALLBACK(_write) \ - devcb = &esqpanel_device::set_tx_wr_callback(*device, DEVCB2_##_write); + devcb = &esqpanel_device::set_tx_wr_callback(*device, DEVCB_##_write); #define MCFG_ESQPANEL_ANALOG_CALLBACK(_write) \ - devcb = &esqpanel_device::set_analog_wr_callback(*device, DEVCB2_##_write); + devcb = &esqpanel_device::set_analog_wr_callback(*device, DEVCB_##_write); //************************************************************************** // TYPE DEFINITIONS @@ -55,8 +55,8 @@ public: // construction/destruction esqpanel_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); - template<class _Object> static devcb2_base &set_tx_wr_callback(device_t &device, _Object object) { return downcast<esqpanel_device &>(device).m_write_tx.set_callback(object); } - template<class _Object> static devcb2_base &set_analog_wr_callback(device_t &device, _Object object) { return downcast<esqpanel_device &>(device).m_write_analog.set_callback(object); } + template<class _Object> static devcb_base &set_tx_wr_callback(device_t &device, _Object object) { return downcast<esqpanel_device &>(device).m_write_tx.set_callback(object); } + template<class _Object> static devcb_base &set_analog_wr_callback(device_t &device, _Object object) { return downcast<esqpanel_device &>(device).m_write_analog.set_callback(object); } virtual void send_to_display(UINT8 data) = 0; @@ -82,8 +82,8 @@ private: bool m_bCalibSecondByte; bool m_bButtonLightSecondByte; - devcb2_write_line m_write_tx; - devcb2_write16 m_write_analog; + devcb_write_line m_write_tx; + devcb_write16 m_write_analog; UINT8 m_xmitring[XMIT_RING_SIZE]; int m_xmit_read, m_xmit_write; bool m_tx_busy; diff --git a/src/mess/machine/fm_scsi.h b/src/mess/machine/fm_scsi.h index b297b9c1602..6c98db5aeff 100644 --- a/src/mess/machine/fm_scsi.h +++ b/src/mess/machine/fm_scsi.h @@ -34,9 +34,9 @@ MCFG_DEVICE_ADD(_tag, FMSCSI, 0) #define MCFG_FMSCSI_IRQ_HANDLER(_devcb) \ - devcb = &fmscsi_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &fmscsi_device::set_irq_handler(*device, DEVCB_##_devcb); #define MCFG_FMSCSI_DRQ_HANDLER(_devcb) \ - devcb = &fmscsi_device::set_drq_handler(*device, DEVCB2_##_devcb); + devcb = &fmscsi_device::set_drq_handler(*device, DEVCB_##_devcb); class fmscsi_device : public legacy_scsi_host_adapter { @@ -45,8 +45,8 @@ public: fmscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<fmscsi_device &>(device).m_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_drq_handler(device_t &device, _Object object) { return downcast<fmscsi_device &>(device).m_drq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<fmscsi_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_drq_handler(device_t &device, _Object object) { return downcast<fmscsi_device &>(device).m_drq_handler.set_callback(object); } // any publically accessible interfaces needed for runtime UINT8 fmscsi_data_r(void); @@ -76,8 +76,8 @@ private: int get_scsi_cmd_len(UINT8 cbyte); - devcb2_write_line m_irq_handler; - devcb2_write_line m_drq_handler; + devcb_write_line m_irq_handler; + devcb_write_line m_drq_handler; UINT8 m_command[32]; //UINT8 m_result[32]; diff --git a/src/mess/machine/ie15_kbd.h b/src/mess/machine/ie15_kbd.h index cbdda9b0311..a0d574d02d0 100644 --- a/src/mess/machine/ie15_kbd.h +++ b/src/mess/machine/ie15_kbd.h @@ -30,7 +30,7 @@ ***************************************************************************/ #define MCFG_IE15_KEYBOARD_CB(_devcb) \ - devcb = &ie15_keyboard_device::set_keyboard_callback(*device, DEVCB2_##_devcb); + devcb = &ie15_keyboard_device::set_keyboard_callback(*device, DEVCB_##_devcb); /*************************************************************************** FUNCTION PROTOTYPES @@ -43,7 +43,7 @@ public: ie15_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); ie15_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<ie15_keyboard_device &>(device).m_keyboard_cb.set_callback(object); } + template<class _Object> static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<ie15_keyboard_device &>(device).m_keyboard_cb.set_callback(object); } virtual ioport_constructor device_input_ports() const; virtual machine_config_constructor device_mconfig_additions() const; @@ -70,7 +70,7 @@ private: UINT8 m_ruslat; UINT8 *m_rom; - devcb2_write16 m_keyboard_cb; + devcb_write16 m_keyboard_cb; }; extern const device_type IE15_KEYBOARD; diff --git a/src/mess/machine/isbc_215g.h b/src/mess/machine/isbc_215g.h index 61554e68fb3..bbccafedcf6 100644 --- a/src/mess/machine/isbc_215g.h +++ b/src/mess/machine/isbc_215g.h @@ -29,7 +29,7 @@ public: static void static_set_wakeup_addr(device_t &device, UINT32 wakeup) { downcast<isbc_215g_device &>(device).m_wakeup = wakeup; } static void static_set_maincpu_tag(device_t &device, const char *maincpu_tag) { downcast<isbc_215g_device &>(device).m_maincpu_tag = maincpu_tag; } - template<class _Object> static devcb2_base &static_set_irq_callback(device_t &device, _Object object) { return downcast<isbc_215g_device &>(device).m_out_irq_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_irq_callback(device_t &device, _Object object) { return downcast<isbc_215g_device &>(device).m_out_irq_func.set_callback(object); } protected: virtual void device_start(); @@ -46,7 +46,7 @@ private: required_device<isbx_slot_device> m_sbx1; required_device<isbx_slot_device> m_sbx2; - devcb2_write_line m_out_irq_func; + devcb_write_line m_out_irq_func; int m_reset; UINT16 m_wakeup, m_secoffset, m_sector[512]; @@ -69,7 +69,7 @@ private: isbc_215g_device::static_set_maincpu_tag(*device, _maincpu_tag); #define MCFG_ISBC_215_IRQ(_irq_line) \ - devcb = &isbc_215g_device::static_set_irq_callback(*device, DEVCB2_##_irq_line); + devcb = &isbc_215g_device::static_set_irq_callback(*device, DEVCB_##_irq_line); extern const device_type ISBC_215G; diff --git a/src/mess/machine/kc_keyb.h b/src/mess/machine/kc_keyb.h index b87c51cd8e4..6e3a6c54b93 100644 --- a/src/mess/machine/kc_keyb.h +++ b/src/mess/machine/kc_keyb.h @@ -10,7 +10,7 @@ #define __KC_KEYB_H__ #define MCFG_KC_KEYBOARD_OUT_CALLBACK(_write) \ - devcb = &kc_keyboard_device::set_out_wr_callback(*device, DEVCB2_##_write); + devcb = &kc_keyboard_device::set_out_wr_callback(*device, DEVCB_##_write); /*************************************************************************** TYPE DEFINITIONS @@ -28,7 +28,7 @@ public: kc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~kc_keyboard_device(); - template<class _Object> static devcb2_base &set_out_wr_callback(device_t &device, _Object object) { return downcast<kc_keyboard_device &>(device).m_write_out.set_callback(object); } + template<class _Object> static devcb_base &set_out_wr_callback(device_t &device, _Object object) { return downcast<kc_keyboard_device &>(device).m_write_out.set_callback(object); } // optional information overrides virtual ioport_constructor device_input_ports() const; @@ -48,7 +48,7 @@ private: // internal state emu_timer * m_timer_transmit_pulse; - devcb2_write_line m_write_out; + devcb_write_line m_write_out; // pulses to transmit struct diff --git a/src/mess/machine/mackbd.h b/src/mess/machine/mackbd.h index feb0eac27e0..b7a571499a6 100644 --- a/src/mess/machine/mackbd.h +++ b/src/mess/machine/mackbd.h @@ -21,10 +21,10 @@ MCFG_DEVICE_REMOVE(_tag) #define MCFG_MACKBD_CLKOUT_HANDLER(_devcb) \ - devcb = &mackbd_device::set_clkout_handler(*device, DEVCB2_##_devcb); + devcb = &mackbd_device::set_clkout_handler(*device, DEVCB_##_devcb); #define MCFG_MACKBD_DATAOUT_HANDLER(_devcb) \ - devcb = &mackbd_device::set_dataout_handler(*device, DEVCB2_##_devcb); + devcb = &mackbd_device::set_dataout_handler(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -36,8 +36,8 @@ class mackbd_device : public device_t { public: // static config helper - template<class _Object> static devcb2_base &set_clkout_handler(device_t &device, _Object object) { return downcast<mackbd_device &>(device).m_clkout_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_dataout_handler(device_t &device, _Object object) { return downcast<mackbd_device &>(device).m_dataout_handler.set_callback(object); } + template<class _Object> static devcb_base &set_clkout_handler(device_t &device, _Object object) { return downcast<mackbd_device &>(device).m_clkout_handler.set_callback(object); } + template<class _Object> static devcb_base &set_dataout_handler(device_t &device, _Object object) { return downcast<mackbd_device &>(device).m_dataout_handler.set_callback(object); } // construction/destruction mackbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -65,8 +65,8 @@ protected: private: UINT8 p0, p1, p2, data_from_mac, data_to_mac; - devcb2_write_line m_clkout_handler; - devcb2_write_line m_dataout_handler; + devcb_write_line m_clkout_handler; + devcb_write_line m_dataout_handler; void scan_kbd_col(int col); }; diff --git a/src/mess/machine/microdrv.h b/src/mess/machine/microdrv.h index f42179e9dbd..51107e1c4b5 100644 --- a/src/mess/machine/microdrv.h +++ b/src/mess/machine/microdrv.h @@ -25,7 +25,7 @@ MCFG_DEVICE_ADD(_tag, MICRODRIVE, 0) #define MCFG_MICRODRIVE_COMMS_OUT_CALLBACK(_write) \ - devcb = µdrive_image_device::set_comms_out_wr_callback(*device, DEVCB2_##_write); + devcb = µdrive_image_device::set_comms_out_wr_callback(*device, DEVCB_##_write); @@ -43,7 +43,7 @@ public: microdrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~microdrive_image_device(); - template<class _Object> static devcb2_base &set_comms_out_wr_callback(device_t &device, _Object object) { return downcast<microdrive_image_device &>(device).m_write_comms_out.set_callback(object); } + template<class _Object> static devcb_base &set_comms_out_wr_callback(device_t &device, _Object object) { return downcast<microdrive_image_device &>(device).m_write_comms_out.set_callback(object); } // image-level overrides virtual bool call_load(); @@ -76,7 +76,7 @@ protected: virtual void device_start(); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); private: - devcb2_write_line m_write_comms_out; + devcb_write_line m_write_comms_out; int m_clk; int m_comms_in; diff --git a/src/mess/machine/micropolis.h b/src/mess/machine/micropolis.h index 2cd7852561d..32dc071d368 100644 --- a/src/mess/machine/micropolis.h +++ b/src/mess/machine/micropolis.h @@ -18,13 +18,13 @@ ***************************************************************************/ #define MCFG_MICROPOLIS_DDEN_CALLBACK(_read) \ - devcb = µpolis_device::set_dden_rd_callback(*device, DEVCB2_##_read); + devcb = µpolis_device::set_dden_rd_callback(*device, DEVCB_##_read); #define MCFG_MICROPOLIS_INTRQ_CALLBACK(_write) \ - devcb = µpolis_device::set_intrq_wr_callback(*device, DEVCB2_##_write); + devcb = µpolis_device::set_intrq_wr_callback(*device, DEVCB_##_write); #define MCFG_MICROPOLIS_DRQ_CALLBACK(_write) \ - devcb = µpolis_device::set_drq_wr_callback(*device, DEVCB2_##_write); + devcb = µpolis_device::set_drq_wr_callback(*device, DEVCB_##_write); /* Interface */ struct micropolis_interface @@ -43,9 +43,9 @@ public: micropolis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~micropolis_device() {} - template<class _Object> static devcb2_base &set_dden_rd_callback(device_t &device, _Object object) { return downcast<micropolis_device &>(device).m_read_dden.set_callback(object); } - template<class _Object> static devcb2_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<micropolis_device &>(device).m_write_intrq.set_callback(object); } - template<class _Object> static devcb2_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<micropolis_device &>(device).m_write_drq.set_callback(object); } + template<class _Object> static devcb_base &set_dden_rd_callback(device_t &device, _Object object) { return downcast<micropolis_device &>(device).m_read_dden.set_callback(object); } + template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<micropolis_device &>(device).m_write_intrq.set_callback(object); } + template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<micropolis_device &>(device).m_write_drq.set_callback(object); } void set_drive(UINT8 drive); // set current drive (0-3) @@ -67,9 +67,9 @@ protected: private: // internal state - devcb2_read_line m_read_dden; - devcb2_write_line m_write_intrq; - devcb2_write_line m_write_drq; + devcb_read_line m_read_dden; + devcb_write_line m_write_intrq; + devcb_write_line m_write_drq; /* register */ UINT8 m_data; diff --git a/src/mess/machine/mm1kb.h b/src/mess/machine/mm1kb.h index fe02d220784..a6a9b825f3e 100644 --- a/src/mess/machine/mm1kb.h +++ b/src/mess/machine/mm1kb.h @@ -24,7 +24,7 @@ //************************************************************************** #define MCFG_MM1_KEYBOARD_KBST_CALLBACK(_write) \ - devcb = &mm1_keyboard_t::set_kbst_wr_callback(*device, DEVCB2_##_write); + devcb = &mm1_keyboard_t::set_kbst_wr_callback(*device, DEVCB_##_write); @@ -40,7 +40,7 @@ public: // construction/destruction mm1_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_kbst_wr_callback(device_t &device, _Object object) { return downcast<mm1_keyboard_t &>(device).m_write_kbst.set_callback(object); } + template<class _Object> static devcb_base &set_kbst_wr_callback(device_t &device, _Object object) { return downcast<mm1_keyboard_t &>(device).m_write_kbst.set_callback(object); } // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -57,7 +57,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); private: - devcb2_write_line m_write_kbst; + devcb_write_line m_write_kbst; required_device<speaker_sound_device> m_speaker; required_memory_region m_rom; diff --git a/src/mess/machine/nextkbd.h b/src/mess/machine/nextkbd.h index 78948f63746..e3ac9107c70 100644 --- a/src/mess/machine/nextkbd.h +++ b/src/mess/machine/nextkbd.h @@ -4,21 +4,21 @@ #include "emu.h" #define MCFG_NEXTKBD_INT_CHANGE_CALLBACK(_write) \ - devcb = &nextkbd_device::set_int_change_wr_callback(*device, DEVCB2_##_write); + devcb = &nextkbd_device::set_int_change_wr_callback(*device, DEVCB_##_write); #define MCFG_NEXTKBD_INT_POWER_CALLBACK(_write) \ - devcb = &nextkbd_device::set_int_power_wr_callback(*device, DEVCB2_##_write); + devcb = &nextkbd_device::set_int_power_wr_callback(*device, DEVCB_##_write); #define MCFG_NEXTKBD_INT_NMI_CALLBACK(_write) \ - devcb = &nextkbd_device::set_int_nmi_wr_callback(*device, DEVCB2_##_write); + devcb = &nextkbd_device::set_int_nmi_wr_callback(*device, DEVCB_##_write); class nextkbd_device : public device_t { public: nextkbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_int_change_wr_callback(device_t &device, _Object object) { return downcast<nextkbd_device &>(device).int_change_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_int_power_wr_callback(device_t &device, _Object object) { return downcast<nextkbd_device &>(device).int_power_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_int_nmi_wr_callback(device_t &device, _Object object) { return downcast<nextkbd_device &>(device).int_nmi_cb.set_callback(object); } + template<class _Object> static devcb_base &set_int_change_wr_callback(device_t &device, _Object object) { return downcast<nextkbd_device &>(device).int_change_cb.set_callback(object); } + template<class _Object> static devcb_base &set_int_power_wr_callback(device_t &device, _Object object) { return downcast<nextkbd_device &>(device).int_power_cb.set_callback(object); } + template<class _Object> static devcb_base &set_int_nmi_wr_callback(device_t &device, _Object object) { return downcast<nextkbd_device &>(device).int_nmi_cb.set_callback(object); } DECLARE_ADDRESS_MAP(amap, 32); @@ -88,7 +88,7 @@ private: enum { FIFO_SIZE = 32 }; - devcb2_write_line int_change_cb, int_power_cb, int_nmi_cb; + devcb_write_line int_change_cb, int_power_cb, int_nmi_cb; required_ioport mousex; required_ioport mousey; required_ioport mousebtn; diff --git a/src/mess/machine/nextmo.h b/src/mess/machine/nextmo.h index 7714b84d7ed..afea4f77a06 100644 --- a/src/mess/machine/nextmo.h +++ b/src/mess/machine/nextmo.h @@ -2,18 +2,18 @@ #define NEXTMO_H #define MCFG_NEXTMO_IRQ_CALLBACK(_write) \ - devcb = &nextmo_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &nextmo_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_NEXTMO_DRQ_CALLBACK(_write) \ - devcb = &nextmo_device::set_drq_wr_callback(*device, DEVCB2_##_write); + devcb = &nextmo_device::set_drq_wr_callback(*device, DEVCB_##_write); class nextmo_device : public device_t { public: nextmo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<nextmo_device &>(device).irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<nextmo_device &>(device).drq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<nextmo_device &>(device).irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<nextmo_device &>(device).drq_cb.set_callback(object); } DECLARE_ADDRESS_MAP(map, 32); @@ -46,7 +46,7 @@ protected: private: UINT8 sector[0x510]; UINT8 r4, r5, r6, r7; - devcb2_write_line irq_cb, drq_cb; + devcb_write_line irq_cb, drq_cb; int sector_pos; void check_dma_end(); diff --git a/src/mess/machine/pc1512kb.h b/src/mess/machine/pc1512kb.h index cd5e79c4240..e431977fe7e 100644 --- a/src/mess/machine/pc1512kb.h +++ b/src/mess/machine/pc1512kb.h @@ -33,10 +33,10 @@ //************************************************************************** #define MCFG_PC1512_KEYBOARD_CLOCK_CALLBACK(_write) \ - devcb = &pc1512_keyboard_device::set_clock_wr_callback(*device, DEVCB2_##_write); + devcb = &pc1512_keyboard_device::set_clock_wr_callback(*device, DEVCB_##_write); #define MCFG_PC1512_KEYBOARD_DATA_CALLBACK(_write) \ - devcb = &pc1512_keyboard_device::set_data_wr_callback(*device, DEVCB2_##_write); + devcb = &pc1512_keyboard_device::set_data_wr_callback(*device, DEVCB_##_write); @@ -52,8 +52,8 @@ public: // construction/destruction pc1512_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_clock_wr_callback(device_t &device, _Object object) { return downcast<pc1512_keyboard_device &>(device).m_write_clock.set_callback(object); } - template<class _Object> static devcb2_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<pc1512_keyboard_device &>(device).m_write_data.set_callback(object); } + template<class _Object> static devcb_base &set_clock_wr_callback(device_t &device, _Object object) { return downcast<pc1512_keyboard_device &>(device).m_write_clock.set_callback(object); } + template<class _Object> static devcb_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<pc1512_keyboard_device &>(device).m_write_data.set_callback(object); } // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -99,8 +99,8 @@ private: required_ioport m_y11; required_ioport m_com; - devcb2_write_line m_write_clock; - devcb2_write_line m_write_data; + devcb_write_line m_write_clock; + devcb_write_line m_write_data; int m_data_in; int m_clock_in; diff --git a/src/mess/machine/pc9801_kbd.h b/src/mess/machine/pc9801_kbd.h index 00030289854..e1588b3ad06 100644 --- a/src/mess/machine/pc9801_kbd.h +++ b/src/mess/machine/pc9801_kbd.h @@ -15,7 +15,7 @@ //************************************************************************** #define MCFG_PC9801_KBD_IRQ_CALLBACK(_write) \ - devcb = &pc9801_kbd_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &pc9801_kbd_device::set_irq_wr_callback(*device, DEVCB_##_write); //************************************************************************** @@ -30,7 +30,7 @@ public: // construction/destruction pc9801_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<pc9801_kbd_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<pc9801_kbd_device &>(device).m_write_irq.set_callback(object); } virtual ioport_constructor device_input_ports() const; @@ -46,7 +46,7 @@ protected: virtual void device_reset(); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - devcb2_write_line m_write_irq; + devcb_write_line m_write_irq; static const device_timer_id RX_TIMER = 1; emu_timer * m_rxtimer; diff --git a/src/mess/machine/psxcd.h b/src/mess/machine/psxcd.h index 6d2f8a5f81a..79bbc988972 100644 --- a/src/mess/machine/psxcd.h +++ b/src/mess/machine/psxcd.h @@ -14,7 +14,7 @@ MCFG_DEVICE_ADD(_tag, PSXCD, 0) #define MCFG_PSXCD_IRQ_HANDLER(_devcb) \ - devcb = &psxcd_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &psxcd_device::set_irq_handler(*device, DEVCB_##_devcb); class psxcd_device : public cdrom_image_device { @@ -22,7 +22,7 @@ public: psxcd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxcd_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxcd_device &>(device).m_irq_handler.set_callback(object); } static void static_set_devname(device_t &device, const char *devname); virtual bool call_load(); virtual void call_unload(); @@ -148,7 +148,7 @@ private: bool m_timerinuse[MAX_PSXCD_TIMERS]; - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; cpu_device *m_maincpu; spu_device *m_spu; }; diff --git a/src/mess/machine/smartmed.h b/src/mess/machine/smartmed.h index d7e2e8b6730..8cb832ce46c 100644 --- a/src/mess/machine/smartmed.h +++ b/src/mess/machine/smartmed.h @@ -8,7 +8,7 @@ //#define SMARTMEDIA_IMAGE_SAVE #define MCFG_NAND_RNB_CALLBACK(_write) \ - devcb = &nand_device::set_rnb_wr_callback(*device, DEVCB2_##_write); + devcb = &nand_device::set_rnb_wr_callback(*device, DEVCB_##_write); /*************************************************************************** TYPE DEFINITIONS @@ -78,7 +78,7 @@ public: nand_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); nand_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); - template<class _Object> static devcb2_base &set_rnb_wr_callback(device_t &device, _Object object) { return downcast<nand_device &>(device).m_write_rnb.set_callback(object); } + template<class _Object> static devcb_base &set_rnb_wr_callback(device_t &device, _Object object) { return downcast<nand_device &>(device).m_write_rnb.set_callback(object); } int is_present(); int is_protected(); @@ -134,7 +134,7 @@ protected: int m_row_address_cycles; int m_sequential_row_read; - devcb2_write_line m_write_rnb; + devcb_write_line m_write_rnb; #ifdef SMARTMEDIA_IMAGE_SAVE int m_image_format; diff --git a/src/mess/machine/tandy2kb.h b/src/mess/machine/tandy2kb.h index b1b50fe74b4..13756addc71 100644 --- a/src/mess/machine/tandy2kb.h +++ b/src/mess/machine/tandy2kb.h @@ -32,10 +32,10 @@ //************************************************************************** #define MCFG_TANDY2000_KEYBOARD_CLOCK_CALLBACK(_write) \ - devcb = &tandy2k_keyboard_device::set_clock_wr_callback(*device, DEVCB2_##_write); + devcb = &tandy2k_keyboard_device::set_clock_wr_callback(*device, DEVCB_##_write); #define MCFG_TANDY2000_KEYBOARD_DATA_CALLBACK(_write) \ - devcb = &tandy2k_keyboard_device::set_data_wr_callback(*device, DEVCB2_##_write); + devcb = &tandy2k_keyboard_device::set_data_wr_callback(*device, DEVCB_##_write); @@ -51,8 +51,8 @@ public: // construction/destruction tandy2k_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_clock_wr_callback(device_t &device, _Object object) { return downcast<tandy2k_keyboard_device &>(device).m_write_clock.set_callback(object); } - template<class _Object> static devcb2_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<tandy2k_keyboard_device &>(device).m_write_data.set_callback(object); } + template<class _Object> static devcb_base &set_clock_wr_callback(device_t &device, _Object object) { return downcast<tandy2k_keyboard_device &>(device).m_write_clock.set_callback(object); } + template<class _Object> static devcb_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<tandy2k_keyboard_device &>(device).m_write_data.set_callback(object); } // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -95,8 +95,8 @@ private: required_ioport m_y10; required_ioport m_y11; - devcb2_write_line m_write_clock; - devcb2_write_line m_write_data; + devcb_write_line m_write_clock; + devcb_write_line m_write_data; UINT16 m_keylatch; diff --git a/src/mess/machine/teleprinter.h b/src/mess/machine/teleprinter.h index 33eb9277a8f..bff767bf9d6 100644 --- a/src/mess/machine/teleprinter.h +++ b/src/mess/machine/teleprinter.h @@ -14,7 +14,7 @@ #define TELEPRINTER_SCREEN_TAG "tty_screen" #define MCFG_GENERIC_TELEPRINTER_KEYBOARD_CB(_devcb) \ - devcb = &generic_terminal_device::set_keyboard_callback(*device, DEVCB2_##_devcb); + devcb = &generic_terminal_device::set_keyboard_callback(*device, DEVCB_##_devcb); /*************************************************************************** FUNCTION PROTOTYPES diff --git a/src/mess/machine/ti99/990_dk.h b/src/mess/machine/ti99/990_dk.h index 0d0fa4e74e2..329d524187e 100644 --- a/src/mess/machine/ti99/990_dk.h +++ b/src/mess/machine/ti99/990_dk.h @@ -18,7 +18,7 @@ public: DECLARE_READ8_MEMBER( cru_r ); DECLARE_WRITE8_MEMBER( cru_w ); - template<class _Object> static devcb2_base &static_set_int_callback(device_t &device, _Object object) + template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast<fd800_legacy_device &>(device).m_int_line.set_callback(object); } @@ -42,7 +42,7 @@ private: UINT16 m_cmd_reg; int m_interrupt_f_f; - devcb2_write_line m_int_line; + devcb_write_line m_int_line; enum buf_mode_t { bm_off, bm_read, bm_write @@ -69,6 +69,6 @@ private: LEGACY_FLOPPY_OPTIONS_EXTERN(fd800); #define MCFG_FD800_INT_HANDLER( _intcallb ) \ - devcb = &fd800_legacy_device::static_set_int_callback( *device, DEVCB2_##_intcallb ); + devcb = &fd800_legacy_device::static_set_int_callback( *device, DEVCB_##_intcallb ); #endif diff --git a/src/mess/machine/ti99/990_hd.h b/src/mess/machine/ti99/990_hd.h index 770c2d428d6..7dc7f149eae 100644 --- a/src/mess/machine/ti99/990_hd.h +++ b/src/mess/machine/ti99/990_hd.h @@ -15,7 +15,7 @@ class ti990_hdc_device : public device_t public: ti990_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &static_set_int_callback(device_t &device, _Object object) { return downcast<ti990_hdc_device &>(device).m_interrupt_callback.set_callback(object); } + template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast<ti990_hdc_device &>(device).m_interrupt_callback.set_callback(object); } DECLARE_READ16_MEMBER(read); DECLARE_WRITE16_MEMBER(write); @@ -65,13 +65,13 @@ private: UINT16 m_w[8]; - devcb2_write_line m_interrupt_callback; + devcb_write_line m_interrupt_callback; hd_unit_t m_d[MAX_DISK_UNIT]; }; #define MCFG_TI990_HDC_INT_CALLBACK( _write ) \ - devcb = &ti990_hdc_device::static_set_int_callback( *device, DEVCB2_##_write ); + devcb = &ti990_hdc_device::static_set_int_callback( *device, DEVCB_##_write ); extern const device_type TI990_HDC; diff --git a/src/mess/machine/ti99/990_tap.h b/src/mess/machine/ti99/990_tap.h index 9986272e23a..d560a1ee1ec 100644 --- a/src/mess/machine/ti99/990_tap.h +++ b/src/mess/machine/ti99/990_tap.h @@ -17,7 +17,7 @@ class tap_990_device : public device_t { public: tap_990_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &static_set_int_callback(device_t &device, _Object object) + template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast<tap_990_device &>(device).m_int_line.set_callback(object); } @@ -50,7 +50,7 @@ private: void read_transport_status(); void execute_command(); - devcb2_write_line m_int_line; + devcb_write_line m_int_line; UINT16 m_w[8]; @@ -58,4 +58,4 @@ private: }; #define MCFG_TI990_TAPE_INT_HANDLER( _intcallb ) \ - devcb = &tap_990_device::static_set_int_callback( *device, DEVCB2_##_intcallb ); + devcb = &tap_990_device::static_set_int_callback( *device, DEVCB_##_intcallb ); diff --git a/src/mess/machine/ti99/datamux.h b/src/mess/machine/ti99/datamux.h index f16148efc9b..64c36bd7d28 100644 --- a/src/mess/machine/ti99/datamux.h +++ b/src/mess/machine/ti99/datamux.h @@ -77,7 +77,7 @@ public: DECLARE_WRITE_LINE_MEMBER( dbin_in ); DECLARE_WRITE_LINE_MEMBER( ready_line ); - template<class _Object> static devcb2_base &static_set_ready_callback(device_t &device, _Object object) + template<class _Object> static devcb_base &static_set_ready_callback(device_t &device, _Object object) { return downcast<ti99_datamux_device &>(device).m_ready.set_callback(object); } @@ -110,7 +110,7 @@ private: void ready_join(); // Ready line to the CPU - devcb2_write_line m_ready; + devcb_write_line m_ready; // Own ready state. line_state m_muxready; @@ -154,4 +154,4 @@ private: #endif #define MCFG_DMUX_READY_HANDLER( _intcallb ) \ - devcb = &ti99_datamux_device::static_set_ready_callback( *device, DEVCB2_##_intcallb ); + devcb = &ti99_datamux_device::static_set_ready_callback( *device, DEVCB_##_intcallb ); diff --git a/src/mess/machine/ti99/genboard.h b/src/mess/machine/ti99/genboard.h index 912507925ae..80198c83ecb 100644 --- a/src/mess/machine/ti99/genboard.h +++ b/src/mess/machine/ti99/genboard.h @@ -62,13 +62,13 @@ public: DECLARE_WRITE_LINE_MEMBER( clock_control ); UINT8 get_recent_key(); - template<class _Object> static devcb2_base &static_set_int_callback(device_t &device, _Object object) { return downcast<geneve_keyboard_device &>(device).m_interrupt.set_callback(object); } + template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast<geneve_keyboard_device &>(device).m_interrupt.set_callback(object); } protected: void device_start(); void device_reset(); ioport_constructor device_input_ports() const; - devcb2_write_line m_interrupt; // Keyboard interrupt to console + devcb_write_line m_interrupt; // Keyboard interrupt to console void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); private: @@ -101,7 +101,7 @@ private: }; #define MCFG_GENEVE_KBINT_HANDLER( _intcallb ) \ - devcb = &geneve_keyboard_device::static_set_int_callback( *device, DEVCB2_##_intcallb ); + devcb = &geneve_keyboard_device::static_set_int_callback( *device, DEVCB_##_intcallb ); /*****************************************************************************/ @@ -128,7 +128,7 @@ public: DECLARE_WRITE_LINE_MEMBER( clock_in ); DECLARE_WRITE_LINE_MEMBER( dbin_in ); - template<class _Object> static devcb2_base &static_set_ready_callback(device_t &device, _Object object) { return downcast<geneve_mapper_device &>(device).m_ready.set_callback(object); } + template<class _Object> static devcb_base &static_set_ready_callback(device_t &device, _Object object) { return downcast<geneve_mapper_device &>(device).m_ready.set_callback(object); } protected: void device_start(); @@ -181,7 +181,7 @@ private: int m_sram_val; // Ready line to the CPU - devcb2_write_line m_ready; + devcb_write_line m_ready; // Counter for the wait states. int m_waitcount; @@ -201,6 +201,6 @@ private: }; #define MCFG_GENEVE_READY_HANDLER( _intcallb ) \ - devcb = &geneve_mapper_device::static_set_ready_callback( *device, DEVCB2_##_intcallb ); + devcb = &geneve_mapper_device::static_set_ready_callback( *device, DEVCB_##_intcallb ); #endif diff --git a/src/mess/machine/ti99/grom.h b/src/mess/machine/ti99/grom.h index 1599db84dd3..e491d3e3e52 100644 --- a/src/mess/machine/ti99/grom.h +++ b/src/mess/machine/ti99/grom.h @@ -29,7 +29,7 @@ struct ti99grom_config const ti99grom_config(name) = #define MCFG_GROM_READY_CALLBACK(_write) \ - devcb = &ti99_grom_device::set_ready_wr_callback(*device, DEVCB2_##_write); + devcb = &ti99_grom_device::set_ready_wr_callback(*device, DEVCB_##_write); extern const device_type GROM; @@ -41,7 +41,7 @@ class ti99_grom_device : public bus8z_device, ti99grom_config public: ti99_grom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<ti99_grom_device &>(device).m_gromready.set_callback(object); } + template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<ti99_grom_device &>(device).m_gromready.set_callback(object); } DECLARE_READ8Z_MEMBER(readz); DECLARE_WRITE8_MEMBER(write); @@ -59,7 +59,7 @@ private: int m_size; // Ready callback. This line is usually connected to the READY pin of the CPU. - devcb2_write_line m_gromready; + devcb_write_line m_gromready; // Frequency of the incoming GROM clock. In most application cases the // GROM gets its clock from the video display processor (TMS9918) diff --git a/src/mess/machine/ti99/gromport.h b/src/mess/machine/ti99/gromport.h index ca41fa37599..1c9af2ede1f 100644 --- a/src/mess/machine/ti99/gromport.h +++ b/src/mess/machine/ti99/gromport.h @@ -29,8 +29,8 @@ public: DECLARE_WRITE8_MEMBER(cruwrite); DECLARE_WRITE_LINE_MEMBER(ready_line); - template<class _Object> static devcb2_base &static_set_ready_callback(device_t &device, _Object object) { return downcast<gromport_device &>(device).m_console_ready.set_callback(object); } - template<class _Object> static devcb2_base &static_set_reset_callback(device_t &device, _Object object) { return downcast<gromport_device &>(device).m_console_reset.set_callback(object); } + template<class _Object> static devcb_base &static_set_ready_callback(device_t &device, _Object object) { return downcast<gromport_device &>(device).m_console_ready.set_callback(object); } + template<class _Object> static devcb_base &static_set_reset_callback(device_t &device, _Object object) { return downcast<gromport_device &>(device).m_console_reset.set_callback(object); } void cartridge_inserted(); void set_grom_base(UINT16 grombase, UINT16 grommask); @@ -46,8 +46,8 @@ protected: private: ti99_cartridge_connector_device* m_connector; bool m_reset_on_insert; - devcb2_write_line m_console_ready; - devcb2_write_line m_console_reset; + devcb_write_line m_console_ready; + devcb_write_line m_console_reset; UINT16 m_grombase; UINT16 m_grommask; }; @@ -59,10 +59,10 @@ SLOT_INTERFACE_EXTERN(gromport); MCFG_DEVICE_SLOT_INTERFACE(gromport, "single", false) #define MCFG_GROMPORT_READY_HANDLER( _ready ) \ - devcb = &gromport_device::static_set_ready_callback( *device, DEVCB2_##_ready ); + devcb = &gromport_device::static_set_ready_callback( *device, DEVCB_##_ready ); #define MCFG_GROMPORT_RESET_HANDLER( _reset ) \ - devcb = &gromport_device::static_set_reset_callback( *device, DEVCB2_##_reset ); + devcb = &gromport_device::static_set_reset_callback( *device, DEVCB_##_reset ); /****************************************************************************/ diff --git a/src/mess/machine/ti99/joyport.h b/src/mess/machine/ti99/joyport.h index 0faeb5536d7..4df3f686787 100644 --- a/src/mess/machine/ti99/joyport.h +++ b/src/mess/machine/ti99/joyport.h @@ -56,14 +56,14 @@ public: void set_interrupt(int state); void pulse_clock(); - template<class _Object> static devcb2_base &static_set_int_callback(device_t &device, _Object object) { return downcast<joyport_device &>(device).m_interrupt.set_callback(object); } + template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast<joyport_device &>(device).m_interrupt.set_callback(object); } protected: void device_start(); void device_config_complete(); private: - devcb2_write_line m_interrupt; + devcb_write_line m_interrupt; joyport_attached_device* m_connected; }; @@ -72,7 +72,7 @@ SLOT_INTERFACE_EXTERN(joystick_port_994); SLOT_INTERFACE_EXTERN(joystick_port_gen); #define MCFG_JOYPORT_INT_HANDLER( _intcallb ) \ - devcb = &joyport_device::static_set_int_callback( *device, DEVCB2_##_intcallb ); + devcb = &joyport_device::static_set_int_callback( *device, DEVCB_##_intcallb ); #define MCFG_GENEVE_JOYPORT_ADD( _tag ) \ MCFG_DEVICE_ADD(_tag, JOYPORT, 0) \ diff --git a/src/mess/machine/ti99/mapper8.h b/src/mess/machine/ti99/mapper8.h index 1662c638cac..6535cac0d58 100644 --- a/src/mess/machine/ti99/mapper8.h +++ b/src/mess/machine/ti99/mapper8.h @@ -69,7 +69,7 @@ struct mapper8_list_entry const mapper8_config(name) = #define MCFG_MAINBOARD8_READY_CALLBACK(_write) \ - devcb = &mainboard8_device::set_ready_wr_callback(*device, DEVCB2_##_write); + devcb = &mainboard8_device::set_ready_wr_callback(*device, DEVCB_##_write); struct mapper8_config { @@ -141,7 +141,7 @@ class mainboard8_device : public bus8z_device public: mainboard8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<mainboard8_device &>(device).m_ready.set_callback(object); } + template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<mainboard8_device &>(device).m_ready.set_callback(object); } DECLARE_READ8_MEMBER( readm); // used from address map DECLARE_WRITE8_MEMBER( writem ); // used from address map @@ -170,7 +170,7 @@ private: void mapwrite(int offset, UINT8 data); // Ready line to the CPU - devcb2_write_line m_ready; + devcb_write_line m_ready; // All devices that are attached to the 16-bit address bus. simple_list<logically_addressed_device> m_logcomp; diff --git a/src/mess/machine/ti99/speech8.h b/src/mess/machine/ti99/speech8.h index 9e57dec76f6..18f299be977 100644 --- a/src/mess/machine/ti99/speech8.h +++ b/src/mess/machine/ti99/speech8.h @@ -21,14 +21,14 @@ extern const device_type TI99_SPEECH8; #define MCFG_SPEECH8_READY_CALLBACK(_write) \ - devcb = &ti998_spsyn_device::set_ready_wr_callback(*device, DEVCB2_##_write); + devcb = &ti998_spsyn_device::set_ready_wr_callback(*device, DEVCB_##_write); class ti998_spsyn_device : public bus8z_device { public: ti998_spsyn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<ti998_spsyn_device &>(device).m_ready.set_callback(object); } + template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<ti998_spsyn_device &>(device).m_ready.set_callback(object); } DECLARE_READ8Z_MEMBER(readz); DECLARE_WRITE8_MEMBER(write); @@ -57,7 +57,7 @@ private: // UINT32 m_sprom_length; // length of data pointed by speechrom_data, from 0 to 2^18 // Ready line to the CPU - devcb2_write_line m_ready; + devcb_write_line m_ready; }; #define MCFG_TISPEECH8_ADD(_tag, _conf) \ diff --git a/src/mess/machine/ti99/videowrp.h b/src/mess/machine/ti99/videowrp.h index c134c5069b9..458d48b1441 100644 --- a/src/mess/machine/ti99/videowrp.h +++ b/src/mess/machine/ti99/videowrp.h @@ -93,7 +93,7 @@ public: DECLARE_WRITE8_MEMBER(write); DECLARE_WRITE_LINE_MEMBER( sound_ready ); // connect to console READY - template<class _Object> static devcb2_base &static_set_int_callback(device_t &device, _Object object) { return downcast<ti_sound_system_device &>(device).m_console_ready.set_callback(object); } + template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast<ti_sound_system_device &>(device).m_console_ready.set_callback(object); } protected: virtual void device_start(void); @@ -101,7 +101,7 @@ protected: private: sn76496_base_device* m_sound_chip; - devcb2_write_line m_console_ready; + devcb_write_line m_console_ready; }; /* @@ -182,6 +182,6 @@ protected: MCFG_DEVICE_ADD(_tag, TISOUND_76496, 0) #define MCFG_TI_SOUND_READY_HANDLER( _ready ) \ - devcb = &ti_sound_system_device::static_set_int_callback( *device, DEVCB2_##_ready ); + devcb = &ti_sound_system_device::static_set_int_callback( *device, DEVCB_##_ready ); #endif /* __TIVIDEO__ */ diff --git a/src/mess/machine/trs80m2kb.h b/src/mess/machine/trs80m2kb.h index 58e94836ef8..ea5ea0d3550 100644 --- a/src/mess/machine/trs80m2kb.h +++ b/src/mess/machine/trs80m2kb.h @@ -33,7 +33,7 @@ //************************************************************************** #define MCFG_TRS80M2_KEYBOARD_CLOCK_CALLBACK(_write) \ - devcb = &trs80m2_keyboard_device::set_clock_wr_callback(*device, DEVCB2_##_write); + devcb = &trs80m2_keyboard_device::set_clock_wr_callback(*device, DEVCB_##_write); @@ -49,7 +49,7 @@ public: // construction/destruction trs80m2_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_clock_wr_callback(device_t &device, _Object object) { return downcast<trs80m2_keyboard_device &>(device).m_write_clock.set_callback(object); } + template<class _Object> static devcb_base &set_clock_wr_callback(device_t &device, _Object object) { return downcast<trs80m2_keyboard_device &>(device).m_write_clock.set_callback(object); } // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -91,7 +91,7 @@ private: required_ioport m_ya; required_ioport m_yb; - devcb2_write_line m_write_clock; + devcb_write_line m_write_clock; int m_busy; int m_data; diff --git a/src/mess/machine/upd65031.h b/src/mess/machine/upd65031.h index 2f96a075c5f..1a7756a5e7f 100644 --- a/src/mess/machine/upd65031.h +++ b/src/mess/machine/upd65031.h @@ -18,16 +18,16 @@ //************************************************************************** #define MCFG_UPD65031_KB_CALLBACK(_read) \ - devcb = &upd65031_device::set_kb_rd_callback(*device, DEVCB2_##_read); + devcb = &upd65031_device::set_kb_rd_callback(*device, DEVCB_##_read); #define MCFG_UPD65031_INT_CALLBACK(_write) \ - devcb = &upd65031_device::set_int_wr_callback(*device, DEVCB2_##_write); + devcb = &upd65031_device::set_int_wr_callback(*device, DEVCB_##_write); #define MCFG_UPD65031_NMI_CALLBACK(_write) \ - devcb = &upd65031_device::set_nmi_wr_callback(*device, DEVCB2_##_write); + devcb = &upd65031_device::set_nmi_wr_callback(*device, DEVCB_##_write); #define MCFG_UPD65031_SPKR_CALLBACK(_write) \ - devcb = &upd65031_device::set_spkr_wr_callback(*device, DEVCB2_##_write); + devcb = &upd65031_device::set_spkr_wr_callback(*device, DEVCB_##_write); #define MCFG_UPD65031_SCR_UPDATE_CB(_class, _method) \ upd65031_device::set_screen_update_callback(*device, upd65031_screen_update_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); @@ -55,10 +55,10 @@ public: // construction/destruction upd65031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_kb_rd_callback(device_t &device, _Object object) { return downcast<upd65031_device &>(device).m_read_kb.set_callback(object); } - template<class _Object> static devcb2_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<upd65031_device &>(device).m_write_int.set_callback(object); } - template<class _Object> static devcb2_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<upd65031_device &>(device).m_write_nmi.set_callback(object); } - template<class _Object> static devcb2_base &set_spkr_wr_callback(device_t &device, _Object object) { return downcast<upd65031_device &>(device).m_write_spkr.set_callback(object); } + template<class _Object> static devcb_base &set_kb_rd_callback(device_t &device, _Object object) { return downcast<upd65031_device &>(device).m_read_kb.set_callback(object); } + template<class _Object> static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<upd65031_device &>(device).m_write_int.set_callback(object); } + template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<upd65031_device &>(device).m_write_nmi.set_callback(object); } + template<class _Object> static devcb_base &set_spkr_wr_callback(device_t &device, _Object object) { return downcast<upd65031_device &>(device).m_write_spkr.set_callback(object); } static void set_screen_update_callback(device_t &device, upd65031_screen_update_delegate callback) { downcast<upd65031_device &>(device).m_screen_update_cb = callback; } static void set_memory_update_callback(device_t &device, upd65031_memory_update_delegate callback) { downcast<upd65031_device &>(device).m_out_mem_cb = callback; } @@ -83,10 +83,10 @@ private: static const device_timer_id TIMER_FLASH = 1; static const device_timer_id TIMER_SPEAKER = 2; - devcb2_read8 m_read_kb; - devcb2_write_line m_write_int; - devcb2_write_line m_write_nmi; - devcb2_write_line m_write_spkr; + devcb_read8 m_read_kb; + devcb_write_line m_write_int; + devcb_write_line m_write_nmi; + devcb_write_line m_write_spkr; upd65031_screen_update_delegate m_screen_update_cb; // callback for update the LCD upd65031_memory_update_delegate m_out_mem_cb; // callback for update bankswitch diff --git a/src/mess/machine/v1050kb.h b/src/mess/machine/v1050kb.h index 6f9ede79a97..3a6bcffa788 100644 --- a/src/mess/machine/v1050kb.h +++ b/src/mess/machine/v1050kb.h @@ -25,7 +25,7 @@ //************************************************************************** #define MCFG_V1050_KEYBOARD_OUT_TX_HANDLER(_devcb) \ - devcb = &v1050_keyboard_device::set_out_tx_handler(*device, DEVCB2_##_devcb); + devcb = &v1050_keyboard_device::set_out_tx_handler(*device, DEVCB_##_devcb); @@ -41,7 +41,7 @@ public: // construction/destruction v1050_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_tx_handler(device_t &device, _Object object) { return downcast<v1050_keyboard_device &>(device).m_out_tx_handler.set_callback(object); } + template<class _Object> static devcb_base &set_out_tx_handler(device_t &device, _Object object) { return downcast<v1050_keyboard_device &>(device).m_out_tx_handler.set_callback(object); } // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -75,7 +75,7 @@ private: required_ioport m_y9; required_ioport m_ya; required_ioport m_yb; - devcb2_write_line m_out_tx_handler; + devcb_write_line m_out_tx_handler; UINT8 m_y; }; diff --git a/src/mess/machine/victor9kb.h b/src/mess/machine/victor9kb.h index 61ee8784bc5..a126ac67069 100644 --- a/src/mess/machine/victor9kb.h +++ b/src/mess/machine/victor9kb.h @@ -25,10 +25,10 @@ //************************************************************************** #define MCFG_VICTOR9K_KBRDY_HANDLER(_devcb) \ - devcb = &victor9k_keyboard_device::set_kbrdy_handler(*device, DEVCB2_##_devcb); + devcb = &victor9k_keyboard_device::set_kbrdy_handler(*device, DEVCB_##_devcb); #define MCFG_VICTOR9K_KBDATA_HANDLER(_devcb) \ - devcb = &victor9k_keyboard_device::set_kbdata_handler(*device, DEVCB2_##_devcb); + devcb = &victor9k_keyboard_device::set_kbdata_handler(*device, DEVCB_##_devcb); //************************************************************************** @@ -43,8 +43,8 @@ public: // construction/destruction victor9k_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_kbrdy_handler(device_t &device, _Object object) { return downcast<victor9k_keyboard_device &>(device).m_kbrdy_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_kbdata_handler(device_t &device, _Object object) { return downcast<victor9k_keyboard_device &>(device).m_kbdata_handler.set_callback(object); } + template<class _Object> static devcb_base &set_kbrdy_handler(device_t &device, _Object object) { return downcast<victor9k_keyboard_device &>(device).m_kbrdy_handler.set_callback(object); } + template<class _Object> static devcb_base &set_kbdata_handler(device_t &device, _Object object) { return downcast<victor9k_keyboard_device &>(device).m_kbdata_handler.set_callback(object); } // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -82,8 +82,8 @@ private: required_ioport m_yb; required_ioport m_yc; - devcb2_write_line m_kbrdy_handler; - devcb2_write_line m_kbdata_handler; + devcb_write_line m_kbrdy_handler; + devcb_write_line m_kbdata_handler; UINT8 m_y; int m_kbrdy; diff --git a/src/mess/machine/wangpckb.h b/src/mess/machine/wangpckb.h index 09f4d0a6f03..38a0dbe321c 100644 --- a/src/mess/machine/wangpckb.h +++ b/src/mess/machine/wangpckb.h @@ -37,7 +37,7 @@ MCFG_DEVICE_ADD(WANGPC_KEYBOARD_TAG, WANGPC_KEYBOARD, 0) #define MCFG_WANGPCKB_TXD_HANDLER(_devcb) \ - devcb = &wangpc_keyboard_device::set_txd_handler(*device, DEVCB2_##_devcb); + devcb = &wangpc_keyboard_device::set_txd_handler(*device, DEVCB_##_devcb); //************************************************************************** @@ -53,7 +53,7 @@ public: // construction/destruction wangpc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_txd_handler(device_t &device, _Object object) { return downcast<wangpc_keyboard_device &>(device).m_txd_handler.set_callback(object); } + template<class _Object> static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast<wangpc_keyboard_device &>(device).m_txd_handler.set_callback(object); } // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -96,7 +96,7 @@ private: required_ioport m_yd; required_ioport m_ye; required_ioport m_yf; - devcb2_write_line m_txd_handler; + devcb_write_line m_txd_handler; UINT8 m_y; }; diff --git a/src/mess/machine/zx8302.h b/src/mess/machine/zx8302.h index 4575e52b136..8915d2c91dc 100644 --- a/src/mess/machine/zx8302.h +++ b/src/mess/machine/zx8302.h @@ -48,46 +48,46 @@ zx8302_device::set_rtc_clock(*device, _clk); #define MCFG_ZX8302_OUT_IPL1L_CB(_devcb) \ - devcb = &zx8302_device::set_out_ipl1l_callback(*device, DEVCB2_##_devcb); + devcb = &zx8302_device::set_out_ipl1l_callback(*device, DEVCB_##_devcb); #define MCFG_ZX8302_OUT_BAUDX4_CB(_devcb) \ - devcb = &zx8302_device::set_out_baudx4_callback(*device, DEVCB2_##_devcb); + devcb = &zx8302_device::set_out_baudx4_callback(*device, DEVCB_##_devcb); #define MCFG_ZX8302_OUT_COMDATA_CB(_devcb) \ - devcb = &zx8302_device::set_out_comdata_callback(*device, DEVCB2_##_devcb); + devcb = &zx8302_device::set_out_comdata_callback(*device, DEVCB_##_devcb); #define MCFG_ZX8302_OUT_TXD1_CB(_devcb) \ - devcb = &zx8302_device::set_out_txd1_callback(*device, DEVCB2_##_devcb); + devcb = &zx8302_device::set_out_txd1_callback(*device, DEVCB_##_devcb); #define MCFG_ZX8302_OUT_TXD2_CB(_devcb) \ - devcb = &zx8302_device::set_out_txd2_callback(*device, DEVCB2_##_devcb); + devcb = &zx8302_device::set_out_txd2_callback(*device, DEVCB_##_devcb); #define MCFG_ZX8302_OUT_NETOUT_CB(_devcb) \ - devcb = &zx8302_device::set_out_netout_callback(*device, DEVCB2_##_devcb); + devcb = &zx8302_device::set_out_netout_callback(*device, DEVCB_##_devcb); #define MCFG_ZX8302_OUT_MDSELCK_CB(_devcb) \ - devcb = &zx8302_device::set_out_mdselck_callback(*device, DEVCB2_##_devcb); + devcb = &zx8302_device::set_out_mdselck_callback(*device, DEVCB_##_devcb); #define MCFG_ZX8302_OUT_MDSELD_CB(_devcb) \ - devcb = &zx8302_device::set_out_mdseld_callback(*device, DEVCB2_##_devcb); + devcb = &zx8302_device::set_out_mdseld_callback(*device, DEVCB_##_devcb); #define MCFG_ZX8302_OUT_MDRDW_CB(_devcb) \ - devcb = &zx8302_device::set_out_mdrdw_callback(*device, DEVCB2_##_devcb); + devcb = &zx8302_device::set_out_mdrdw_callback(*device, DEVCB_##_devcb); #define MCFG_ZX8302_OUT_ERASE_CB(_devcb) \ - devcb = &zx8302_device::set_out_erase_callback(*device, DEVCB2_##_devcb); + devcb = &zx8302_device::set_out_erase_callback(*device, DEVCB_##_devcb); #define MCFG_ZX8302_OUT_RAW1_CB(_devcb) \ - devcb = &zx8302_device::set_out_raw1_callback(*device, DEVCB2_##_devcb); + devcb = &zx8302_device::set_out_raw1_callback(*device, DEVCB_##_devcb); #define MCFG_ZX8302_IN_RAW1_CB(_devcb) \ - devcb = &zx8302_device::set_in_raw1_callback(*device, DEVCB2_##_devcb); + devcb = &zx8302_device::set_in_raw1_callback(*device, DEVCB_##_devcb); #define MCFG_ZX8302_OUT_RAW2_CB(_devcb) \ - devcb = &zx8302_device::set_out_raw2_callback(*device, DEVCB2_##_devcb); + devcb = &zx8302_device::set_out_raw2_callback(*device, DEVCB_##_devcb); #define MCFG_ZX8302_IN_RAW2_CB(_devcb) \ - devcb = &zx8302_device::set_in_raw2_callback(*device, DEVCB2_##_devcb); + devcb = &zx8302_device::set_in_raw2_callback(*device, DEVCB_##_devcb); ///************************************************************************* @@ -104,20 +104,20 @@ public: zx8302_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_rtc_clock(device_t &device, int rtc_clock) { downcast<zx8302_device &>(device).m_rtc_clock = rtc_clock; } - template<class _Object> static devcb2_base &set_out_ipl1l_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_ipl1l_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_baudx4_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_baudx4_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_comdata_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_comdata_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_txd1_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_txd1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_txd2_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_txd2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_netout_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_netout_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_mdselck_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_mdselck_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_mdseld_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_mdseld_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_mdrdw_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_mdrdw_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_erase_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_erase_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_raw1_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_raw1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_raw1_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_in_raw1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_raw2_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_raw2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_raw2_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_in_raw2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_ipl1l_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_ipl1l_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_baudx4_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_baudx4_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_comdata_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_comdata_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_txd1_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_txd1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_txd2_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_txd2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_netout_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_netout_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_mdselck_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_mdselck_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_mdseld_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_mdseld_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_mdrdw_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_mdrdw_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_erase_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_erase_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_raw1_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_raw1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_raw1_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_in_raw1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_raw2_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_raw2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_raw2_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_in_raw2_cb.set_callback(object); } DECLARE_READ8_MEMBER( rtc_r ); DECLARE_WRITE8_MEMBER( rtc_w ); @@ -209,22 +209,22 @@ private: int m_rtc_clock; // the RTC clock (pin 30) of the chip // serial - devcb2_write_line m_out_ipl1l_cb; - devcb2_write_line m_out_baudx4_cb; - devcb2_write_line m_out_comdata_cb; - devcb2_write_line m_out_txd1_cb; - devcb2_write_line m_out_txd2_cb; - devcb2_write_line m_out_netout_cb; + devcb_write_line m_out_ipl1l_cb; + devcb_write_line m_out_baudx4_cb; + devcb_write_line m_out_comdata_cb; + devcb_write_line m_out_txd1_cb; + devcb_write_line m_out_txd2_cb; + devcb_write_line m_out_netout_cb; // microdrive - devcb2_write_line m_out_mdselck_cb; - devcb2_write_line m_out_mdseld_cb; - devcb2_write_line m_out_mdrdw_cb; - devcb2_write_line m_out_erase_cb; - devcb2_write_line m_out_raw1_cb; - devcb2_read_line m_in_raw1_cb; - devcb2_write_line m_out_raw2_cb; - devcb2_read_line m_in_raw2_cb; + devcb_write_line m_out_mdselck_cb; + devcb_write_line m_out_mdseld_cb; + devcb_write_line m_out_mdrdw_cb; + devcb_write_line m_out_erase_cb; + devcb_write_line m_out_raw1_cb; + devcb_read_line m_in_raw1_cb; + devcb_write_line m_out_raw2_cb; + devcb_read_line m_in_raw2_cb; int m_rs232_rx; int m_dtr1; diff --git a/src/mess/video/733_asr.h b/src/mess/video/733_asr.h index 52b4240ed98..a5b6c1c7010 100644 --- a/src/mess/video/733_asr.h +++ b/src/mess/video/733_asr.h @@ -18,11 +18,11 @@ public: DECLARE_READ8_MEMBER(cru_r); DECLARE_WRITE8_MEMBER(cru_w); - template<class _Object> static devcb2_base &static_set_keyint_callback(device_t &device, _Object object) + template<class _Object> static devcb_base &static_set_keyint_callback(device_t &device, _Object object) { return downcast<asr733_device &>(device).m_keyint_line.set_callback(object); } - template<class _Object> static devcb2_base &static_set_lineint_callback(device_t &device, _Object object) + template<class _Object> static devcb_base &static_set_lineint_callback(device_t &device, _Object object) { return downcast<asr733_device &>(device).m_lineint_line.set_callback(object); } @@ -73,14 +73,14 @@ private: required_device<palette_device> m_palette; required_device<gfxdecode_device> m_gfxdecode; - devcb2_write_line m_keyint_line; - devcb2_write_line m_lineint_line; + devcb_write_line m_keyint_line; + devcb_write_line m_lineint_line; }; extern const device_type ASR733; #define MCFG_ASR733_KEYINT_HANDLER( _intcallb ) \ - devcb = &asr733_device::static_set_keyint_callback( *device, DEVCB2_##_intcallb ); + devcb = &asr733_device::static_set_keyint_callback( *device, DEVCB_##_intcallb ); #define MCFG_ASR733_LINEINT_HANDLER( _intcallb ) \ - devcb = &asr733_device::static_set_lineint_callback( *device, DEVCB2_##_intcallb ); + devcb = &asr733_device::static_set_lineint_callback( *device, DEVCB_##_intcallb ); diff --git a/src/mess/video/911_vdt.h b/src/mess/video/911_vdt.h index e1881a51a5e..5492bcf3fc4 100644 --- a/src/mess/video/911_vdt.h +++ b/src/mess/video/911_vdt.h @@ -42,12 +42,12 @@ public: DECLARE_PALETTE_INIT(vdt911); - template<class _Object> static devcb2_base &static_set_keyint_callback(device_t &device, _Object object) + template<class _Object> static devcb_base &static_set_keyint_callback(device_t &device, _Object object) { return downcast<vdt911_device &>(device).m_keyint_line.set_callback(object); } - template<class _Object> static devcb2_base &static_set_lineint_callback(device_t &device, _Object object) + template<class _Object> static devcb_base &static_set_lineint_callback(device_t &device, _Object object) { return downcast<vdt911_device &>(device).m_lineint_line.set_callback(object); } @@ -103,14 +103,14 @@ private: required_device<beep_device> m_beeper; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; - devcb2_write_line m_keyint_line; - devcb2_write_line m_lineint_line; + devcb_write_line m_keyint_line; + devcb_write_line m_lineint_line; }; extern const device_type VDT911; #define MCFG_VDT911_KEYINT_HANDLER( _intcallb ) \ - devcb = &vdt911_device::static_set_keyint_callback( *device, DEVCB2_##_intcallb ); + devcb = &vdt911_device::static_set_keyint_callback( *device, DEVCB_##_intcallb ); #define MCFG_VDT911_LINEINT_HANDLER( _intcallb ) \ - devcb = &vdt911_device::static_set_lineint_callback( *device, DEVCB2_##_intcallb ); + devcb = &vdt911_device::static_set_lineint_callback( *device, DEVCB_##_intcallb ); diff --git a/src/mess/video/gime.h b/src/mess/video/gime.h index 323490d612c..11d44f0d65b 100644 --- a/src/mess/video/gime.h +++ b/src/mess/video/gime.h @@ -26,13 +26,13 @@ #define MCFG_GIME_FSYNC_CALLBACK MCFG_MC6847_FSYNC_CALLBACK #define MCFG_GIME_IRQ_CALLBACK(_write) \ - devcb = &gime_base_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &gime_base_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_GIME_FIRQ_CALLBACK(_write) \ - devcb = &gime_base_device::set_firq_wr_callback(*device, DEVCB2_##_write); + devcb = &gime_base_device::set_firq_wr_callback(*device, DEVCB_##_write); #define MCFG_GIME_FLOATING_BUS_CALLBACK(_read) \ - devcb = &gime_base_device::set_floating_bus_rd_callback(*device, DEVCB2_##_read); + devcb = &gime_base_device::set_floating_bus_rd_callback(*device, DEVCB_##_read); /* interface */ struct gime_interface @@ -54,9 +54,9 @@ class cococart_slot_device; class gime_base_device : public mc6847_friend_device, public sam6883_friend_device { public: - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<gime_base_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_firq_wr_callback(device_t &device, _Object object) { return downcast<gime_base_device &>(device).m_write_firq.set_callback(object); } - template<class _Object> static devcb2_base &set_floating_bus_rd_callback(device_t &device, _Object object) { return downcast<gime_base_device &>(device).m_read_floating_bus.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<gime_base_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_firq_wr_callback(device_t &device, _Object object) { return downcast<gime_base_device &>(device).m_write_firq.set_callback(object); } + template<class _Object> static devcb_base &set_floating_bus_rd_callback(device_t &device, _Object object) { return downcast<gime_base_device &>(device).m_read_floating_bus.set_callback(object); } // read/write DECLARE_READ8_MEMBER( read ) { return read(offset); } @@ -159,9 +159,9 @@ private: static const UINT8 hires_font[128][12]; // callbacks - devcb2_write_line m_write_irq; - devcb2_write_line m_write_firq; - devcb2_read8 m_read_floating_bus; + devcb_write_line m_write_irq; + devcb_write_line m_write_firq; + devcb_read8 m_read_floating_bus; // device state UINT8 m_gime_registers[16]; diff --git a/src/mess/video/k1ge.h b/src/mess/video/k1ge.h index e9ed010f2c0..4b5eedd2863 100644 --- a/src/mess/video/k1ge.h +++ b/src/mess/video/k1ge.h @@ -6,14 +6,14 @@ #define MCFG_K1GE_ADD(_tag, _clock, _screen, _vblank, _hblank ) \ MCFG_DEVICE_ADD( _tag, K1GE, _clock ) \ MCFG_VIDEO_SET_SCREEN( _screen ) \ - devcb = &k1ge_device::static_set_vblank_callback( *device, DEVCB2_##_vblank ); \ - devcb = &k1ge_device::static_set_hblank_callback( *device, DEVCB2_##_hblank ); + devcb = &k1ge_device::static_set_vblank_callback( *device, DEVCB_##_vblank ); \ + devcb = &k1ge_device::static_set_hblank_callback( *device, DEVCB_##_hblank ); #define MCFG_K2GE_ADD(_tag, _clock, _screen, _vblank, _hblank ) \ MCFG_DEVICE_ADD( _tag, K2GE, _clock ) \ MCFG_VIDEO_SET_SCREEN( _screen ) \ - devcb = &k1ge_device::static_set_vblank_callback( *device, DEVCB2_##_vblank ); \ - devcb = &k1ge_device::static_set_hblank_callback( *device, DEVCB2_##_hblank ); + devcb = &k1ge_device::static_set_vblank_callback( *device, DEVCB_##_vblank ); \ + devcb = &k1ge_device::static_set_hblank_callback( *device, DEVCB_##_hblank ); class k1ge_device : public device_t, @@ -33,8 +33,8 @@ public: void update( bitmap_ind16 &bitmap, const rectangle &cliprect ); // Static methods - template<class _Object> static devcb2_base &static_set_vblank_callback(device_t &device, _Object object) { return downcast<k1ge_device &>(device).m_vblank_pin_w.set_callback(object); } - template<class _Object> static devcb2_base &static_set_hblank_callback(device_t &device, _Object object) { return downcast<k1ge_device &>(device).m_hblank_pin_w.set_callback(object); } + template<class _Object> static devcb_base &static_set_vblank_callback(device_t &device, _Object object) { return downcast<k1ge_device &>(device).m_vblank_pin_w.set_callback(object); } + template<class _Object> static devcb_base &static_set_hblank_callback(device_t &device, _Object object) { return downcast<k1ge_device &>(device).m_hblank_pin_w.set_callback(object); } static const int K1GE_SCREEN_HEIGHT = 199; protected: @@ -43,8 +43,8 @@ protected: virtual void device_reset(); virtual machine_config_constructor device_mconfig_additions() const; - devcb2_write_line m_vblank_pin_w; - devcb2_write_line m_hblank_pin_w; + devcb_write_line m_vblank_pin_w; + devcb_write_line m_hblank_pin_w; UINT8 *m_vram; UINT8 m_wba_h, m_wba_v, m_wsi_h, m_wsi_v; diff --git a/src/mess/video/nick.h b/src/mess/video/nick.h index 65adbe4678f..8080c528ae8 100644 --- a/src/mess/video/nick.h +++ b/src/mess/video/nick.h @@ -34,7 +34,7 @@ #define MCFG_NICK_VIRQ_CALLBACK(_write) \ - devcb = &nick_device::set_virq_wr_callback(*device, DEVCB2_##_write); + devcb = &nick_device::set_virq_wr_callback(*device, DEVCB_##_write); /* there are 64us per line, although in reality @@ -76,7 +76,7 @@ public: // construction/destruction nick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_virq_wr_callback(device_t &device, _Object object) { return downcast<nick_device &>(device).m_write_virq.set_callback(object); } + template<class _Object> static devcb_base &set_virq_wr_callback(device_t &device, _Object object) { return downcast<nick_device &>(device).m_write_virq.set_callback(object); } virtual DECLARE_ADDRESS_MAP(vram_map, 8); virtual DECLARE_ADDRESS_MAP(vio_map, 8); @@ -103,7 +103,7 @@ protected: address_space_config m_space_config; private: - devcb2_write_line m_write_virq; + devcb_write_line m_write_virq; void initialize_palette(); diff --git a/src/mess/video/uv201.h b/src/mess/video/uv201.h index d6aebdb469a..f1dc644c1ec 100644 --- a/src/mess/video/uv201.h +++ b/src/mess/video/uv201.h @@ -76,13 +76,13 @@ #define MCFG_UV201_EXT_INT_CALLBACK(_write) \ - devcb = &uv201_device::set_ext_int_wr_callback(*device, DEVCB2_##_write); + devcb = &uv201_device::set_ext_int_wr_callback(*device, DEVCB_##_write); #define MCFG_UV201_HBLANK_CALLBACK(_write) \ - devcb = &uv201_device::set_hblank_wr_callback(*device, DEVCB2_##_write); + devcb = &uv201_device::set_hblank_wr_callback(*device, DEVCB_##_write); #define MCFG_UV201_DB_CALLBACK(_read) \ - devcb = &uv201_device::set_db_rd_callback(*device, DEVCB2_##_read); + devcb = &uv201_device::set_db_rd_callback(*device, DEVCB_##_read); @@ -99,9 +99,9 @@ public: // construction/destruction uv201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_ext_int_wr_callback(device_t &device, _Object object) { return downcast<uv201_device &>(device).m_write_ext_int.set_callback(object); } - template<class _Object> static devcb2_base &set_hblank_wr_callback(device_t &device, _Object object) { return downcast<uv201_device &>(device).m_write_hblank.set_callback(object); } - template<class _Object> static devcb2_base &set_db_rd_callback(device_t &device, _Object object) { return downcast<uv201_device &>(device).m_read_db.set_callback(object); } + template<class _Object> static devcb_base &set_ext_int_wr_callback(device_t &device, _Object object) { return downcast<uv201_device &>(device).m_write_ext_int.set_callback(object); } + template<class _Object> static devcb_base &set_hblank_wr_callback(device_t &device, _Object object) { return downcast<uv201_device &>(device).m_write_hblank.set_callback(object); } + template<class _Object> static devcb_base &set_db_rd_callback(device_t &device, _Object object) { return downcast<uv201_device &>(device).m_read_db.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -132,9 +132,9 @@ private: void set_y_interrupt(); void do_partial_update(); - devcb2_write_line m_write_ext_int; - devcb2_write_line m_write_hblank; - devcb2_read8 m_read_db; + devcb_write_line m_write_ext_int; + devcb_write_line m_write_hblank; + devcb_read8 m_read_db; rgb_t m_palette_val[32]; UINT8 m_ram[0x90]; diff --git a/src/mess/video/vtvideo.h b/src/mess/video/vtvideo.h index 410f5373076..99e10f39d56 100644 --- a/src/mess/video/vtvideo.h +++ b/src/mess/video/vtvideo.h @@ -23,8 +23,8 @@ public: vt100_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~vt100_video_device() {} - template<class _Object> static devcb2_base &set_ram_rd_callback(device_t &device, _Object object) { return downcast<vt100_video_device &>(device).m_read_ram.set_callback(object); } - template<class _Object> static devcb2_base &set_clear_video_irq_wr_callback(device_t &device, _Object object) { return downcast<vt100_video_device &>(device).m_write_clear_video_interrupt.set_callback(object); } + template<class _Object> static devcb_base &set_ram_rd_callback(device_t &device, _Object object) { return downcast<vt100_video_device &>(device).m_read_ram.set_callback(object); } + template<class _Object> static devcb_base &set_clear_video_irq_wr_callback(device_t &device, _Object object) { return downcast<vt100_video_device &>(device).m_write_clear_video_interrupt.set_callback(object); } static void set_chargen_tag(device_t &device, const char *tag) { downcast<vt100_video_device &>(device).m_char_rom_tag = tag; } @@ -45,8 +45,8 @@ protected: virtual void display_char(bitmap_ind16 &bitmap, UINT8 code, int x, int y, UINT8 scroll_region, UINT8 display_type); TIMER_CALLBACK_MEMBER(lba7_change); - devcb2_read8 m_read_ram; - devcb2_write8 m_write_clear_video_interrupt; + devcb_read8 m_read_ram; + devcb_write8 m_write_clear_video_interrupt; UINT8 *m_gfx; /* content of char rom */ @@ -100,9 +100,9 @@ extern const device_type RAINBOW_VIDEO; vt100_video_device::set_chargen_tag(*device, _tag); #define MCFG_VT_VIDEO_RAM_CALLBACK(_read) \ - devcb = &vt100_video_device::set_ram_rd_callback(*device, DEVCB2_##_read); + devcb = &vt100_video_device::set_ram_rd_callback(*device, DEVCB_##_read); #define MCFG_VT_VIDEO_CLEAR_VIDEO_INTERRUPT_CALLBACK(_write) \ - devcb = &vt100_video_device::set_clear_video_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &vt100_video_device::set_clear_video_irq_wr_callback(*device, DEVCB_##_write); #endif diff --git a/src/mess/video/zx8301.h b/src/mess/video/zx8301.h index 2211b83e811..53a12f75079 100644 --- a/src/mess/video/zx8301.h +++ b/src/mess/video/zx8301.h @@ -49,7 +49,7 @@ zx8301_device::static_set_cpu_tag(*device, "^"_tag); #define MCFG_ZX8301_VSYNC_CALLBACK(_write) \ - devcb = &zx8301_device::set_vsync_wr_callback(*device, DEVCB2_##_write); + devcb = &zx8301_device::set_vsync_wr_callback(*device, DEVCB_##_write); @@ -67,7 +67,7 @@ public: // construction/destruction zx8301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_vsync_wr_callback(device_t &device, _Object object) { return downcast<zx8301_device &>(device).m_write_vsync.set_callback(object); } + template<class _Object> static devcb_base &set_vsync_wr_callback(device_t &device, _Object object) { return downcast<zx8301_device &>(device).m_write_vsync.set_callback(object); } static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<zx8301_device &>(device).m_cpu.set_tag(tag); } DECLARE_WRITE8_MEMBER( control_w ); @@ -102,7 +102,7 @@ private: required_device<cpu_device> m_cpu; - devcb2_write_line m_write_vsync; + devcb_write_line m_write_vsync; //address_space *m_data; |