diff options
author | 2014-05-14 06:46:50 +0000 | |
---|---|---|
committer | 2014-05-14 06:46:50 +0000 | |
commit | 546fbff34966f4f5f62930dd73c064df90d4e51e (patch) | |
tree | a2e859303874d5ee6cda105c465983e5223d5675 /src | |
parent | c5a60146edfc6d9bf8ff7f398b0c3fa17b94b1e3 (diff) |
devcv2 -> devcb (nw)
Diffstat (limited to 'src')
404 files changed, 4709 insertions, 4709 deletions
diff --git a/src/emu/bus/a1bus/a1bus.h b/src/emu/bus/a1bus/a1bus.h index ea94c176cfd..ef748915607 100644 --- a/src/emu/bus/a1bus/a1bus.h +++ b/src/emu/bus/a1bus/a1bus.h @@ -22,10 +22,10 @@ a1bus_device::static_set_cputag(*device, _cputag); #define MCFG_A1BUS_OUT_IRQ_CB(_devcb) \ - devcb = &a1bus_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &a1bus_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_A1BUS_OUT_NMI_CB(_devcb) \ - devcb = &a1bus_device::set_out_nmi_callback(*device, DEVCB2_##_devcb); + devcb = &a1bus_device::set_out_nmi_callback(*device, DEVCB_##_devcb); #define MCFG_A1BUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, A1BUS_SLOT, 0) \ @@ -78,8 +78,8 @@ public: // inline configuration static void static_set_cputag(device_t &device, const char *tag); - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_nmi_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_nmi_cb.set_callback(object); } void add_a1bus_card(device_a1bus_card_interface *card); device_a1bus_card_interface *get_a1bus_card(); @@ -101,8 +101,8 @@ protected: // internal state cpu_device *m_maincpu; - devcb2_write_line m_out_irq_cb; - devcb2_write_line m_out_nmi_cb; + devcb_write_line m_out_irq_cb; + devcb_write_line m_out_nmi_cb; device_a1bus_card_interface *m_device; const char *m_cputag; diff --git a/src/emu/bus/a2bus/a2bus.h b/src/emu/bus/a2bus/a2bus.h index 4291ddd13ec..d2dcdbe4362 100644 --- a/src/emu/bus/a2bus/a2bus.h +++ b/src/emu/bus/a2bus/a2bus.h @@ -23,13 +23,13 @@ a2bus_device::static_set_cputag(*device, _cputag); #define MCFG_A2BUS_OUT_IRQ_CB(_devcb) \ - devcb = &a2bus_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &a2bus_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_A2BUS_OUT_NMI_CB(_devcb) \ - devcb = &a2bus_device::set_out_nmi_callback(*device, DEVCB2_##_devcb); + devcb = &a2bus_device::set_out_nmi_callback(*device, DEVCB_##_devcb); #define MCFG_A2BUS_OUT_INH_CB(_devcb) \ - devcb = &a2bus_device::set_out_inh_callback(*device, DEVCB2_##_devcb); + devcb = &a2bus_device::set_out_inh_callback(*device, DEVCB_##_devcb); #define MCFG_A2BUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, A2BUS_SLOT, 0) \ @@ -82,9 +82,9 @@ public: // inline configuration static void static_set_cputag(device_t &device, const char *tag); - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_nmi_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_inh_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_inh_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_nmi_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_inh_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_inh_cb.set_callback(object); } void add_a2bus_card(int slot, device_a2bus_card_interface *card); device_a2bus_card_interface *get_a2bus_card(int slot); @@ -104,9 +104,9 @@ protected: // internal state cpu_device *m_maincpu; - devcb2_write_line m_out_irq_cb; - devcb2_write_line m_out_nmi_cb; - devcb2_write_line m_out_inh_cb; + devcb_write_line m_out_irq_cb; + devcb_write_line m_out_nmi_cb; + devcb_write_line m_out_inh_cb; device_a2bus_card_interface *m_device_list[8]; const char *m_cputag; diff --git a/src/emu/bus/a2bus/a2eauxslot.h b/src/emu/bus/a2bus/a2eauxslot.h index ff527694687..7e7d110c484 100644 --- a/src/emu/bus/a2bus/a2eauxslot.h +++ b/src/emu/bus/a2bus/a2eauxslot.h @@ -22,10 +22,10 @@ a2eauxslot_device::static_set_cputag(*device, _cputag); #define MCFG_A2EAUXSLOT_OUT_IRQ_CB(_devcb) \ - devcb = &a2eauxslot_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &a2eauxslot_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_A2EAUXSLOT_OUT_NMI_CB(_devcb) \ - devcb = &a2eauxslot_device::set_out_nmi_callback(*device, DEVCB2_##_devcb); + devcb = &a2eauxslot_device::set_out_nmi_callback(*device, DEVCB_##_devcb); #define MCFG_A2EAUXSLOT_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, A2EAUXSLOT_SLOT, 0) \ @@ -74,8 +74,8 @@ public: // inline configuration static void static_set_cputag(device_t &device, const char *tag); - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a2eauxslot_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a2eauxslot_device &>(device).m_out_nmi_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a2eauxslot_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a2eauxslot_device &>(device).m_out_nmi_cb.set_callback(object); } void add_a2eauxslot_card(device_a2eauxslot_card_interface *card); device_a2eauxslot_card_interface *get_a2eauxslot_card(); @@ -94,8 +94,8 @@ protected: // internal state cpu_device *m_maincpu; - devcb2_write_line m_out_irq_cb; - devcb2_write_line m_out_nmi_cb; + devcb_write_line m_out_irq_cb; + devcb_write_line m_out_nmi_cb; device_a2eauxslot_card_interface *m_device; const char *m_cputag; diff --git a/src/emu/bus/abcbus/abcbus.h b/src/emu/bus/abcbus/abcbus.h index 81d0713c924..994b3a80bec 100644 --- a/src/emu/bus/abcbus/abcbus.h +++ b/src/emu/bus/abcbus/abcbus.h @@ -124,34 +124,34 @@ #define MCFG_ABCBUS_SLOT_IRQ_CALLBACK(_irq) \ - downcast<abcbus_slot_device *>(device)->set_irq_callback(DEVCB2_##_irq); + downcast<abcbus_slot_device *>(device)->set_irq_callback(DEVCB_##_irq); #define MCFG_ABCBUS_SLOT_NMI_CALLBACK(_nmi) \ - downcast<abcbus_slot_device *>(device)->set_nmi_callback(DEVCB2_##_nmi); + downcast<abcbus_slot_device *>(device)->set_nmi_callback(DEVCB_##_nmi); #define MCFG_ABCBUS_SLOT_RDY_CALLBACK(_rdy) \ - downcast<abcbus_slot_device *>(device)->set_rdy_callback(DEVCB2_##_rdy); + downcast<abcbus_slot_device *>(device)->set_rdy_callback(DEVCB_##_rdy); #define MCFG_ABCBUS_SLOT_RESIN_CALLBACK(_resin) \ - downcast<abcbus_slot_device *>(device)->set_resin_callback(DEVCB2_##_resin); + downcast<abcbus_slot_device *>(device)->set_resin_callback(DEVCB_##_resin); #define MCFG_ABCBUS_SLOT_PREN_CALLBACK(_pren) \ - downcast<abcbus_slot_device *>(device)->set_pren_callback(DEVCB2_##_pren); + downcast<abcbus_slot_device *>(device)->set_pren_callback(DEVCB_##_pren); #define MCFG_ABCBUS_SLOT_TRRQ_CALLBACK(_trrq) \ - downcast<abcbus_slot_device *>(device)->set_trrq_callback(DEVCB2_##_trrq); + downcast<abcbus_slot_device *>(device)->set_trrq_callback(DEVCB_##_trrq); #define MCFG_ABCBUS_SLOT_XINT2_CALLBACK(_xint2) \ - downcast<abcbus_slot_device *>(device)->set_xint2_callback(DEVCB2_##_xint2); + downcast<abcbus_slot_device *>(device)->set_xint2_callback(DEVCB_##_xint2); #define MCFG_ABCBUS_SLOT_XINT3_CALLBACK(_xint3) \ - downcast<abcbus_slot_device *>(device)->set_xint3_callback(DEVCB2_##_xint3); + downcast<abcbus_slot_device *>(device)->set_xint3_callback(DEVCB_##_xint3); #define MCFG_ABCBUS_SLOT_XINT4_CALLBACK(_xint4) \ - downcast<abcbus_slot_device *>(device)->set_xint4_callback(DEVCB2_##_xint4); + downcast<abcbus_slot_device *>(device)->set_xint4_callback(DEVCB_##_xint4); #define MCFG_ABCBUS_SLOT_XINT5_CALLBACK(_xint5) \ - downcast<abcbus_slot_device *>(device)->set_xint5_callback(DEVCB2_##_xint5); + downcast<abcbus_slot_device *>(device)->set_xint5_callback(DEVCB_##_xint5); @@ -281,16 +281,16 @@ protected: virtual void device_start(); virtual void device_reset() { if (m_card) get_card_device()->reset(); } - devcb2_write_line m_write_irq; - devcb2_write_line m_write_nmi; - devcb2_write_line m_write_rdy; - devcb2_write_line m_write_resin; - devcb2_write_line m_write_pren; - devcb2_write_line m_write_trrq; - devcb2_write_line m_write_xint2; - devcb2_write_line m_write_xint3; - devcb2_write_line m_write_xint4; - devcb2_write_line m_write_xint5; + devcb_write_line m_write_irq; + devcb_write_line m_write_nmi; + devcb_write_line m_write_rdy; + devcb_write_line m_write_resin; + devcb_write_line m_write_pren; + devcb_write_line m_write_trrq; + devcb_write_line m_write_xint2; + devcb_write_line m_write_xint3; + devcb_write_line m_write_xint4; + devcb_write_line m_write_xint5; device_abcbus_card_interface *m_card; diff --git a/src/emu/bus/abckb/abckb.h b/src/emu/bus/abckb/abckb.h index f9c050b11ed..6f33da2ed3f 100644 --- a/src/emu/bus/abckb/abckb.h +++ b/src/emu/bus/abckb/abckb.h @@ -27,13 +27,13 @@ MCFG_DEVICE_SLOT_INTERFACE(abc_keyboard_devices, _def_slot, false) #define MCFG_ABC_KEYBOARD_OUT_RX_HANDLER(_devcb) \ - devcb = &abc_keyboard_port_device::set_out_rx_handler(*device, DEVCB2_##_devcb); + devcb = &abc_keyboard_port_device::set_out_rx_handler(*device, DEVCB_##_devcb); #define MCFG_ABC_KEYBOARD_OUT_TRXC_HANDLER(_devcb) \ - devcb = &abc_keyboard_port_device::set_out_trxc_handler(*device, DEVCB2_##_devcb); + devcb = &abc_keyboard_port_device::set_out_trxc_handler(*device, DEVCB_##_devcb); #define MCFG_ABC_KEYBOARD_OUT_KEYDOWN_HANDLER(_devcb) \ - devcb = &abc_keyboard_port_device::set_out_keydown_handler(*device, DEVCB2_##_devcb); + devcb = &abc_keyboard_port_device::set_out_keydown_handler(*device, DEVCB_##_devcb); @@ -50,9 +50,9 @@ public: // construction/destruction abc_keyboard_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_rx_handler(device_t &device, _Object object) { return downcast<abc_keyboard_port_device &>(device).m_out_rx_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_out_trxc_handler(device_t &device, _Object object) { return downcast<abc_keyboard_port_device &>(device).m_out_trxc_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_out_keydown_handler(device_t &device, _Object object) { return downcast<abc_keyboard_port_device &>(device).m_out_keydown_handler.set_callback(object); } + template<class _Object> static devcb_base &set_out_rx_handler(device_t &device, _Object object) { return downcast<abc_keyboard_port_device &>(device).m_out_rx_handler.set_callback(object); } + template<class _Object> static devcb_base &set_out_trxc_handler(device_t &device, _Object object) { return downcast<abc_keyboard_port_device &>(device).m_out_trxc_handler.set_callback(object); } + template<class _Object> static devcb_base &set_out_keydown_handler(device_t &device, _Object object) { return downcast<abc_keyboard_port_device &>(device).m_out_keydown_handler.set_callback(object); } // computer interface DECLARE_WRITE_LINE_MEMBER( txd_w ); @@ -67,9 +67,9 @@ protected: virtual void device_start(); virtual void device_reset(); - devcb2_write_line m_out_rx_handler; - devcb2_write_line m_out_trxc_handler; - devcb2_write_line m_out_keydown_handler; + devcb_write_line m_out_rx_handler; + devcb_write_line m_out_trxc_handler; + devcb_write_line m_out_keydown_handler; abc_keyboard_interface *m_card; }; diff --git a/src/emu/bus/adam/exp.h b/src/emu/bus/adam/exp.h index 412aafe4ba2..59a24cd7a09 100644 --- a/src/emu/bus/adam/exp.h +++ b/src/emu/bus/adam/exp.h @@ -38,7 +38,7 @@ #define MCFG_ADAM_EXPANSION_SLOT_IRQ_CALLBACK(_write) \ - devcb = &adam_expansion_slot_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &adam_expansion_slot_device::set_irq_wr_callback(*device, DEVCB_##_write); @@ -59,7 +59,7 @@ public: adam_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~adam_expansion_slot_device() { } - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<adam_expansion_slot_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<adam_expansion_slot_device &>(device).m_write_irq.set_callback(object); } // computer interface UINT8 bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2); @@ -92,7 +92,7 @@ protected: // slot interface overrides virtual void get_default_card_software(astring &result); - devcb2_write_line m_write_irq; + devcb_write_line m_write_irq; device_adam_expansion_slot_card_interface *m_card; }; diff --git a/src/emu/bus/bml3/bml3bus.h b/src/emu/bus/bml3/bml3bus.h index d4bb36932a8..969fbcf7656 100644 --- a/src/emu/bus/bml3/bml3bus.h +++ b/src/emu/bus/bml3/bml3bus.h @@ -23,13 +23,13 @@ bml3bus_device::static_set_cputag(*device, _cputag); #define MCFG_BML3BUS_OUT_NMI_CB(_devcb) \ - devcb = &bml3bus_device::set_out_nmi_callback(*device, DEVCB2_##_devcb); + devcb = &bml3bus_device::set_out_nmi_callback(*device, DEVCB_##_devcb); #define MCFG_BML3BUS_OUT_IRQ_CB(_devcb) \ - devcb = &bml3bus_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &bml3bus_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_BML3BUS_OUT_FIRQ_CB(_devcb) \ - devcb = &bml3bus_device::set_out_firq_callback(*device, DEVCB2_##_devcb); + devcb = &bml3bus_device::set_out_firq_callback(*device, DEVCB_##_devcb); #define MCFG_BML3BUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, BML3BUS_SLOT, 0) \ @@ -82,9 +82,9 @@ public: // inline configuration static void static_set_cputag(device_t &device, const char *tag); - template<class _Object> static devcb2_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_nmi_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_firq_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_firq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_nmi_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_firq_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_firq_cb.set_callback(object); } void add_bml3bus_card(int slot, device_bml3bus_card_interface *card); device_bml3bus_card_interface *get_bml3bus_card(int slot); @@ -105,9 +105,9 @@ protected: // internal state cpu_device *m_maincpu; - devcb2_write_line m_out_nmi_cb; - devcb2_write_line m_out_irq_cb; - devcb2_write_line m_out_firq_cb; + devcb_write_line m_out_nmi_cb; + devcb_write_line m_out_irq_cb; + devcb_write_line m_out_firq_cb; device_bml3bus_card_interface *m_device_list[BML3BUS_MAX_SLOTS]; const char *m_cputag; diff --git a/src/emu/bus/c64/exp.h b/src/emu/bus/c64/exp.h index 83f09109585..6da81655e30 100644 --- a/src/emu/bus/c64/exp.h +++ b/src/emu/bus/c64/exp.h @@ -71,22 +71,22 @@ #define MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(_write) \ - devcb = &c64_expansion_slot_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &c64_expansion_slot_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(_write) \ - devcb = &c64_expansion_slot_device::set_nmi_wr_callback(*device, DEVCB2_##_write); + devcb = &c64_expansion_slot_device::set_nmi_wr_callback(*device, DEVCB_##_write); #define MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(_write) \ - devcb = &c64_expansion_slot_device::set_reset_wr_callback(*device, DEVCB2_##_write); + devcb = &c64_expansion_slot_device::set_reset_wr_callback(*device, DEVCB_##_write); #define MCFG_C64_EXPANSION_SLOT_CD_INPUT_CALLBACK(_read) \ - devcb = &c64_expansion_slot_device::set_cd_rd_callback(*device, DEVCB2_##_read); + devcb = &c64_expansion_slot_device::set_cd_rd_callback(*device, DEVCB_##_read); #define MCFG_C64_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(_write) \ - devcb = &c64_expansion_slot_device::set_cd_wr_callback(*device, DEVCB2_##_write); + devcb = &c64_expansion_slot_device::set_cd_wr_callback(*device, DEVCB_##_write); #define MCFG_C64_EXPANSION_SLOT_DMA_CALLBACK(_write) \ - devcb = &c64_expansion_slot_device::set_dma_wr_callback(*device, DEVCB2_##_write); + devcb = &c64_expansion_slot_device::set_dma_wr_callback(*device, DEVCB_##_write); @@ -106,12 +106,12 @@ public: // construction/destruction c64_expansion_slot_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<c64_expansion_slot_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_nmi.set_callback(object); } - template<class _Object> static devcb2_base &set_reset_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_reset.set_callback(object); } - template<class _Object> static devcb2_base &set_cd_rd_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_read_dma_cd.set_callback(object); } - template<class _Object> static devcb2_base &set_cd_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_dma_cd.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_dma.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_nmi.set_callback(object); } + template<class _Object> static devcb_base &set_reset_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_reset.set_callback(object); } + template<class _Object> static devcb_base &set_cd_rd_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_read_dma_cd.set_callback(object); } + template<class _Object> static devcb_base &set_cd_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_dma_cd.set_callback(object); } + template<class _Object> static devcb_base &set_dma_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_dma.set_callback(object); } // computer interface UINT8 cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); @@ -154,12 +154,12 @@ protected: // slot interface overrides virtual void get_default_card_software(astring &result); - devcb2_read8 m_read_dma_cd; - devcb2_write8 m_write_dma_cd; - devcb2_write_line m_write_irq; - devcb2_write_line m_write_nmi; - devcb2_write_line m_write_dma; - devcb2_write_line m_write_reset; + devcb_read8 m_read_dma_cd; + devcb_write8 m_write_dma_cd; + devcb_write_line m_write_irq; + devcb_write_line m_write_nmi; + devcb_write_line m_write_dma; + devcb_write_line m_write_reset; device_c64_expansion_card_interface *m_card; diff --git a/src/emu/bus/cbm2/user.h b/src/emu/bus/cbm2/user.h index 842426c93da..5000bec678b 100644 --- a/src/emu/bus/cbm2/user.h +++ b/src/emu/bus/cbm2/user.h @@ -52,16 +52,16 @@ #define MCFG_CBM2_USER_PORT_IRQ_CALLBACK(_write) \ - devcb = &cbm2_user_port_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &cbm2_user_port_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_CBM2_USER_PORT_SP_CALLBACK(_write) \ - devcb = &cbm2_user_port_device::set_sp_wr_callback(*device, DEVCB2_##_write); + devcb = &cbm2_user_port_device::set_sp_wr_callback(*device, DEVCB_##_write); #define MCFG_CBM2_USER_PORT_CNT_CALLBACK(_write) \ - devcb = &cbm2_user_port_device::set_cnt_wr_callback(*device, DEVCB2_##_write); + devcb = &cbm2_user_port_device::set_cnt_wr_callback(*device, DEVCB_##_write); #define MCFG_CBM2_USER_PORT_FLAG_CALLBACK(_write) \ - devcb = &cbm2_user_port_device::set_flag_wr_callback(*device, DEVCB2_##_write); + devcb = &cbm2_user_port_device::set_flag_wr_callback(*device, DEVCB_##_write); @@ -111,10 +111,10 @@ public: cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~cbm2_user_port_device() { } - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<cbm2_user_port_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_sp_wr_callback(device_t &device, _Object object) { return downcast<cbm2_user_port_device &>(device).m_write_sp.set_callback(object); } - template<class _Object> static devcb2_base &set_cnt_wr_callback(device_t &device, _Object object) { return downcast<cbm2_user_port_device &>(device).m_write_cnt.set_callback(object); } - template<class _Object> static devcb2_base &set_flag_wr_callback(device_t &device, _Object object) { return downcast<cbm2_user_port_device &>(device).m_write_flag.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<cbm2_user_port_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_sp_wr_callback(device_t &device, _Object object) { return downcast<cbm2_user_port_device &>(device).m_write_sp.set_callback(object); } + template<class _Object> static devcb_base &set_cnt_wr_callback(device_t &device, _Object object) { return downcast<cbm2_user_port_device &>(device).m_write_cnt.set_callback(object); } + template<class _Object> static devcb_base &set_flag_wr_callback(device_t &device, _Object object) { return downcast<cbm2_user_port_device &>(device).m_write_flag.set_callback(object); } // computer interface DECLARE_READ8_MEMBER( d1_r ) { UINT8 data = 0xff; if (m_card != NULL) data = m_card->cbm2_d1_r(space, offset); return data; } @@ -139,10 +139,10 @@ protected: // device-level overrides virtual void device_start(); - devcb2_write_line m_write_irq; - devcb2_write_line m_write_sp; - devcb2_write_line m_write_cnt; - devcb2_write_line m_write_flag; + devcb_write_line m_write_irq; + devcb_write_line m_write_sp; + devcb_write_line m_write_cnt; + devcb_write_line m_write_flag; device_cbm2_user_port_interface *m_card; }; diff --git a/src/emu/bus/cbmiec/cbmiec.h b/src/emu/bus/cbmiec/cbmiec.h index 5bf37a1ea89..685a01ad7bd 100644 --- a/src/emu/bus/cbmiec/cbmiec.h +++ b/src/emu/bus/cbmiec/cbmiec.h @@ -35,19 +35,19 @@ #define MCFG_CBM_IEC_BUS_SRQ_CALLBACK(_write) \ - downcast<cbm_iec_device *>(device)->set_srq_callback(DEVCB2_##_write); + downcast<cbm_iec_device *>(device)->set_srq_callback(DEVCB_##_write); #define MCFG_CBM_IEC_BUS_ATN_CALLBACK(_write) \ - downcast<cbm_iec_device *>(device)->set_atn_callback(DEVCB2_##_write); + downcast<cbm_iec_device *>(device)->set_atn_callback(DEVCB_##_write); #define MCFG_CBM_IEC_BUS_CLK_CALLBACK(_write) \ - downcast<cbm_iec_device *>(device)->set_clk_callback(DEVCB2_##_write); + downcast<cbm_iec_device *>(device)->set_clk_callback(DEVCB_##_write); #define MCFG_CBM_IEC_BUS_DATA_CALLBACK(_write) \ - downcast<cbm_iec_device *>(device)->set_data_callback(DEVCB2_##_write); + downcast<cbm_iec_device *>(device)->set_data_callback(DEVCB_##_write); #define MCFG_CBM_IEC_BUS_RESET_CALLBACK(_write) \ - downcast<cbm_iec_device *>(device)->set_reset_callback(DEVCB2_##_write); + downcast<cbm_iec_device *>(device)->set_reset_callback(DEVCB_##_write); #define MCFG_CBM_IEC_SLOT_ADD(_tag, _address, _slot_intf, _def_slot) \ @@ -142,11 +142,11 @@ protected: simple_list<daisy_entry> m_device_list; private: - devcb2_write_line m_write_srq; - devcb2_write_line m_write_atn; - devcb2_write_line m_write_clk; - devcb2_write_line m_write_data; - devcb2_write_line m_write_reset; + devcb_write_line m_write_srq; + devcb_write_line m_write_atn; + devcb_write_line m_write_clk; + devcb_write_line m_write_data; + devcb_write_line m_write_reset; void set_signal(device_t *device, int signal, int state); int get_signal(int signal); diff --git a/src/emu/bus/centronics/ctronics.h b/src/emu/bus/centronics/ctronics.h index 92b8b2f9812..9dc450cc2e0 100644 --- a/src/emu/bus/centronics/ctronics.h +++ b/src/emu/bus/centronics/ctronics.h @@ -22,55 +22,55 @@ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_CENTRONICS_STROBE_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_strobe_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_strobe_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_DATA0_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_data0_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_data0_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_DATA1_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_data1_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_data1_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_DATA2_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_data2_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_data2_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_DATA3_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_data3_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_data3_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_DATA4_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_data4_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_data4_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_DATA5_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_data5_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_data5_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_DATA6_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_data6_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_data6_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_DATA7_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_data7_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_data7_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_ACK_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_ack_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_ack_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_BUSY_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_busy_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_busy_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_PERROR_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_perror_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_perror_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_SELECT_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_select_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_select_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_AUTOFD_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_autofd_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_autofd_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_FAULT_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_fault_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_fault_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_INIT_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_init_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_init_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_SELECT_IN_HANDLER(_devcb) \ - devcb = ¢ronics_device::set_select_in_handler(*device, DEVCB2_##_devcb); + devcb = ¢ronics_device::set_select_in_handler(*device, DEVCB_##_devcb); #define MCFG_CENTRONICS_OUTPUT_LATCH_ADD(_tag, _centronics_tag) \ MCFG_DEVICE_ADD(_tag, OUTPUT_LATCH, 0) \ @@ -105,23 +105,23 @@ class centronics_device : public device_t, public: centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_strobe_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_strobe_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data0_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data0_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data1_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data1_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data2_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data3_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data3_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data4_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data4_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data5_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data5_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data6_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data6_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data7_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data7_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_ack_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_ack_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_busy_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_busy_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_perror_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_perror_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_select_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_select_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_autofd_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_autofd_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_fault_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_fault_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_init_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_init_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_select_in_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_select_in_handler.set_callback(object); } + template<class _Object> static devcb_base &set_strobe_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_strobe_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data0_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data0_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data1_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data1_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data2_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data3_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data3_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data4_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data4_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data5_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data5_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data6_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data6_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data7_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data7_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ack_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_ack_handler.set_callback(object); } + template<class _Object> static devcb_base &set_busy_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_busy_handler.set_callback(object); } + template<class _Object> static devcb_base &set_perror_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_perror_handler.set_callback(object); } + template<class _Object> static devcb_base &set_select_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_select_handler.set_callback(object); } + template<class _Object> static devcb_base &set_autofd_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_autofd_handler.set_callback(object); } + template<class _Object> static devcb_base &set_fault_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_fault_handler.set_callback(object); } + template<class _Object> static devcb_base &set_init_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_init_handler.set_callback(object); } + template<class _Object> static devcb_base &set_select_in_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_select_in_handler.set_callback(object); } DECLARE_WRITE_LINE_MEMBER( write_strobe ); DECLARE_WRITE_LINE_MEMBER( write_data0 ); @@ -146,23 +146,23 @@ protected: virtual void device_config_complete(); virtual void device_start(); - devcb2_write_line m_strobe_handler; - devcb2_write_line m_data0_handler; - devcb2_write_line m_data1_handler; - devcb2_write_line m_data2_handler; - devcb2_write_line m_data3_handler; - devcb2_write_line m_data4_handler; - devcb2_write_line m_data5_handler; - devcb2_write_line m_data6_handler; - devcb2_write_line m_data7_handler; - devcb2_write_line m_ack_handler; - devcb2_write_line m_busy_handler; - devcb2_write_line m_perror_handler; - devcb2_write_line m_select_handler; - devcb2_write_line m_autofd_handler; - devcb2_write_line m_fault_handler; - devcb2_write_line m_init_handler; - devcb2_write_line m_select_in_handler; + devcb_write_line m_strobe_handler; + devcb_write_line m_data0_handler; + devcb_write_line m_data1_handler; + devcb_write_line m_data2_handler; + devcb_write_line m_data3_handler; + devcb_write_line m_data4_handler; + devcb_write_line m_data5_handler; + devcb_write_line m_data6_handler; + devcb_write_line m_data7_handler; + devcb_write_line m_ack_handler; + devcb_write_line m_busy_handler; + devcb_write_line m_perror_handler; + devcb_write_line m_select_handler; + devcb_write_line m_autofd_handler; + devcb_write_line m_fault_handler; + devcb_write_line m_init_handler; + devcb_write_line m_select_in_handler; private: device_centronics_peripheral_interface *m_dev; diff --git a/src/emu/bus/coco/cococart.h b/src/emu/bus/coco/cococart.h index b5824d925c5..07171b03426 100644 --- a/src/emu/bus/coco/cococart.h +++ b/src/emu/bus/coco/cococart.h @@ -46,7 +46,7 @@ struct coco_cartridge_line cococart_line_value value; int line; int q_count; - devcb2_write_line *callback; + devcb_write_line *callback; }; // ======================> cococart_base_update_delegate @@ -55,13 +55,13 @@ struct coco_cartridge_line typedef delegate<void (UINT8 *)> cococart_base_update_delegate; #define MCFG_COCO_CARTRIDGE_CART_CB(_devcb) \ - devcb = &cococart_slot_device::static_set_cart_callback(*device, DEVCB2_##_devcb); + devcb = &cococart_slot_device::static_set_cart_callback(*device, DEVCB_##_devcb); #define MCFG_COCO_CARTRIDGE_NMI_CB(_devcb) \ - devcb = &cococart_slot_device::static_set_nmi_callback(*device, DEVCB2_##_devcb); + devcb = &cococart_slot_device::static_set_nmi_callback(*device, DEVCB_##_devcb); #define MCFG_COCO_CARTRIDGE_HALT_CB(_devcb) \ - devcb = &cococart_slot_device::static_set_halt_callback(*device, DEVCB2_##_devcb); + devcb = &cococart_slot_device::static_set_halt_callback(*device, DEVCB_##_devcb); // ======================> cococart_slot_device @@ -75,9 +75,9 @@ public: // construction/destruction cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &static_set_cart_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_cart_callback.set_callback(object); } - template<class _Object> static devcb2_base &static_set_nmi_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_nmi_callback.set_callback(object); } - template<class _Object> static devcb2_base &static_set_halt_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_halt_callback.set_callback(object); } + template<class _Object> static devcb_base &static_set_cart_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_cart_callback.set_callback(object); } + template<class _Object> static devcb_base &static_set_nmi_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_nmi_callback.set_callback(object); } + template<class _Object> static devcb_base &static_set_halt_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_halt_callback.set_callback(object); } // device-level overrides virtual void device_start(); @@ -129,9 +129,9 @@ private: coco_cartridge_line m_nmi_line; coco_cartridge_line m_halt_line; public: - devcb2_write_line m_cart_callback; - devcb2_write_line m_nmi_callback; - devcb2_write_line m_halt_callback; + devcb_write_line m_cart_callback; + devcb_write_line m_nmi_callback; + devcb_write_line m_halt_callback; private: // cartridge device_cococart_interface *m_cart; diff --git a/src/emu/bus/coleco/ctrl.h b/src/emu/bus/coleco/ctrl.h index d04617c18c7..bbbf3217428 100644 --- a/src/emu/bus/coleco/ctrl.h +++ b/src/emu/bus/coleco/ctrl.h @@ -31,7 +31,7 @@ #define MCFG_COLECOVISION_CONTROL_PORT_IRQ_CALLBACK(_write) \ - devcb = &colecovision_control_port_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &colecovision_control_port_device::set_irq_wr_callback(*device, DEVCB_##_write); @@ -74,7 +74,7 @@ public: virtual ~colecovision_control_port_device() { } // static configuration helpers - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<colecovision_control_port_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<colecovision_control_port_device &>(device).m_write_irq.set_callback(object); } // computer interface UINT8 read() { UINT8 data = 0xff; if (exists()) data = m_device->joy_r(); return data; } @@ -94,7 +94,7 @@ protected: device_colecovision_control_port_interface *m_device; private: - devcb2_write_line m_write_irq; + devcb_write_line m_write_irq; }; diff --git a/src/emu/bus/comx35/exp.h b/src/emu/bus/comx35/exp.h index 22c9f49b028..9afffd9ff98 100644 --- a/src/emu/bus/comx35/exp.h +++ b/src/emu/bus/comx35/exp.h @@ -61,7 +61,7 @@ #define MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(_write) \ - devcb = &comx_expansion_slot_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &comx_expansion_slot_device::set_irq_wr_callback(*device, DEVCB_##_write); @@ -81,7 +81,7 @@ public: comx_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~comx_expansion_slot_device() { } - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<comx_expansion_slot_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<comx_expansion_slot_device &>(device).m_write_irq.set_callback(object); } UINT8 mrd_r(address_space &space, offs_t offset, int *extrom); void mwr_w(address_space &space, offs_t offset, UINT8 data); @@ -100,7 +100,7 @@ protected: // device-level overrides virtual void device_start(); - devcb2_write_line m_write_irq; + devcb_write_line m_write_irq; device_comx_expansion_card_interface *m_card; }; diff --git a/src/emu/bus/cpc/cpcexp.h b/src/emu/bus/cpc/cpcexp.h index a560574fefa..b5ab0247331 100644 --- a/src/emu/bus/cpc/cpcexp.h +++ b/src/emu/bus/cpc/cpcexp.h @@ -51,19 +51,19 @@ //************************************************************************** #define MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(_devcb) \ - devcb = &cpc_expansion_slot_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &cpc_expansion_slot_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(_devcb) \ - devcb = &cpc_expansion_slot_device::set_out_nmi_callback(*device, DEVCB2_##_devcb); + devcb = &cpc_expansion_slot_device::set_out_nmi_callback(*device, DEVCB_##_devcb); #define MCFG_CPC_EXPANSION_SLOT_OUT_RESET_CB(_devcb) \ - devcb = &cpc_expansion_slot_device::set_out_reset_callback(*device, DEVCB2_##_devcb); + devcb = &cpc_expansion_slot_device::set_out_reset_callback(*device, DEVCB_##_devcb); #define MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(_devcb) \ - devcb = &cpc_expansion_slot_device::set_out_romdis_callback(*device, DEVCB2_##_devcb); + devcb = &cpc_expansion_slot_device::set_out_romdis_callback(*device, DEVCB_##_devcb); #define MCFG_CPC_EXPANSION_SLOT_OUT_ROMEN_CB(_devcb) \ - devcb = &cpc_expansion_slot_device::set_out_romen_callback(*device, DEVCB2_##_devcb); + devcb = &cpc_expansion_slot_device::set_out_romen_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -94,11 +94,11 @@ public: cpc_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~cpc_expansion_slot_device(); - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_nmi_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_reset_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_reset_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_romdis_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_romdis_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_romen_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_romen_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_nmi_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_reset_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_reset_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_romdis_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_romdis_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_romen_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_romen_cb.set_callback(object); } DECLARE_WRITE_LINE_MEMBER( irq_w ); DECLARE_WRITE_LINE_MEMBER( nmi_w ); @@ -111,11 +111,11 @@ protected: virtual void device_start(); virtual void device_reset(); - devcb2_write_line m_out_irq_cb; - devcb2_write_line m_out_nmi_cb; - devcb2_write_line m_out_reset_cb; - devcb2_write_line m_out_romdis_cb; - devcb2_write_line m_out_romen_cb; + devcb_write_line m_out_irq_cb; + devcb_write_line m_out_nmi_cb; + devcb_write_line m_out_reset_cb; + devcb_write_line m_out_romdis_cb; + devcb_write_line m_out_romen_cb; device_cpc_expansion_card_interface *m_card; }; diff --git a/src/emu/bus/ecbbus/ecbbus.h b/src/emu/bus/ecbbus/ecbbus.h index 34d07bcd08f..3a0217e2462 100644 --- a/src/emu/bus/ecbbus/ecbbus.h +++ b/src/emu/bus/ecbbus/ecbbus.h @@ -77,10 +77,10 @@ #define MCFG_ECBBUS_IRQ_CALLBACK(_write) \ - devcb = &ecbbus_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &ecbbus_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_ECBBUS_NMI_CALLBACK(_write) \ - devcb = &ecbbus_device::set_nmi_wr_callback(*device, DEVCB2_##_write); + devcb = &ecbbus_device::set_nmi_wr_callback(*device, DEVCB_##_write); @@ -130,8 +130,8 @@ public: // construction/destruction ecbbus_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<ecbbus_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<ecbbus_device &>(device).m_write_nmi.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<ecbbus_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<ecbbus_device &>(device).m_write_nmi.set_callback(object); } void add_card(device_ecbbus_card_interface *card, int pos); @@ -149,8 +149,8 @@ protected: virtual void device_start(); private: - devcb2_write_line m_write_irq; - devcb2_write_line m_write_nmi; + devcb_write_line m_write_irq; + devcb_write_line m_write_nmi; device_ecbbus_card_interface *m_ecbbus_device[MAX_ECBBUS_SLOTS]; }; diff --git a/src/emu/bus/econet/econet.h b/src/emu/bus/econet/econet.h index 542fd910108..144b55b5cb3 100644 --- a/src/emu/bus/econet/econet.h +++ b/src/emu/bus/econet/econet.h @@ -40,10 +40,10 @@ #define MCFG_ECONET_CLK_CALLBACK(_write) \ - devcb = &econet_device::set_clk_wr_callback(*device, DEVCB2_##_write); + devcb = &econet_device::set_clk_wr_callback(*device, DEVCB_##_write); #define MCFG_ECONET_DATA_CALLBACK(_write) \ - devcb = &econet_device::set_data_wr_callback(*device, DEVCB2_##_write); + devcb = &econet_device::set_data_wr_callback(*device, DEVCB_##_write); @@ -61,8 +61,8 @@ public: // construction/destruction econet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_clk_wr_callback(device_t &device, _Object object) { return downcast<econet_device &>(device).m_write_clk.set_callback(object); } - template<class _Object> static devcb2_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<econet_device &>(device).m_write_data.set_callback(object); } + template<class _Object> static devcb_base &set_clk_wr_callback(device_t &device, _Object object) { return downcast<econet_device &>(device).m_write_clk.set_callback(object); } + template<class _Object> static devcb_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<econet_device &>(device).m_write_data.set_callback(object); } void add_device(device_t *target, int address); @@ -102,8 +102,8 @@ protected: simple_list<daisy_entry> m_device_list; private: - devcb2_write_line m_write_clk; - devcb2_write_line m_write_data; + devcb_write_line m_write_clk; + devcb_write_line m_write_data; inline void set_signal(device_t *device, int signal, int state); inline int get_signal(int signal); diff --git a/src/emu/bus/ep64/exp.h b/src/emu/bus/ep64/exp.h index 2afee455d39..a1ebcedd625 100644 --- a/src/emu/bus/ep64/exp.h +++ b/src/emu/bus/ep64/exp.h @@ -75,13 +75,13 @@ ep64_expansion_bus_slot_device::static_set_dave_tag(*device, "^"_tag); #define MCFG_EP64_EXPANSION_BUS_SLOT_IRQ_CALLBACK(_write) \ - devcb = &ep64_expansion_bus_slot_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &ep64_expansion_bus_slot_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_EP64_EXPANSION_BUS_SLOT_NMI_CALLBACK(_write) \ - devcb = &ep64_expansion_bus_slot_device::set_nmi_wr_callback(*device, DEVCB2_##_write); + devcb = &ep64_expansion_bus_slot_device::set_nmi_wr_callback(*device, DEVCB_##_write); #define MCFG_EP64_EXPANSION_BUS_SLOT_WAIT_CALLBACK(_write) \ - devcb = &ep64_expansion_bus_slot_device::set_wait_wr_callback(*device, DEVCB2_##_write); + devcb = &ep64_expansion_bus_slot_device::set_wait_wr_callback(*device, DEVCB_##_write); @@ -103,9 +103,9 @@ public: ep64_expansion_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_dave_tag(device_t &device, const char* tag) { downcast<ep64_expansion_bus_slot_device &>(device).m_dave.set_tag(tag); } - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<ep64_expansion_bus_slot_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<ep64_expansion_bus_slot_device &>(device).m_write_nmi.set_callback(object); } - template<class _Object> static devcb2_base &set_wait_wr_callback(device_t &device, _Object object) { return downcast<ep64_expansion_bus_slot_device &>(device).m_write_wait.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<ep64_expansion_bus_slot_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<ep64_expansion_bus_slot_device &>(device).m_write_nmi.set_callback(object); } + template<class _Object> static devcb_base &set_wait_wr_callback(device_t &device, _Object object) { return downcast<ep64_expansion_bus_slot_device &>(device).m_write_wait.set_callback(object); } DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_write_nmi(state); } @@ -120,9 +120,9 @@ protected: virtual void device_reset(); private: - devcb2_write_line m_write_irq; - devcb2_write_line m_write_nmi; - devcb2_write_line m_write_wait; + devcb_write_line m_write_irq; + devcb_write_line m_write_nmi; + devcb_write_line m_write_wait; required_device<dave_device> m_dave; diff --git a/src/emu/bus/epson_sio/epson_sio.h b/src/emu/bus/epson_sio/epson_sio.h index f398d4d1ea1..1d171239826 100644 --- a/src/emu/bus/epson_sio/epson_sio.h +++ b/src/emu/bus/epson_sio/epson_sio.h @@ -24,10 +24,10 @@ MCFG_DEVICE_SLOT_INTERFACE(epson_sio_devices, _def_slot, false) #define MCFG_EPSON_SIO_RX(_rx) \ - downcast<epson_sio_device *>(device)->set_rx_callback(DEVCB2_##_rx); + downcast<epson_sio_device *>(device)->set_rx_callback(DEVCB_##_rx); #define MCFG_EPSON_SIO_PIN(_pin) \ - downcast<epson_sio_device *>(device)->set_pin_callback(DEVCB2_##_pin); + downcast<epson_sio_device *>(device)->set_pin_callback(DEVCB_##_pin); //************************************************************************** @@ -65,8 +65,8 @@ protected: device_epson_sio_interface *m_cart; private: - devcb2_write_line m_write_rx; - devcb2_write_line m_write_pin; + devcb_write_line m_write_rx; + devcb_write_line m_write_pin; }; diff --git a/src/emu/bus/ieee488/c2040fdc.h b/src/emu/bus/ieee488/c2040fdc.h index c72b0fad426..b8a20600f43 100644 --- a/src/emu/bus/ieee488/c2040fdc.h +++ b/src/emu/bus/ieee488/c2040fdc.h @@ -27,13 +27,13 @@ //************************************************************************** #define MCFG_C2040_SYNC_CALLBACK(_write) \ - devcb = &c2040_fdc_t::set_sync_wr_callback(*device, DEVCB2_##_write); + devcb = &c2040_fdc_t::set_sync_wr_callback(*device, DEVCB_##_write); #define MCFG_C2040_READY_CALLBACK(_write) \ - devcb = &c2040_fdc_t::set_ready_wr_callback(*device, DEVCB2_##_write); + devcb = &c2040_fdc_t::set_ready_wr_callback(*device, DEVCB_##_write); #define MCFG_C2040_ERROR_CALLBACK(_write) \ - devcb = &c2040_fdc_t::set_error_wr_callback(*device, DEVCB2_##_write); + devcb = &c2040_fdc_t::set_error_wr_callback(*device, DEVCB_##_write); @@ -50,9 +50,9 @@ public: c2040_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); c2040_fdc_t(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_sync_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_sync.set_callback(object); } - template<class _Object> static devcb2_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_ready.set_callback(object); } - template<class _Object> static devcb2_base &set_error_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_error.set_callback(object); } + template<class _Object> static devcb_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_sync.set_callback(object); } + template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_ready.set_callback(object); } + template<class _Object> static devcb_base &set_error_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_error.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -120,9 +120,9 @@ protected: int write_position; }; - devcb2_write_line m_write_sync; - devcb2_write_line m_write_ready; - devcb2_write_line m_write_error; + devcb_write_line m_write_sync; + devcb_write_line m_write_ready; + devcb_write_line m_write_error; required_memory_region m_gcr_rom; diff --git a/src/emu/bus/ieee488/ieee488.h b/src/emu/bus/ieee488/ieee488.h index cbafda8608f..7014e625c2f 100644 --- a/src/emu/bus/ieee488/ieee488.h +++ b/src/emu/bus/ieee488/ieee488.h @@ -36,28 +36,28 @@ #define MCFG_IEEE488_EOI_CALLBACK(_write) \ - downcast<ieee488_device *>(device)->set_eoi_callback(DEVCB2_##_write); + downcast<ieee488_device *>(device)->set_eoi_callback(DEVCB_##_write); #define MCFG_IEEE488_DAV_CALLBACK(_write) \ - downcast<ieee488_device *>(device)->set_dav_callback(DEVCB2_##_write); + downcast<ieee488_device *>(device)->set_dav_callback(DEVCB_##_write); #define MCFG_IEEE488_NRFD_CALLBACK(_write) \ - downcast<ieee488_device *>(device)->set_nrfd_callback(DEVCB2_##_write); + downcast<ieee488_device *>(device)->set_nrfd_callback(DEVCB_##_write); #define MCFG_IEEE488_NDAC_CALLBACK(_write) \ - downcast<ieee488_device *>(device)->set_ndac_callback(DEVCB2_##_write); + downcast<ieee488_device *>(device)->set_ndac_callback(DEVCB_##_write); #define MCFG_IEEE488_IFC_CALLBACK(_write) \ - downcast<ieee488_device *>(device)->set_ifc_callback(DEVCB2_##_write); + downcast<ieee488_device *>(device)->set_ifc_callback(DEVCB_##_write); #define MCFG_IEEE488_SRQ_CALLBACK(_write) \ - downcast<ieee488_device *>(device)->set_srq_callback(DEVCB2_##_write); + downcast<ieee488_device *>(device)->set_srq_callback(DEVCB_##_write); #define MCFG_IEEE488_ATN_CALLBACK(_write) \ - downcast<ieee488_device *>(device)->set_atn_callback(DEVCB2_##_write); + downcast<ieee488_device *>(device)->set_atn_callback(DEVCB_##_write); #define MCFG_IEEE488_REN_CALLBACK(_write) \ - downcast<ieee488_device *>(device)->set_ren_callback(DEVCB2_##_write); + downcast<ieee488_device *>(device)->set_ren_callback(DEVCB_##_write); #define MCFG_IEEE488_SLOT_ADD(_tag, _address, _slot_intf, _def_slot) \ @@ -176,14 +176,14 @@ protected: simple_list<daisy_entry> m_device_list; private: - devcb2_write_line m_write_eoi; - devcb2_write_line m_write_dav; - devcb2_write_line m_write_nrfd; - devcb2_write_line m_write_ndac; - devcb2_write_line m_write_ifc; - devcb2_write_line m_write_srq; - devcb2_write_line m_write_atn; - devcb2_write_line m_write_ren; + devcb_write_line m_write_eoi; + devcb_write_line m_write_dav; + devcb_write_line m_write_nrfd; + devcb_write_line m_write_ndac; + devcb_write_line m_write_ifc; + devcb_write_line m_write_srq; + devcb_write_line m_write_atn; + devcb_write_line m_write_ren; void set_signal(device_t *device, int signal, int state); int get_signal(int signal); diff --git a/src/emu/bus/iq151/iq151.h b/src/emu/bus/iq151/iq151.h index a5614bbe3b4..e7fe12e8b4b 100644 --- a/src/emu/bus/iq151/iq151.h +++ b/src/emu/bus/iq151/iq151.h @@ -80,12 +80,12 @@ public: iq151cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~iq151cart_slot_device(); - template<class _Object> static devcb2_base &set_out_irq0_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq1_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq3_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq4_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq4_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_drq_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_drq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq0_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq1_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq3_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq4_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq4_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_drq_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_drq_cb.set_callback(object); } // device-level overrides virtual void device_start(); @@ -115,12 +115,12 @@ public: virtual void io_write(offs_t offset, UINT8 data); virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect); - devcb2_write_line m_out_irq0_cb; - devcb2_write_line m_out_irq1_cb; - devcb2_write_line m_out_irq2_cb; - devcb2_write_line m_out_irq3_cb; - devcb2_write_line m_out_irq4_cb; - devcb2_write_line m_out_drq_cb; + devcb_write_line m_out_irq0_cb; + devcb_write_line m_out_irq1_cb; + devcb_write_line m_out_irq2_cb; + devcb_write_line m_out_irq3_cb; + devcb_write_line m_out_irq4_cb; + devcb_write_line m_out_drq_cb; device_iq151cart_interface* m_cart; }; @@ -135,21 +135,21 @@ extern const device_type IQ151CART_SLOT; ***************************************************************************/ #define MCFG_IQ151CART_SLOT_OUT_IRQ0_CB(_devcb) \ - devcb = &iq151cart_slot_device::set_out_irq0_callback(*device, DEVCB2_##_devcb); + devcb = &iq151cart_slot_device::set_out_irq0_callback(*device, DEVCB_##_devcb); #define MCFG_IQ151CART_SLOT_OUT_IRQ1_CB(_devcb) \ - devcb = &iq151cart_slot_device::set_out_irq1_callback(*device, DEVCB2_##_devcb); + devcb = &iq151cart_slot_device::set_out_irq1_callback(*device, DEVCB_##_devcb); #define MCFG_IQ151CART_SLOT_OUT_IRQ2_CB(_devcb) \ - devcb = &iq151cart_slot_device::set_out_irq2_callback(*device, DEVCB2_##_devcb); + devcb = &iq151cart_slot_device::set_out_irq2_callback(*device, DEVCB_##_devcb); #define MCFG_IQ151CART_SLOT_OUT_IRQ3_CB(_devcb) \ - devcb = &iq151cart_slot_device::set_out_irq3_callback(*device, DEVCB2_##_devcb); + devcb = &iq151cart_slot_device::set_out_irq3_callback(*device, DEVCB_##_devcb); #define MCFG_IQ151CART_SLOT_OUT_IRQ4_CB(_devcb) \ - devcb = &iq151cart_slot_device::set_out_irq4_callback(*device, DEVCB2_##_devcb); + devcb = &iq151cart_slot_device::set_out_irq4_callback(*device, DEVCB_##_devcb); #define MCFG_IQ151CART_SLOT_OUT_DRQ_CB(_devcb) \ - devcb = &iq151cart_slot_device::set_out_drq_callback(*device, DEVCB2_##_devcb); + devcb = &iq151cart_slot_device::set_out_drq_callback(*device, DEVCB_##_devcb); #endif /* __IQ151CART_H__ */ diff --git a/src/emu/bus/isa/gus.h b/src/emu/bus/isa/gus.h index 03999f02927..06451a0ac56 100644 --- a/src/emu/bus/isa/gus.h +++ b/src/emu/bus/isa/gus.h @@ -45,37 +45,37 @@ #include "machine/6850acia.h" #define MCFG_GF1_TXIRQ_HANDLER(_devcb) \ - devcb = &gf1_device::set_txirq_handler(*device, DEVCB2_##_devcb); + devcb = &gf1_device::set_txirq_handler(*device, DEVCB_##_devcb); #define MCFG_GF1_RXIRQ_HANDLER(_devcb) \ - devcb = &gf1_device::set_rxirq_handler(*device, DEVCB2_##_devcb); + devcb = &gf1_device::set_rxirq_handler(*device, DEVCB_##_devcb); #define MCFG_GF1_WAVE_IRQ_HANDLER(_devcb) \ - devcb = &gf1_device::set_wave_irq_handler(*device, DEVCB2_##_devcb); + devcb = &gf1_device::set_wave_irq_handler(*device, DEVCB_##_devcb); #define MCFG_GF1_RAMP_IRQ_HANDLER(_devcb) \ - devcb = &gf1_device::set_ramp_irq_handler(*device, DEVCB2_##_devcb); + devcb = &gf1_device::set_ramp_irq_handler(*device, DEVCB_##_devcb); #define MCFG_GF1_TIMER1_IRQ_HANDLER(_devcb) \ - devcb = &gf1_device::set_timer1_irq_handler(*device, DEVCB2_##_devcb); + devcb = &gf1_device::set_timer1_irq_handler(*device, DEVCB_##_devcb); #define MCFG_GF1_TIMER2_IRQ_HANDLER(_devcb) \ - devcb = &gf1_device::set_timer2_irq_handler(*device, DEVCB2_##_devcb); + devcb = &gf1_device::set_timer2_irq_handler(*device, DEVCB_##_devcb); #define MCFG_GF1_SB_IRQ_HANDLER(_devcb) \ - devcb = &gf1_device::set_sb_irq_handler(*device, DEVCB2_##_devcb); + devcb = &gf1_device::set_sb_irq_handler(*device, DEVCB_##_devcb); #define MCFG_GF1_DMA_IRQ_HANDLER(_devcb) \ - devcb = &gf1_device::set_dma_irq_handler(*device, DEVCB2_##_devcb); + devcb = &gf1_device::set_dma_irq_handler(*device, DEVCB_##_devcb); #define MCFG_GF1_DRQ1_HANDLER(_devcb) \ - devcb = &gf1_device::set_drq1_handler(*device, DEVCB2_##_devcb); + devcb = &gf1_device::set_drq1_handler(*device, DEVCB_##_devcb); #define MCFG_GF1_DRQ2_HANDLER(_devcb) \ - devcb = &gf1_device::set_drq2_handler(*device, DEVCB2_##_devcb); + devcb = &gf1_device::set_drq2_handler(*device, DEVCB_##_devcb); #define MCFG_GF1_NMI_HANDLER(_devcb) \ - devcb = &gf1_device::set_nmi_handler(*device, DEVCB2_##_devcb); + devcb = &gf1_device::set_nmi_handler(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -121,17 +121,17 @@ public: // construction/destruction gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_txirq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_txirq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_rxirq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_rxirq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_wave_irq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_wave_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_ramp_irq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_ramp_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_timer1_irq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_timer1_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_timer2_irq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_timer2_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_sb_irq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_sb_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_irq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_dma_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_drq1_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_drq1_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_drq2_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_drq2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_nmi_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_nmi_handler.set_callback(object); } + template<class _Object> static devcb_base &set_txirq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_txirq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_rxirq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_rxirq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_wave_irq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_wave_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ramp_irq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_ramp_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_timer1_irq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_timer1_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_timer2_irq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_timer2_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_sb_irq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_sb_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_dma_irq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_dma_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_drq1_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_drq1_handler.set_callback(object); } + template<class _Object> static devcb_base &set_drq2_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_drq2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_nmi_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_nmi_handler.set_callback(object); } // current IRQ/DMA channel getters UINT8 gf1_irq() { if(m_gf1_irq != 0) return m_gf1_irq; else return m_midi_irq; } // workaround for win95 loading dumb values @@ -247,17 +247,17 @@ private: int m_txirq; int m_rxirq; - devcb2_write_line m_txirq_handler; - devcb2_write_line m_rxirq_handler; - devcb2_write_line m_wave_irq_handler; - devcb2_write_line m_ramp_irq_handler; - devcb2_write_line m_timer1_irq_handler; - devcb2_write_line m_timer2_irq_handler; - devcb2_write_line m_sb_irq_handler; - devcb2_write_line m_dma_irq_handler; - devcb2_write_line m_drq1_handler; - devcb2_write_line m_drq2_handler; - devcb2_write_line m_nmi_handler; + devcb_write_line m_txirq_handler; + devcb_write_line m_rxirq_handler; + devcb_write_line m_wave_irq_handler; + devcb_write_line m_ramp_irq_handler; + devcb_write_line m_timer1_irq_handler; + devcb_write_line m_timer2_irq_handler; + devcb_write_line m_sb_irq_handler; + devcb_write_line m_dma_irq_handler; + devcb_write_line m_drq1_handler; + devcb_write_line m_drq2_handler; + devcb_write_line m_nmi_handler; }; class isa16_gus_device : diff --git a/src/emu/bus/isa/isa.h b/src/emu/bus/isa/isa.h index 180483c9659..f4640af9a98 100644 --- a/src/emu/bus/isa/isa.h +++ b/src/emu/bus/isa/isa.h @@ -91,62 +91,62 @@ isa16_slot_device::static_set_isa16_slot(*device, owner, _isatag); #define MCFG_ISA_BUS_IOCHCK(_iochck) \ - downcast<isa8_device *>(device)->set_iochck_callback(DEVCB2_##_iochck); + downcast<isa8_device *>(device)->set_iochck_callback(DEVCB_##_iochck); #define MCFG_ISA_OUT_IRQ2_CB(_devcb) \ - devcb = &isa8_device::set_out_irq2_callback(*device, DEVCB2_##_devcb); + devcb = &isa8_device::set_out_irq2_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_IRQ3_CB(_devcb) \ - devcb = &isa8_device::set_out_irq3_callback(*device, DEVCB2_##_devcb); + devcb = &isa8_device::set_out_irq3_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_IRQ4_CB(_devcb) \ - devcb = &isa8_device::set_out_irq4_callback(*device, DEVCB2_##_devcb); + devcb = &isa8_device::set_out_irq4_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_IRQ5_CB(_devcb) \ - devcb = &isa8_device::set_out_irq5_callback(*device, DEVCB2_##_devcb); + devcb = &isa8_device::set_out_irq5_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_IRQ6_CB(_devcb) \ - devcb = &isa8_device::set_out_irq6_callback(*device, DEVCB2_##_devcb); + devcb = &isa8_device::set_out_irq6_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_IRQ7_CB(_devcb) \ - devcb = &isa8_device::set_out_irq7_callback(*device, DEVCB2_##_devcb); + devcb = &isa8_device::set_out_irq7_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_DRQ1_CB(_devcb) \ - devcb = &isa8_device::set_out_drq1_callback(*device, DEVCB2_##_devcb); + devcb = &isa8_device::set_out_drq1_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_DRQ2_CB(_devcb) \ - devcb = &isa8_device::set_out_drq2_callback(*device, DEVCB2_##_devcb); + devcb = &isa8_device::set_out_drq2_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_DRQ3_CB(_devcb) \ - devcb = &isa8_device::set_out_drq3_callback(*device, DEVCB2_##_devcb); + devcb = &isa8_device::set_out_drq3_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_IRQ10_CB(_devcb) \ - devcb = &isa16_device::set_out_irq10_callback(*device, DEVCB2_##_devcb); + devcb = &isa16_device::set_out_irq10_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_IRQ11_CB(_devcb) \ - devcb = &isa16_device::set_out_irq11_callback(*device, DEVCB2_##_devcb); + devcb = &isa16_device::set_out_irq11_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_IRQ12_CB(_devcb) \ - devcb = &isa16_device::set_out_irq12_callback(*device, DEVCB2_##_devcb); + devcb = &isa16_device::set_out_irq12_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_IRQ14_CB(_devcb) \ - devcb = &isa16_device::set_out_irq14_callback(*device, DEVCB2_##_devcb); + devcb = &isa16_device::set_out_irq14_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_IRQ15_CB(_devcb) \ - devcb = &isa16_device::set_out_irq15_callback(*device, DEVCB2_##_devcb); + devcb = &isa16_device::set_out_irq15_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_DRQ0_CB(_devcb) \ - devcb = &isa16_device::set_out_drq0_callback(*device, DEVCB2_##_devcb); + devcb = &isa16_device::set_out_drq0_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_DRQ5_CB(_devcb) \ - devcb = &isa16_device::set_out_drq5_callback(*device, DEVCB2_##_devcb); + devcb = &isa16_device::set_out_drq5_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_DRQ6_CB(_devcb) \ - devcb = &isa16_device::set_out_drq6_callback(*device, DEVCB2_##_devcb); + devcb = &isa16_device::set_out_drq6_callback(*device, DEVCB_##_devcb); #define MCFG_ISA_OUT_DRQ7_CB(_devcb) \ - devcb = &isa16_device::set_out_drq7_callback(*device, DEVCB2_##_devcb); + devcb = &isa16_device::set_out_drq7_callback(*device, DEVCB_##_devcb); //************************************************************************** @@ -190,15 +190,15 @@ public: static void static_set_cputag(device_t &device, const char *tag); static void static_set_custom_spaces(device_t &device); template<class _iochck> void set_iochck_callback(_iochck iochck) { m_write_iochck.set_callback(iochck); } - template<class _Object> static devcb2_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_irq2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq3_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_irq3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq4_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_irq4_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq5_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_irq5_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq6_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_irq6_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq7_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_irq7_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_drq1_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_drq1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_drq2_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_drq2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_drq3_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_drq3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_irq2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq3_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_irq3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq4_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_irq4_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq5_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_irq5_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq6_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_irq6_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq7_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_irq7_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_drq1_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_drq1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_drq2_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_drq2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_drq3_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_drq3_cb.set_callback(object); } // for ISA8, put the 8-bit configs in the primary slots and the 16-bit configs in the secondary virtual const address_space_config *memory_space_config(address_spacenum spacenum) const @@ -270,15 +270,15 @@ protected: int m_iowidth, m_prgwidth; bool m_allocspaces; - devcb2_write_line m_out_irq2_cb; - devcb2_write_line m_out_irq3_cb; - devcb2_write_line m_out_irq4_cb; - devcb2_write_line m_out_irq5_cb; - devcb2_write_line m_out_irq6_cb; - devcb2_write_line m_out_irq7_cb; - devcb2_write_line m_out_drq1_cb; - devcb2_write_line m_out_drq2_cb; - devcb2_write_line m_out_drq3_cb; + devcb_write_line m_out_irq2_cb; + devcb_write_line m_out_irq3_cb; + devcb_write_line m_out_irq4_cb; + devcb_write_line m_out_irq5_cb; + devcb_write_line m_out_irq6_cb; + devcb_write_line m_out_irq7_cb; + devcb_write_line m_out_drq1_cb; + devcb_write_line m_out_drq2_cb; + devcb_write_line m_out_drq3_cb; device_isa8_card_interface *m_dma_device[8]; bool m_dma_eop[8]; @@ -286,7 +286,7 @@ protected: bool m_nmi_enabled; private: - devcb2_write_line m_write_iochck; + devcb_write_line m_write_iochck; }; @@ -345,15 +345,15 @@ public: // construction/destruction isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_irq10_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq10_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq11_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq11_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq12_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq12_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq14_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq14_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq15_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq15_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_drq0_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_drq0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_drq5_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_drq5_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_drq6_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_drq6_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_drq7_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_drq7_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq10_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq10_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq11_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq11_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq12_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq12_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq14_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq14_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq15_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq15_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_drq0_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_drq0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_drq5_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_drq5_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_drq6_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_drq6_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_drq7_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_drq7_cb.set_callback(object); } void install16_device(offs_t start, offs_t end, offs_t mask, offs_t mirror, read16_delegate rhandler, write16_delegate whandler); @@ -402,15 +402,15 @@ protected: private: // internal state - devcb2_write_line m_out_irq10_cb; - devcb2_write_line m_out_irq11_cb; - devcb2_write_line m_out_irq12_cb; - devcb2_write_line m_out_irq14_cb; - devcb2_write_line m_out_irq15_cb; - devcb2_write_line m_out_drq0_cb; - devcb2_write_line m_out_drq5_cb; - devcb2_write_line m_out_drq6_cb; - devcb2_write_line m_out_drq7_cb; + devcb_write_line m_out_irq10_cb; + devcb_write_line m_out_irq11_cb; + devcb_write_line m_out_irq12_cb; + devcb_write_line m_out_irq14_cb; + devcb_write_line m_out_irq15_cb; + devcb_write_line m_out_drq0_cb; + devcb_write_line m_out_drq5_cb; + devcb_write_line m_out_drq6_cb; + devcb_write_line m_out_drq7_cb; }; diff --git a/src/emu/bus/isbx/isbx.h b/src/emu/bus/isbx/isbx.h index 5e2abe67beb..c2ae0ee07d3 100644 --- a/src/emu/bus/isbx/isbx.h +++ b/src/emu/bus/isbx/isbx.h @@ -53,16 +53,16 @@ #define MCFG_ISBX_SLOT_MINTR0_CALLBACK(_mintr0) \ - downcast<isbx_slot_device *>(device)->set_mintr0_callback(DEVCB2_##_mintr0); + downcast<isbx_slot_device *>(device)->set_mintr0_callback(DEVCB_##_mintr0); #define MCFG_ISBX_SLOT_MINTR1_CALLBACK(_mintr1) \ - downcast<isbx_slot_device *>(device)->set_mintr1_callback(DEVCB2_##_mintr1); + downcast<isbx_slot_device *>(device)->set_mintr1_callback(DEVCB_##_mintr1); #define MCFG_ISBX_SLOT_MDRQT_CALLBACK(_mdrqt) \ - downcast<isbx_slot_device *>(device)->set_mdrqt_callback(DEVCB2_##_mdrqt); + downcast<isbx_slot_device *>(device)->set_mdrqt_callback(DEVCB_##_mdrqt); #define MCFG_ISBX_SLOT_MWAIT_CALLBACK(_mwait) \ - downcast<isbx_slot_device *>(device)->set_mwait_callback(DEVCB2_##_mwait); + downcast<isbx_slot_device *>(device)->set_mwait_callback(DEVCB_##_mwait); @@ -134,10 +134,10 @@ protected: virtual void device_start(); virtual void device_reset() { if (m_card) get_card_device()->reset(); } - devcb2_write_line m_write_mintr0; - devcb2_write_line m_write_mintr1; - devcb2_write_line m_write_mdrqt; - devcb2_write_line m_write_mwait; + devcb_write_line m_write_mintr0; + devcb_write_line m_write_mintr1; + devcb_write_line m_write_mdrqt; + devcb_write_line m_write_mwait; device_isbx_card_interface *m_card; }; diff --git a/src/emu/bus/kc/kc.h b/src/emu/bus/kc/kc.h index 4814f08b98f..8970e957530 100644 --- a/src/emu/bus/kc/kc.h +++ b/src/emu/bus/kc/kc.h @@ -46,9 +46,9 @@ public: kcexp_slot_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); virtual ~kcexp_slot_device(); - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_nmi_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_halt_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_halt_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_nmi_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_halt_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_halt_cb.set_callback(object); } // device-level overrides virtual void device_start(); @@ -66,9 +66,9 @@ public: virtual DECLARE_WRITE_LINE_MEMBER( mei_w ); virtual DECLARE_WRITE_LINE_MEMBER( meo_w ); - devcb2_write_line m_out_irq_cb; - devcb2_write_line m_out_nmi_cb; - devcb2_write_line m_out_halt_cb; + devcb_write_line m_out_irq_cb; + devcb_write_line m_out_nmi_cb; + devcb_write_line m_out_halt_cb; device_kcexp_interface* m_cart; @@ -117,26 +117,26 @@ extern const device_type KCCART_SLOT; ***************************************************************************/ #define MCFG_KCEXP_SLOT_OUT_IRQ_CB(_devcb) \ - devcb = &kcexp_slot_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &kcexp_slot_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_KCEXP_SLOT_OUT_NMI_CB(_devcb) \ - devcb = &kcexp_slot_device::set_out_nmi_callback(*device, DEVCB2_##_devcb); + devcb = &kcexp_slot_device::set_out_nmi_callback(*device, DEVCB_##_devcb); #define MCFG_KCEXP_SLOT_OUT_HALT_CB(_devcb) \ - devcb = &kcexp_slot_device::set_out_halt_callback(*device, DEVCB2_##_devcb); + devcb = &kcexp_slot_device::set_out_halt_callback(*device, DEVCB_##_devcb); #define MCFG_KCEXP_SLOT_NEXT_SLOT(_next_slot_tag) \ kcexp_slot_device::static_set_next_slot(*device, _next_slot_tag); #define MCFG_KCCART_SLOT_OUT_IRQ_CB(_devcb) \ - devcb = &kccart_slot_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &kccart_slot_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_KCCART_SLOT_OUT_NMI_CB(_devcb) \ - devcb = &kccart_slot_device::set_out_nmi_callback(*device, DEVCB2_##_devcb); + devcb = &kccart_slot_device::set_out_nmi_callback(*device, DEVCB_##_devcb); #define MCFG_KCCART_SLOT_OUT_HALT_CB(_devcb) \ - devcb = &kccart_slot_device::set_out_halt_callback(*device, DEVCB2_##_devcb); + devcb = &kccart_slot_device::set_out_halt_callback(*device, DEVCB_##_devcb); #define MCFG_KCCART_SLOT_NEXT_SLOT(_next_slot_tag) \ kccart_slot_device::static_set_next_slot(*device, _next_slot_tag); diff --git a/src/emu/bus/midi/midi.h b/src/emu/bus/midi/midi.h index 249bf869e41..9b2eb850668 100644 --- a/src/emu/bus/midi/midi.h +++ b/src/emu/bus/midi/midi.h @@ -8,7 +8,7 @@ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_MIDI_RX_HANDLER(_devcb) \ - devcb = &midi_port_device::set_rx_handler(*device, DEVCB2_##_devcb); + devcb = &midi_port_device::set_rx_handler(*device, DEVCB_##_devcb); class device_midi_port_interface; @@ -22,7 +22,7 @@ public: virtual ~midi_port_device(); // static configuration helpers - template<class _Object> static devcb2_base &set_rx_handler(device_t &device, _Object object) { return downcast<midi_port_device &>(device).m_rxd_handler.set_callback(object); } + template<class _Object> static devcb_base &set_rx_handler(device_t &device, _Object object) { return downcast<midi_port_device &>(device).m_rxd_handler.set_callback(object); } DECLARE_WRITE_LINE_MEMBER( write_txd ); @@ -34,7 +34,7 @@ protected: int m_rxd; - devcb2_write_line m_rxd_handler; + devcb_write_line m_rxd_handler; private: device_midi_port_interface *m_dev; diff --git a/src/emu/bus/nubus/nubus.h b/src/emu/bus/nubus/nubus.h index a32657a1dc4..eb79dbc8b83 100644 --- a/src/emu/bus/nubus/nubus.h +++ b/src/emu/bus/nubus/nubus.h @@ -22,22 +22,22 @@ nubus_device::static_set_cputag(*device, _cputag); #define MCFG_NUBUS_OUT_IRQ9_CB(_devcb) \ - devcb = &nubus_device::set_out_irq9_callback(*device, DEVCB2_##_devcb); + devcb = &nubus_device::set_out_irq9_callback(*device, DEVCB_##_devcb); #define MCFG_NUBUS_OUT_IRQA_CB(_devcb) \ - devcb = &nubus_device::set_out_irqa_callback(*device, DEVCB2_##_devcb); + devcb = &nubus_device::set_out_irqa_callback(*device, DEVCB_##_devcb); #define MCFG_NUBUS_OUT_IRQB_CB(_devcb) \ - devcb = &nubus_device::set_out_irqb_callback(*device, DEVCB2_##_devcb); + devcb = &nubus_device::set_out_irqb_callback(*device, DEVCB_##_devcb); #define MCFG_NUBUS_OUT_IRQC_CB(_devcb) \ - devcb = &nubus_device::set_out_irqc_callback(*device, DEVCB2_##_devcb); + devcb = &nubus_device::set_out_irqc_callback(*device, DEVCB_##_devcb); #define MCFG_NUBUS_OUT_IRQD_CB(_devcb) \ - devcb = &nubus_device::set_out_irqd_callback(*device, DEVCB2_##_devcb); + devcb = &nubus_device::set_out_irqd_callback(*device, DEVCB_##_devcb); #define MCFG_NUBUS_OUT_IRQE_CB(_devcb) \ - devcb = &nubus_device::set_out_irqe_callback(*device, DEVCB2_##_devcb); + devcb = &nubus_device::set_out_irqe_callback(*device, DEVCB_##_devcb); #define MCFG_NUBUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, NUBUS_SLOT, 0) \ @@ -91,12 +91,12 @@ public: // inline configuration static void static_set_cputag(device_t &device, const char *tag); - template<class _Object> static devcb2_base &set_out_irq9_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irq9_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irqa_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irqb_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irqc_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqc_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irqd_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqd_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irqe_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqe_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq9_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irq9_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irqa_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irqb_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irqc_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irqd_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqd_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irqe_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqe_cb.set_callback(object); } void add_nubus_card(device_nubus_card_interface *card); void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler, UINT32 mask=0xffffffff); @@ -122,12 +122,12 @@ protected: // internal state cpu_device *m_maincpu; - devcb2_write_line m_out_irq9_cb; - devcb2_write_line m_out_irqa_cb; - devcb2_write_line m_out_irqb_cb; - devcb2_write_line m_out_irqc_cb; - devcb2_write_line m_out_irqd_cb; - devcb2_write_line m_out_irqe_cb; + devcb_write_line m_out_irq9_cb; + devcb_write_line m_out_irqa_cb; + devcb_write_line m_out_irqb_cb; + devcb_write_line m_out_irqc_cb; + devcb_write_line m_out_irqd_cb; + devcb_write_line m_out_irqe_cb; simple_list<device_nubus_card_interface> m_device_list; const char *m_cputag; diff --git a/src/emu/bus/oricext/oricext.h b/src/emu/bus/oricext/oricext.h index 2a5f2134a60..1d2cb6e2a65 100644 --- a/src/emu/bus/oricext/oricext.h +++ b/src/emu/bus/oricext/oricext.h @@ -14,7 +14,7 @@ MCFG_DEVICE_ADD(_tag, ORICEXT_CONNECTOR, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ downcast<oricext_connector *>(device)->set_cputag(_cputag); \ - devcb = &oricext_connector::set_irq_handler(*device, DEVCB2_##_irq); + devcb = &oricext_connector::set_irq_handler(*device, DEVCB_##_irq); class oricext_device; @@ -27,11 +27,11 @@ public: virtual ~oricext_connector(); void set_cputag(const char *tag); - template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<oricext_connector &>(device).irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<oricext_connector &>(device).irq_handler.set_callback(object); } void irq_w(int state); protected: - devcb2_write_line irq_handler; + devcb_write_line irq_handler; const char *cputag; virtual void device_start(); virtual void device_config_complete(); diff --git a/src/emu/bus/pc_kbd/pc_kbdc.h b/src/emu/bus/pc_kbd/pc_kbdc.h index dcbb6cd362f..d391486e5e5 100644 --- a/src/emu/bus/pc_kbd/pc_kbdc.h +++ b/src/emu/bus/pc_kbd/pc_kbdc.h @@ -20,10 +20,10 @@ set the data line and then set the clock line. //************************************************************************** #define MCFG_PC_KBDC_OUT_CLOCK_CB(_devcb) \ - devcb = &pc_kbdc_device::set_out_clock_callback(*device, DEVCB2_##_devcb); + devcb = &pc_kbdc_device::set_out_clock_callback(*device, DEVCB_##_devcb); #define MCFG_PC_KBDC_OUT_DATA_CB(_devcb) \ - devcb = &pc_kbdc_device::set_out_data_callback(*device, DEVCB2_##_devcb); + devcb = &pc_kbdc_device::set_out_data_callback(*device, DEVCB_##_devcb); #define MCFG_PC_KBDC_SLOT_ADD(_kbdc_tag, _tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, PC_KBDC_SLOT, 0 ) \ @@ -65,8 +65,8 @@ public: // construction/destruction pc_kbdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_clock_callback(device_t &device, _Object object) { return downcast<pc_kbdc_device &>(device).m_out_clock_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_data_callback(device_t &device, _Object object) { return downcast<pc_kbdc_device &>(device).m_out_data_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_clock_callback(device_t &device, _Object object) { return downcast<pc_kbdc_device &>(device).m_out_clock_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_data_callback(device_t &device, _Object object) { return downcast<pc_kbdc_device &>(device).m_out_data_cb.set_callback(object); } void set_keyboard(device_pc_kbd_interface *keyboard); @@ -86,8 +86,8 @@ protected: void update_clock_state(); void update_data_state(); - devcb2_write_line m_out_clock_cb; - devcb2_write_line m_out_data_cb; + devcb_write_line m_out_clock_cb; + devcb_write_line m_out_data_cb; int m_clock_state; int m_data_state; diff --git a/src/emu/bus/pet/cass.h b/src/emu/bus/pet/cass.h index 495ed31d195..584c3834e5f 100644 --- a/src/emu/bus/pet/cass.h +++ b/src/emu/bus/pet/cass.h @@ -43,7 +43,7 @@ #define MCFG_PET_DATASSETTE_PORT_ADD(_tag, _slot_intf, _def_slot, _devcb) \ MCFG_DEVICE_ADD(_tag, PET_DATASSETTE_PORT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ - devcb = &pet_datassette_port_device::set_read_handler(*device, DEVCB2_##_devcb); + devcb = &pet_datassette_port_device::set_read_handler(*device, DEVCB_##_devcb); @@ -64,7 +64,7 @@ public: virtual ~pet_datassette_port_device(); // static configuration helpers - template<class _Object> static devcb2_base &set_read_handler(device_t &device, _Object object) { return downcast<pet_datassette_port_device &>(device).m_read_handler.set_callback(object); } + template<class _Object> static devcb_base &set_read_handler(device_t &device, _Object object) { return downcast<pet_datassette_port_device &>(device).m_read_handler.set_callback(object); } // computer interface DECLARE_READ_LINE_MEMBER( read ); @@ -79,7 +79,7 @@ protected: // device-level overrides virtual void device_start(); - devcb2_write_line m_read_handler; + devcb_write_line m_read_handler; device_pet_datassette_port_interface *m_cart; }; diff --git a/src/emu/bus/pet/exp.h b/src/emu/bus/pet/exp.h index fc6ac6a42f9..daf579a315b 100644 --- a/src/emu/bus/pet/exp.h +++ b/src/emu/bus/pet/exp.h @@ -38,7 +38,7 @@ #define MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(_read, _write) \ - downcast<pet_expansion_slot_device *>(device)->set_callbacks(DEVCB2_##_read, DEVCB2_##_write); + downcast<pet_expansion_slot_device *>(device)->set_callbacks(DEVCB_##_read, DEVCB_##_write); @@ -103,8 +103,8 @@ protected: device_pet_expansion_card_interface *m_card; - devcb2_read8 m_read_dma; - devcb2_write8 m_write_dma; + devcb_read8 m_read_dma; + devcb_write8 m_write_dma; }; diff --git a/src/emu/bus/pet/user.h b/src/emu/bus/pet/user.h index 8edd633ece5..c8647543759 100644 --- a/src/emu/bus/pet/user.h +++ b/src/emu/bus/pet/user.h @@ -37,61 +37,61 @@ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_PET_USER_PORT_2_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_2_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_2_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_3_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_3_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_3_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_4_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_4_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_4_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_5_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_5_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_5_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_6_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_6_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_6_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_7_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_7_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_7_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_8_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_8_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_8_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_9_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_9_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_9_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_10_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_10_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_10_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_B_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_b_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_b_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_C_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_c_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_c_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_D_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_d_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_d_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_E_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_e_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_e_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_F_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_f_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_f_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_H_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_h_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_h_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_J_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_j_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_j_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_K_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_k_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_k_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_L_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_l_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_l_handler(*device, DEVCB_##_devcb); #define MCFG_PET_USER_PORT_M_HANDLER(_devcb) \ - devcb = &pet_user_port_device::set_m_handler(*device, DEVCB2_##_devcb); + devcb = &pet_user_port_device::set_m_handler(*device, DEVCB_##_devcb); extern const device_type PET_USER_PORT; @@ -106,25 +106,25 @@ class pet_user_port_device : public device_t, public: pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_2_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_3_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_3_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_4_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_4_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_5_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_5_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_6_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_6_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_7_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_7_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_8_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_8_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_9_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_9_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_10_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_10_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_b_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_b_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_c_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_c_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_d_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_e_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_e_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_f_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_f_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_h_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_h_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_j_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_j_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_k_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_k_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_l_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_l_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_m_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_m_handler.set_callback(object); } + template<class _Object> static devcb_base &set_2_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_3_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_3_handler.set_callback(object); } + template<class _Object> static devcb_base &set_4_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_4_handler.set_callback(object); } + template<class _Object> static devcb_base &set_5_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_5_handler.set_callback(object); } + template<class _Object> static devcb_base &set_6_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_6_handler.set_callback(object); } + template<class _Object> static devcb_base &set_7_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_7_handler.set_callback(object); } + template<class _Object> static devcb_base &set_8_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_8_handler.set_callback(object); } + template<class _Object> static devcb_base &set_9_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_9_handler.set_callback(object); } + template<class _Object> static devcb_base &set_10_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_10_handler.set_callback(object); } + template<class _Object> static devcb_base &set_b_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_b_handler.set_callback(object); } + template<class _Object> static devcb_base &set_c_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_c_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_d_handler.set_callback(object); } + template<class _Object> static devcb_base &set_e_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_e_handler.set_callback(object); } + template<class _Object> static devcb_base &set_f_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_f_handler.set_callback(object); } + template<class _Object> static devcb_base &set_h_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_h_handler.set_callback(object); } + template<class _Object> static devcb_base &set_j_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_j_handler.set_callback(object); } + template<class _Object> static devcb_base &set_k_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_k_handler.set_callback(object); } + template<class _Object> static devcb_base &set_l_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_l_handler.set_callback(object); } + template<class _Object> static devcb_base &set_m_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_m_handler.set_callback(object); } DECLARE_WRITE_LINE_MEMBER( write_2 ); DECLARE_WRITE_LINE_MEMBER( write_3 ); @@ -151,25 +151,25 @@ protected: virtual void device_config_complete(); virtual void device_start(); - devcb2_write_line m_2_handler; - devcb2_write_line m_3_handler; - devcb2_write_line m_4_handler; - devcb2_write_line m_5_handler; - devcb2_write_line m_6_handler; - devcb2_write_line m_7_handler; - devcb2_write_line m_8_handler; - devcb2_write_line m_9_handler; - devcb2_write_line m_10_handler; - devcb2_write_line m_b_handler; - devcb2_write_line m_c_handler; - devcb2_write_line m_d_handler; - devcb2_write_line m_e_handler; - devcb2_write_line m_f_handler; - devcb2_write_line m_h_handler; - devcb2_write_line m_j_handler; - devcb2_write_line m_k_handler; - devcb2_write_line m_l_handler; - devcb2_write_line m_m_handler; + devcb_write_line m_2_handler; + devcb_write_line m_3_handler; + devcb_write_line m_4_handler; + devcb_write_line m_5_handler; + devcb_write_line m_6_handler; + devcb_write_line m_7_handler; + devcb_write_line m_8_handler; + devcb_write_line m_9_handler; + devcb_write_line m_10_handler; + devcb_write_line m_b_handler; + devcb_write_line m_c_handler; + devcb_write_line m_d_handler; + devcb_write_line m_e_handler; + devcb_write_line m_f_handler; + devcb_write_line m_h_handler; + devcb_write_line m_j_handler; + devcb_write_line m_k_handler; + devcb_write_line m_l_handler; + devcb_write_line m_m_handler; private: device_pet_user_port_interface *m_card; diff --git a/src/emu/bus/plus4/exp.h b/src/emu/bus/plus4/exp.h index cb364fdf7dd..64cdacc4dc2 100644 --- a/src/emu/bus/plus4/exp.h +++ b/src/emu/bus/plus4/exp.h @@ -71,16 +71,16 @@ #define MCFG_PLUS4_EXPANSION_SLOT_IRQ_CALLBACK(_write) \ - devcb = &plus4_expansion_slot_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &plus4_expansion_slot_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_PLUS4_EXPANSION_SLOT_CD_INPUT_CALLBACK(_read) \ - devcb = &plus4_expansion_slot_device::set_cd_rd_callback(*device, DEVCB2_##_read); + devcb = &plus4_expansion_slot_device::set_cd_rd_callback(*device, DEVCB_##_read); #define MCFG_PLUS4_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(_write) \ - devcb = &plus4_expansion_slot_device::set_cd_wr_callback(*device, DEVCB2_##_write); + devcb = &plus4_expansion_slot_device::set_cd_wr_callback(*device, DEVCB_##_write); #define MCFG_PLUS4_EXPANSION_SLOT_AEC_CALLBACK(_write) \ - devcb = &plus4_expansion_slot_device::set_aec_wr_callback(*device, DEVCB2_##_write); + devcb = &plus4_expansion_slot_device::set_aec_wr_callback(*device, DEVCB_##_write); @@ -100,10 +100,10 @@ public: // construction/destruction plus4_expansion_slot_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<plus4_expansion_slot_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_cd_rd_callback(device_t &device, _Object object) { return downcast<plus4_expansion_slot_device &>(device).m_read_dma_cd.set_callback(object); } - template<class _Object> static devcb2_base &set_cd_wr_callback(device_t &device, _Object object) { return downcast<plus4_expansion_slot_device &>(device).m_write_dma_cd.set_callback(object); } - template<class _Object> static devcb2_base &set_aec_wr_callback(device_t &device, _Object object) { return downcast<plus4_expansion_slot_device &>(device).m_write_aec.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<plus4_expansion_slot_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_cd_rd_callback(device_t &device, _Object object) { return downcast<plus4_expansion_slot_device &>(device).m_read_dma_cd.set_callback(object); } + template<class _Object> static devcb_base &set_cd_wr_callback(device_t &device, _Object object) { return downcast<plus4_expansion_slot_device &>(device).m_write_dma_cd.set_callback(object); } + template<class _Object> static devcb_base &set_aec_wr_callback(device_t &device, _Object object) { return downcast<plus4_expansion_slot_device &>(device).m_write_aec.set_callback(object); } // computer interface UINT8 cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h); @@ -140,10 +140,10 @@ protected: // slot interface overrides virtual void get_default_card_software(astring &result); - devcb2_write_line m_write_irq; - devcb2_read8 m_read_dma_cd; - devcb2_write8 m_write_dma_cd; - devcb2_write_line m_write_aec; + devcb_write_line m_write_irq; + devcb_read8 m_read_dma_cd; + devcb_write8 m_write_dma_cd; + devcb_write_line m_write_aec; device_plus4_expansion_card_interface *m_card; }; diff --git a/src/emu/bus/rs232/rs232.h b/src/emu/bus/rs232/rs232.h index 863bf7468ee..a7df88e0700 100644 --- a/src/emu/bus/rs232/rs232.h +++ b/src/emu/bus/rs232/rs232.h @@ -10,19 +10,19 @@ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_RS232_RXD_HANDLER(_devcb) \ - devcb = &rs232_port_device::set_rxd_handler(*device, DEVCB2_##_devcb); + devcb = &rs232_port_device::set_rxd_handler(*device, DEVCB_##_devcb); #define MCFG_RS232_DCD_HANDLER(_devcb) \ - devcb = &rs232_port_device::set_dcd_handler(*device, DEVCB2_##_devcb); + devcb = &rs232_port_device::set_dcd_handler(*device, DEVCB_##_devcb); #define MCFG_RS232_DSR_HANDLER(_devcb) \ - devcb = &rs232_port_device::set_dsr_handler(*device, DEVCB2_##_devcb); + devcb = &rs232_port_device::set_dsr_handler(*device, DEVCB_##_devcb); #define MCFG_RS232_RI_HANDLER(_devcb) \ - devcb = &rs232_port_device::set_ri_handler(*device, DEVCB2_##_devcb); + devcb = &rs232_port_device::set_ri_handler(*device, DEVCB_##_devcb); #define MCFG_RS232_CTS_HANDLER(_devcb) \ - devcb = &rs232_port_device::set_cts_handler(*device, DEVCB2_##_devcb); + devcb = &rs232_port_device::set_cts_handler(*device, DEVCB_##_devcb); #define RS232_BAUD_110 (0x00) #define RS232_BAUD_150 (0x01) @@ -120,11 +120,11 @@ public: virtual ~rs232_port_device(); // static configuration helpers - template<class _Object> static devcb2_base &set_rxd_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_rxd_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_dcd_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_dcd_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_dsr_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_dsr_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_ri_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_ri_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_cts_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_cts_handler.set_callback(object); } + template<class _Object> static devcb_base &set_rxd_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_rxd_handler.set_callback(object); } + template<class _Object> static devcb_base &set_dcd_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_dcd_handler.set_callback(object); } + template<class _Object> static devcb_base &set_dsr_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_dsr_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ri_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_ri_handler.set_callback(object); } + template<class _Object> static devcb_base &set_cts_handler(device_t &device, _Object object) { return downcast<rs232_port_device &>(device).m_cts_handler.set_callback(object); } DECLARE_WRITE_LINE_MEMBER( write_txd ); DECLARE_WRITE_LINE_MEMBER( write_dtr ); @@ -147,11 +147,11 @@ protected: int m_ri; int m_cts; - devcb2_write_line m_rxd_handler; - devcb2_write_line m_dcd_handler; - devcb2_write_line m_dsr_handler; - devcb2_write_line m_ri_handler; - devcb2_write_line m_cts_handler; + devcb_write_line m_rxd_handler; + devcb_write_line m_dcd_handler; + devcb_write_line m_dsr_handler; + devcb_write_line m_ri_handler; + devcb_write_line m_cts_handler; private: device_rs232_port_interface *m_dev; diff --git a/src/emu/bus/s100/s100.h b/src/emu/bus/s100/s100.h index 887b7b1f9b4..a44923c5945 100644 --- a/src/emu/bus/s100/s100.h +++ b/src/emu/bus/s100/s100.h @@ -92,55 +92,55 @@ #define MCFG_S100_IRQ_CALLBACK(_write) \ - devcb = &s100_bus_t::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_NMI_CALLBACK(_write) \ - devcb = &s100_bus_t::set_nmi_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_nmi_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_VI0_CALLBACK(_write) \ - devcb = &s100_bus_t::set_vi0_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_vi0_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_VI1_CALLBACK(_write) \ - devcb = &s100_bus_t::set_vi1_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_vi1_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_VI2_CALLBACK(_write) \ - devcb = &s100_bus_t::set_vi2_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_vi2_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_VI3_CALLBACK(_write) \ - devcb = &s100_bus_t::set_vi3_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_vi3_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_VI4_CALLBACK(_write) \ - devcb = &s100_bus_t::set_vi4_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_vi4_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_VI5_CALLBACK(_write) \ - devcb = &s100_bus_t::set_vi5_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_vi5_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_VI6_CALLBACK(_write) \ - devcb = &s100_bus_t::set_vi6_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_vi6_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_VI7_CALLBACK(_write) \ - devcb = &s100_bus_t::set_vi7_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_vi7_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_DMA0_CALLBACK(_write) \ - devcb = &s100_bus_t::set_dma0_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_dma0_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_DMA1_CALLBACK(_write) \ - devcb = &s100_bus_t::set_dma1_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_dma1_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_DMA2_CALLBACK(_write) \ - devcb = &s100_bus_t::set_dma2_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_dma2_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_DMA3_CALLBACK(_write) \ - devcb = &s100_bus_t::set_dma3_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_dma3_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_RDY_CALLBACK(_write) \ - devcb = &s100_bus_t::set_rdy_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_rdy_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_HOLD_CALLBACK(_write) \ - devcb = &s100_bus_t::set_hold_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_hold_wr_callback(*device, DEVCB_##_write); #define MCFG_S100_ERROR_CALLBACK(_write) \ - devcb = &s100_bus_t::set_error_wr_callback(*device, DEVCB2_##_write); + devcb = &s100_bus_t::set_error_wr_callback(*device, DEVCB_##_write); @@ -214,23 +214,23 @@ public: s100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~s100_bus_t() { m_device_list.detach_all(); } - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_nmi.set_callback(object); } - template<class _Object> static devcb2_base &set_vi0_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi0.set_callback(object); } - template<class _Object> static devcb2_base &set_vi1_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi1.set_callback(object); } - template<class _Object> static devcb2_base &set_vi2_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi2.set_callback(object); } - template<class _Object> static devcb2_base &set_vi3_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi3.set_callback(object); } - template<class _Object> static devcb2_base &set_vi4_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi4.set_callback(object); } - template<class _Object> static devcb2_base &set_vi5_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi5.set_callback(object); } - template<class _Object> static devcb2_base &set_vi6_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi6.set_callback(object); } - template<class _Object> static devcb2_base &set_vi7_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi7.set_callback(object); } - template<class _Object> static devcb2_base &set_dma0_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_dma0.set_callback(object); } - template<class _Object> static devcb2_base &set_dma1_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_dma1.set_callback(object); } - template<class _Object> static devcb2_base &set_dma2_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_dma2.set_callback(object); } - template<class _Object> static devcb2_base &set_dma3_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_dma3.set_callback(object); } - template<class _Object> static devcb2_base &set_rdy_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_rdy.set_callback(object); } - template<class _Object> static devcb2_base &set_hold_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_hold.set_callback(object); } - template<class _Object> static devcb2_base &set_error_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_error.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_nmi.set_callback(object); } + template<class _Object> static devcb_base &set_vi0_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi0.set_callback(object); } + template<class _Object> static devcb_base &set_vi1_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi1.set_callback(object); } + template<class _Object> static devcb_base &set_vi2_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi2.set_callback(object); } + template<class _Object> static devcb_base &set_vi3_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi3.set_callback(object); } + template<class _Object> static devcb_base &set_vi4_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi4.set_callback(object); } + template<class _Object> static devcb_base &set_vi5_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi5.set_callback(object); } + template<class _Object> static devcb_base &set_vi6_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi6.set_callback(object); } + template<class _Object> static devcb_base &set_vi7_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_vi7.set_callback(object); } + template<class _Object> static devcb_base &set_dma0_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_dma0.set_callback(object); } + template<class _Object> static devcb_base &set_dma1_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_dma1.set_callback(object); } + template<class _Object> static devcb_base &set_dma2_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_dma2.set_callback(object); } + template<class _Object> static devcb_base &set_dma3_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_dma3.set_callback(object); } + template<class _Object> static devcb_base &set_rdy_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_rdy.set_callback(object); } + template<class _Object> static devcb_base &set_hold_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_hold.set_callback(object); } + template<class _Object> static devcb_base &set_error_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_error.set_callback(object); } void add_card(device_s100_card_interface *card); @@ -264,23 +264,23 @@ protected: virtual void device_reset(); private: - devcb2_write_line m_write_irq; - devcb2_write_line m_write_nmi; - devcb2_write_line m_write_vi0; - devcb2_write_line m_write_vi1; - devcb2_write_line m_write_vi2; - devcb2_write_line m_write_vi3; - devcb2_write_line m_write_vi4; - devcb2_write_line m_write_vi5; - devcb2_write_line m_write_vi6; - devcb2_write_line m_write_vi7; - devcb2_write_line m_write_dma0; - devcb2_write_line m_write_dma1; - devcb2_write_line m_write_dma2; - devcb2_write_line m_write_dma3; - devcb2_write_line m_write_rdy; - devcb2_write_line m_write_hold; - devcb2_write_line m_write_error; + devcb_write_line m_write_irq; + devcb_write_line m_write_nmi; + devcb_write_line m_write_vi0; + devcb_write_line m_write_vi1; + devcb_write_line m_write_vi2; + devcb_write_line m_write_vi3; + devcb_write_line m_write_vi4; + devcb_write_line m_write_vi5; + devcb_write_line m_write_vi6; + devcb_write_line m_write_vi7; + devcb_write_line m_write_dma0; + devcb_write_line m_write_dma1; + devcb_write_line m_write_dma2; + devcb_write_line m_write_dma3; + devcb_write_line m_write_rdy; + devcb_write_line m_write_hold; + devcb_write_line m_write_error; simple_list<device_s100_card_interface> m_device_list; }; diff --git a/src/emu/bus/scsi/scsi.h b/src/emu/bus/scsi/scsi.h index 4bb34c5a602..e38c5f88b43 100644 --- a/src/emu/bus/scsi/scsi.h +++ b/src/emu/bus/scsi/scsi.h @@ -19,55 +19,55 @@ #define SCSI_PORT_DEVICE7 "7" #define MCFG_SCSI_BSY_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_bsy_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_bsy_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_SEL_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_sel_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_sel_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_CD_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_cd_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_cd_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_IO_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_io_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_io_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_MSG_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_msg_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_msg_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_REQ_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_req_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_req_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_ACK_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_ack_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_ack_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_ATN_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_atn_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_atn_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_RST_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_rst_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_rst_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_DATA0_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_data0_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_data0_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_DATA1_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_data1_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_data1_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_DATA2_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_data2_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_data2_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_DATA3_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_data3_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_data3_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_DATA4_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_data4_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_data4_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_DATA5_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_data5_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_data5_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_DATA6_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_data6_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_data6_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_DATA7_HANDLER(_devcb) \ - devcb = &SCSI_PORT_DEVICE::set_data7_handler(*device, DEVCB2_##_devcb); + devcb = &SCSI_PORT_DEVICE::set_data7_handler(*device, DEVCB_##_devcb); #define MCFG_SCSI_OUTPUT_LATCH_ADD(_tag, scsi_port_tag) \ MCFG_DEVICE_ADD(_tag, OUTPUT_LATCH, 0) \ @@ -101,23 +101,23 @@ public: // construction/destruction SCSI_PORT_DEVICE(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_bsy_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_bsy_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_sel_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_sel_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_cd_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_cd_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_io_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_io_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_msg_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_msg_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_req_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_req_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_ack_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_ack_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_atn_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_atn_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_rst_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_rst_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data0_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data0_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data1_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data1_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data2_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data3_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data3_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data4_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data4_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data5_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data5_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data6_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data6_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_data7_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data7_handler.set_callback(object); } + template<class _Object> static devcb_base &set_bsy_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_bsy_handler.set_callback(object); } + template<class _Object> static devcb_base &set_sel_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_sel_handler.set_callback(object); } + template<class _Object> static devcb_base &set_cd_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_cd_handler.set_callback(object); } + template<class _Object> static devcb_base &set_io_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_io_handler.set_callback(object); } + template<class _Object> static devcb_base &set_msg_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_msg_handler.set_callback(object); } + template<class _Object> static devcb_base &set_req_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_req_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ack_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_ack_handler.set_callback(object); } + template<class _Object> static devcb_base &set_atn_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_atn_handler.set_callback(object); } + template<class _Object> static devcb_base &set_rst_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_rst_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data0_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data0_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data1_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data1_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data2_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data3_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data3_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data4_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data4_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data5_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data5_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data6_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data6_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data7_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_data7_handler.set_callback(object); } DECLARE_WRITE_LINE_MEMBER( write_bsy ); DECLARE_WRITE_LINE_MEMBER( write_sel ); @@ -161,23 +161,23 @@ protected: void update_data7(); private: - devcb2_write_line m_bsy_handler; - devcb2_write_line m_sel_handler; - devcb2_write_line m_cd_handler; - devcb2_write_line m_io_handler; - devcb2_write_line m_msg_handler; - devcb2_write_line m_req_handler; - devcb2_write_line m_ack_handler; - devcb2_write_line m_atn_handler; - devcb2_write_line m_rst_handler; - devcb2_write_line m_data0_handler; - devcb2_write_line m_data1_handler; - devcb2_write_line m_data2_handler; - devcb2_write_line m_data3_handler; - devcb2_write_line m_data4_handler; - devcb2_write_line m_data5_handler; - devcb2_write_line m_data6_handler; - devcb2_write_line m_data7_handler; + devcb_write_line m_bsy_handler; + devcb_write_line m_sel_handler; + devcb_write_line m_cd_handler; + devcb_write_line m_io_handler; + devcb_write_line m_msg_handler; + devcb_write_line m_req_handler; + devcb_write_line m_ack_handler; + devcb_write_line m_atn_handler; + devcb_write_line m_rst_handler; + devcb_write_line m_data0_handler; + devcb_write_line m_data1_handler; + devcb_write_line m_data2_handler; + devcb_write_line m_data3_handler; + devcb_write_line m_data4_handler; + devcb_write_line m_data5_handler; + devcb_write_line m_data6_handler; + devcb_write_line m_data7_handler; SCSI_PORT_SLOT_device *m_slot[7]; int m_device_count; diff --git a/src/emu/bus/sms_ctrl/smsctrl.h b/src/emu/bus/sms_ctrl/smsctrl.h index ba1e5146307..0a1cc6632c8 100644 --- a/src/emu/bus/sms_ctrl/smsctrl.h +++ b/src/emu/bus/sms_ctrl/smsctrl.h @@ -31,11 +31,11 @@ #define MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(_devcb) \ - devcb = &sms_control_port_device::set_th_input_handler(*device, DEVCB2_##_devcb); + devcb = &sms_control_port_device::set_th_input_handler(*device, DEVCB_##_devcb); #define MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(_devcb) \ - devcb = &sms_control_port_device::set_pixel_handler(*device, DEVCB2_##_devcb); + devcb = &sms_control_port_device::set_pixel_handler(*device, DEVCB_##_devcb); @@ -56,9 +56,9 @@ public: virtual ~sms_control_port_device(); // static configuration helpers - template<class _Object> static devcb2_base &set_th_input_handler(device_t &device, _Object object) { return downcast<sms_control_port_device &>(device).m_th_pin_handler.set_callback(object); } + template<class _Object> static devcb_base &set_th_input_handler(device_t &device, _Object object) { return downcast<sms_control_port_device &>(device).m_th_pin_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_pixel_handler(device_t &device, _Object object) { return downcast<sms_control_port_device &>(device).m_pixel_handler.set_callback(object); } + template<class _Object> static devcb_base &set_pixel_handler(device_t &device, _Object object) { return downcast<sms_control_port_device &>(device).m_pixel_handler.set_callback(object); } // Physical DE-9 connector interface @@ -86,8 +86,8 @@ public: device_sms_control_port_interface *m_device; private: - devcb2_write_line m_th_pin_handler; - devcb2_read32 m_pixel_handler; + devcb_write_line m_th_pin_handler; + devcb_read32 m_pixel_handler; }; diff --git a/src/emu/bus/ti99_peb/peribox.h b/src/emu/bus/ti99_peb/peribox.h index 22ae92ff11d..ceeef006168 100644 --- a/src/emu/bus/ti99_peb/peribox.h +++ b/src/emu/bus/ti99_peb/peribox.h @@ -39,9 +39,9 @@ public: peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); peribox_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 &static_set_inta_callback(device_t &device, _Object object) { return downcast<peribox_device &>(device).m_console_inta.set_callback(object); } - template<class _Object> static devcb2_base &static_set_intb_callback(device_t &device, _Object object) { return downcast<peribox_device &>(device).m_console_intb.set_callback(object); } - template<class _Object> static devcb2_base &static_set_ready_callback(device_t &device, _Object object) { return downcast<peribox_device &>(device).m_datamux_ready.set_callback(object); } + template<class _Object> static devcb_base &static_set_inta_callback(device_t &device, _Object object) { return downcast<peribox_device &>(device).m_console_inta.set_callback(object); } + template<class _Object> static devcb_base &static_set_intb_callback(device_t &device, _Object object) { return downcast<peribox_device &>(device).m_console_intb.set_callback(object); } + template<class _Object> static devcb_base &static_set_ready_callback(device_t &device, _Object object) { return downcast<peribox_device &>(device).m_datamux_ready.set_callback(object); } // Next seven methods are called from the console DECLARE_READ8Z_MEMBER(readz); @@ -70,9 +70,9 @@ protected: virtual machine_config_constructor device_mconfig_additions() const; // Next three methods call back the console - devcb2_write_line m_console_inta; // INTA line (Box to console) - devcb2_write_line m_console_intb; // INTB line - devcb2_write_line m_datamux_ready; // READY line (to the datamux) + devcb_write_line m_console_inta; // INTA line (Box to console) + devcb_write_line m_console_intb; // INTB line + devcb_write_line m_datamux_ready; // READY line (to the datamux) void set_slot_loaded(int slot, peribox_slot_device* slotdev); peribox_slot_device *m_slot[9]; // for the sake of simplicity we donate the first two positions (0,1) @@ -237,13 +237,13 @@ protected: MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _default, false) #define MCFG_PERIBOX_INTA_HANDLER( _inta ) \ - devcb = &peribox_device::static_set_inta_callback( *device, DEVCB2_##_inta ); + devcb = &peribox_device::static_set_inta_callback( *device, DEVCB_##_inta ); #define MCFG_PERIBOX_INTB_HANDLER( _intb ) \ - devcb = &peribox_device::static_set_intb_callback( *device, DEVCB2_##_intb ); + devcb = &peribox_device::static_set_intb_callback( *device, DEVCB_##_intb ); #define MCFG_PERIBOX_READY_HANDLER( _ready ) \ - devcb = &peribox_device::static_set_ready_callback( *device, DEVCB2_##_ready ); + devcb = &peribox_device::static_set_ready_callback( *device, DEVCB_##_ready ); /* diff --git a/src/emu/bus/tvc/tvc.h b/src/emu/bus/tvc/tvc.h index 0bd8f39da27..e02922218b5 100644 --- a/src/emu/bus/tvc/tvc.h +++ b/src/emu/bus/tvc/tvc.h @@ -90,8 +90,8 @@ public: tvcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~tvcexp_slot_device(); - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<tvcexp_slot_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<tvcexp_slot_device &>(device).m_out_nmi_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<tvcexp_slot_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<tvcexp_slot_device &>(device).m_out_nmi_cb.set_callback(object); } // device-level overrides virtual void device_start(); @@ -105,8 +105,8 @@ public: virtual DECLARE_READ8_MEMBER(io_read); virtual DECLARE_WRITE8_MEMBER(io_write); - devcb2_write_line m_out_irq_cb; - devcb2_write_line m_out_nmi_cb; + devcb_write_line m_out_irq_cb; + devcb_write_line m_out_nmi_cb; device_tvcexp_interface* m_cart; }; @@ -120,9 +120,9 @@ extern const device_type TVCEXP_SLOT; ***************************************************************************/ #define MCFG_TVCEXP_SLOT_OUT_IRQ_CB(_devcb) \ - devcb = &tvcexp_slot_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &tvcexp_slot_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_TVCEXP_SLOT_OUT_NMI_CB(_devcb) \ - devcb = &tvcexp_slot_device::set_out_nmi_callback(*device, DEVCB2_##_devcb); + devcb = &tvcexp_slot_device::set_out_nmi_callback(*device, DEVCB_##_devcb); #endif /* __TVCEXP_H__ */ diff --git a/src/emu/bus/vcs/ctrl.h b/src/emu/bus/vcs/ctrl.h index f5109b29276..ab01e6ab942 100644 --- a/src/emu/bus/vcs/ctrl.h +++ b/src/emu/bus/vcs/ctrl.h @@ -31,7 +31,7 @@ #define MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(_write) \ - devcb = &vcs_control_port_device::set_trigger_wr_callback(*device, DEVCB2_##_write); + devcb = &vcs_control_port_device::set_trigger_wr_callback(*device, DEVCB_##_write); @@ -75,7 +75,7 @@ public: virtual ~vcs_control_port_device() { } // static configuration helpers - template<class _Object> static devcb2_base &set_trigger_wr_callback(device_t &device, _Object object) { return downcast<vcs_control_port_device &>(device).m_write_trigger.set_callback(object); } + template<class _Object> static devcb_base &set_trigger_wr_callback(device_t &device, _Object object) { return downcast<vcs_control_port_device &>(device).m_write_trigger.set_callback(object); } // computer interface @@ -113,7 +113,7 @@ protected: device_vcs_control_port_interface *m_device; private: - devcb2_write_line m_write_trigger; + devcb_write_line m_write_trigger; }; diff --git a/src/emu/bus/vic10/exp.h b/src/emu/bus/vic10/exp.h index e675dfe3867..7c93ef7b247 100644 --- a/src/emu/bus/vic10/exp.h +++ b/src/emu/bus/vic10/exp.h @@ -62,23 +62,23 @@ #define MCFG_VIC10_EXPANSION_SLOT_IRQ_CALLBACK(_write) \ - devcb = &vic10_expansion_slot_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &vic10_expansion_slot_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_VIC10_EXPANSION_SLOT_RES_CALLBACK(_write) \ - devcb = &vic10_expansion_slot_device::set_res_wr_callback(*device, DEVCB2_##_write); + devcb = &vic10_expansion_slot_device::set_res_wr_callback(*device, DEVCB_##_write); #define MCFG_VIC10_EXPANSION_SLOT_CNT_CALLBACK(_write) \ - devcb = &vic10_expansion_slot_device::set_cnt_wr_callback(*device, DEVCB2_##_write); + devcb = &vic10_expansion_slot_device::set_cnt_wr_callback(*device, DEVCB_##_write); #define MCFG_VIC10_EXPANSION_SLOT_SP_CALLBACK(_write) \ - devcb = &vic10_expansion_slot_device::set_sp_wr_callback(*device, DEVCB2_##_write); + devcb = &vic10_expansion_slot_device::set_sp_wr_callback(*device, DEVCB_##_write); #define MCFG_VIC10_EXPANSION_SLOT_IRQ_CALLBACKS(_irq, _res) \ - downcast<vic10_expansion_slot_device *>(device)->set_irq_callbacks(DEVCB2_##_irq, DEVCB2_##_res); + downcast<vic10_expansion_slot_device *>(device)->set_irq_callbacks(DEVCB_##_irq, DEVCB_##_res); #define MCFG_VIC10_EXPANSION_SLOT_SERIAL_CALLBACKS(_cnt, _sp) \ - downcast<vic10_expansion_slot_device *>(device)->set_serial_callbacks(DEVCB2_##_cnt, DEVCB2_##_sp); + downcast<vic10_expansion_slot_device *>(device)->set_serial_callbacks(DEVCB_##_cnt, DEVCB_##_sp); @@ -98,10 +98,10 @@ public: // construction/destruction vic10_expansion_slot_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<vic10_expansion_slot_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_res_wr_callback(device_t &device, _Object object) { return downcast<vic10_expansion_slot_device &>(device).m_write_res.set_callback(object); } - template<class _Object> static devcb2_base &set_cnt_wr_callback(device_t &device, _Object object) { return downcast<vic10_expansion_slot_device &>(device).m_write_cnt.set_callback(object); } - template<class _Object> static devcb2_base &set_sp_wr_callback(device_t &device, _Object object) { return downcast<vic10_expansion_slot_device &>(device).m_write_sp.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<vic10_expansion_slot_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_res_wr_callback(device_t &device, _Object object) { return downcast<vic10_expansion_slot_device &>(device).m_write_res.set_callback(object); } + template<class _Object> static devcb_base &set_cnt_wr_callback(device_t &device, _Object object) { return downcast<vic10_expansion_slot_device &>(device).m_write_cnt.set_callback(object); } + template<class _Object> static devcb_base &set_sp_wr_callback(device_t &device, _Object object) { return downcast<vic10_expansion_slot_device &>(device).m_write_sp.set_callback(object); } // computer interface UINT8 cd_r(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram); @@ -139,10 +139,10 @@ protected: // slot interface overrides virtual void get_default_card_software(astring &result); - devcb2_write_line m_write_irq; - devcb2_write_line m_write_res; - devcb2_write_line m_write_cnt; - devcb2_write_line m_write_sp; + devcb_write_line m_write_irq; + devcb_write_line m_write_res; + devcb_write_line m_write_cnt; + devcb_write_line m_write_sp; device_vic10_expansion_card_interface *m_card; }; diff --git a/src/emu/bus/vic20/exp.h b/src/emu/bus/vic20/exp.h index 2f52cc1c91f..d3886b42db7 100644 --- a/src/emu/bus/vic20/exp.h +++ b/src/emu/bus/vic20/exp.h @@ -67,13 +67,13 @@ #define MCFG_VIC20_EXPANSION_SLOT_IRQ_CALLBACK(_write) \ - devcb = &vic20_expansion_slot_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &vic20_expansion_slot_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_VIC20_EXPANSION_SLOT_NMI_CALLBACK(_write) \ - devcb = &vic20_expansion_slot_device::set_nmi_wr_callback(*device, DEVCB2_##_write); + devcb = &vic20_expansion_slot_device::set_nmi_wr_callback(*device, DEVCB_##_write); #define MCFG_VIC20_EXPANSION_SLOT_RES_CALLBACK(_write) \ - devcb = &vic20_expansion_slot_device::set_res_wr_callback(*device, DEVCB2_##_write); + devcb = &vic20_expansion_slot_device::set_res_wr_callback(*device, DEVCB_##_write); @@ -93,9 +93,9 @@ public: // construction/destruction vic20_expansion_slot_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<vic20_expansion_slot_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<vic20_expansion_slot_device &>(device).m_write_nmi.set_callback(object); } - template<class _Object> static devcb2_base &set_res_wr_callback(device_t &device, _Object object) { return downcast<vic20_expansion_slot_device &>(device).m_write_res.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<vic20_expansion_slot_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<vic20_expansion_slot_device &>(device).m_write_nmi.set_callback(object); } + template<class _Object> static devcb_base &set_res_wr_callback(device_t &device, _Object object) { return downcast<vic20_expansion_slot_device &>(device).m_write_res.set_callback(object); } // computer interface UINT8 cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); @@ -130,9 +130,9 @@ protected: // slot interface overrides virtual void get_default_card_software(astring &result); - devcb2_write_line m_write_irq; - devcb2_write_line m_write_nmi; - devcb2_write_line m_write_res; + devcb_write_line m_write_irq; + devcb_write_line m_write_nmi; + devcb_write_line m_write_res; device_vic20_expansion_card_interface *m_card; }; diff --git a/src/emu/bus/vidbrain/exp.h b/src/emu/bus/vidbrain/exp.h index 2f1e7f67988..c4ec1ca1ffb 100644 --- a/src/emu/bus/vidbrain/exp.h +++ b/src/emu/bus/vidbrain/exp.h @@ -64,7 +64,7 @@ #define MCFG_VIDEOBRAIN_EXPANSION_SLOT_EXTRES_CALLBACK(_write) \ - devcb = &videobrain_expansion_slot_device::set_extres_wr_callback(*device, DEVCB2_##_write); + devcb = &videobrain_expansion_slot_device::set_extres_wr_callback(*device, DEVCB_##_write); @@ -116,7 +116,7 @@ public: videobrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~videobrain_expansion_slot_device() { } - template<class _Object> static devcb2_base &set_extres_wr_callback(device_t &device, _Object object) { return downcast<videobrain_expansion_slot_device &>(device).m_write_extres.set_callback(object); } + template<class _Object> static devcb_base &set_extres_wr_callback(device_t &device, _Object object) { return downcast<videobrain_expansion_slot_device &>(device).m_write_extres.set_callback(object); } // computer interface UINT8 bo_r(address_space &space, offs_t offset, int cs1, int cs2); @@ -155,7 +155,7 @@ protected: // slot interface overrides virtual void get_default_card_software(astring &result); - devcb2_write_line m_write_extres; + devcb_write_line m_write_extres; device_videobrain_expansion_card_interface *m_cart; }; diff --git a/src/emu/bus/vip/byteio.h b/src/emu/bus/vip/byteio.h index 4fa9423f192..2d8a8667814 100644 --- a/src/emu/bus/vip/byteio.h +++ b/src/emu/bus/vip/byteio.h @@ -58,7 +58,7 @@ #define MCFG_VIP_BYTEIO_PORT_ADD(_tag, _slot_intf, _def_slot, _inst) \ MCFG_DEVICE_ADD(_tag, VIP_BYTEIO_PORT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ - downcast<vip_byteio_port_device *>(device)->set_inst_callback(DEVCB2_##_inst); + downcast<vip_byteio_port_device *>(device)->set_inst_callback(DEVCB_##_inst); @@ -94,7 +94,7 @@ protected: virtual void device_start(); virtual void device_reset(); - devcb2_write_line m_write_inst; + devcb_write_line m_write_inst; device_vip_byteio_port_interface *m_cart; }; diff --git a/src/emu/bus/vip/exp.h b/src/emu/bus/vip/exp.h index ba7a3682ac7..5ff114f2402 100644 --- a/src/emu/bus/vip/exp.h +++ b/src/emu/bus/vip/exp.h @@ -61,13 +61,13 @@ #define MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(_write) \ - devcb = &vip_expansion_slot_device::set_int_wr_callback(*device, DEVCB2_##_write); + devcb = &vip_expansion_slot_device::set_int_wr_callback(*device, DEVCB_##_write); #define MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(_write) \ - devcb = &vip_expansion_slot_device::set_dma_out_wr_callback(*device, DEVCB2_##_write); + devcb = &vip_expansion_slot_device::set_dma_out_wr_callback(*device, DEVCB_##_write); #define MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(_write) \ - devcb = &vip_expansion_slot_device::set_dma_in_wr_callback(*device, DEVCB2_##_write); + devcb = &vip_expansion_slot_device::set_dma_in_wr_callback(*device, DEVCB_##_write); @@ -86,9 +86,9 @@ public: // construction/destruction vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_int.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_out_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_dma_out.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_in_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_dma_in.set_callback(object); } + template<class _Object> static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_int.set_callback(object); } + template<class _Object> static devcb_base &set_dma_out_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_dma_out.set_callback(object); } + template<class _Object> static devcb_base &set_dma_in_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_dma_in.set_callback(object); } // computer interface UINT8 program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh); @@ -114,9 +114,9 @@ protected: // device-level overrides virtual void device_start(); - devcb2_write_line m_write_int; - devcb2_write_line m_write_dma_out; - devcb2_write_line m_write_dma_in; + devcb_write_line m_write_int; + devcb_write_line m_write_dma_out; + devcb_write_line m_write_dma_in; device_vip_expansion_card_interface *m_card; }; diff --git a/src/emu/bus/wangpc/wangpc.h b/src/emu/bus/wangpc/wangpc.h index ea594b19413..a0a24674c3a 100644 --- a/src/emu/bus/wangpc/wangpc.h +++ b/src/emu/bus/wangpc/wangpc.h @@ -43,34 +43,34 @@ #define MCFG_WANGPC_BUS_IRQ2_CALLBACK(_write) \ - devcb = &wangpcbus_device::set_irq2_wr_callback(*device, DEVCB2_##_write); + devcb = &wangpcbus_device::set_irq2_wr_callback(*device, DEVCB_##_write); #define MCFG_WANGPC_BUS_IRQ3_CALLBACK(_write) \ - devcb = &wangpcbus_device::set_irq3_wr_callback(*device, DEVCB2_##_write); + devcb = &wangpcbus_device::set_irq3_wr_callback(*device, DEVCB_##_write); #define MCFG_WANGPC_BUS_IRQ4_CALLBACK(_write) \ - devcb = &wangpcbus_device::set_irq4_wr_callback(*device, DEVCB2_##_write); + devcb = &wangpcbus_device::set_irq4_wr_callback(*device, DEVCB_##_write); #define MCFG_WANGPC_BUS_IRQ5_CALLBACK(_write) \ - devcb = &wangpcbus_device::set_irq5_wr_callback(*device, DEVCB2_##_write); + devcb = &wangpcbus_device::set_irq5_wr_callback(*device, DEVCB_##_write); #define MCFG_WANGPC_BUS_IRQ6_CALLBACK(_write) \ - devcb = &wangpcbus_device::set_irq6_wr_callback(*device, DEVCB2_##_write); + devcb = &wangpcbus_device::set_irq6_wr_callback(*device, DEVCB_##_write); #define MCFG_WANGPC_BUS_IRQ7_CALLBACK(_write) \ - devcb = &wangpcbus_device::set_irq7_wr_callback(*device, DEVCB2_##_write); + devcb = &wangpcbus_device::set_irq7_wr_callback(*device, DEVCB_##_write); #define MCFG_WANGPC_BUS_DRQ1_CALLBACK(_write) \ - devcb = &wangpcbus_device::set_drq1_wr_callback(*device, DEVCB2_##_write); + devcb = &wangpcbus_device::set_drq1_wr_callback(*device, DEVCB_##_write); #define MCFG_WANGPC_BUS_DRQ2_CALLBACK(_write) \ - devcb = &wangpcbus_device::set_drq2_wr_callback(*device, DEVCB2_##_write); + devcb = &wangpcbus_device::set_drq2_wr_callback(*device, DEVCB_##_write); #define MCFG_WANGPC_BUS_DRQ3_CALLBACK(_write) \ - devcb = &wangpcbus_device::set_drq3_wr_callback(*device, DEVCB2_##_write); + devcb = &wangpcbus_device::set_drq3_wr_callback(*device, DEVCB_##_write); #define MCFG_WANGPC_BUS_IOERROR_CALLBACK(_write) \ - devcb = &wangpcbus_device::set_ioerror_wr_callback(*device, DEVCB2_##_write); + devcb = &wangpcbus_device::set_ioerror_wr_callback(*device, DEVCB_##_write); //************************************************************************** @@ -117,16 +117,16 @@ public: wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~wangpcbus_device() { m_device_list.detach_all(); } - template<class _Object> static devcb2_base &set_irq2_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq2.set_callback(object); } - template<class _Object> static devcb2_base &set_irq3_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq3.set_callback(object); } - template<class _Object> static devcb2_base &set_irq4_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq4.set_callback(object); } - template<class _Object> static devcb2_base &set_irq5_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq5.set_callback(object); } - template<class _Object> static devcb2_base &set_irq6_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq6.set_callback(object); } - template<class _Object> static devcb2_base &set_irq7_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq7.set_callback(object); } - template<class _Object> static devcb2_base &set_drq1_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_drq1.set_callback(object); } - template<class _Object> static devcb2_base &set_drq2_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_drq2.set_callback(object); } - template<class _Object> static devcb2_base &set_drq3_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_drq3.set_callback(object); } - template<class _Object> static devcb2_base &set_ioerror_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_ioerror.set_callback(object); } + template<class _Object> static devcb_base &set_irq2_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq2.set_callback(object); } + template<class _Object> static devcb_base &set_irq3_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq3.set_callback(object); } + template<class _Object> static devcb_base &set_irq4_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq4.set_callback(object); } + template<class _Object> static devcb_base &set_irq5_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq5.set_callback(object); } + template<class _Object> static devcb_base &set_irq6_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq6.set_callback(object); } + template<class _Object> static devcb_base &set_irq7_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq7.set_callback(object); } + template<class _Object> static devcb_base &set_drq1_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_drq1.set_callback(object); } + template<class _Object> static devcb_base &set_drq2_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_drq2.set_callback(object); } + template<class _Object> static devcb_base &set_drq3_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_drq3.set_callback(object); } + template<class _Object> static devcb_base &set_ioerror_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_ioerror.set_callback(object); } void add_card(device_wangpcbus_card_interface *card, int sid); @@ -168,16 +168,16 @@ protected: virtual void device_start(); private: - devcb2_write_line m_write_irq2; - devcb2_write_line m_write_irq3; - devcb2_write_line m_write_irq4; - devcb2_write_line m_write_irq5; - devcb2_write_line m_write_irq6; - devcb2_write_line m_write_irq7; - devcb2_write_line m_write_drq1; - devcb2_write_line m_write_drq2; - devcb2_write_line m_write_drq3; - devcb2_write_line m_write_ioerror; + devcb_write_line m_write_irq2; + devcb_write_line m_write_irq3; + devcb_write_line m_write_irq4; + devcb_write_line m_write_irq5; + devcb_write_line m_write_irq6; + devcb_write_line m_write_irq7; + devcb_write_line m_write_drq1; + devcb_write_line m_write_drq2; + devcb_write_line m_write_drq3; + devcb_write_line m_write_ioerror; simple_list<device_wangpcbus_card_interface> m_device_list; }; diff --git a/src/emu/bus/x68k/x68kexp.h b/src/emu/bus/x68k/x68kexp.h index 0ec9097885b..74da5ef89b8 100644 --- a/src/emu/bus/x68k/x68kexp.h +++ b/src/emu/bus/x68k/x68kexp.h @@ -75,16 +75,16 @@ //************************************************************************** #define MCFG_X68K_EXPANSION_SLOT_OUT_IRQ2_CB(_devcb) \ - devcb = &x68k_expansion_slot_device::set_out_irq2_callback(*device, DEVCB2_##_devcb); + devcb = &x68k_expansion_slot_device::set_out_irq2_callback(*device, DEVCB_##_devcb); #define MCFG_X68K_EXPANSION_SLOT_OUT_IRQ4_CB(_devcb) \ - devcb = &x68k_expansion_slot_device::set_out_irq4_callback(*device, DEVCB2_##_devcb); + devcb = &x68k_expansion_slot_device::set_out_irq4_callback(*device, DEVCB_##_devcb); #define MCFG_X68K_EXPANSION_SLOT_OUT_NMI_CB(_devcb) \ - devcb = &x68k_expansion_slot_device::set_out_nmi_callback(*device, DEVCB2_##_devcb); + devcb = &x68k_expansion_slot_device::set_out_nmi_callback(*device, DEVCB_##_devcb); #define MCFG_X68K_EXPANSION_SLOT_OUT_RESET_CB(_devcb) \ - devcb = &x68k_expansion_slot_device::set_out_reset_callback(*device, DEVCB2_##_devcb); + devcb = &x68k_expansion_slot_device::set_out_reset_callback(*device, DEVCB_##_devcb); //************************************************************************** @@ -116,10 +116,10 @@ public: x68k_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~x68k_expansion_slot_device(); - template<class _Object> static devcb2_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_irq2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq4_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_irq4_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_nmi_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_reset_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_reset_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_irq2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq4_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_irq4_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_nmi_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_reset_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_reset_cb.set_callback(object); } DECLARE_WRITE_LINE_MEMBER( irq2_w ); @@ -132,10 +132,10 @@ protected: virtual void device_start(); virtual void device_reset(); - devcb2_write_line m_out_irq2_cb; - devcb2_write_line m_out_irq4_cb; - devcb2_write_line m_out_nmi_cb; - devcb2_write_line m_out_reset_cb; + devcb_write_line m_out_irq2_cb; + devcb_write_line m_out_irq4_cb; + devcb_write_line m_out_nmi_cb; + devcb_write_line m_out_reset_cb; device_x68k_expansion_card_interface *m_card; }; diff --git a/src/emu/bus/z88/z88.h b/src/emu/bus/z88/z88.h index 0be76989c89..edeae5e6624 100644 --- a/src/emu/bus/z88/z88.h +++ b/src/emu/bus/z88/z88.h @@ -86,7 +86,7 @@ public: z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~z88cart_slot_device(); - template<class _Object> static devcb2_base &set_out_flp_callback(device_t &device, _Object object) { return downcast<z88cart_slot_device &>(device).m_out_flp_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_flp_callback(device_t &device, _Object object) { return downcast<z88cart_slot_device &>(device).m_out_flp_cb.set_callback(object); } // device-level overrides virtual void device_start(); @@ -118,7 +118,7 @@ public: private: static const device_timer_id TIMER_FLP_CLEAR = 0; - devcb2_write_line m_out_flp_cb; + devcb_write_line m_out_flp_cb; device_z88cart_interface* m_cart; emu_timer * m_flp_timer; }; @@ -133,6 +133,6 @@ extern const device_type Z88CART_SLOT; ***************************************************************************/ #define MCFG_Z88CART_SLOT_OUT_FLP_CB(_devcb) \ - devcb = &z88cart_slot_device::set_out_flp_callback(*device, DEVCB2_##_devcb); + devcb = &z88cart_slot_device::set_out_flp_callback(*device, DEVCB_##_devcb); #endif /* __Z88CART_H__ */ diff --git a/src/emu/bus/zorro/zorro.h b/src/emu/bus/zorro/zorro.h index d018b217374..754ee63a4cd 100644 --- a/src/emu/bus/zorro/zorro.h +++ b/src/emu/bus/zorro/zorro.h @@ -165,16 +165,16 @@ // callbacks #define MCFG_EXPANSION_SLOT_OVR_HANDLER(_devcb) \ - devcb = &zorro_device::set_ovr_handler(*device, DEVCB2_##_devcb); + devcb = &zorro_device::set_ovr_handler(*device, DEVCB_##_devcb); #define MCFG_EXPANSION_SLOT_INT2_HANDLER(_devcb) \ - devcb = &zorro_device::set_int2_handler(*device, DEVCB2_##_devcb); + devcb = &zorro_device::set_int2_handler(*device, DEVCB_##_devcb); #define MCFG_EXPANSION_SLOT_INT6_HANDLER(_devcb) \ - devcb = &zorro_device::set_int6_handler(*device, DEVCB2_##_devcb); + devcb = &zorro_device::set_int6_handler(*device, DEVCB_##_devcb); #define MCFG_EXPANSION_SLOT_IPL_HANDLER(_devcb) \ - devcb = &exp_slot_device::set_ipl_handler(*device, DEVCB2_##_devcb); + devcb = &exp_slot_device::set_ipl_handler(*device, DEVCB_##_devcb); // ======================> zorro 2 bus @@ -186,25 +186,25 @@ MCFG_ZORRO_SLOT_ADD("zorrobus", _tag, _slot_intf, _def_slot) #define MCFG_ZORRO2_OVR_HANDLER(_devcb) \ - devcb = &zorro_device::set_ovr_handler(*device, DEVCB2_##_devcb); + devcb = &zorro_device::set_ovr_handler(*device, DEVCB_##_devcb); #define MCFG_ZORRO2_INT2_HANDLER(_devcb) \ - devcb = &zorro_device::set_int2_handler(*device, DEVCB2_##_devcb); + devcb = &zorro_device::set_int2_handler(*device, DEVCB_##_devcb); #define MCFG_ZORRO2_INT6_HANDLER(_devcb) \ - devcb = &zorro_device::set_int6_handler(*device, DEVCB2_##_devcb); + devcb = &zorro_device::set_int6_handler(*device, DEVCB_##_devcb); #define MCFG_ZORRO2_EINT1_HANDLER(_devcb) \ - devcb = &zorro2_device::set_eint1_handler(*device, DEVCB2_##_devcb); + devcb = &zorro2_device::set_eint1_handler(*device, DEVCB_##_devcb); #define MCFG_ZORRO2_EINT4_HANDLER(_devcb) \ - devcb = &zorro2_device::set_eint4_handler(*device, DEVCB2_##_devcb); + devcb = &zorro2_device::set_eint4_handler(*device, DEVCB_##_devcb); #define MCFG_ZORRO2_EINT5_HANDLER(_devcb) \ - devcb = &zorro2_device::set_eint5_handler(*device, DEVCB2_##_devcb); + devcb = &zorro2_device::set_eint5_handler(*device, DEVCB_##_devcb); #define MCFG_ZORRO2_EINT7_HANDLER(_devcb) \ - devcb = &zorro2_device::set_eint7_handler(*device, DEVCB2_##_devcb); + devcb = &zorro2_device::set_eint7_handler(*device, DEVCB_##_devcb); //************************************************************************** @@ -252,11 +252,11 @@ public: // static configuration helpers static void set_cputag(device_t &device, const char *tag); - template<class _Object> static devcb2_base &set_int2_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_int2_handler(device_t &device, _Object object) { return downcast<zorro_device &>(device).m_int2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_int6_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_int6_handler(device_t &device, _Object object) { return downcast<zorro_device &>(device).m_int6_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_ovr_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_ovr_handler(device_t &device, _Object object) { return downcast<zorro_device &>(device).m_ovr_handler.set_callback(object); } virtual void add_card(device_zorro_card_interface *card) = 0; @@ -281,9 +281,9 @@ protected: private: const char *m_cputag; - devcb2_write_line m_ovr_handler; - devcb2_write_line m_int2_handler; - devcb2_write_line m_int6_handler; + devcb_write_line m_ovr_handler; + devcb_write_line m_int2_handler; + devcb_write_line m_int6_handler; }; // ======================> expansion slot device @@ -296,7 +296,7 @@ public: exp_slot_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_ipl_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_ipl_handler(device_t &device, _Object object) { return downcast<exp_slot_device &>(device).m_ipl_handler.set_callback(object); } // the expansion slot can only have a single card @@ -313,7 +313,7 @@ protected: virtual void device_start(); private: - devcb2_write8 m_ipl_handler; + devcb_write8 m_ipl_handler; device_exp_card_interface *m_dev; }; @@ -331,13 +331,13 @@ public: zorro2_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_eint1_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_eint1_handler(device_t &device, _Object object) { return downcast<zorro2_device &>(device).m_eint1_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_eint4_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_eint4_handler(device_t &device, _Object object) { return downcast<zorro2_device &>(device).m_eint4_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_eint5_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_eint5_handler(device_t &device, _Object object) { return downcast<zorro2_device &>(device).m_eint5_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_eint7_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_eint7_handler(device_t &device, _Object object) { return downcast<zorro2_device &>(device).m_eint7_handler.set_callback(object); } // device-level overrides @@ -362,10 +362,10 @@ protected: virtual void device_start(); private: - devcb2_write_line m_eint1_handler; - devcb2_write_line m_eint4_handler; - devcb2_write_line m_eint5_handler; - devcb2_write_line m_eint7_handler; + devcb_write_line m_eint1_handler; + devcb_write_line m_eint4_handler; + devcb_write_line m_eint5_handler; + devcb_write_line m_eint7_handler; simple_list<device_zorro2_card_interface> m_dev; diff --git a/src/emu/cpu/adsp2100/adsp2100.h b/src/emu/cpu/adsp2100/adsp2100.h index de0fbccb56f..460ddd6ce98 100644 --- a/src/emu/cpu/adsp2100/adsp2100.h +++ b/src/emu/cpu/adsp2100/adsp2100.h @@ -184,13 +184,13 @@ enum //************************************************************************** #define MCFG_ADSP21XX_SPORT_RX_CB(_devcb) \ - devcb = &adsp21xx_device::set_sport_rx_callback(*device, DEVCB2_##_devcb); + devcb = &adsp21xx_device::set_sport_rx_callback(*device, DEVCB_##_devcb); #define MCFG_ADSP21XX_SPORT_TX_CB(_devcb) \ - devcb = &adsp21xx_device::set_sport_tx_callback(*device, DEVCB2_##_devcb); + devcb = &adsp21xx_device::set_sport_tx_callback(*device, DEVCB_##_devcb); #define MCFG_ADSP21XX_TIMER_FIRED_CB(_devcb) \ - devcb = &adsp21xx_device::set_timer_fired_callback(*device, DEVCB2_##_devcb); + devcb = &adsp21xx_device::set_timer_fired_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -217,9 +217,9 @@ protected: public: // inline configuration helpers - template<class _Object> static devcb2_base &set_sport_rx_callback(device_t &device, _Object object) { return downcast<adsp21xx_device &>(device).m_sport_rx_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_sport_tx_callback(device_t &device, _Object object) { return downcast<adsp21xx_device &>(device).m_sport_tx_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_timer_fired_callback(device_t &device, _Object object) { return downcast<adsp21xx_device &>(device).m_timer_fired_cb.set_callback(object); } + template<class _Object> static devcb_base &set_sport_rx_callback(device_t &device, _Object object) { return downcast<adsp21xx_device &>(device).m_sport_rx_cb.set_callback(object); } + template<class _Object> static devcb_base &set_sport_tx_callback(device_t &device, _Object object) { return downcast<adsp21xx_device &>(device).m_sport_tx_cb.set_callback(object); } + template<class _Object> static devcb_base &set_timer_fired_callback(device_t &device, _Object object) { return downcast<adsp21xx_device &>(device).m_timer_fired_cb.set_callback(object); } // public interfaces void load_boot_data(UINT8 *srcdata, UINT32 *dstdata); @@ -456,9 +456,9 @@ protected: UINT16 m_mask_table[0x4000]; UINT16 m_reverse_table[0x4000]; - devcb2_read32 m_sport_rx_cb; // callback for serial receive - devcb2_write32 m_sport_tx_cb; // callback for serial transmit - devcb2_write_line m_timer_fired_cb; // callback for timer fired + devcb_read32 m_sport_rx_cb; // callback for serial receive + devcb_write32 m_sport_tx_cb; // callback for serial transmit + devcb_write_line m_timer_fired_cb; // callback for timer fired // debugging #if ADSP_TRACK_HOTSPOTS diff --git a/src/emu/cpu/ccpu/ccpu.h b/src/emu/cpu/ccpu/ccpu.h index 0b9e99967a8..6e3033969f4 100644 --- a/src/emu/cpu/ccpu/ccpu.h +++ b/src/emu/cpu/ccpu/ccpu.h @@ -39,7 +39,7 @@ typedef device_delegate<void (INT16, INT16, INT16, INT16, UINT8)> ccpu_vector_de #define MCFG_CCPU_EXTERNAL_FUNC(_devcb) \ - ccpu_cpu_device::set_external_func(*device, DEVCB2_##_devcb); + ccpu_cpu_device::set_external_func(*device, DEVCB_##_devcb); #define MCFG_CCPU_VECTOR_FUNC(d) \ ccpu_cpu_device::set_vector_func(*device, d); @@ -52,7 +52,7 @@ public: ccpu_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_external_func(device_t &device, _Object object) { return downcast<ccpu_cpu_device &>(device).m_external_input.set_callback(object); } + template<class _Object> static devcb_base &set_external_func(device_t &device, _Object object) { return downcast<ccpu_cpu_device &>(device).m_external_input.set_callback(object); } static void set_vector_func(device_t &device, ccpu_vector_delegate callback) { downcast<ccpu_cpu_device &>(device).m_vector_callback = callback; } DECLARE_READ8_MEMBER( read_jmi ); @@ -108,7 +108,7 @@ protected: UINT16 m_miflag, m_nextmiflag, m_nextnextmiflag; UINT16 m_drflag; - devcb2_read8 m_external_input; + devcb_read8 m_external_input; ccpu_vector_delegate m_vector_callback; UINT8 m_waiting; diff --git a/src/emu/cpu/cosmac/cosmac.h b/src/emu/cpu/cosmac/cosmac.h index eafd8195aa2..aef20d339df 100644 --- a/src/emu/cpu/cosmac/cosmac.h +++ b/src/emu/cpu/cosmac/cosmac.h @@ -91,34 +91,34 @@ //************************************************************************** #define MCFG_COSMAC_WAIT_CALLBACK(_read) \ - devcb = &cosmac_device::set_wait_rd_callback(*device, DEVCB2_##_read); + devcb = &cosmac_device::set_wait_rd_callback(*device, DEVCB_##_read); #define MCFG_COSMAC_CLEAR_CALLBACK(_read) \ - devcb = &cosmac_device::set_clear_rd_callback(*device, DEVCB2_##_read); + devcb = &cosmac_device::set_clear_rd_callback(*device, DEVCB_##_read); #define MCFG_COSMAC_EF1_CALLBACK(_read) \ - devcb = &cosmac_device::set_ef1_rd_callback(*device, DEVCB2_##_read); + devcb = &cosmac_device::set_ef1_rd_callback(*device, DEVCB_##_read); #define MCFG_COSMAC_EF2_CALLBACK(_read) \ - devcb = &cosmac_device::set_ef2_rd_callback(*device, DEVCB2_##_read); + devcb = &cosmac_device::set_ef2_rd_callback(*device, DEVCB_##_read); #define MCFG_COSMAC_EF3_CALLBACK(_read) \ - devcb = &cosmac_device::set_ef3_rd_callback(*device, DEVCB2_##_read); + devcb = &cosmac_device::set_ef3_rd_callback(*device, DEVCB_##_read); #define MCFG_COSMAC_EF4_CALLBACK(_read) \ - devcb = &cosmac_device::set_ef4_rd_callback(*device, DEVCB2_##_read); + devcb = &cosmac_device::set_ef4_rd_callback(*device, DEVCB_##_read); #define MCFG_COSMAC_Q_CALLBACK(_write) \ - devcb = &cosmac_device::set_q_wr_callback(*device, DEVCB2_##_write); + devcb = &cosmac_device::set_q_wr_callback(*device, DEVCB_##_write); #define MCFG_COSMAC_DMAR_CALLBACK(_read) \ - devcb = &cosmac_device::set_dma_rd_callback(*device, DEVCB2_##_read); + devcb = &cosmac_device::set_dma_rd_callback(*device, DEVCB_##_read); #define MCFG_COSMAC_DMAW_CALLBACK(_write) \ - devcb = &cosmac_device::set_dma_wr_callback(*device, DEVCB2_##_write); + devcb = &cosmac_device::set_dma_wr_callback(*device, DEVCB_##_write); #define MCFG_COSMAC_SC_CALLBACK(_write) \ - devcb = &cosmac_device::set_sc_wr_callback(*device, DEVCB2_##_write); + devcb = &cosmac_device::set_sc_wr_callback(*device, DEVCB_##_write); @@ -195,16 +195,16 @@ public: // construction/destruction cosmac_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_wait_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_wait.set_callback(object); } - template<class _Object> static devcb2_base &set_clear_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_clear.set_callback(object); } - template<class _Object> static devcb2_base &set_ef1_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_ef1.set_callback(object); } - template<class _Object> static devcb2_base &set_ef2_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_ef2.set_callback(object); } - template<class _Object> static devcb2_base &set_ef3_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_ef3.set_callback(object); } - template<class _Object> static devcb2_base &set_ef4_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_ef4.set_callback(object); } - template<class _Object> static devcb2_base &set_q_wr_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_write_q.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_dma.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_wr_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_write_dma.set_callback(object); } - template<class _Object> static devcb2_base &set_sc_wr_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_write_sc.set_callback(object); } + template<class _Object> static devcb_base &set_wait_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_wait.set_callback(object); } + template<class _Object> static devcb_base &set_clear_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_clear.set_callback(object); } + template<class _Object> static devcb_base &set_ef1_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_ef1.set_callback(object); } + template<class _Object> static devcb_base &set_ef2_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_ef2.set_callback(object); } + template<class _Object> static devcb_base &set_ef3_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_ef3.set_callback(object); } + template<class _Object> static devcb_base &set_ef4_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_ef4.set_callback(object); } + template<class _Object> static devcb_base &set_q_wr_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_write_q.set_callback(object); } + template<class _Object> static devcb_base &set_dma_rd_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_read_dma.set_callback(object); } + template<class _Object> static devcb_base &set_dma_wr_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_write_dma.set_callback(object); } + template<class _Object> static devcb_base &set_sc_wr_callback(device_t &device, _Object object) { return downcast<cosmac_device &>(device).m_write_sc.set_callback(object); } // public interfaces offs_t get_memory_address(); @@ -374,16 +374,16 @@ protected: const address_space_config m_io_config; // device callbacks - devcb2_read_line m_read_wait; - devcb2_read_line m_read_clear; - devcb2_read_line m_read_ef1; - devcb2_read_line m_read_ef2; - devcb2_read_line m_read_ef3; - devcb2_read_line m_read_ef4; - devcb2_write_line m_write_q; - devcb2_read8 m_read_dma; - devcb2_write8 m_write_dma; - devcb2_write8 m_write_sc; + devcb_read_line m_read_wait; + devcb_read_line m_read_clear; + devcb_read_line m_read_ef1; + devcb_read_line m_read_ef2; + devcb_read_line m_read_ef3; + devcb_read_line m_read_ef4; + devcb_write_line m_write_q; + devcb_read8 m_read_dma; + devcb_write8 m_write_dma; + devcb_write8 m_write_sc; // control modes enum cosmac_mode diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.h b/src/emu/cpu/cubeqcpu/cubeqcpu.h index 4243fe15595..6bb765fee76 100644 --- a/src/emu/cpu/cubeqcpu/cubeqcpu.h +++ b/src/emu/cpu/cubeqcpu/cubeqcpu.h @@ -118,16 +118,16 @@ enum #define MCFG_CQUESTSND_CONFIG(_dac_w, _sound_tag) \ - cquestsnd_cpu_device::set_dac_w(*device, DEVCB2_##_dac_w); \ + cquestsnd_cpu_device::set_dac_w(*device, DEVCB_##_dac_w); \ cquestsnd_cpu_device::set_sound_region(*device, _sound_tag); #define MCFG_CQUESTROT_CONFIG(_linedata_w) \ - cquestrot_cpu_device::set_linedata_w(*device, DEVCB2_##_linedata_w ); + cquestrot_cpu_device::set_linedata_w(*device, DEVCB_##_linedata_w ); #define MCFG_CQUESTLIN_CONFIG(_linedata_r) \ - cquestlin_cpu_device::set_linedata_r(*device, DEVCB2_##_linedata_r ); + cquestlin_cpu_device::set_linedata_r(*device, DEVCB_##_linedata_r ); /*************************************************************************** @@ -141,7 +141,7 @@ public: cquestsnd_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_dac_w(device_t &device, _Object object) { return downcast<cquestsnd_cpu_device &>(device).m_dac_w.set_callback(object); } + template<class _Object> static devcb_base &set_dac_w(device_t &device, _Object object) { return downcast<cquestsnd_cpu_device &>(device).m_dac_w.set_callback(object); } static void set_sound_region(device_t &device, const char *tag) { downcast<cquestsnd_cpu_device &>(device).m_sound_region_tag = tag; } DECLARE_WRITE16_MEMBER(sndram_w); @@ -190,7 +190,7 @@ private: int m_prev_ipram; int m_prev_ipwrt; - devcb2_write16 m_dac_w; + devcb_write16 m_dac_w; const char *m_sound_region_tag; UINT16 *m_sound_data; @@ -209,7 +209,7 @@ public: cquestrot_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_linedata_w(device_t &device, _Object object) { return downcast<cquestrot_cpu_device &>(device).m_linedata_w.set_callback(object); } + template<class _Object> static devcb_base &set_linedata_w(device_t &device, _Object object) { return downcast<cquestrot_cpu_device &>(device).m_linedata_w.set_callback(object); } DECLARE_READ16_MEMBER(linedata_r); DECLARE_WRITE16_MEMBER(rotram_w); @@ -239,7 +239,7 @@ protected: private: address_space_config m_program_config; - devcb2_write16 m_linedata_w; + devcb_write16 m_linedata_w; /* AM2901 internals */ UINT16 m_ram[16]; @@ -291,7 +291,7 @@ public: cquestlin_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_linedata_r(device_t &device, _Object object) { return downcast<cquestlin_cpu_device &>(device).m_linedata_r.set_callback(object); } + template<class _Object> static devcb_base &set_linedata_r(device_t &device, _Object object) { return downcast<cquestlin_cpu_device &>(device).m_linedata_r.set_callback(object); } DECLARE_WRITE16_MEMBER( linedata_w ); void cubeqcpu_swap_line_banks(); @@ -323,7 +323,7 @@ protected: private: address_space_config m_program_config; - devcb2_read16 m_linedata_r; + devcb_read16 m_linedata_r; /* 12-bit AM2901 internals */ UINT16 m_ram[16]; diff --git a/src/emu/cpu/dsp32/dsp32.h b/src/emu/cpu/dsp32/dsp32.h index 4d9daa9455c..5089ec75842 100644 --- a/src/emu/cpu/dsp32/dsp32.h +++ b/src/emu/cpu/dsp32/dsp32.h @@ -96,7 +96,7 @@ enum //************************************************************************** #define MCFG_DSP32C_OUTPUT_CALLBACK(_write) \ - devcb = &dsp32c_device::set_output_pins_callback(*device, DEVCB2_##_write); + devcb = &dsp32c_device::set_output_pins_callback(*device, DEVCB_##_write); // ======================> dsp32c_device @@ -106,7 +106,7 @@ public: // construction/destruction dsp32c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_output_pins_callback(device_t &device, _Object object) { return downcast<dsp32c_device &>(device).m_output_pins_changed.set_callback(object); } + template<class _Object> static devcb_base &set_output_pins_callback(device_t &device, _Object object) { return downcast<dsp32c_device &>(device).m_output_pins_changed.set_callback(object); } // public interfaces @@ -433,7 +433,7 @@ protected: address_space * m_program; direct_read_data *m_direct; - devcb2_write32 m_output_pins_changed; + devcb_write32 m_output_pins_changed; // tables static void (dsp32c_device::*const s_dsp32ops[])(UINT32 op); static const UINT32 s_regmap[4][16]; diff --git a/src/emu/cpu/esrip/esrip.h b/src/emu/cpu/esrip/esrip.h index d39a7fb047c..103141791fd 100644 --- a/src/emu/cpu/esrip/esrip.h +++ b/src/emu/cpu/esrip/esrip.h @@ -26,13 +26,13 @@ #define ESRIP_DRAW(name) int name(int l, int r, int fig, int attr, int addr, int col, int x_scale, int bank) #define MCFG_ESRIP_FDT_R_CALLBACK(_read) \ - devcb = &esrip_device::static_set_fdt_r_callback(*device, DEVCB2_##_read); + devcb = &esrip_device::static_set_fdt_r_callback(*device, DEVCB_##_read); #define MCFG_ESRIP_FDT_W_CALLBACK(_write) \ - devcb = &esrip_device::static_set_fdt_w_callback(*device, DEVCB2_##_write); + devcb = &esrip_device::static_set_fdt_w_callback(*device, DEVCB_##_write); #define MCFG_ESRIP_STATUS_IN_CALLBACK(_read) \ - devcb = &esrip_device::static_set_status_in_callback(*device, DEVCB2_##_read); + devcb = &esrip_device::static_set_status_in_callback(*device, DEVCB_##_read); #define MCFG_ESRIP_DRAW_CALLBACK_OWNER(_class, _method) \ esrip_device::static_set_draw_callback(*device, esrip_draw_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); @@ -117,9 +117,9 @@ public: esrip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers - template<class _Object> static devcb2_base &static_set_fdt_r_callback(device_t &device, _Object object) { return downcast<esrip_device &>(device).m_fdt_r.set_callback(object); } - template<class _Object> static devcb2_base &static_set_fdt_w_callback(device_t &device, _Object object) { return downcast<esrip_device &>(device).m_fdt_w.set_callback(object); } - template<class _Object> static devcb2_base &static_set_status_in_callback(device_t &device, _Object object) { return downcast<esrip_device &>(device).m_status_in.set_callback(object); } + template<class _Object> static devcb_base &static_set_fdt_r_callback(device_t &device, _Object object) { return downcast<esrip_device &>(device).m_fdt_r.set_callback(object); } + template<class _Object> static devcb_base &static_set_fdt_w_callback(device_t &device, _Object object) { return downcast<esrip_device &>(device).m_fdt_w.set_callback(object); } + template<class _Object> static devcb_base &static_set_status_in_callback(device_t &device, _Object object) { return downcast<esrip_device &>(device).m_status_in.set_callback(object); } static void static_set_draw_callback(device_t &device, esrip_draw_delegate func) { downcast<esrip_device &>(device).m_draw = func; } static void static_lbrm_prom(device_t &device, const char *name) { downcast<esrip_device &>(device).m_lbrm_prom = name; } @@ -208,9 +208,9 @@ protected: int m_icount; - devcb2_read16 m_fdt_r; - devcb2_write16 m_fdt_w; - devcb2_read8 m_status_in; + devcb_read16 m_fdt_r; + devcb_write16 m_fdt_w; + devcb_read8 m_status_in; esrip_draw_delegate m_draw; const char *m_lbrm_prom; diff --git a/src/emu/cpu/h8/h8_sci.h b/src/emu/cpu/h8/h8_sci.h index 555db757335..24ead36b7cd 100644 --- a/src/emu/cpu/h8/h8_sci.h +++ b/src/emu/cpu/h8/h8_sci.h @@ -51,10 +51,10 @@ downcast<h8_sci_device *>(device)->set_external_clock_period(_period); #define MCFG_H8_SCI_TX_CALLBACK(_devcb) \ - devcb = &h8_sci_device::set_tx_cb(*device, DEVCB2_##_devcb); + devcb = &h8_sci_device::set_tx_cb(*device, DEVCB_##_devcb); #define MCFG_H8_SCI_CLK_CALLBACK(_devcb) \ - devcb = &h8_sci_device::set_clk_cb(*device, DEVCB2_##_devcb); + devcb = &h8_sci_device::set_clk_cb(*device, DEVCB_##_devcb); class h8_sci_device : public device_t { public: @@ -80,8 +80,8 @@ public: DECLARE_WRITE_LINE_MEMBER(rx_w); DECLARE_WRITE_LINE_MEMBER(clk_w); - template<class _Object> static devcb2_base &set_tx_cb(device_t &device, _Object object) { return downcast<h8_sci_device &>(device).tx_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_clk_cb(device_t &device, _Object object) { return downcast<h8_sci_device &>(device).clk_cb.set_callback(object); } + template<class _Object> static devcb_base &set_tx_cb(device_t &device, _Object object) { return downcast<h8_sci_device &>(device).tx_cb.set_callback(object); } + template<class _Object> static devcb_base &set_clk_cb(device_t &device, _Object object) { return downcast<h8_sci_device &>(device).clk_cb.set_callback(object); } UINT64 internal_update(UINT64 current_time); @@ -137,7 +137,7 @@ protected: }; required_device<h8_device> cpu; - devcb2_write_line tx_cb, clk_cb; + devcb_write_line tx_cb, clk_cb; h8_intc_device *intc; const char *intc_tag; attotime external_clock_period, cur_sync_time; diff --git a/src/emu/cpu/i386/i386.h b/src/emu/cpu/i386/i386.h index 01722a5a38b..0caa4bbc23a 100644 --- a/src/emu/cpu/i386/i386.h +++ b/src/emu/cpu/i386/i386.h @@ -18,7 +18,7 @@ #define MCFG_I386_SMIACT(_devcb) \ - i386_device::set_smiact(*device, DEVCB2_##_devcb); + i386_device::set_smiact(*device, DEVCB_##_devcb); class i386_device : public cpu_device @@ -29,7 +29,7 @@ public: i386_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, int program_data_width=32, int program_addr_width=32, int io_data_width=32); // static configuration helpers - template<class _Object> static devcb2_base &set_smiact(device_t &device, _Object object) { return downcast<i386_device &>(device).m_smiact.set_callback(object); } + template<class _Object> static devcb_base &set_smiact(device_t &device, _Object object) { return downcast<i386_device &>(device).m_smiact.set_callback(object); } UINT64 debug_segbase(symbol_table &table, int params, const UINT64 *param); UINT64 debug_seglimit(symbol_table &table, int params, const UINT64 *param); @@ -253,7 +253,7 @@ struct I386_CALL_GATE bool m_nmi_masked; bool m_nmi_latched; UINT32 m_smbase; - devcb2_write_line m_smiact; + devcb_write_line m_smiact; // bytes in current opcode, debug only UINT8 m_opcode_bytes[16]; diff --git a/src/emu/cpu/i8085/i8085.h b/src/emu/cpu/i8085/i8085.h index 9f7fb5932ea..4f6a4158b5b 100644 --- a/src/emu/cpu/i8085/i8085.h +++ b/src/emu/cpu/i8085/i8085.h @@ -35,19 +35,19 @@ enum /* STATUS changed callback */ #define MCFG_I8085A_STATUS(_devcb) \ - i8085a_cpu_device::set_out_status_func(*device, DEVCB2_##_devcb); + i8085a_cpu_device::set_out_status_func(*device, DEVCB_##_devcb); /* INTE changed callback */ #define MCFG_I8085A_INTE(_devcb) \ - i8085a_cpu_device::set_out_inte_func(*device, DEVCB2_##_devcb); + i8085a_cpu_device::set_out_inte_func(*device, DEVCB_##_devcb); /* SID changed callback (8085A only) */ #define MCFG_I8085A_SID(_devcb) \ - i8085a_cpu_device::set_in_sid_func(*device, DEVCB2_##_devcb); + i8085a_cpu_device::set_in_sid_func(*device, DEVCB_##_devcb); /* SOD changed callback (8085A only) */ #define MCFG_I8085A_SOD(_devcb) \ - i8085a_cpu_device::set_out_sod_func(*device, DEVCB2_##_devcb); + i8085a_cpu_device::set_out_sod_func(*device, DEVCB_##_devcb); class i8085a_cpu_device : public cpu_device @@ -58,10 +58,10 @@ public: i8085a_cpu_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, int cputype); // static configuration helpers - template<class _Object> static devcb2_base &set_out_status_func(device_t &device, _Object object) { return downcast<i8085a_cpu_device &>(device).m_out_status_func.set_callback(object); } - template<class _Object> static devcb2_base &set_out_inte_func(device_t &device, _Object object) { return downcast<i8085a_cpu_device &>(device).m_out_inte_func.set_callback(object); } - template<class _Object> static devcb2_base &set_in_sid_func(device_t &device, _Object object) { return downcast<i8085a_cpu_device &>(device).m_in_sid_func.set_callback(object); } - template<class _Object> static devcb2_base &set_out_sod_func(device_t &device, _Object object) { return downcast<i8085a_cpu_device &>(device).m_out_sod_func.set_callback(object); } + template<class _Object> static devcb_base &set_out_status_func(device_t &device, _Object object) { return downcast<i8085a_cpu_device &>(device).m_out_status_func.set_callback(object); } + template<class _Object> static devcb_base &set_out_inte_func(device_t &device, _Object object) { return downcast<i8085a_cpu_device &>(device).m_out_inte_func.set_callback(object); } + template<class _Object> static devcb_base &set_in_sid_func(device_t &device, _Object object) { return downcast<i8085a_cpu_device &>(device).m_in_sid_func.set_callback(object); } + template<class _Object> static devcb_base &set_out_sod_func(device_t &device, _Object object) { return downcast<i8085a_cpu_device &>(device).m_out_sod_func.set_callback(object); } protected: // device-level overrides @@ -95,10 +95,10 @@ private: address_space_config m_program_config; address_space_config m_io_config; - devcb2_write8 m_out_status_func; - devcb2_write_line m_out_inte_func; - devcb2_read_line m_in_sid_func; - devcb2_write_line m_out_sod_func; + devcb_write8 m_out_status_func; + devcb_write_line m_out_inte_func; + devcb_read_line m_in_sid_func; + devcb_write_line m_out_sod_func; int m_cputype; /* 0 8080, 1 8085A */ PAIR m_PC,m_SP,m_AF,m_BC,m_DE,m_HL,m_WZ; diff --git a/src/emu/cpu/i8089/i8089.h b/src/emu/cpu/i8089/i8089.h index 24392df74af..3f5129d47cd 100644 --- a/src/emu/cpu/i8089/i8089.h +++ b/src/emu/cpu/i8089/i8089.h @@ -24,10 +24,10 @@ i8089_device::set_databus_width(*device, _databus_width); #define MCFG_I8089_SINTR1(_sintr1) \ - downcast<i8089_device *>(device)->set_sintr1_callback(DEVCB2_##_sintr1); + downcast<i8089_device *>(device)->set_sintr1_callback(DEVCB_##_sintr1); #define MCFG_I8089_SINTR2(_sintr2) \ - downcast<i8089_device *>(device)->set_sintr2_callback(DEVCB2_##_sintr2); + downcast<i8089_device *>(device)->set_sintr2_callback(DEVCB_##_sintr2); //************************************************************************** @@ -107,8 +107,8 @@ private: required_device<i8089_channel> m_ch1; required_device<i8089_channel> m_ch2; - devcb2_write_line m_write_sintr1; - devcb2_write_line m_write_sintr2; + devcb_write_line m_write_sintr1; + devcb_write_line m_write_sintr2; void initialize(); diff --git a/src/emu/cpu/i8089/i8089_channel.h b/src/emu/cpu/i8089/i8089_channel.h index 2ec3d70626c..c6691fb4ff2 100644 --- a/src/emu/cpu/i8089/i8089_channel.h +++ b/src/emu/cpu/i8089/i8089_channel.h @@ -26,7 +26,7 @@ MCFG_DEVICE_ADD(_tag, I8089_CHANNEL, 0) #define MCFG_I8089_CHANNEL_SINTR(_sintr) \ - downcast<i8089_channel *>(device)->set_sintr_callback(DEVCB2_##_sintr); + downcast<i8089_channel *>(device)->set_sintr_callback(DEVCB_##_sintr); //************************************************************************** @@ -175,7 +175,7 @@ private: void examine_ccw(UINT8 ccw); - devcb2_write_line m_write_sintr; + devcb_write_line m_write_sintr; i8089_device *m_iop; diff --git a/src/emu/cpu/i86/i186.h b/src/emu/cpu/i86/i186.h index fd16b15c93b..33a32efdf4d 100644 --- a/src/emu/cpu/i86/i186.h +++ b/src/emu/cpu/i86/i186.h @@ -14,10 +14,10 @@ public: i80186_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); i80186_cpu_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, int data_bus_size); - template<class _Object> static devcb2_base &static_set_read_slave_ack_callback(device_t &device, _Object object) { return downcast<i80186_cpu_device &>(device).m_read_slave_ack_func.set_callback(object); } - template<class _Object> static devcb2_base &static_set_chip_select_callback(device_t &device, _Object object) { return downcast<i80186_cpu_device &>(device).m_out_chip_select_func.set_callback(object); } - template<class _Object> static devcb2_base &static_set_tmrout0_handler(device_t &device, _Object object) { return downcast<i80186_cpu_device &>(device).m_out_tmrout0_func.set_callback(object); } - template<class _Object> static devcb2_base &static_set_tmrout1_handler(device_t &device, _Object object) { return downcast<i80186_cpu_device &>(device).m_out_tmrout1_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_read_slave_ack_callback(device_t &device, _Object object) { return downcast<i80186_cpu_device &>(device).m_read_slave_ack_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_chip_select_callback(device_t &device, _Object object) { return downcast<i80186_cpu_device &>(device).m_out_chip_select_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_tmrout0_handler(device_t &device, _Object object) { return downcast<i80186_cpu_device &>(device).m_out_tmrout0_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_tmrout1_handler(device_t &device, _Object object) { return downcast<i80186_cpu_device &>(device).m_out_tmrout1_func.set_callback(object); } IRQ_CALLBACK_MEMBER(int_callback); DECLARE_WRITE_LINE_MEMBER(drq0_w) { if(state) drq_callback(0); m_dma[0].drq_state = state; } @@ -129,10 +129,10 @@ private: address_space_config m_program_config; address_space_config m_io_config; - devcb2_read8 m_read_slave_ack_func; - devcb2_write16 m_out_chip_select_func; - devcb2_write_line m_out_tmrout0_func; - devcb2_write_line m_out_tmrout1_func; + devcb_read8 m_read_slave_ack_func; + devcb_write16 m_out_chip_select_func; + devcb_write_line m_out_tmrout0_func; + devcb_write_line m_out_tmrout1_func; }; class i80188_cpu_device : public i80186_cpu_device @@ -143,15 +143,15 @@ public: }; #define MCFG_80186_IRQ_SLAVE_ACK(_devcb) \ - devcb = &i80186_cpu_device::static_set_read_slave_ack_callback(*device, DEVCB2_##_devcb); + devcb = &i80186_cpu_device::static_set_read_slave_ack_callback(*device, DEVCB_##_devcb); #define MCFG_80186_CHIP_SELECT_CB(_devcb) \ - devcb = &i80186_cpu_device::static_set_chip_select_callback(*device, DEVCB2_##_devcb); + devcb = &i80186_cpu_device::static_set_chip_select_callback(*device, DEVCB_##_devcb); #define MCFG_80186_TMROUT0_HANDLER(_devcb) \ - devcb = &i80186_cpu_device::static_set_tmrout0_handler(*device, DEVCB2_##_devcb); + devcb = &i80186_cpu_device::static_set_tmrout0_handler(*device, DEVCB_##_devcb); #define MCFG_80186_TMROUT1_HANDLER(_devcb) \ - devcb = &i80186_cpu_device::static_set_tmrout1_handler(*device, DEVCB2_##_devcb); + devcb = &i80186_cpu_device::static_set_tmrout1_handler(*device, DEVCB_##_devcb); #endif diff --git a/src/emu/cpu/i86/i286.h b/src/emu/cpu/i86/i286.h index 0bf9d28724e..27d1bd505f4 100644 --- a/src/emu/cpu/i86/i286.h +++ b/src/emu/cpu/i86/i286.h @@ -69,7 +69,7 @@ public: typedef delegate<UINT32 (bool)> a20_cb; static void static_set_a20_callback(device_t &device, a20_cb object) { downcast<i80286_cpu_device &>(device).m_a20_callback = object; } - template<class _Object> static devcb2_base &static_set_shutdown_callback(device_t &device, _Object object) { return downcast<i80286_cpu_device &>(device).m_out_shutdown_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_shutdown_callback(device_t &device, _Object object) { return downcast<i80286_cpu_device &>(device).m_out_shutdown_func.set_callback(object); } protected: virtual void execute_run(); @@ -150,13 +150,13 @@ private: a20_cb m_a20_callback; bool m_shutdown; - devcb2_write_line m_out_shutdown_func; + devcb_write_line m_out_shutdown_func; }; #define MCFG_80286_A20(_class, _a20_cb) \ i80286_cpu_device::static_set_a20_callback(*device, i80286_cpu_device::a20_cb(FUNC(_class::_a20_cb), (_class *)owner)); #define MCFG_80286_SHUTDOWN(_devcb) \ - devcb = &i80286_cpu_device::static_set_shutdown_callback(*device, DEVCB2_##_devcb); + devcb = &i80286_cpu_device::static_set_shutdown_callback(*device, DEVCB_##_devcb); #endif /* I286_H_ */ diff --git a/src/emu/cpu/jaguar/jaguar.h b/src/emu/cpu/jaguar/jaguar.h index 780e96b98d4..44421aed033 100644 --- a/src/emu/cpu/jaguar/jaguar.h +++ b/src/emu/cpu/jaguar/jaguar.h @@ -74,7 +74,7 @@ enum ***************************************************************************/ #define MCFG_JAGUAR_IRQ_HANDLER(_devcb) \ - devcb = &jaguar_cpu_device::set_int_func(*device, DEVCB2_##_devcb); + devcb = &jaguar_cpu_device::set_int_func(*device, DEVCB_##_devcb); /*************************************************************************** @@ -107,7 +107,7 @@ public: ~jaguar_cpu_device(); // static configuration helpers - template<class _Object> static devcb2_base &set_int_func(device_t &device, _Object object) { return downcast<jaguar_cpu_device &>(device).m_cpu_interrupt.set_callback(object); } + template<class _Object> static devcb_base &set_int_func(device_t &device, _Object object) { return downcast<jaguar_cpu_device &>(device).m_cpu_interrupt.set_callback(object); } virtual DECLARE_WRITE32_MEMBER(ctrl_w) { assert(0); } virtual DECLARE_READ32_MEMBER(ctrl_r) { assert(0); return 0; } @@ -150,7 +150,7 @@ protected: bool m_isdsp; int m_icount; int m_bankswitch_icount; - devcb2_write_line m_cpu_interrupt; + devcb_write_line m_cpu_interrupt; address_space *m_program; direct_read_data *m_direct; diff --git a/src/emu/cpu/lc8670/lc8670.h b/src/emu/cpu/lc8670/lc8670.h index 5c67c8853ec..98e50328eca 100644 --- a/src/emu/cpu/lc8670/lc8670.h +++ b/src/emu/cpu/lc8670/lc8670.h @@ -65,7 +65,7 @@ typedef UINT32 (*lc8670_lcd_update)(device_t &device, bitmap_ind16 &bitmap, cons lc8670_cpu_device::static_set_cpu_clock(*device, LC8670_RC_CLOCK, _rc_clock); \ lc8670_cpu_device::static_set_cpu_clock(*device, LC8670_CF_CLOCK, _cf_clock); #define MCFG_LC8670_BANKSWITCH_CB(_devcb) \ - devcb = &lc8670_cpu_device::static_set_bankswitch_cb(*device, DEVCB2_##_devcb); + devcb = &lc8670_cpu_device::static_set_bankswitch_cb(*device, DEVCB_##_devcb); #define MCFG_LC8670_LCD_UPDATE_CB(_cb) \ lc8670_cpu_device::static_set_lcd_update_cb(*device, _cb); @@ -93,7 +93,7 @@ public: // static configuration helpers static void static_set_cpu_clock(device_t &device, int _source, UINT32 _clock) { downcast<lc8670_cpu_device &>(device).m_clocks[_source] = _clock; } static void static_set_lcd_update_cb(device_t &device, lc8670_lcd_update _cb) { downcast<lc8670_cpu_device &>(device).m_lcd_update_func = _cb; } - template<class _Object> static devcb2_base & static_set_bankswitch_cb(device_t &device, _Object object) { return downcast<lc8670_cpu_device &>(device).m_bankswitch_func.set_callback(object); } + template<class _Object> static devcb_base & static_set_bankswitch_cb(device_t &device, _Object object) { return downcast<lc8670_cpu_device &>(device).m_bankswitch_func.set_callback(object); } protected: // device-level overrides @@ -233,7 +233,7 @@ private: // configuration UINT32 m_clocks[3]; // clock sources - devcb2_write8 m_bankswitch_func; // bankswitch CB + devcb_write8 m_bankswitch_func; // bankswitch CB lc8670_lcd_update m_lcd_update_func; // LCD update CB // interrupts vectors diff --git a/src/emu/cpu/lh5801/lh5801.h b/src/emu/cpu/lh5801/lh5801.h index 34ae0b4d50b..0d01d1d579c 100644 --- a/src/emu/cpu/lh5801/lh5801.h +++ b/src/emu/cpu/lh5801/lh5801.h @@ -72,7 +72,7 @@ enum #define MCFG_LH5801_IN(_devcb) \ - lh5801_cpu_device::set_in_func(*device, DEVCB2_##_devcb); + lh5801_cpu_device::set_in_func(*device, DEVCB_##_devcb); class lh5801_cpu_device : public cpu_device @@ -82,7 +82,7 @@ public: lh5801_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_in_func(device_t &device, _Object object) { return downcast<lh5801_cpu_device &>(device).m_in_func.set_callback(object); } + template<class _Object> static devcb_base &set_in_func(device_t &device, _Object object) { return downcast<lh5801_cpu_device &>(device).m_in_func.set_callback(object); } protected: // device-level overrides @@ -112,7 +112,7 @@ private: address_space_config m_program_config; address_space_config m_io_config; - devcb2_read8 m_in_func; + devcb_read8 m_in_func; address_space *m_program; //ME0 address_space *m_io; //ME1 diff --git a/src/emu/cpu/lr35902/lr35902.h b/src/emu/cpu/lr35902/lr35902.h index ab07b658555..b6de0686ab7 100644 --- a/src/emu/cpu/lr35902/lr35902.h +++ b/src/emu/cpu/lr35902/lr35902.h @@ -5,7 +5,7 @@ #define MCFG_LR35902_TIMER_CB(_devcb) \ - lr35902_cpu_device::set_timer_cb(*device, DEVCB2_##_devcb); + lr35902_cpu_device::set_timer_cb(*device, DEVCB_##_devcb); #define MCFG_LR35902_HALT_BUG \ lr35902_cpu_device::set_halt_bug(*device); // This should be removed/improved once all gameboy boot roms have been dumped @@ -30,7 +30,7 @@ public: lr35902_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); // static configuration helpers - template<class _Object> static devcb2_base &set_timer_cb(device_t &device, _Object object) { return downcast<lr35902_cpu_device &>(device).m_timer_func.set_callback(object); } + template<class _Object> static devcb_base &set_timer_cb(device_t &device, _Object object) { return downcast<lr35902_cpu_device &>(device).m_timer_func.set_callback(object); } static void set_halt_bug(device_t &device) { downcast<lr35902_cpu_device &>(device).m_features |= LR35902_FEATURE_HALT_BUG; } static void set_reset_values(device_t &device, const UINT16 *regs) { downcast<lr35902_cpu_device &>(device).c_regs = regs; } @@ -98,7 +98,7 @@ protected: address_space *m_program; int m_icount; /* Timer callback */ - devcb2_write8 m_timer_func; + devcb_write8 m_timer_func; /* Fetch & execute related */ int m_execution_state; UINT8 m_op; diff --git a/src/emu/cpu/m6502/m3745x.h b/src/emu/cpu/m6502/m3745x.h index 45cfd2cda5a..e6a3b35a0d7 100644 --- a/src/emu/cpu/m6502/m3745x.h +++ b/src/emu/cpu/m6502/m3745x.h @@ -10,22 +10,22 @@ //************************************************************************** #define MCFG_M3745X_ADC14_CALLBACKS(_ad0, _ad1, _ad2, _ad3) \ - downcast<m3745x_device *>(device)->set_ad14_callbacks(DEVCB2_##_ad0, DEVCB2_##_ad1, DEVCB2_##_ad2, DEVCB2_##_ad3); + downcast<m3745x_device *>(device)->set_ad14_callbacks(DEVCB_##_ad0, DEVCB_##_ad1, DEVCB_##_ad2, DEVCB_##_ad3); #define MCFG_M3745X_ADC58_CALLBACKS(_ad0, _ad1, _ad2, _ad3) \ - downcast<m3745x_device *>(device)->set_ad58_callbacks(DEVCB2_##_ad0, DEVCB2_##_ad1, DEVCB2_##_ad2, DEVCB2_##_ad3); + downcast<m3745x_device *>(device)->set_ad58_callbacks(DEVCB_##_ad0, DEVCB_##_ad1, DEVCB_##_ad2, DEVCB_##_ad3); #define MCFG_M3745X_PORT3_CALLBACKS(_read, _write) \ - downcast<m3745x_device *>(device)->set_p3_callbacks(DEVCB2_##_read, DEVCB2_##_write); + downcast<m3745x_device *>(device)->set_p3_callbacks(DEVCB_##_read, DEVCB_##_write); #define MCFG_M3745X_PORT4_CALLBACKS(_read, _write) \ - downcast<m3745x_device *>(device)->set_p4_callbacks(DEVCB2_##_read, DEVCB2_##_write); + downcast<m3745x_device *>(device)->set_p4_callbacks(DEVCB_##_read, DEVCB_##_write); #define MCFG_M3745X_PORT5_CALLBACKS(_read, _write) \ - downcast<m3745x_device *>(device)->set_p5_callbacks(DEVCB2_##_read, DEVCB2_##_write); + downcast<m3745x_device *>(device)->set_p5_callbacks(DEVCB_##_read, DEVCB_##_write); #define MCFG_M3745X_PORT6_CALLBACKS(_read, _write) \ - downcast<m3745x_device *>(device)->set_p6_callbacks(DEVCB2_##_read, DEVCB2_##_write); + downcast<m3745x_device *>(device)->set_p6_callbacks(DEVCB_##_read, DEVCB_##_write); //************************************************************************** // TYPE DEFINITIONS @@ -103,10 +103,10 @@ public: read_ad_7.set_callback(rd4); } - devcb2_read8 read_p3, read_p4, read_p5, read_p6; - devcb2_write8 write_p3, write_p4, write_p5, write_p6; - devcb2_read8 read_ad_0, read_ad_1, read_ad_2, read_ad_3; - devcb2_read8 read_ad_4, read_ad_5, read_ad_6, read_ad_7; + devcb_read8 read_p3, read_p4, read_p5, read_p6; + devcb_write8 write_p3, write_p4, write_p5, write_p6; + devcb_read8 read_ad_0, read_ad_1, read_ad_2, read_ad_3; + devcb_read8 read_ad_4, read_ad_5, read_ad_6, read_ad_7; DECLARE_READ8_MEMBER(ports_r); DECLARE_WRITE8_MEMBER(ports_w); diff --git a/src/emu/cpu/m6502/m5074x.h b/src/emu/cpu/m6502/m5074x.h index d8054aba221..5b40a8ae4c3 100644 --- a/src/emu/cpu/m6502/m5074x.h +++ b/src/emu/cpu/m6502/m5074x.h @@ -10,28 +10,28 @@ //************************************************************************** #define MCFG_M5074X_PORT0_READ_CALLBACK(_read) \ - devcb = &m5074x_device::set_p0_rd_callback(*device, DEVCB2_##_read); + devcb = &m5074x_device::set_p0_rd_callback(*device, DEVCB_##_read); #define MCFG_M5074X_PORT1_READ_CALLBACK(_read) \ - devcb = &m5074x_device::set_p1_rd_callback(*device, DEVCB2_##_read); + devcb = &m5074x_device::set_p1_rd_callback(*device, DEVCB_##_read); #define MCFG_M5074X_PORT2_READ_CALLBACK(_read) \ - devcb = &m5074x_device::set_p2_rd_callback(*device, DEVCB2_##_read); + devcb = &m5074x_device::set_p2_rd_callback(*device, DEVCB_##_read); #define MCFG_M5074X_PORT3_READ_CALLBACK(_read) \ - devcb = &m5074x_device::set_p3_rd_callback(*device, DEVCB2_##_read); + devcb = &m5074x_device::set_p3_rd_callback(*device, DEVCB_##_read); #define MCFG_M5074X_PORT0_WRITE_CALLBACK(_write) \ - devcb = &m5074x_device::set_p0_wr_callback(*device, DEVCB2_##_write); + devcb = &m5074x_device::set_p0_wr_callback(*device, DEVCB_##_write); #define MCFG_M5074X_PORT1_WRITE_CALLBACK(_write) \ - devcb = &m5074x_device::set_p1_wr_callback(*device, DEVCB2_##_write); + devcb = &m5074x_device::set_p1_wr_callback(*device, DEVCB_##_write); #define MCFG_M5074X_PORT2_WRITE_CALLBACK(_write) \ - devcb = &m5074x_device::set_p2_wr_callback(*device, DEVCB2_##_write); + devcb = &m5074x_device::set_p2_wr_callback(*device, DEVCB_##_write); #define MCFG_M5074X_PORT3_WRITE_CALLBACK(_write) \ - devcb = &m5074x_device::set_p3_wr_callback(*device, DEVCB2_##_write); + devcb = &m5074x_device::set_p3_wr_callback(*device, DEVCB_##_write); //************************************************************************** // TYPE DEFINITIONS @@ -66,17 +66,17 @@ public: const address_space_config m_program_config; - template<class _Object> static devcb2_base &set_p0_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p0.set_callback(object); } - template<class _Object> static devcb2_base &set_p1_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p1.set_callback(object); } - template<class _Object> static devcb2_base &set_p2_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p2.set_callback(object); } - template<class _Object> static devcb2_base &set_p3_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p3.set_callback(object); } - template<class _Object> static devcb2_base &set_p0_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p0.set_callback(object); } - template<class _Object> static devcb2_base &set_p1_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p1.set_callback(object); } - template<class _Object> static devcb2_base &set_p2_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p2.set_callback(object); } - template<class _Object> static devcb2_base &set_p3_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p3.set_callback(object); } - - devcb2_read8 read_p0, read_p1, read_p2, read_p3; - devcb2_write8 write_p0, write_p1, write_p2, write_p3; + template<class _Object> static devcb_base &set_p0_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p0.set_callback(object); } + template<class _Object> static devcb_base &set_p1_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p1.set_callback(object); } + template<class _Object> static devcb_base &set_p2_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p2.set_callback(object); } + template<class _Object> static devcb_base &set_p3_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p3.set_callback(object); } + template<class _Object> static devcb_base &set_p0_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p0.set_callback(object); } + template<class _Object> static devcb_base &set_p1_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p1.set_callback(object); } + template<class _Object> static devcb_base &set_p2_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p2.set_callback(object); } + template<class _Object> static devcb_base &set_p3_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p3.set_callback(object); } + + devcb_read8 read_p0, read_p1, read_p2, read_p3; + devcb_write8 write_p0, write_p1, write_p2, write_p3; DECLARE_READ8_MEMBER(ports_r); DECLARE_WRITE8_MEMBER(ports_w); diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h index 6c8a9809def..b433c72f9e5 100644 --- a/src/emu/cpu/m6502/m6502.h +++ b/src/emu/cpu/m6502/m6502.h @@ -44,7 +44,7 @@ downcast<m6502_device *>(device)->disable_direct(); #define MCFG_M6502_SYNC_CALLBACK(_cb) \ - devcb = &m6502_device::set_sync_callback(*device, DEVCB2_##_cb); + devcb = &m6502_device::set_sync_callback(*device, DEVCB_##_cb); class m6502_device : public cpu_device { public: @@ -65,9 +65,9 @@ public: bool get_sync() const { return sync; } void disable_direct() { direct_disabled = true; } - template<class _Object> static devcb2_base &set_sync_callback(device_t &device, _Object object) { return downcast<m6502_device &>(device).sync_w.set_callback(object); } + template<class _Object> static devcb_base &set_sync_callback(device_t &device, _Object object) { return downcast<m6502_device &>(device).sync_w.set_callback(object); } - devcb2_write_line sync_w; + devcb_write_line sync_w; protected: class memory_interface { diff --git a/src/emu/cpu/m6502/m6510.h b/src/emu/cpu/m6502/m6510.h index 224f530b4f9..9906f588074 100644 --- a/src/emu/cpu/m6502/m6510.h +++ b/src/emu/cpu/m6502/m6510.h @@ -43,7 +43,7 @@ #include "m6502.h" #define MCFG_M6510_PORT_CALLBACKS(_read, _write) \ - downcast<m6510_device *>(device)->set_callbacks(DEVCB2_##_read, DEVCB2_##_write); + downcast<m6510_device *>(device)->set_callbacks(DEVCB_##_read, DEVCB_##_write); #define MCFG_M6510_PORT_PULLS(_up, _down) \ downcast<m6510_device *>(device)->set_pulls(_up, _down); @@ -89,8 +89,8 @@ protected: virtual UINT8 read_decrypted(UINT16 adr); }; - devcb2_read8 read_port; - devcb2_write8 write_port; + devcb_read8 read_port; + devcb_write8 write_port; UINT8 pullup, floating, dir, port, drive; diff --git a/src/emu/cpu/m6502/m6510t.h b/src/emu/cpu/m6502/m6510t.h index 82e1baecf29..0765f9e38c1 100644 --- a/src/emu/cpu/m6502/m6510t.h +++ b/src/emu/cpu/m6502/m6510t.h @@ -43,7 +43,7 @@ #include "m6510.h" #define MCFG_M6510T_PORT_CALLBACKS(_read, _write) \ - downcast<m6510t_device *>(device)->set_callbacks(DEVCB2_##_read, DEVCB2_##_write); + downcast<m6510t_device *>(device)->set_callbacks(DEVCB_##_read, DEVCB_##_write); #define MCFG_M6510T_PORT_PULLS(_up, _down) \ downcast<m6510t_device *>(device)->set_pulls(_up, _down); diff --git a/src/emu/cpu/m6502/m7501.h b/src/emu/cpu/m6502/m7501.h index c75dba10de5..f869dfc5234 100644 --- a/src/emu/cpu/m6502/m7501.h +++ b/src/emu/cpu/m6502/m7501.h @@ -43,7 +43,7 @@ #include "m6510.h" #define MCFG_M7501_PORT_CALLBACKS(_read, _write) \ - downcast<m7501_device *>(device)->set_callbacks(DEVCB2_##_read, DEVCB2_##_write); + downcast<m7501_device *>(device)->set_callbacks(DEVCB_##_read, DEVCB_##_write); #define MCFG_M7501_PORT_PULLS(_up, _down) \ downcast<m7501_device *>(device)->set_pulls(_up, _down); diff --git a/src/emu/cpu/m6502/m8502.h b/src/emu/cpu/m6502/m8502.h index cbd10093da8..c44206e8bdf 100644 --- a/src/emu/cpu/m6502/m8502.h +++ b/src/emu/cpu/m6502/m8502.h @@ -43,7 +43,7 @@ #include "m6510.h" #define MCFG_M8502_PORT_CALLBACKS(_read, _write) \ - downcast<m8502_device *>(device)->set_callbacks(DEVCB2_##_read, DEVCB2_##_write); + downcast<m8502_device *>(device)->set_callbacks(DEVCB_##_read, DEVCB_##_write); #define MCFG_M8502_PORT_PULLS(_up, _down) \ downcast<m8502_device *>(device)->set_pulls(_up, _down); diff --git a/src/emu/cpu/m6800/m6800.h b/src/emu/cpu/m6800/m6800.h index d4e5c9ae901..b62977046ea 100644 --- a/src/emu/cpu/m6800/m6800.h +++ b/src/emu/cpu/m6800/m6800.h @@ -45,9 +45,9 @@ enum #define MCFG_M6801_SC2(_devcb) \ - m6800_cpu_device::set_out_sc2_func(*device, DEVCB2_##_devcb); + m6800_cpu_device::set_out_sc2_func(*device, DEVCB_##_devcb); #define MCFG_M6801_SER_TX(_devcb) \ - m6800_cpu_device::set_out_sertx_func(*device, DEVCB2_##_devcb); + m6800_cpu_device::set_out_sertx_func(*device, DEVCB_##_devcb); class m6800_cpu_device : public cpu_device { @@ -59,8 +59,8 @@ public: m6800_cpu_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, bool has_io, int clock_divider, const m6800_cpu_device::op_func *insn, const UINT8 *cycles, address_map_constructor internal = NULL); // static configuration helpers - template<class _Object> static devcb2_base &set_out_sc2_func(device_t &device, _Object object) { return downcast<m6800_cpu_device &>(device).m_out_sc2_func.set_callback(object); } - template<class _Object> static devcb2_base &set_out_sertx_func(device_t &device, _Object object) { return downcast<m6800_cpu_device &>(device).m_out_sertx_func.set_callback(object); } + template<class _Object> static devcb_base &set_out_sc2_func(device_t &device, _Object object) { return downcast<m6800_cpu_device &>(device).m_out_sc2_func.set_callback(object); } + template<class _Object> static devcb_base &set_out_sertx_func(device_t &device, _Object object) { return downcast<m6800_cpu_device &>(device).m_out_sertx_func.set_callback(object); } DECLARE_READ8_MEMBER( m6801_io_r ); DECLARE_WRITE8_MEMBER( m6801_io_w ); @@ -96,8 +96,8 @@ protected: address_space_config m_io_config; bool m_has_io; - devcb2_write_line m_out_sc2_func; - devcb2_write_line m_out_sertx_func; + devcb_write_line m_out_sc2_func; + devcb_write_line m_out_sertx_func; PAIR m_ppc; /* Previous program counter */ PAIR m_pc; /* Program counter */ diff --git a/src/emu/cpu/m6809/m6809.h b/src/emu/cpu/m6809/m6809.h index e6a1bbcc732..b98430b5f46 100644 --- a/src/emu/cpu/m6809/m6809.h +++ b/src/emu/cpu/m6809/m6809.h @@ -139,7 +139,7 @@ protected: PAIR16 m_ea; // effective address // Callbacks - devcb2_write_line m_lic_func; // LIC pin on the 6809E + devcb_write_line m_lic_func; // LIC pin on the 6809E // eat cycles ATTR_FORCE_INLINE void eat(int cycles) { m_icount -= cycles; } @@ -271,7 +271,7 @@ public: // ======================> m6809e_device #define MCFG_M6809E_LIC_CB(_devcb) \ - m6809e_device::set_lic_cb(*device, DEVCB2_##_devcb); + m6809e_device::set_lic_cb(*device, DEVCB_##_devcb); class m6809e_device : public m6809_base_device @@ -281,7 +281,7 @@ public: m6809e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_lic_cb(device_t &device, _Object object) { return downcast<m6809e_device &>(device).m_lic_func.set_callback(object); } + template<class _Object> static devcb_base &set_lic_cb(device_t &device, _Object object) { return downcast<m6809e_device &>(device).m_lic_func.set_callback(object); } }; enum diff --git a/src/emu/cpu/mb86233/mb86233.h b/src/emu/cpu/mb86233/mb86233.h index c495b034920..68ca986f45c 100644 --- a/src/emu/cpu/mb86233/mb86233.h +++ b/src/emu/cpu/mb86233/mb86233.h @@ -39,9 +39,9 @@ enum }; -#define MCFG_MB86233_FIFO_READ_CB(_devcb) mb86233_cpu_device::set_fifo_read_cb(*device, DEVCB2_##_devcb); -#define MCFG_MB86233_FIFO_READ_OK_CB(_devcb) mb86233_cpu_device::set_fifo_read_ok_cb(*device, DEVCB2_##_devcb); -#define MCFG_MB86233_FIFO_WRITE_CB(_devcb) mb86233_cpu_device::set_fifo_write_cb(*device, DEVCB2_##_devcb); +#define MCFG_MB86233_FIFO_READ_CB(_devcb) mb86233_cpu_device::set_fifo_read_cb(*device, DEVCB_##_devcb); +#define MCFG_MB86233_FIFO_READ_OK_CB(_devcb) mb86233_cpu_device::set_fifo_read_ok_cb(*device, DEVCB_##_devcb); +#define MCFG_MB86233_FIFO_WRITE_CB(_devcb) mb86233_cpu_device::set_fifo_write_cb(*device, DEVCB_##_devcb); #define MCFG_MB86233_TABLE_REGION(_region) mb86233_cpu_device::set_tablergn(*device, _region); @@ -52,9 +52,9 @@ public: mb86233_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_fifo_read_cb(device_t &device, _Object object) { return downcast<mb86233_cpu_device &>(device).m_fifo_read_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_fifo_read_ok_cb(device_t &device, _Object object) { return downcast<mb86233_cpu_device &>(device).m_fifo_read_ok_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_fifo_write_cb(device_t &device, _Object object) { return downcast<mb86233_cpu_device &>(device).m_fifo_write_cb.set_callback(object); } + template<class _Object> static devcb_base &set_fifo_read_cb(device_t &device, _Object object) { return downcast<mb86233_cpu_device &>(device).m_fifo_read_cb.set_callback(object); } + template<class _Object> static devcb_base &set_fifo_read_ok_cb(device_t &device, _Object object) { return downcast<mb86233_cpu_device &>(device).m_fifo_read_ok_cb.set_callback(object); } + template<class _Object> static devcb_base &set_fifo_write_cb(device_t &device, _Object object) { return downcast<mb86233_cpu_device &>(device).m_fifo_write_cb.set_callback(object); } static void set_tablergn(device_t &device, const char *tablergn) { downcast<mb86233_cpu_device &>(device).m_tablergn = tablergn; } protected: @@ -114,9 +114,9 @@ private: /* FIFO */ int m_fifo_wait; - devcb2_read32 m_fifo_read_cb; - devcb2_read_line m_fifo_read_ok_cb; - devcb2_write32 m_fifo_write_cb; + devcb_read32 m_fifo_read_cb; + devcb_read_line m_fifo_read_ok_cb; + devcb_write32 m_fifo_write_cb; const char *m_tablergn; /* internal RAM */ diff --git a/src/emu/cpu/mips/r3000.h b/src/emu/cpu/mips/r3000.h index 83819ace935..a76af82386d 100644 --- a/src/emu/cpu/mips/r3000.h +++ b/src/emu/cpu/mips/r3000.h @@ -20,16 +20,16 @@ r3000_device::static_set_endianness(*device, _endianness); #define MCFG_R3000_BRCOND0_INPUT(_devcb) \ - devcb = &r3000_device::static_set_brcond0_input(*device, DEVCB2_##_devcb); + devcb = &r3000_device::static_set_brcond0_input(*device, DEVCB_##_devcb); #define MCFG_R3000_BRCOND1_INPUT(_devcb) \ - devcb = &r3000_device::static_set_brcond1_input(*device, DEVCB2_##_devcb); + devcb = &r3000_device::static_set_brcond1_input(*device, DEVCB_##_devcb); #define MCFG_R3000_BRCOND2_INPUT(_devcb) \ - devcb = &r3000_device::static_set_brcond2_input(*device, DEVCB2_##_devcb); + devcb = &r3000_device::static_set_brcond2_input(*device, DEVCB_##_devcb); #define MCFG_R3000_BRCOND3_INPUT(_devcb) \ - devcb = &r3000_device::static_set_brcond3_input(*device, DEVCB2_##_devcb); + devcb = &r3000_device::static_set_brcond3_input(*device, DEVCB_##_devcb); /*************************************************************************** @@ -87,22 +87,22 @@ public: downcast<r3000_device &>(device).m_endianness = endianness; } - template<class _Object> static devcb2_base &static_set_brcond0_input(device_t &device, _Object object) + template<class _Object> static devcb_base &static_set_brcond0_input(device_t &device, _Object object) { return downcast<r3000_device &>(device).m_in_brcond0.set_callback(object); } - template<class _Object> static devcb2_base &static_set_brcond1_input(device_t &device, _Object object) + template<class _Object> static devcb_base &static_set_brcond1_input(device_t &device, _Object object) { return downcast<r3000_device &>(device).m_in_brcond1.set_callback(object); } - template<class _Object> static devcb2_base &static_set_brcond2_input(device_t &device, _Object object) + template<class _Object> static devcb_base &static_set_brcond2_input(device_t &device, _Object object) { return downcast<r3000_device &>(device).m_in_brcond2.set_callback(object); } - template<class _Object> static devcb2_base &static_set_brcond3_input(device_t &device, _Object object) + template<class _Object> static devcb_base &static_set_brcond3_input(device_t &device, _Object object) { return downcast<r3000_device &>(device).m_in_brcond3.set_callback(object); } @@ -256,10 +256,10 @@ protected: size_t m_dcache_size; // I/O - devcb2_read_line m_in_brcond0; - devcb2_read_line m_in_brcond1; - devcb2_read_line m_in_brcond2; - devcb2_read_line m_in_brcond3; + devcb_read_line m_in_brcond0; + devcb_read_line m_in_brcond1; + devcb_read_line m_in_brcond2; + devcb_read_line m_in_brcond3; }; diff --git a/src/emu/cpu/pdp1/tx0.h b/src/emu/cpu/pdp1/tx0.h index 198ffa694a2..46f639e2e81 100644 --- a/src/emu/cpu/pdp1/tx0.h +++ b/src/emu/cpu/pdp1/tx0.h @@ -20,16 +20,16 @@ enum #define MCFG_TX0_CONFIG(_cpy_devcb, _r1l_devcb, _dis_devcb, _r3l_devcb, _prt_devcb, _rsv_devcb, _p6h_devcb, _p7h_devcb, _sel_devcb, _res_devcb) \ - tx0_device::set_cpy_cb(*device, DEVCB2_##_cpy_devcb); \ - tx0_device::set_r1l_cb(*device, DEVCB2_##_r1l_devcb); \ - tx0_device::set_dis_cb(*device, DEVCB2_##_dis_devcb); \ - tx0_device::set_r3l_cb(*device, DEVCB2_##_r3l_devcb); \ - tx0_device::set_prt_cb(*device, DEVCB2_##_prt_devcb); \ - tx0_device::set_rsv_cb(*device, DEVCB2_##_rsv_devcb); \ - tx0_device::set_p6h_cb(*device, DEVCB2_##_p6h_devcb); \ - tx0_device::set_p7h_cb(*device, DEVCB2_##_p7h_devcb); \ - tx0_device::set_sel_cb(*device, DEVCB2_##_sel_devcb); \ - tx0_device::set_res_cb(*device, DEVCB2_##_res_devcb); + tx0_device::set_cpy_cb(*device, DEVCB_##_cpy_devcb); \ + tx0_device::set_r1l_cb(*device, DEVCB_##_r1l_devcb); \ + tx0_device::set_dis_cb(*device, DEVCB_##_dis_devcb); \ + tx0_device::set_r3l_cb(*device, DEVCB_##_r3l_devcb); \ + tx0_device::set_prt_cb(*device, DEVCB_##_prt_devcb); \ + tx0_device::set_rsv_cb(*device, DEVCB_##_rsv_devcb); \ + tx0_device::set_p6h_cb(*device, DEVCB_##_p6h_devcb); \ + tx0_device::set_p7h_cb(*device, DEVCB_##_p7h_devcb); \ + tx0_device::set_sel_cb(*device, DEVCB_##_sel_devcb); \ + tx0_device::set_res_cb(*device, DEVCB_##_res_devcb); class tx0_device : public cpu_device @@ -39,16 +39,16 @@ public: tx0_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, int addr_bits, int address_mask, int ir_mask); // static configuration helpers - template<class _Object> static devcb2_base &set_cpy_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_cpy_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_r1l_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_r1l_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_dis_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_dis_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_r3l_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_r3l_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_prt_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_prt_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_rsv_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_rsv_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_p6h_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_p6h_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_p7h_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_p7h_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_sel_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_sel_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_res_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_io_reset_callback.set_callback(object); } + template<class _Object> static devcb_base &set_cpy_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_cpy_handler.set_callback(object); } + template<class _Object> static devcb_base &set_r1l_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_r1l_handler.set_callback(object); } + template<class _Object> static devcb_base &set_dis_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_dis_handler.set_callback(object); } + template<class _Object> static devcb_base &set_r3l_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_r3l_handler.set_callback(object); } + template<class _Object> static devcb_base &set_prt_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_prt_handler.set_callback(object); } + template<class _Object> static devcb_base &set_rsv_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_rsv_handler.set_callback(object); } + template<class _Object> static devcb_base &set_p6h_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_p6h_handler.set_callback(object); } + template<class _Object> static devcb_base &set_p7h_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_p7h_handler.set_callback(object); } + template<class _Object> static devcb_base &set_sel_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_sel_handler.set_callback(object); } + template<class _Object> static devcb_base &set_res_cb(device_t &device, _Object object) { return downcast<tx0_device &>(device).m_io_reset_callback.set_callback(object); } void pulse_reset(); void io_complete(); @@ -121,18 +121,18 @@ protected: 5: reserved (for unimplemented typ instruction?) 6: p6h 7: p7h */ - devcb2_write_line m_cpy_handler; - devcb2_write_line m_r1l_handler; - devcb2_write_line m_dis_handler; - devcb2_write_line m_r3l_handler; - devcb2_write_line m_prt_handler; - devcb2_write_line m_rsv_handler; - devcb2_write_line m_p6h_handler; - devcb2_write_line m_p7h_handler; + devcb_write_line m_cpy_handler; + devcb_write_line m_r1l_handler; + devcb_write_line m_dis_handler; + devcb_write_line m_r3l_handler; + devcb_write_line m_prt_handler; + devcb_write_line m_rsv_handler; + devcb_write_line m_p6h_handler; + devcb_write_line m_p7h_handler; /* select instruction handler */ - devcb2_write_line m_sel_handler; + devcb_write_line m_sel_handler; /* callback called when reset line is pulsed: IO devices should reset */ - devcb2_write_line m_io_reset_callback; + devcb_write_line m_io_reset_callback; int tx0_read(offs_t address); void tx0_write(offs_t address, int data); diff --git a/src/emu/cpu/psx/dma.h b/src/emu/cpu/psx/dma.h index 491ddb813d5..5d47dcdea77 100644 --- a/src/emu/cpu/psx/dma.h +++ b/src/emu/cpu/psx/dma.h @@ -17,7 +17,7 @@ extern const device_type PSX_DMA; #define MCFG_PSX_DMA_IRQ_HANDLER(_devcb) \ - devcb = &psxdma_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &psxdma_device::set_irq_handler(*device, DEVCB_##_devcb); typedef delegate<void (UINT32 *, UINT32, INT32)> psx_dma_read_delegate; typedef delegate<void (UINT32 *, UINT32, INT32)> psx_dma_write_delegate; @@ -40,7 +40,7 @@ public: psxdma_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<psxdma_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxdma_device &>(device).m_irq_handler.set_callback(object); } void install_read_handler( int n_channel, psx_dma_read_delegate p_fn_dma_read ); void install_write_handler( int n_channel, psx_dma_read_delegate p_fn_dma_write ); @@ -70,7 +70,7 @@ private: UINT32 m_dpcp; UINT32 m_dicr; - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; }; #endif diff --git a/src/emu/cpu/psx/irq.h b/src/emu/cpu/psx/irq.h index 09eec4f3525..55f9a5086c5 100644 --- a/src/emu/cpu/psx/irq.h +++ b/src/emu/cpu/psx/irq.h @@ -17,7 +17,7 @@ extern const device_type PSX_IRQ; #define MCFG_PSX_IRQ_HANDLER(_devcb) \ - devcb = &psxirq_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &psxirq_device::set_irq_handler(*device, DEVCB_##_devcb); class psxirq_device : public device_t { @@ -25,7 +25,7 @@ public: psxirq_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<psxirq_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxirq_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ32_MEMBER( read ); DECLARE_WRITE32_MEMBER( write ); @@ -54,7 +54,7 @@ private: UINT32 n_irqdata; UINT32 n_irqmask; - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; }; #endif diff --git a/src/emu/cpu/psx/psx.h b/src/emu/cpu/psx/psx.h index d34335016a4..bf8fd2fc1a1 100644 --- a/src/emu/cpu/psx/psx.h +++ b/src/emu/cpu/psx/psx.h @@ -115,19 +115,19 @@ enum psxcpu_device::getcpu( *owner, cputag )->subdevice<psxdma_device>("dma")->install_write_handler( channel, handler ); #define MCFG_PSX_GPU_READ_HANDLER(_devcb) \ - devcb = &psxcpu_device::set_gpu_read_handler(*device, DEVCB2_##_devcb); + devcb = &psxcpu_device::set_gpu_read_handler(*device, DEVCB_##_devcb); #define MCFG_PSX_GPU_WRITE_HANDLER(_devcb) \ - devcb = &psxcpu_device::set_gpu_write_handler(*device, DEVCB2_##_devcb); + devcb = &psxcpu_device::set_gpu_write_handler(*device, DEVCB_##_devcb); #define MCFG_PSX_SPU_READ_HANDLER(_devcb) \ - devcb = &psxcpu_device::set_spu_read_handler(*device, DEVCB2_##_devcb); + devcb = &psxcpu_device::set_spu_read_handler(*device, DEVCB_##_devcb); #define MCFG_PSX_SPU_WRITE_HANDLER(_devcb) \ - devcb = &psxcpu_device::set_spu_write_handler(*device, DEVCB2_##_devcb); + devcb = &psxcpu_device::set_spu_write_handler(*device, DEVCB_##_devcb); #define MCFG_PSX_CD_READ_HANDLER(_devcb) \ - devcb = &psxcpu_device::set_cd_read_handler(*device, DEVCB2_##_devcb); + devcb = &psxcpu_device::set_cd_read_handler(*device, DEVCB_##_devcb); #define MCFG_PSX_CD_WRITE_HANDLER(_devcb) \ - devcb = &psxcpu_device::set_cd_write_handler(*device, DEVCB2_##_devcb); + devcb = &psxcpu_device::set_cd_write_handler(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -155,12 +155,12 @@ public: virtual ~psxcpu_device() {}; // static configuration helpers - template<class _Object> static devcb2_base &set_gpu_read_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_gpu_read_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_gpu_write_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_gpu_write_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_spu_read_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_spu_read_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_spu_write_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_spu_write_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_cd_read_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_cd_read_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_cd_write_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_cd_write_handler.set_callback(object); } + template<class _Object> static devcb_base &set_gpu_read_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_gpu_read_handler.set_callback(object); } + template<class _Object> static devcb_base &set_gpu_write_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_gpu_write_handler.set_callback(object); } + template<class _Object> static devcb_base &set_spu_read_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_spu_read_handler.set_callback(object); } + template<class _Object> static devcb_base &set_spu_write_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_spu_write_handler.set_callback(object); } + template<class _Object> static devcb_base &set_cd_read_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_cd_read_handler.set_callback(object); } + template<class _Object> static devcb_base &set_cd_write_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_cd_write_handler.set_callback(object); } // public interfaces DECLARE_WRITE32_MEMBER( berr_w ); @@ -338,12 +338,12 @@ protected: gte m_gte; - devcb2_read32 m_gpu_read_handler; - devcb2_write32 m_gpu_write_handler; - devcb2_read16 m_spu_read_handler; - devcb2_write16 m_spu_write_handler; - devcb2_read8 m_cd_read_handler; - devcb2_write8 m_cd_write_handler; + devcb_read32 m_gpu_read_handler; + devcb_write32 m_gpu_write_handler; + devcb_read16 m_spu_read_handler; + devcb_write16 m_spu_write_handler; + devcb_read8 m_cd_read_handler; + devcb_write8 m_cd_write_handler; required_device<ram_device> m_ram; memory_region *m_rom; diff --git a/src/emu/cpu/psx/rcnt.h b/src/emu/cpu/psx/rcnt.h index a7ecfd6a1c5..2b05a14108c 100644 --- a/src/emu/cpu/psx/rcnt.h +++ b/src/emu/cpu/psx/rcnt.h @@ -17,11 +17,11 @@ extern const device_type PSX_RCNT; #define MCFG_PSX_RCNT_IRQ0_HANDLER(_devcb) \ - devcb = &psxrcnt_device::set_irq0_handler(*device, DEVCB2_##_devcb); + devcb = &psxrcnt_device::set_irq0_handler(*device, DEVCB_##_devcb); #define MCFG_PSX_RCNT_IRQ1_HANDLER(_devcb) \ - devcb = &psxrcnt_device::set_irq1_handler(*device, DEVCB2_##_devcb); + devcb = &psxrcnt_device::set_irq1_handler(*device, DEVCB_##_devcb); #define MCFG_PSX_RCNT_IRQ2_HANDLER(_devcb) \ - devcb = &psxrcnt_device::set_irq2_handler(*device, DEVCB2_##_devcb); + devcb = &psxrcnt_device::set_irq2_handler(*device, DEVCB_##_devcb); #define PSX_RC_STOP ( 0x01 ) #define PSX_RC_RESET ( 0x04 ) /* guess */ #define PSX_RC_COUNTTARGET ( 0x08 ) @@ -46,9 +46,9 @@ public: psxrcnt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_irq0_handler(device_t &device, _Object object) { return downcast<psxrcnt_device &>(device).m_irq0_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_irq1_handler(device_t &device, _Object object) { return downcast<psxrcnt_device &>(device).m_irq1_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_irq2_handler(device_t &device, _Object object) { return downcast<psxrcnt_device &>(device).m_irq2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq0_handler(device_t &device, _Object object) { return downcast<psxrcnt_device &>(device).m_irq0_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq1_handler(device_t &device, _Object object) { return downcast<psxrcnt_device &>(device).m_irq1_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq2_handler(device_t &device, _Object object) { return downcast<psxrcnt_device &>(device).m_irq2_handler.set_callback(object); } DECLARE_WRITE32_MEMBER( write ); DECLARE_READ32_MEMBER( read ); @@ -68,9 +68,9 @@ private: int root_target( int n_counter ); void root_timer_adjust( int n_counter ); - devcb2_write_line m_irq0_handler; - devcb2_write_line m_irq1_handler; - devcb2_write_line m_irq2_handler; + devcb_write_line m_irq0_handler; + devcb_write_line m_irq1_handler; + devcb_write_line m_irq2_handler; }; #endif diff --git a/src/emu/cpu/psx/sio.h b/src/emu/cpu/psx/sio.h index 93f26c3daed..c2e084c6d5e 100644 --- a/src/emu/cpu/psx/sio.h +++ b/src/emu/cpu/psx/sio.h @@ -19,7 +19,7 @@ extern const device_type PSX_SIO0; extern const device_type PSX_SIO1; #define MCFG_PSX_SIO_IRQ_HANDLER(_devcb) \ - devcb = &psxsio_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &psxsio_device::set_irq_handler(*device, DEVCB_##_devcb); #define SIO_BUF_SIZE ( 8 ) #define SIO_STATUS_TX_RDY ( 1 << 0 ) @@ -43,7 +43,7 @@ public: psxsio_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); // static configuration helpers - template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxsio_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxsio_device &>(device).m_irq_handler.set_callback(object); } DECLARE_WRITE32_MEMBER( write ); DECLARE_READ32_MEMBER( read ); @@ -78,7 +78,7 @@ private: emu_timer *m_timer; - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; psxsiodev_device *devices[ 10 ]; int deviceCount; diff --git a/src/emu/cpu/rsp/rsp.h b/src/emu/cpu/rsp/rsp.h index 9aef17f85fc..e2812609e59 100644 --- a/src/emu/cpu/rsp/rsp.h +++ b/src/emu/cpu/rsp/rsp.h @@ -144,19 +144,19 @@ union ACCUMULATOR_REG }; #define MCFG_RSP_DP_REG_R_CB(_devcb) \ - devcb = &rsp_cpu_device::static_set_dp_reg_r_callback(*device, DEVCB2_##_devcb); + devcb = &rsp_cpu_device::static_set_dp_reg_r_callback(*device, DEVCB_##_devcb); #define MCFG_RSP_DP_REG_W_CB(_devcb) \ - devcb = &rsp_cpu_device::static_set_dp_reg_w_callback(*device, DEVCB2_##_devcb); + devcb = &rsp_cpu_device::static_set_dp_reg_w_callback(*device, DEVCB_##_devcb); #define MCFG_RSP_SP_REG_R_CB(_devcb) \ - devcb = &rsp_cpu_device::static_set_sp_reg_r_callback(*device, DEVCB2_##_devcb); + devcb = &rsp_cpu_device::static_set_sp_reg_r_callback(*device, DEVCB_##_devcb); #define MCFG_RSP_SP_REG_W_CB(_devcb) \ - devcb = &rsp_cpu_device::static_set_sp_reg_w_callback(*device, DEVCB2_##_devcb); + devcb = &rsp_cpu_device::static_set_sp_reg_w_callback(*device, DEVCB_##_devcb); #define MCFG_RSP_SP_SET_STATUS_CB(_devcb) \ - devcb = &rsp_cpu_device::static_set_status_callback(*device, DEVCB2_##_devcb); + devcb = &rsp_cpu_device::static_set_status_callback(*device, DEVCB_##_devcb); class rsp_cpu_device : public legacy_cpu_device { @@ -166,18 +166,18 @@ protected: public: void resolve_cb(); - template<class _Object> static devcb2_base &static_set_dp_reg_r_callback(device_t &device, _Object object) { return downcast<rsp_cpu_device &>(device).dp_reg_r_func.set_callback(object); } - template<class _Object> static devcb2_base &static_set_dp_reg_w_callback(device_t &device, _Object object) { return downcast<rsp_cpu_device &>(device).dp_reg_w_func.set_callback(object); } - template<class _Object> static devcb2_base &static_set_sp_reg_r_callback(device_t &device, _Object object) { return downcast<rsp_cpu_device &>(device).sp_reg_r_func.set_callback(object); } - template<class _Object> static devcb2_base &static_set_sp_reg_w_callback(device_t &device, _Object object) { return downcast<rsp_cpu_device &>(device).sp_reg_w_func.set_callback(object); } - template<class _Object> static devcb2_base &static_set_status_callback(device_t &device, _Object object) { return downcast<rsp_cpu_device &>(device).sp_set_status_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_dp_reg_r_callback(device_t &device, _Object object) { return downcast<rsp_cpu_device &>(device).dp_reg_r_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_dp_reg_w_callback(device_t &device, _Object object) { return downcast<rsp_cpu_device &>(device).dp_reg_w_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_sp_reg_r_callback(device_t &device, _Object object) { return downcast<rsp_cpu_device &>(device).sp_reg_r_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_sp_reg_w_callback(device_t &device, _Object object) { return downcast<rsp_cpu_device &>(device).sp_reg_w_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_status_callback(device_t &device, _Object object) { return downcast<rsp_cpu_device &>(device).sp_set_status_func.set_callback(object); } - devcb2_read32 dp_reg_r_func; - devcb2_write32 dp_reg_w_func; - devcb2_read32 sp_reg_r_func; - devcb2_write32 sp_reg_w_func; - devcb2_write32 sp_set_status_func; + devcb_read32 dp_reg_r_func; + devcb_write32 dp_reg_w_func; + devcb_read32 sp_reg_r_func; + devcb_write32 sp_reg_w_func; + devcb_write32 sp_set_status_func; }; diff --git a/src/emu/cpu/s2650/s2650.h b/src/emu/cpu/s2650/s2650.h index 9137324ce11..913432d3356 100644 --- a/src/emu/cpu/s2650/s2650.h +++ b/src/emu/cpu/s2650/s2650.h @@ -25,7 +25,7 @@ extern const device_type S2650; #define MCFG_S2650_FLAG_HANDLER(_devcb) \ - devcb = &s2650_device::set_flag_handler(*device, DEVCB2_##_devcb); + devcb = &s2650_device::set_flag_handler(*device, DEVCB_##_devcb); class s2650_device : public cpu_device { @@ -36,7 +36,7 @@ public: DECLARE_WRITE_LINE_MEMBER(write_sense); // static configuration helpers - template<class _Object> static devcb2_base &set_flag_handler(device_t &device, _Object object) { return downcast<s2650_device &>(device).m_flag_handler.set_callback(object); } + template<class _Object> static devcb_base &set_flag_handler(device_t &device, _Object object) { return downcast<s2650_device &>(device).m_flag_handler.set_callback(object); } protected: // device-level overrides @@ -71,7 +71,7 @@ private: address_space_config m_program_config; address_space_config m_io_config; - devcb2_write_line m_flag_handler; + devcb_write_line m_flag_handler; UINT16 m_ppc; /* previous program counter (page + iar) */ UINT16 m_page; /* 8K page select register (A14..A13) */ diff --git a/src/emu/cpu/saturn/saturn.h b/src/emu/cpu/saturn/saturn.h index 53dabec81ab..3fd90db1ff1 100644 --- a/src/emu/cpu/saturn/saturn.h +++ b/src/emu/cpu/saturn/saturn.h @@ -75,14 +75,14 @@ enum #define MCFG_SATURN_CONFIG(_out, _in, _reset, _config, _unconfig, _id, _crc, _rsi) \ - saturn_device::set_out_func(*device, DEVCB2_##_out); \ - saturn_device::set_in_func(*device, DEVCB2_##_in); \ - saturn_device::set_reset_func(*device, DEVCB2_##_reset); \ - saturn_device::set_config_func(*device, DEVCB2_##_config); \ - saturn_device::set_unconfig_func(*device, DEVCB2_##_unconfig); \ - saturn_device::set_id_func(*device, DEVCB2_##_id); \ - saturn_device::set_crc_func(*device, DEVCB2_##_crc); \ - saturn_device::set_rsi_func(*device, DEVCB2_##_rsi); + saturn_device::set_out_func(*device, DEVCB_##_out); \ + saturn_device::set_in_func(*device, DEVCB_##_in); \ + saturn_device::set_reset_func(*device, DEVCB_##_reset); \ + saturn_device::set_config_func(*device, DEVCB_##_config); \ + saturn_device::set_unconfig_func(*device, DEVCB_##_unconfig); \ + saturn_device::set_id_func(*device, DEVCB_##_id); \ + saturn_device::set_crc_func(*device, DEVCB_##_crc); \ + saturn_device::set_rsi_func(*device, DEVCB_##_rsi); class saturn_device : public cpu_device @@ -92,14 +92,14 @@ public: saturn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_out_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_out_func.set_callback(object); } - template<class _Object> static devcb2_base &set_in_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_in_func.set_callback(object); } - template<class _Object> static devcb2_base &set_reset_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_reset_func.set_callback(object); } - template<class _Object> static devcb2_base &set_config_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_config_func.set_callback(object); } - template<class _Object> static devcb2_base &set_unconfig_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_unconfig_func.set_callback(object); } - template<class _Object> static devcb2_base &set_id_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_id_func.set_callback(object); } - template<class _Object> static devcb2_base &set_crc_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_crc_func.set_callback(object); } - template<class _Object> static devcb2_base &set_rsi_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_rsi_func.set_callback(object); } + template<class _Object> static devcb_base &set_out_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_out_func.set_callback(object); } + template<class _Object> static devcb_base &set_in_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_in_func.set_callback(object); } + template<class _Object> static devcb_base &set_reset_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_reset_func.set_callback(object); } + template<class _Object> static devcb_base &set_config_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_config_func.set_callback(object); } + template<class _Object> static devcb_base &set_unconfig_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_unconfig_func.set_callback(object); } + template<class _Object> static devcb_base &set_id_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_id_func.set_callback(object); } + template<class _Object> static devcb_base &set_crc_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_crc_func.set_callback(object); } + template<class _Object> static devcb_base &set_rsi_func(device_t &device, _Object object) { return downcast<saturn_device &>(device).m_rsi_func.set_callback(object); } protected: // device-level overrides @@ -129,14 +129,14 @@ protected: private: address_space_config m_program_config; - devcb2_write32 m_out_func; - devcb2_read32 m_in_func; - devcb2_write_line m_reset_func; - devcb2_write32 m_config_func; - devcb2_write32 m_unconfig_func; - devcb2_read32 m_id_func; - devcb2_write32 m_crc_func; - devcb2_write_line m_rsi_func; + devcb_write32 m_out_func; + devcb_read32 m_in_func; + devcb_write_line m_reset_func; + devcb_write32 m_config_func; + devcb_write32 m_unconfig_func; + devcb_read32 m_id_func; + devcb_write32 m_crc_func; + devcb_write_line m_rsi_func; // 64 bit, unpacked (one nibble per byte) typedef UINT8 Saturn64[16]; diff --git a/src/emu/cpu/sc61860/sc61860.h b/src/emu/cpu/sc61860/sc61860.h index c29e7079126..5d4e62de9c0 100644 --- a/src/emu/cpu/sc61860/sc61860.h +++ b/src/emu/cpu/sc61860/sc61860.h @@ -55,28 +55,28 @@ enum #define MCFG_SC61860_READ_RESET_HANDLER(_devcb) \ - devcb = &sc61860_device::set_reset_cb(*device, DEVCB2_##_devcb); + devcb = &sc61860_device::set_reset_cb(*device, DEVCB_##_devcb); #define MCFG_SC61860_READ_BRK_HANDLER(_devcb) \ - devcb = &sc61860_device::set_brk_cb(*device, DEVCB2_##_devcb); + devcb = &sc61860_device::set_brk_cb(*device, DEVCB_##_devcb); #define MCFG_SC61860_READ_X_HANDLER(_devcb) \ - devcb = &sc61860_device::set_x_cb(*device, DEVCB2_##_devcb); + devcb = &sc61860_device::set_x_cb(*device, DEVCB_##_devcb); #define MCFG_SC61860_READ_A_HANDLER(_devcb) \ - devcb = &sc61860_device::set_ina_cb(*device, DEVCB2_##_devcb); + devcb = &sc61860_device::set_ina_cb(*device, DEVCB_##_devcb); #define MCFG_SC61860_WRITE_A_HANDLER(_devcb) \ - devcb = &sc61860_device::set_outa_cb(*device, DEVCB2_##_devcb); + devcb = &sc61860_device::set_outa_cb(*device, DEVCB_##_devcb); #define MCFG_SC61860_READ_B_HANDLER(_devcb) \ - devcb = &sc61860_device::set_inb_cb(*device, DEVCB2_##_devcb); + devcb = &sc61860_device::set_inb_cb(*device, DEVCB_##_devcb); #define MCFG_SC61860_WRITE_B_HANDLER(_devcb) \ - devcb = &sc61860_device::set_outb_cb(*device, DEVCB2_##_devcb); + devcb = &sc61860_device::set_outb_cb(*device, DEVCB_##_devcb); #define MCFG_SC61860_WRITE_C_HANDLER(_devcb) \ - devcb = &sc61860_device::set_outc_cb(*device, DEVCB2_##_devcb); + devcb = &sc61860_device::set_outc_cb(*device, DEVCB_##_devcb); class sc61860_device : public cpu_device { @@ -85,14 +85,14 @@ public: sc61860_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_reset_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_reset.set_callback(object); } - template<class _Object> static devcb2_base &set_brk_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_brk.set_callback(object); } - template<class _Object> static devcb2_base &set_x_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_x.set_callback(object); } - template<class _Object> static devcb2_base &set_ina_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_ina.set_callback(object); } - template<class _Object> static devcb2_base &set_outa_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_outa.set_callback(object); } - template<class _Object> static devcb2_base &set_inb_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_inb.set_callback(object); } - template<class _Object> static devcb2_base &set_outb_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_outb.set_callback(object); } - template<class _Object> static devcb2_base &set_outc_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_outc.set_callback(object); } + template<class _Object> static devcb_base &set_reset_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_reset.set_callback(object); } + template<class _Object> static devcb_base &set_brk_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_brk.set_callback(object); } + template<class _Object> static devcb_base &set_x_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_x.set_callback(object); } + template<class _Object> static devcb_base &set_ina_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_ina.set_callback(object); } + template<class _Object> static devcb_base &set_outa_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_outa.set_callback(object); } + template<class _Object> static devcb_base &set_inb_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_inb.set_callback(object); } + template<class _Object> static devcb_base &set_outb_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_outb.set_callback(object); } + template<class _Object> static devcb_base &set_outc_cb(device_t &device, _Object object) { return downcast<sc61860_device &>(device).m_outc.set_callback(object); } /* this is though for power on/off of the sharps */ UINT8 *internal_ram(); @@ -126,14 +126,14 @@ protected: private: address_space_config m_program_config; - devcb2_read_line m_reset; - devcb2_read_line m_brk; - devcb2_read_line m_x; - devcb2_read8 m_ina; - devcb2_write8 m_outa; - devcb2_read8 m_inb; - devcb2_write8 m_outb; - devcb2_write8 m_outc; + devcb_read_line m_reset; + devcb_read_line m_brk; + devcb_read_line m_x; + devcb_read8 m_ina; + devcb_write8 m_outa; + devcb_read8 m_inb; + devcb_write8 m_outb; + devcb_write8 m_outc; UINT8 m_p, m_q, m_r; //7 bits only? diff --git a/src/emu/cpu/scmp/scmp.h b/src/emu/cpu/scmp/scmp.h index 974ebd079be..b46630693a2 100644 --- a/src/emu/cpu/scmp/scmp.h +++ b/src/emu/cpu/scmp/scmp.h @@ -18,12 +18,12 @@ enum #define MCFG_SCMP_CONFIG(_flag_out_devcb, _sout_devcb, _sin_devcb, _sensea_devcb, _senseb_devcb, _halt_devcb) \ - scmp_device::set_flag_out_cb(*device, DEVCB2_##_flag_out_devcb); \ - scmp_device::set_sout_cb(*device, DEVCB2_##_sout_devcb); \ - scmp_device::set_sin_cb(*device, DEVCB2_##_sin_devcb); \ - scmp_device::set_sensea_cb(*device, DEVCB2_##_sensea_devcb); \ - scmp_device::set_senseb_cb(*device, DEVCB2_##_senseb_devcb); \ - scmp_device::set_halt_cb(*device, DEVCB2_##_halt_devcb); + scmp_device::set_flag_out_cb(*device, DEVCB_##_flag_out_devcb); \ + scmp_device::set_sout_cb(*device, DEVCB_##_sout_devcb); \ + scmp_device::set_sin_cb(*device, DEVCB_##_sin_devcb); \ + scmp_device::set_sensea_cb(*device, DEVCB_##_sensea_devcb); \ + scmp_device::set_senseb_cb(*device, DEVCB_##_senseb_devcb); \ + scmp_device::set_halt_cb(*device, DEVCB_##_halt_devcb); class scmp_device : public cpu_device @@ -34,12 +34,12 @@ public: scmp_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); // static configuration helpers - template<class _Object> static devcb2_base &set_flag_out_cb(device_t &device, _Object object) { return downcast<scmp_device &>(device).m_flag_out_func.set_callback(object); } - template<class _Object> static devcb2_base &set_sout_cb(device_t &device, _Object object) { return downcast<scmp_device &>(device).m_sout_func.set_callback(object); } - template<class _Object> static devcb2_base &set_sin_cb(device_t &device, _Object object) { return downcast<scmp_device &>(device).m_sin_func.set_callback(object); } - template<class _Object> static devcb2_base &set_sensea_cb(device_t &device, _Object object) { return downcast<scmp_device &>(device).m_sensea_func.set_callback(object); } - template<class _Object> static devcb2_base &set_senseb_cb(device_t &device, _Object object) { return downcast<scmp_device &>(device).m_senseb_func.set_callback(object); } - template<class _Object> static devcb2_base &set_halt_cb(device_t &device, _Object object) { return downcast<scmp_device &>(device).m_halt_func.set_callback(object); } + template<class _Object> static devcb_base &set_flag_out_cb(device_t &device, _Object object) { return downcast<scmp_device &>(device).m_flag_out_func.set_callback(object); } + template<class _Object> static devcb_base &set_sout_cb(device_t &device, _Object object) { return downcast<scmp_device &>(device).m_sout_func.set_callback(object); } + template<class _Object> static devcb_base &set_sin_cb(device_t &device, _Object object) { return downcast<scmp_device &>(device).m_sin_func.set_callback(object); } + template<class _Object> static devcb_base &set_sensea_cb(device_t &device, _Object object) { return downcast<scmp_device &>(device).m_sensea_func.set_callback(object); } + template<class _Object> static devcb_base &set_senseb_cb(device_t &device, _Object object) { return downcast<scmp_device &>(device).m_senseb_func.set_callback(object); } + template<class _Object> static devcb_base &set_halt_cb(device_t &device, _Object object) { return downcast<scmp_device &>(device).m_halt_func.set_callback(object); } protected: // device-level overrides @@ -78,12 +78,12 @@ private: direct_read_data *m_direct; int m_icount; - devcb2_write8 m_flag_out_func; - devcb2_write_line m_sout_func; - devcb2_read_line m_sin_func; - devcb2_read_line m_sensea_func; - devcb2_read_line m_senseb_func; - devcb2_write_line m_halt_func; + devcb_write8 m_flag_out_func; + devcb_write_line m_sout_func; + devcb_read_line m_sin_func; + devcb_read_line m_sensea_func; + devcb_read_line m_senseb_func; + devcb_write_line m_halt_func; inline UINT16 ADD12(UINT16 addr, INT8 val); inline UINT8 ROP(); diff --git a/src/emu/cpu/scudsp/scudsp.h b/src/emu/cpu/scudsp/scudsp.h index c0271f9db5a..9d460b58ee0 100644 --- a/src/emu/cpu/scudsp/scudsp.h +++ b/src/emu/cpu/scudsp/scudsp.h @@ -35,13 +35,13 @@ enum #define MCFG_SCUDSP_OUT_IRQ_CB(_devcb) \ - devcb = &scudsp_cpu_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &scudsp_cpu_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_SCUDSP_IN_DMA_CB(_devcb) \ - devcb = &scudsp_cpu_device::set_in_dma_callback(*device, DEVCB2_##_devcb); + devcb = &scudsp_cpu_device::set_in_dma_callback(*device, DEVCB_##_devcb); #define MCFG_SCUDSP_OUT_DMA_CB(_devcb) \ - devcb = &scudsp_cpu_device::set_out_dma_callback(*device, DEVCB2_##_devcb); + devcb = &scudsp_cpu_device::set_out_dma_callback(*device, DEVCB_##_devcb); #define SCUDSP_RESET INPUT_LINE_RESET /* Non-Maskable */ @@ -62,9 +62,9 @@ public: // construction/destruction scudsp_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<scudsp_cpu_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_dma_callback(device_t &device, _Object object) { return downcast<scudsp_cpu_device &>(device).m_in_dma_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dma_callback(device_t &device, _Object object) { return downcast<scudsp_cpu_device &>(device).m_out_dma_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<scudsp_cpu_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_dma_callback(device_t &device, _Object object) { return downcast<scudsp_cpu_device &>(device).m_in_dma_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dma_callback(device_t &device, _Object object) { return downcast<scudsp_cpu_device &>(device).m_out_dma_cb.set_callback(object); } /* port 0 */ DECLARE_READ32_MEMBER( program_control_r ); @@ -101,9 +101,9 @@ protected: virtual UINT32 disasm_max_opcode_bytes() const { return 4; } virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - devcb2_write_line m_out_irq_cb; - devcb2_read16 m_in_dma_cb; - devcb2_write16 m_out_dma_cb; + devcb_write_line m_out_irq_cb; + devcb_read16 m_in_dma_cb; + devcb_write16 m_out_dma_cb; private: address_space_config m_program_config; diff --git a/src/emu/cpu/sm8500/sm8500.h b/src/emu/cpu/sm8500/sm8500.h index 9ac92d7fcdc..a22c03fc210 100644 --- a/src/emu/cpu/sm8500/sm8500.h +++ b/src/emu/cpu/sm8500/sm8500.h @@ -4,10 +4,10 @@ #define __SM8500_H__ #define MCFG_SM8500_DMA_CB(_devcb) \ - sm8500_cpu_device::set_dma_cb(*device, DEVCB2_##_devcb); + sm8500_cpu_device::set_dma_cb(*device, DEVCB_##_devcb); #define MCFG_SM8500_TIMER_CB(_devcb) \ - sm8500_cpu_device::set_timer_cb(*device, DEVCB2_##_devcb); + sm8500_cpu_device::set_timer_cb(*device, DEVCB_##_devcb); enum { @@ -27,8 +27,8 @@ public: sm8500_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); // static configuration helpers - template<class _Object> static devcb2_base &set_dma_cb(device_t &device, _Object object) { return downcast<sm8500_cpu_device &>(device).m_dma_func.set_callback(object); } - template<class _Object> static devcb2_base &set_timer_cb(device_t &device, _Object object) { return downcast<sm8500_cpu_device &>(device).m_timer_func.set_callback(object); } + template<class _Object> static devcb_base &set_dma_cb(device_t &device, _Object object) { return downcast<sm8500_cpu_device &>(device).m_dma_func.set_callback(object); } + template<class _Object> static devcb_base &set_timer_cb(device_t &device, _Object object) { return downcast<sm8500_cpu_device &>(device).m_timer_func.set_callback(object); } /* interrupts */ static const int ILL_INT = 0; @@ -86,8 +86,8 @@ protected: address_space_config m_program_config; - devcb2_write8 m_dma_func; - devcb2_write8 m_timer_func; + devcb_write8 m_dma_func; + devcb_write8 m_timer_func; UINT16 m_PC; UINT8 m_IE0; diff --git a/src/emu/cpu/superfx/superfx.h b/src/emu/cpu/superfx/superfx.h index e96cd2fd1c0..99991a4d226 100644 --- a/src/emu/cpu/superfx/superfx.h +++ b/src/emu/cpu/superfx/superfx.h @@ -85,7 +85,7 @@ enum #define MCFG_SUPERFX_OUT_IRQ(_devcb) \ - superfx_device::set_out_irq_func(*device, DEVCB2_##_devcb); + superfx_device::set_out_irq_func(*device, DEVCB_##_devcb); class superfx_device : public cpu_device @@ -95,7 +95,7 @@ public: superfx_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); // static configuration helpers - template<class _Object> static devcb2_base &set_out_irq_func(device_t &device, _Object object) { return downcast<superfx_device &>(device).m_out_irq_func.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_func(device_t &device, _Object object) { return downcast<superfx_device &>(device).m_out_irq_func.set_callback(object); } UINT8 mmio_read(UINT32 addr); void mmio_write(UINT32 addr, UINT8 data); @@ -129,7 +129,7 @@ protected: private: address_space_config m_program_config; - devcb2_write_line m_out_irq_func; + devcb_write_line m_out_irq_func; UINT8 m_pipeline; UINT16 m_ramaddr; // RAM Address diff --git a/src/emu/cpu/tlcs900/tlcs900.h b/src/emu/cpu/tlcs900/tlcs900.h index 9170301f553..5fa0000e4e4 100644 --- a/src/emu/cpu/tlcs900/tlcs900.h +++ b/src/emu/cpu/tlcs900/tlcs900.h @@ -614,22 +614,22 @@ protected: void _F0(); }; -#define MCFG_TMP95C061_PORT1_READ( _port_read ) tmp95c061_device::set_port1_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C061_PORT1_WRITE( _port_write ) tmp95c061_device::set_port1_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C061_PORT2_WRITE( _port_write ) tmp95c061_device::set_port2_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C061_PORT5_READ( _port_read ) tmp95c061_device::set_port5_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C061_PORT5_WRITE( _port_write ) tmp95c061_device::set_port5_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C061_PORT6_READ( _port_read ) tmp95c061_device::set_port6_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C061_PORT6_WRITE( _port_write ) tmp95c061_device::set_port6_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C061_PORT7_READ( _port_read ) tmp95c061_device::set_port7_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C061_PORT7_WRITE( _port_write ) tmp95c061_device::set_port7_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C061_PORT8_READ( _port_read ) tmp95c061_device::set_port8_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C061_PORT8_WRITE( _port_write ) tmp95c061_device::set_port8_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C061_PORT9_READ( _port_read ) tmp95c061_device::set_port9_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C061_PORTA_READ( _port_read ) tmp95c061_device::set_porta_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C061_PORTA_WRITE( _port_write ) tmp95c061_device::set_porta_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C061_PORTB_READ( _port_read ) tmp95c061_device::set_portb_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C061_PORTB_WRITE( _port_write ) tmp95c061_device::set_portb_write( *device, DEVCB2_##_port_write ); +#define MCFG_TMP95C061_PORT1_READ( _port_read ) tmp95c061_device::set_port1_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C061_PORT1_WRITE( _port_write ) tmp95c061_device::set_port1_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C061_PORT2_WRITE( _port_write ) tmp95c061_device::set_port2_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C061_PORT5_READ( _port_read ) tmp95c061_device::set_port5_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C061_PORT5_WRITE( _port_write ) tmp95c061_device::set_port5_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C061_PORT6_READ( _port_read ) tmp95c061_device::set_port6_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C061_PORT6_WRITE( _port_write ) tmp95c061_device::set_port6_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C061_PORT7_READ( _port_read ) tmp95c061_device::set_port7_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C061_PORT7_WRITE( _port_write ) tmp95c061_device::set_port7_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C061_PORT8_READ( _port_read ) tmp95c061_device::set_port8_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C061_PORT8_WRITE( _port_write ) tmp95c061_device::set_port8_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C061_PORT9_READ( _port_read ) tmp95c061_device::set_port9_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C061_PORTA_READ( _port_read ) tmp95c061_device::set_porta_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C061_PORTA_WRITE( _port_write ) tmp95c061_device::set_porta_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C061_PORTB_READ( _port_read ) tmp95c061_device::set_portb_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C061_PORTB_WRITE( _port_write ) tmp95c061_device::set_portb_write( *device, DEVCB_##_port_write ); class tmp95c061_device : public tlcs900h_device { @@ -638,21 +638,21 @@ public: tmp95c061_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_port1_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port1_read.set_callback(object); } - template<class _Object> static devcb2_base &set_port1_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port1_write.set_callback(object); } - template<class _Object> static devcb2_base &set_port2_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port2_write.set_callback(object); } - template<class _Object> static devcb2_base &set_port5_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port5_read.set_callback(object); } - template<class _Object> static devcb2_base &set_port5_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port5_write.set_callback(object); } - template<class _Object> static devcb2_base &set_port6_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port6_write.set_callback(object); } - template<class _Object> static devcb2_base &set_port7_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port7_read.set_callback(object); } - template<class _Object> static devcb2_base &set_port7_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port7_write.set_callback(object); } - template<class _Object> static devcb2_base &set_port8_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port8_read.set_callback(object); } - template<class _Object> static devcb2_base &set_port8_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port8_write.set_callback(object); } - template<class _Object> static devcb2_base &set_port9_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port9_read.set_callback(object); } - template<class _Object> static devcb2_base &set_porta_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_porta_read.set_callback(object); } - template<class _Object> static devcb2_base &set_porta_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_porta_write.set_callback(object); } - template<class _Object> static devcb2_base &set_portb_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_portb_read.set_callback(object); } - template<class _Object> static devcb2_base &set_portb_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_portb_write.set_callback(object); } + template<class _Object> static devcb_base &set_port1_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port1_read.set_callback(object); } + template<class _Object> static devcb_base &set_port1_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port1_write.set_callback(object); } + template<class _Object> static devcb_base &set_port2_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port2_write.set_callback(object); } + template<class _Object> static devcb_base &set_port5_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port5_read.set_callback(object); } + template<class _Object> static devcb_base &set_port5_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port5_write.set_callback(object); } + template<class _Object> static devcb_base &set_port6_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port6_write.set_callback(object); } + template<class _Object> static devcb_base &set_port7_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port7_read.set_callback(object); } + template<class _Object> static devcb_base &set_port7_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port7_write.set_callback(object); } + template<class _Object> static devcb_base &set_port8_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port8_read.set_callback(object); } + template<class _Object> static devcb_base &set_port8_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port8_write.set_callback(object); } + template<class _Object> static devcb_base &set_port9_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_port9_read.set_callback(object); } + template<class _Object> static devcb_base &set_porta_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_porta_read.set_callback(object); } + template<class _Object> static devcb_base &set_porta_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_porta_write.set_callback(object); } + template<class _Object> static devcb_base &set_portb_read(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_portb_read.set_callback(object); } + template<class _Object> static devcb_base &set_portb_write(device_t &device, _Object object) { return downcast<tmp95c061_device &>(device).m_portb_write.set_callback(object); } DECLARE_READ8_MEMBER( internal_r ); DECLARE_WRITE8_MEMBER( internal_w ); @@ -677,71 +677,71 @@ private: UINT8 m_to3; // Port 1: 8 bit I/O. Shared with D8-D15 - devcb2_read8 m_port1_read; - devcb2_write8 m_port1_write; + devcb_read8 m_port1_read; + devcb_write8 m_port1_write; // Port 2: 8 bit output only. Shared with A16-A23 - devcb2_write8 m_port2_write; + devcb_write8 m_port2_write; // Port 5: 4 bit I/O. Shared with HWR, BUSRQ, BUSAK, RW - devcb2_read8 m_port5_read; - devcb2_write8 m_port5_write; + devcb_read8 m_port5_read; + devcb_write8 m_port5_write; // Port 6: 6 bit I/O. Shared with CS0, CS1, CS3/LCAS, RAS, REFOUT - devcb2_read8 m_port6_read; - devcb2_write8 m_port6_write; + devcb_read8 m_port6_read; + devcb_write8 m_port6_write; // Port 7: 8 bit I/O. Shared with PG0-OUT, PG1-OUT - devcb2_read8 m_port7_read; - devcb2_write8 m_port7_write; + devcb_read8 m_port7_read; + devcb_write8 m_port7_write; // Port 8: 6 bit I/O. Shared with TXD0, TXD1, RXD0, RXD1, CTS0, SCLK0, SCLK1 - devcb2_read8 m_port8_read; - devcb2_write8 m_port8_write; + devcb_read8 m_port8_read; + devcb_write8 m_port8_write; // Port 9: 4 bit input only. Shared with AN0-AN3 - devcb2_read8 m_port9_read; + devcb_read8 m_port9_read; // Port A: 4 bit I/O. Shared with WAIT, TI0, TO1, TO2 - devcb2_read8 m_porta_read; - devcb2_write8 m_porta_write; + devcb_read8 m_porta_read; + devcb_write8 m_porta_write; // Port B: 8 bit I/O. Shared with TI4/INT4, TI5/INT5, TI6/INT6, TI7/INT7, TO4, TO5, TO6 - devcb2_read8 m_portb_read; - devcb2_write8 m_portb_write; + devcb_read8 m_portb_read; + devcb_write8 m_portb_write; }; -#define MCFG_TMP95C063_PORT0_READ( _port_read ) tmp95c063_device::set_port0_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORT0_WRITE( _port_write ) tmp95c063_device::set_port0_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C063_PORT1_READ( _port_read ) tmp95c063_device::set_port1_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORT1_WRITE( _port_write ) tmp95c063_device::set_port1_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C063_PORT2_READ( _port_read ) tmp95c063_device::set_port2_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORT2_WRITE( _port_write ) tmp95c063_device::set_port2_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C063_PORT3_READ( _port_read ) tmp95c063_device::set_port3_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORT3_WRITE( _port_write ) tmp95c063_device::set_port3_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C063_PORT4_READ( _port_read ) tmp95c063_device::set_port4_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORT4_WRITE( _port_write ) tmp95c063_device::set_port4_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C063_PORT5_READ( _port_read ) tmp95c063_device::set_port5_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORT5_WRITE( _port_write ) tmp95c063_device::set_port5_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C063_PORT6_READ( _port_read ) tmp95c063_device::set_port6_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORT6_WRITE( _port_write ) tmp95c063_device::set_port6_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C063_PORT7_READ( _port_read ) tmp95c063_device::set_port7_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORT7_WRITE( _port_write ) tmp95c063_device::set_port7_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C063_PORT8_READ( _port_read ) tmp95c063_device::set_port8_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORT8_WRITE( _port_write ) tmp95c063_device::set_port8_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C063_PORT9_READ( _port_read ) tmp95c063_device::set_port9_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORT9_WRITE( _port_write ) tmp95c063_device::set_port9_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C063_PORTA_READ( _port_read ) tmp95c063_device::set_porta_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORTA_WRITE( _port_write ) tmp95c063_device::set_porta_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C063_PORTB_READ( _port_read ) tmp95c063_device::set_portb_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORTB_WRITE( _port_write ) tmp95c063_device::set_portb_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C063_PORTC_READ( _port_read ) tmp95c063_device::set_portc_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORTC_WRITE( _port_write ) tmp95c063_device::set_portc_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C063_PORTD_READ( _port_read ) tmp95c063_device::set_portd_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORTD_WRITE( _port_write ) tmp95c063_device::set_portd_write( *device, DEVCB2_##_port_write ); -#define MCFG_TMP95C063_PORTE_READ( _port_read ) tmp95c063_device::set_porte_read( *device, DEVCB2_##_port_read ); -#define MCFG_TMP95C063_PORTE_WRITE( _port_write ) tmp95c063_device::set_porte_write( *device, DEVCB2_##_port_write ); +#define MCFG_TMP95C063_PORT0_READ( _port_read ) tmp95c063_device::set_port0_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORT0_WRITE( _port_write ) tmp95c063_device::set_port0_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C063_PORT1_READ( _port_read ) tmp95c063_device::set_port1_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORT1_WRITE( _port_write ) tmp95c063_device::set_port1_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C063_PORT2_READ( _port_read ) tmp95c063_device::set_port2_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORT2_WRITE( _port_write ) tmp95c063_device::set_port2_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C063_PORT3_READ( _port_read ) tmp95c063_device::set_port3_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORT3_WRITE( _port_write ) tmp95c063_device::set_port3_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C063_PORT4_READ( _port_read ) tmp95c063_device::set_port4_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORT4_WRITE( _port_write ) tmp95c063_device::set_port4_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C063_PORT5_READ( _port_read ) tmp95c063_device::set_port5_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORT5_WRITE( _port_write ) tmp95c063_device::set_port5_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C063_PORT6_READ( _port_read ) tmp95c063_device::set_port6_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORT6_WRITE( _port_write ) tmp95c063_device::set_port6_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C063_PORT7_READ( _port_read ) tmp95c063_device::set_port7_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORT7_WRITE( _port_write ) tmp95c063_device::set_port7_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C063_PORT8_READ( _port_read ) tmp95c063_device::set_port8_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORT8_WRITE( _port_write ) tmp95c063_device::set_port8_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C063_PORT9_READ( _port_read ) tmp95c063_device::set_port9_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORT9_WRITE( _port_write ) tmp95c063_device::set_port9_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C063_PORTA_READ( _port_read ) tmp95c063_device::set_porta_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORTA_WRITE( _port_write ) tmp95c063_device::set_porta_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C063_PORTB_READ( _port_read ) tmp95c063_device::set_portb_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORTB_WRITE( _port_write ) tmp95c063_device::set_portb_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C063_PORTC_READ( _port_read ) tmp95c063_device::set_portc_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORTC_WRITE( _port_write ) tmp95c063_device::set_portc_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C063_PORTD_READ( _port_read ) tmp95c063_device::set_portd_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORTD_WRITE( _port_write ) tmp95c063_device::set_portd_write( *device, DEVCB_##_port_write ); +#define MCFG_TMP95C063_PORTE_READ( _port_read ) tmp95c063_device::set_porte_read( *device, DEVCB_##_port_read ); +#define MCFG_TMP95C063_PORTE_WRITE( _port_write ) tmp95c063_device::set_porte_write( *device, DEVCB_##_port_write ); class tmp95c063_device : public tlcs900h_device { @@ -753,28 +753,28 @@ public: DECLARE_WRITE8_MEMBER( internal_w ); // static configuration helpers - template<class _Object> static devcb2_base &set_port1_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port1_read.set_callback(object); } - template<class _Object> static devcb2_base &set_port1_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port1_write.set_callback(object); } - template<class _Object> static devcb2_base &set_port2_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port2_write.set_callback(object); } - template<class _Object> static devcb2_base &set_port5_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port5_read.set_callback(object); } - template<class _Object> static devcb2_base &set_port5_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port5_write.set_callback(object); } - template<class _Object> static devcb2_base &set_port6_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port6_read.set_callback(object); } - template<class _Object> static devcb2_base &set_port6_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port6_write.set_callback(object); } - template<class _Object> static devcb2_base &set_port7_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port7_read.set_callback(object); } - template<class _Object> static devcb2_base &set_port7_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port7_write.set_callback(object); } - template<class _Object> static devcb2_base &set_port8_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port8_read.set_callback(object); } - template<class _Object> static devcb2_base &set_port8_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port8_write.set_callback(object); } - template<class _Object> static devcb2_base &set_port9_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port9_read.set_callback(object); } - template<class _Object> static devcb2_base &set_port9_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port9_write.set_callback(object); } - template<class _Object> static devcb2_base &set_porta_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_porta_read.set_callback(object); } - template<class _Object> static devcb2_base &set_porta_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_porta_write.set_callback(object); } - template<class _Object> static devcb2_base &set_portb_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_portb_read.set_callback(object); } - template<class _Object> static devcb2_base &set_portb_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_portb_write.set_callback(object); } - template<class _Object> static devcb2_base &set_portc_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_portc_read.set_callback(object); } - template<class _Object> static devcb2_base &set_portd_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_portd_read.set_callback(object); } - template<class _Object> static devcb2_base &set_portd_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_portd_write.set_callback(object); } - template<class _Object> static devcb2_base &set_porte_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_porte_read.set_callback(object); } - template<class _Object> static devcb2_base &set_porte_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_porte_write.set_callback(object); } + template<class _Object> static devcb_base &set_port1_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port1_read.set_callback(object); } + template<class _Object> static devcb_base &set_port1_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port1_write.set_callback(object); } + template<class _Object> static devcb_base &set_port2_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port2_write.set_callback(object); } + template<class _Object> static devcb_base &set_port5_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port5_read.set_callback(object); } + template<class _Object> static devcb_base &set_port5_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port5_write.set_callback(object); } + template<class _Object> static devcb_base &set_port6_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port6_read.set_callback(object); } + template<class _Object> static devcb_base &set_port6_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port6_write.set_callback(object); } + template<class _Object> static devcb_base &set_port7_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port7_read.set_callback(object); } + template<class _Object> static devcb_base &set_port7_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port7_write.set_callback(object); } + template<class _Object> static devcb_base &set_port8_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port8_read.set_callback(object); } + template<class _Object> static devcb_base &set_port8_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port8_write.set_callback(object); } + template<class _Object> static devcb_base &set_port9_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port9_read.set_callback(object); } + template<class _Object> static devcb_base &set_port9_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_port9_write.set_callback(object); } + template<class _Object> static devcb_base &set_porta_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_porta_read.set_callback(object); } + template<class _Object> static devcb_base &set_porta_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_porta_write.set_callback(object); } + template<class _Object> static devcb_base &set_portb_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_portb_read.set_callback(object); } + template<class _Object> static devcb_base &set_portb_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_portb_write.set_callback(object); } + template<class _Object> static devcb_base &set_portc_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_portc_read.set_callback(object); } + template<class _Object> static devcb_base &set_portd_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_portd_read.set_callback(object); } + template<class _Object> static devcb_base &set_portd_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_portd_write.set_callback(object); } + template<class _Object> static devcb_base &set_porte_read(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_porte_read.set_callback(object); } + template<class _Object> static devcb_base &set_porte_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_porte_write.set_callback(object); } protected: virtual void device_config_complete(); @@ -789,50 +789,50 @@ protected: private: // Port 1: 8 bit I/O. Shared with d8-d15 - devcb2_read8 m_port1_read; - devcb2_write8 m_port1_write; + devcb_read8 m_port1_read; + devcb_write8 m_port1_write; // Port 2: 8 bit output only. Shared with a16-a23 - devcb2_write8 m_port2_write; + devcb_write8 m_port2_write; // Port 5: 6 bit I/O - devcb2_read8 m_port5_read; - devcb2_write8 m_port5_write; + devcb_read8 m_port5_read; + devcb_write8 m_port5_write; // Port 6: 8 bit I/O. Shared with cs1, cs3 & dram control - devcb2_read8 m_port6_read; - devcb2_write8 m_port6_write; + devcb_read8 m_port6_read; + devcb_write8 m_port6_write; // Port 7: 8 bit I/O - devcb2_read8 m_port7_read; - devcb2_write8 m_port7_write; + devcb_read8 m_port7_read; + devcb_write8 m_port7_write; // Port 8: 8 bit I/O. Shared with SCOUT, WAIT, NMI2, INT0-INT3 - devcb2_read8 m_port8_read; - devcb2_write8 m_port8_write; + devcb_read8 m_port8_read; + devcb_write8 m_port8_write; // Port 9: 8 bit I/O. Shared with clock input and output for the 8-bit timers - devcb2_read8 m_port9_read; - devcb2_write8 m_port9_write; + devcb_read8 m_port9_read; + devcb_write8 m_port9_write; // Port A: 8 bit I/O. Shared with serial channels 0/1 - devcb2_read8 m_porta_read; - devcb2_write8 m_porta_write; + devcb_read8 m_porta_read; + devcb_write8 m_porta_write; // Port B: 8 bit I/O. Shared with 16bit timers - devcb2_read8 m_portb_read; - devcb2_write8 m_portb_write; + devcb_read8 m_portb_read; + devcb_write8 m_portb_write; // Port C: 8 bit input only. Shared with analogue inputs - devcb2_read8 m_portc_read; + devcb_read8 m_portc_read; // Port D: 5 bit I/O. Shared with INT8 - devcb2_read8 m_portd_read; - devcb2_write8 m_portd_write; + devcb_read8 m_portd_read; + devcb_write8 m_portd_write; // Port E: 8 bit I/O. - devcb2_read8 m_porte_read; - devcb2_write8 m_porte_write; + devcb_read8 m_porte_read; + devcb_write8 m_porte_write; }; #endif diff --git a/src/emu/cpu/tms0980/tms0980.h b/src/emu/cpu/tms0980/tms0980.h index 7881dc47a5d..2dbdd89b3b4 100644 --- a/src/emu/cpu/tms0980/tms0980.h +++ b/src/emu/cpu/tms0980/tms0980.h @@ -13,13 +13,13 @@ enum { tms1xxx_cpu_device::set_output_pla(*device, _pla); #define MCFG_TMS1XXX_READ_K(_devcb) \ - tms1xxx_cpu_device::set_read_k(*device, DEVCB2_##_devcb); + tms1xxx_cpu_device::set_read_k(*device, DEVCB_##_devcb); #define MCFG_TMS1XXX_WRITE_O(_devcb) \ - tms1xxx_cpu_device::set_write_o(*device, DEVCB2_##_devcb); + tms1xxx_cpu_device::set_write_o(*device, DEVCB_##_devcb); #define MCFG_TMS1XXX_WRITE_R(_devcb) \ - tms1xxx_cpu_device::set_write_r(*device, DEVCB2_##_devcb); + tms1xxx_cpu_device::set_write_r(*device, DEVCB_##_devcb); class tms1xxx_cpu_device : public cpu_device @@ -53,9 +53,9 @@ public: { } // static configuration helpers - template<class _Object> static devcb2_base &set_read_k(device_t &device, _Object object) { return downcast<tms1xxx_cpu_device &>(device).m_read_k.set_callback(object); } - template<class _Object> static devcb2_base &set_write_o(device_t &device, _Object object) { return downcast<tms1xxx_cpu_device &>(device).m_write_o.set_callback(object); } - template<class _Object> static devcb2_base &set_write_r(device_t &device, _Object object) { return downcast<tms1xxx_cpu_device &>(device).m_write_r.set_callback(object); } + template<class _Object> static devcb_base &set_read_k(device_t &device, _Object object) { return downcast<tms1xxx_cpu_device &>(device).m_read_k.set_callback(object); } + template<class _Object> static devcb_base &set_write_o(device_t &device, _Object object) { return downcast<tms1xxx_cpu_device &>(device).m_write_o.set_callback(object); } + template<class _Object> static devcb_base &set_write_r(device_t &device, _Object object) { return downcast<tms1xxx_cpu_device &>(device).m_write_r.set_callback(object); } static void set_output_pla(device_t &device, const UINT16 *output_pla) { downcast<tms1xxx_cpu_device &>(device).c_output_pla = output_pla; } protected: @@ -125,9 +125,9 @@ protected: address_space *m_data; const UINT16 *c_output_pla; - devcb2_read8 m_read_k; - devcb2_write16 m_write_o; - devcb2_write16 m_write_r; + devcb_read8 m_read_k; + devcb_write16 m_write_o; + devcb_write16 m_write_r; }; diff --git a/src/emu/cpu/tms9900/tms9900.h b/src/emu/cpu/tms9900/tms9900.h index 98c600420bc..7b466622094 100644 --- a/src/emu/cpu/tms9900/tms9900.h +++ b/src/emu/cpu/tms9900/tms9900.h @@ -57,13 +57,13 @@ public: void set_hold(int state); // Callbacks - template<class _Object> static devcb2_base &static_set_extop_callback(device_t &device, _Object object) { return downcast<tms99xx_device &>(device).m_external_operation.set_callback(object); } - template<class _Object> static devcb2_base &static_set_intlevel_callback(device_t &device, _Object object) { return downcast<tms99xx_device &>(device).m_get_intlevel.set_callback(object); } - template<class _Object> static devcb2_base &static_set_iaq_callback(device_t &device, _Object object) { return downcast<tms99xx_device &>(device).m_iaq_line.set_callback(object); } - template<class _Object> static devcb2_base &static_set_clkout_callback(device_t &device, _Object object) { return downcast<tms99xx_device &>(device).m_clock_out_line.set_callback(object); } - template<class _Object> static devcb2_base &static_set_wait_callback(device_t &device, _Object object) { return downcast<tms99xx_device &>(device).m_wait_line.set_callback(object); } - template<class _Object> static devcb2_base &static_set_holda_callback(device_t &device, _Object object) { return downcast<tms99xx_device &>(device).m_holda_line.set_callback(object); } - template<class _Object> static devcb2_base &static_set_dbin_callback(device_t &device, _Object object) { return downcast<tms99xx_device &>(device).m_dbin_line.set_callback(object); } + template<class _Object> static devcb_base &static_set_extop_callback(device_t &device, _Object object) { return downcast<tms99xx_device &>(device).m_external_operation.set_callback(object); } + template<class _Object> static devcb_base &static_set_intlevel_callback(device_t &device, _Object object) { return downcast<tms99xx_device &>(device).m_get_intlevel.set_callback(object); } + template<class _Object> static devcb_base &static_set_iaq_callback(device_t &device, _Object object) { return downcast<tms99xx_device &>(device).m_iaq_line.set_callback(object); } + template<class _Object> static devcb_base &static_set_clkout_callback(device_t &device, _Object object) { return downcast<tms99xx_device &>(device).m_clock_out_line.set_callback(object); } + template<class _Object> static devcb_base &static_set_wait_callback(device_t &device, _Object object) { return downcast<tms99xx_device &>(device).m_wait_line.set_callback(object); } + template<class _Object> static devcb_base &static_set_holda_callback(device_t &device, _Object object) { return downcast<tms99xx_device &>(device).m_holda_line.set_callback(object); } + template<class _Object> static devcb_base &static_set_dbin_callback(device_t &device, _Object object) { return downcast<tms99xx_device &>(device).m_dbin_line.set_callback(object); } protected: // device-level overrides @@ -165,22 +165,22 @@ protected: // Clock output. This is not a pin of the TMS9900 because the TMS9900 // needs an external clock, and usually one of those external lines is // used for this purpose. - devcb2_write_line m_clock_out_line; + devcb_write_line m_clock_out_line; // Wait output. When asserted (high), the CPU is in a wait state. - devcb2_write_line m_wait_line; + devcb_write_line m_wait_line; // HOLD Acknowledge line. When asserted (high), the CPU is in HOLD state. - devcb2_write_line m_holda_line; + devcb_write_line m_holda_line; // Signal to the outside world that we are now getting an instruction - devcb2_write_line m_iaq_line; + devcb_write_line m_iaq_line; // Get the value of the interrupt level lines - devcb2_read8 m_get_intlevel; + devcb_read8 m_get_intlevel; // DBIN line. When asserted (high), the CPU has disabled the data bus output buffers. - devcb2_write_line m_dbin_line; + devcb_write_line m_dbin_line; // Trigger external operation. This is achieved by putting a special value in // the most significant three bits of the address bus (TMS9995: data bus) and @@ -202,7 +202,7 @@ protected: // We could realize this via the CRU access as well, but the data bus access // is not that simple to emulate. For the sake of homogenity between the // chip emulations we use a dedicated callback. - devcb2_write8 m_external_operation; + devcb_write8 m_external_operation; private: diff --git a/src/emu/cpu/tms9900/tms9995.h b/src/emu/cpu/tms9900/tms9995.h index 7517934b588..3ede7e1770c 100644 --- a/src/emu/cpu/tms9900/tms9995.h +++ b/src/emu/cpu/tms9900/tms9995.h @@ -27,19 +27,19 @@ enum }; #define MCFG_TMS9995_EXTOP_HANDLER( _extop) \ - devcb = &tms9995_device::static_set_extop_callback( *device, DEVCB2_##_extop ); + devcb = &tms9995_device::static_set_extop_callback( *device, DEVCB_##_extop ); #define MCFG_TMS9995_IAQ_HANDLER( _iaq ) \ - devcb = &tms9995_device::static_set_iaq_callback( *device, DEVCB2_##_iaq ); + devcb = &tms9995_device::static_set_iaq_callback( *device, DEVCB_##_iaq ); #define MCFG_TMS9995_CLKOUT_HANDLER( _clkout ) \ - devcb = &tms9995_device::static_set_clkout_callback( *device, DEVCB2_##_clkout ); + devcb = &tms9995_device::static_set_clkout_callback( *device, DEVCB_##_clkout ); #define MCFG_TMS9995_HOLDA_HANDLER( _holda ) \ - devcb = &tms9995_device::static_set_holda_callback( *device, DEVCB2_##_holda ); + devcb = &tms9995_device::static_set_holda_callback( *device, DEVCB_##_holda ); #define MCFG_TMS9995_DBIN_HANDLER( _dbin ) \ - devcb = &tms9995_device::static_set_dbin_callback( *device, DEVCB2_##_dbin ); + devcb = &tms9995_device::static_set_dbin_callback( *device, DEVCB_##_dbin ); #define MCFG_TMS9995_ENABLE_OVINT( _ovint ) \ downcast<tms9995_device*>(device)->set_overflow_interrupt( _ovint ); @@ -62,11 +62,11 @@ public: void set_hold(int state); // Callbacks - template<class _Object> static devcb2_base &static_set_extop_callback(device_t &device, _Object object) { return downcast<tms9995_device &>(device).m_external_operation.set_callback(object); } - template<class _Object> static devcb2_base &static_set_iaq_callback(device_t &device, _Object object) { return downcast<tms9995_device &>(device).m_iaq_line.set_callback(object); } - template<class _Object> static devcb2_base &static_set_clkout_callback(device_t &device, _Object object) { return downcast<tms9995_device &>(device).m_clock_out_line.set_callback(object); } - template<class _Object> static devcb2_base &static_set_holda_callback(device_t &device, _Object object) { return downcast<tms9995_device &>(device).m_holda_line.set_callback(object); } - template<class _Object> static devcb2_base &static_set_dbin_callback(device_t &device, _Object object) { return downcast<tms9995_device &>(device).m_dbin_line.set_callback(object); } + template<class _Object> static devcb_base &static_set_extop_callback(device_t &device, _Object object) { return downcast<tms9995_device &>(device).m_external_operation.set_callback(object); } + template<class _Object> static devcb_base &static_set_iaq_callback(device_t &device, _Object object) { return downcast<tms9995_device &>(device).m_iaq_line.set_callback(object); } + template<class _Object> static devcb_base &static_set_clkout_callback(device_t &device, _Object object) { return downcast<tms9995_device &>(device).m_clock_out_line.set_callback(object); } + template<class _Object> static devcb_base &static_set_holda_callback(device_t &device, _Object object) { return downcast<tms9995_device &>(device).m_holda_line.set_callback(object); } + template<class _Object> static devcb_base &static_set_dbin_callback(device_t &device, _Object object) { return downcast<tms9995_device &>(device).m_dbin_line.set_callback(object); } // For debugger access UINT8 debug_read_onchip_memory(offs_t addr) { return m_onchip_memory[addr & 0xff]; }; @@ -411,22 +411,22 @@ private: // We could realize this via the CRU access as well, but the data bus access // is not that simple to emulate. For the sake of homogenity between the // chip emulations we use a dedicated callback. - devcb2_write8 m_external_operation; + devcb_write8 m_external_operation; // Signal to the outside world that we are now getting an instruction (IAQ). // In the real hardware this line is shared with the HOLDA line, and the // /MEMEN line is used to decide which signal we have on the line. We do not // emulate the /MEMEN line, so we have to use two separate lines. - devcb2_write_line m_iaq_line; + devcb_write_line m_iaq_line; // Clock output. - devcb2_write_line m_clock_out_line; + devcb_write_line m_clock_out_line; // Asserted when the CPU is in a HOLD state - devcb2_write_line m_holda_line; + devcb_write_line m_holda_line; // DBIN line. When asserted (high), the CPU has disabled the data bus output buffers. - devcb2_write_line m_dbin_line; + devcb_write_line m_dbin_line; }; diff --git a/src/emu/cpu/tms9900/tms99com.h b/src/emu/cpu/tms9900/tms99com.h index 2d300936b25..3a1aeeb57ee 100644 --- a/src/emu/cpu/tms9900/tms99com.h +++ b/src/emu/cpu/tms9900/tms99com.h @@ -47,25 +47,25 @@ MCFG_DEVICE_IO_MAP(_iomap) #define MCFG_TMS99xx_EXTOP_HANDLER( _extop) \ - devcb = &tms99xx_device::static_set_extop_callback( *device, DEVCB2_##_extop ); + devcb = &tms99xx_device::static_set_extop_callback( *device, DEVCB_##_extop ); #define MCFG_TMS99xx_INTLEVEL_HANDLER( _intlevel ) \ - devcb = &tms99xx_device::static_set_intlevel_callback( *device, DEVCB2_##_intlevel ); + devcb = &tms99xx_device::static_set_intlevel_callback( *device, DEVCB_##_intlevel ); #define MCFG_TMS99xx_IAQ_HANDLER( _iaq ) \ - devcb = &tms99xx_device::static_set_iaq_callback( *device, DEVCB2_##_iaq ); + devcb = &tms99xx_device::static_set_iaq_callback( *device, DEVCB_##_iaq ); #define MCFG_TMS99xx_CLKOUT_HANDLER( _clkout ) \ - devcb = &tms99xx_device::static_set_clkout_callback( *device, DEVCB2_##_clkout ); + devcb = &tms99xx_device::static_set_clkout_callback( *device, DEVCB_##_clkout ); #define MCFG_TMS99xx_WAIT_HANDLER( _wait ) \ - devcb = &tms99xx_device::static_set_wait_callback( *device, DEVCB2_##_wait ); + devcb = &tms99xx_device::static_set_wait_callback( *device, DEVCB_##_wait ); #define MCFG_TMS99xx_HOLDA_HANDLER( _holda ) \ - devcb = &tms99xx_device::static_set_holda_callback( *device, DEVCB2_##_holda ); + devcb = &tms99xx_device::static_set_holda_callback( *device, DEVCB_##_holda ); #define MCFG_TMS99xx_DBIN_HANDLER( _dbin ) \ - devcb = &tms99xx_device::static_set_dbin_callback( *device, DEVCB2_##_dbin ); + devcb = &tms99xx_device::static_set_dbin_callback( *device, DEVCB_##_dbin ); enum { diff --git a/src/emu/cpu/upd7725/upd7725.h b/src/emu/cpu/upd7725/upd7725.h index bcff3ead299..aeb9097e11b 100644 --- a/src/emu/cpu/upd7725/upd7725.h +++ b/src/emu/cpu/upd7725/upd7725.h @@ -32,37 +32,37 @@ class upd96050_device; #define MCFG_NECDSP_IN_INT_CB(_devcb) \ - devcb = &necdsp_device::set_in_int_callback(*device, DEVCB2_##_devcb); + devcb = &necdsp_device::set_in_int_callback(*device, DEVCB_##_devcb); #define MCFG_NECDSP_IN_SI_CB(_devcb) \ - devcb = &necdsp_device::set_in_si_callback(*device, DEVCB2_##_devcb); + devcb = &necdsp_device::set_in_si_callback(*device, DEVCB_##_devcb); #define MCFG_NECDSP_IN_SCK_CB(_devcb) \ - devcb = &necdsp_device::set_in_sck_callback(*device, DEVCB2_##_devcb); + devcb = &necdsp_device::set_in_sck_callback(*device, DEVCB_##_devcb); #define MCFG_NECDSP_IN_SIEN_CB(_devcb) \ - devcb = &necdsp_device::set_in_sien_callback(*device, DEVCB2_##_devcb); + devcb = &necdsp_device::set_in_sien_callback(*device, DEVCB_##_devcb); #define MCFG_NECDSP_IN_SOEN_CB(_devcb) \ - devcb = &necdsp_device::set_in_soen_callback(*device, DEVCB2_##_devcb); + devcb = &necdsp_device::set_in_soen_callback(*device, DEVCB_##_devcb); #define MCFG_NECDSP_IN_DACK_CB(_devcb) \ - devcb = &necdsp_device::set_in_dack_callback(*device, DEVCB2_##_devcb); + devcb = &necdsp_device::set_in_dack_callback(*device, DEVCB_##_devcb); #define MCFG_NECDSP_OUT_P0_CB(_devcb) \ - devcb = &necdsp_device::set_out_p0_callback(*device, DEVCB2_##_devcb); + devcb = &necdsp_device::set_out_p0_callback(*device, DEVCB_##_devcb); #define MCFG_NECDSP_OUT_P1_CB(_devcb) \ - devcb = &necdsp_device::set_out_p1_callback(*device, DEVCB2_##_devcb); + devcb = &necdsp_device::set_out_p1_callback(*device, DEVCB_##_devcb); #define MCFG_NECDSP_OUT_SO_CB(_devcb) \ - devcb = &necdsp_device::set_out_so_callback(*device, DEVCB2_##_devcb); + devcb = &necdsp_device::set_out_so_callback(*device, DEVCB_##_devcb); #define MCFG_NECDSP_OUT_SORQ_CB(_devcb) \ - devcb = &necdsp_device::set_out_sorq_callback(*device, DEVCB2_##_devcb); + devcb = &necdsp_device::set_out_sorq_callback(*device, DEVCB_##_devcb); #define MCFG_NECDSP_OUT_DRQ_CB(_devcb) \ - devcb = &necdsp_device::set_out_drq_callback(*device, DEVCB2_##_devcb); + devcb = &necdsp_device::set_out_drq_callback(*device, DEVCB_##_devcb); // ======================> necdsp_device @@ -75,17 +75,17 @@ protected: public: - template<class _Object> static devcb2_base &set_in_int_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_in_int_cb.set_callback(object); } - //template<class _Object> static devcb2_base &set_in_si_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_in_si_cb.set_callback(object); } - //template<class _Object> static devcb2_base &set_in_sck_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_in_sck_cb.set_callback(object); } - //template<class _Object> static devcb2_base &set_in_sien_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_in_sien_cb.set_callback(object); } - //template<class _Object> static devcb2_base &set_in_soen_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_in_soen_cb.set_callback(object); } - //template<class _Object> static devcb2_base &set_in_dack_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_in_dack_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_p0_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_out_p0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_p1_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_out_p1_cb.set_callback(object); } - //template<class _Object> static devcb2_base &set_out_so_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_out_so_cb.set_callback(object); } - //template<class _Object> static devcb2_base &set_out_sorq_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_out_sorq_cb.set_callback(object); } - //template<class _Object> static devcb2_base &set_out_drq_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_out_drq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_int_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_in_int_cb.set_callback(object); } + //template<class _Object> static devcb_base &set_in_si_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_in_si_cb.set_callback(object); } + //template<class _Object> static devcb_base &set_in_sck_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_in_sck_cb.set_callback(object); } + //template<class _Object> static devcb_base &set_in_sien_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_in_sien_cb.set_callback(object); } + //template<class _Object> static devcb_base &set_in_soen_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_in_soen_cb.set_callback(object); } + //template<class _Object> static devcb_base &set_in_dack_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_in_dack_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_p0_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_out_p0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_p1_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_out_p1_cb.set_callback(object); } + //template<class _Object> static devcb_base &set_out_so_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_out_so_cb.set_callback(object); } + //template<class _Object> static devcb_base &set_out_sorq_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_out_sorq_cb.set_callback(object); } + //template<class _Object> static devcb_base &set_out_drq_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_out_drq_cb.set_callback(object); } UINT8 snesdsp_read(bool mode); void snesdsp_write(bool mode, UINT8 data); @@ -197,17 +197,17 @@ private: protected: // device callbacks - devcb2_read_line m_in_int_cb; - //devcb2_read8 m_in_si_cb; - //devcb2_read_line m_in_sck_cb; - //devcb2_read_line m_in_sien_cb; - //devcb2_read_line m_in_soen_cb; - //devcb2_read_line m_in_dack_cb; - devcb2_write_line m_out_p0_cb; - devcb2_write_line m_out_p1_cb; - //devcb2_write8 m_out_so_cb; - //devcb2_write_line m_out_sorq_cb; - //devcb2_write_line m_out_drq_cb; + devcb_read_line m_in_int_cb; + //devcb_read8 m_in_si_cb; + //devcb_read_line m_in_sck_cb; + //devcb_read_line m_in_sien_cb; + //devcb_read_line m_in_soen_cb; + //devcb_read_line m_in_dack_cb; + devcb_write_line m_out_p0_cb; + devcb_write_line m_out_p1_cb; + //devcb_write8 m_out_so_cb; + //devcb_write_line m_out_sorq_cb; + //devcb_write_line m_out_drq_cb; }; class upd7725_device : public necdsp_device diff --git a/src/emu/cpu/upd7810/upd7810.h b/src/emu/cpu/upd7810/upd7810.h index 758480d4fd3..0d1161e39a8 100644 --- a/src/emu/cpu/upd7810/upd7810.h +++ b/src/emu/cpu/upd7810/upd7810.h @@ -48,37 +48,37 @@ enum #define MCFG_UPD7810_TO(_devcb) \ - upd7810_device::set_to_func(*device, DEVCB2_##_devcb); + upd7810_device::set_to_func(*device, DEVCB_##_devcb); #define MCFG_UPD7810_TXD(_devcb) \ - upd7810_device::set_txd_func(*device, DEVCB2_##_devcb); + upd7810_device::set_txd_func(*device, DEVCB_##_devcb); #define MCFG_UPD7810_RXD(_devcb) \ - upd7810_device::set_rxd_func(*device, DEVCB2_##_devcb); + upd7810_device::set_rxd_func(*device, DEVCB_##_devcb); #define MCFG_UPD7810_AN0(_devcb) \ - upd7810_device::set_an0_func(*device, DEVCB2_##_devcb); + upd7810_device::set_an0_func(*device, DEVCB_##_devcb); #define MCFG_UPD7810_AN1(_devcb) \ - upd7810_device::set_an1_func(*device, DEVCB2_##_devcb); + upd7810_device::set_an1_func(*device, DEVCB_##_devcb); #define MCFG_UPD7810_AN2(_devcb) \ - upd7810_device::set_an2_func(*device, DEVCB2_##_devcb); + upd7810_device::set_an2_func(*device, DEVCB_##_devcb); #define MCFG_UPD7810_AN3(_devcb) \ - upd7810_device::set_an3_func(*device, DEVCB2_##_devcb); + upd7810_device::set_an3_func(*device, DEVCB_##_devcb); #define MCFG_UPD7810_AN4(_devcb) \ - upd7810_device::set_an4_func(*device, DEVCB2_##_devcb); + upd7810_device::set_an4_func(*device, DEVCB_##_devcb); #define MCFG_UPD7810_AN5(_devcb) \ - upd7810_device::set_an5_func(*device, DEVCB2_##_devcb); + upd7810_device::set_an5_func(*device, DEVCB_##_devcb); #define MCFG_UPD7810_AN6(_devcb) \ - upd7810_device::set_an6_func(*device, DEVCB2_##_devcb); + upd7810_device::set_an6_func(*device, DEVCB_##_devcb); #define MCFG_UPD7810_AN7(_devcb) \ - upd7810_device::set_an7_func(*device, DEVCB2_##_devcb); + upd7810_device::set_an7_func(*device, DEVCB_##_devcb); class upd7810_device : public cpu_device @@ -89,17 +89,17 @@ public: upd7810_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); // static configuration helpers - template<class _Object> static devcb2_base &set_to_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_to_func.set_callback(object); } - template<class _Object> static devcb2_base &set_txd_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_txd_func.set_callback(object); } - template<class _Object> static devcb2_base &set_rxd_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_rxd_func.set_callback(object); } - template<class _Object> static devcb2_base &set_an0_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an0_func.set_callback(object); } - template<class _Object> static devcb2_base &set_an1_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an1_func.set_callback(object); } - template<class _Object> static devcb2_base &set_an2_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an2_func.set_callback(object); } - template<class _Object> static devcb2_base &set_an3_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an3_func.set_callback(object); } - template<class _Object> static devcb2_base &set_an4_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an4_func.set_callback(object); } - template<class _Object> static devcb2_base &set_an5_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an5_func.set_callback(object); } - template<class _Object> static devcb2_base &set_an6_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an6_func.set_callback(object); } - template<class _Object> static devcb2_base &set_an7_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an7_func.set_callback(object); } + template<class _Object> static devcb_base &set_to_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_to_func.set_callback(object); } + template<class _Object> static devcb_base &set_txd_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_txd_func.set_callback(object); } + template<class _Object> static devcb_base &set_rxd_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_rxd_func.set_callback(object); } + template<class _Object> static devcb_base &set_an0_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an0_func.set_callback(object); } + template<class _Object> static devcb_base &set_an1_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an1_func.set_callback(object); } + template<class _Object> static devcb_base &set_an2_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an2_func.set_callback(object); } + template<class _Object> static devcb_base &set_an3_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an3_func.set_callback(object); } + template<class _Object> static devcb_base &set_an4_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an4_func.set_callback(object); } + template<class _Object> static devcb_base &set_an5_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an5_func.set_callback(object); } + template<class _Object> static devcb_base &set_an6_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an6_func.set_callback(object); } + template<class _Object> static devcb_base &set_an7_func(device_t &device, _Object object) { return downcast<upd7810_device &>(device).m_an7_func.set_callback(object); } protected: // device-level overrides @@ -127,17 +127,17 @@ protected: virtual void handle_timers(int cycles); virtual void upd7810_take_irq(); - devcb2_write_line m_to_func; - devcb2_write_line m_txd_func; - devcb2_read_line m_rxd_func; - devcb2_read_line m_an0_func; - devcb2_read_line m_an1_func; - devcb2_read_line m_an2_func; - devcb2_read_line m_an3_func; - devcb2_read_line m_an4_func; - devcb2_read_line m_an5_func; - devcb2_read_line m_an6_func; - devcb2_read_line m_an7_func; + devcb_write_line m_to_func; + devcb_write_line m_txd_func; + devcb_read_line m_rxd_func; + devcb_read_line m_an0_func; + devcb_read_line m_an1_func; + devcb_read_line m_an2_func; + devcb_read_line m_an3_func; + devcb_read_line m_an4_func; + devcb_read_line m_an5_func; + devcb_read_line m_an6_func; + devcb_read_line m_an7_func; typedef void (upd7810_device::*opcode_func)(); diff --git a/src/emu/devcb2.c b/src/emu/devcb.c index 19a0f4e1151..afa1056ec10 100644 --- a/src/emu/devcb2.c +++ b/src/emu/devcb.c @@ -2,7 +2,7 @@ // copyright-holders:Aaron Giles /*************************************************************************** - devcb2.c + devcb.c Device callback interface helpers. @@ -17,10 +17,10 @@ //************************************************************************** //------------------------------------------------- -// devcb2_base - constructor +// devcb_base - constructor //------------------------------------------------- -devcb2_base::devcb2_base(device_t &device, UINT64 defmask) +devcb_base::devcb_base(device_t &device, UINT64 defmask) : m_device(device), m_rshift(0), m_mask(defmask), @@ -34,7 +34,7 @@ devcb2_base::devcb2_base(device_t &device, UINT64 defmask) // reset - reset/initialize state //------------------------------------------------- -void devcb2_base::reset(callback_type type) +void devcb_base::reset(callback_type type) { m_type = type; m_target_tag = NULL; @@ -53,7 +53,7 @@ void devcb2_base::reset(callback_type type) // error if we can't find it //------------------------------------------------- -void devcb2_base::resolve_ioport() +void devcb_base::resolve_ioport() { // attempt to resolve, fatal error if fail m_target.ioport = (m_target_tag != NULL) ? m_device.owner()->ioport(m_target_tag) : NULL; @@ -67,7 +67,7 @@ void devcb2_base::resolve_ioport() // number or fatal error if we can't find it //------------------------------------------------- -void devcb2_base::resolve_inputline() +void devcb_base::resolve_inputline() { // attempt to resolve, fatal error if fail m_target.device = (m_target_tag != NULL) ? m_device.owner()->subdevice(m_target_tag) : NULL; @@ -86,7 +86,7 @@ void devcb2_base::resolve_inputline() // fatal error if we can't find it //------------------------------------------------- -void devcb2_base::resolve_space() +void devcb_base::resolve_space() { // attempt to resolve, fatal error if fail device_t *spacedev = (m_space_tag != NULL) ? m_device.owner()->subdevice(m_space_tag) : NULL; @@ -104,11 +104,11 @@ void devcb2_base::resolve_space() //************************************************************************** //------------------------------------------------- -// devcb2_read_base - constructor +// devcb_read_base - constructor //------------------------------------------------- -devcb2_read_base::devcb2_read_base(device_t &device, UINT64 defmask) - : devcb2_base(device, defmask) +devcb_read_base::devcb_read_base(device_t &device, UINT64 defmask) + : devcb_base(device, defmask) { } @@ -117,10 +117,10 @@ devcb2_read_base::devcb2_read_base(device_t &device, UINT64 defmask) // reset - reset/initialize state //------------------------------------------------- -void devcb2_read_base::reset(callback_type type) +void devcb_read_base::reset(callback_type type) { // parent first - devcb2_base::reset(type); + devcb_base::reset(type); // local stuff m_readline = read_line_delegate(); @@ -128,7 +128,7 @@ void devcb2_read_base::reset(callback_type type) m_read16 = read16_delegate(); m_read32 = read32_delegate(); m_read64 = read64_delegate(); - m_adapter = &devcb2_read_base::read_unresolved_adapter; + m_adapter = &devcb_read_base::read_unresolved_adapter; } @@ -137,7 +137,7 @@ void devcb2_read_base::reset(callback_type type) // its final form //------------------------------------------------- -void devcb2_read_base::resolve() +void devcb_read_base::resolve() { // first resolve any address spaces if (m_space_tag != NULL) @@ -158,49 +158,49 @@ void devcb2_read_base::resolve() name = m_readline.name(); m_readline.bind_relative_to(*m_device.owner()); m_target_int = 0; - m_adapter = m_readline.isnull() ? &devcb2_read_base::read_constant_adapter : &devcb2_read_base::read_line_adapter; + m_adapter = m_readline.isnull() ? &devcb_read_base::read_constant_adapter : &devcb_read_base::read_line_adapter; break; case CALLBACK_8: name = m_read8.name(); m_read8.bind_relative_to(*m_device.owner()); m_target_int = 0; - m_adapter = m_read8.isnull() ? &devcb2_read_base::read_constant_adapter : &devcb2_read_base::read8_adapter; + m_adapter = m_read8.isnull() ? &devcb_read_base::read_constant_adapter : &devcb_read_base::read8_adapter; break; case CALLBACK_16: name = m_read16.name(); m_read16.bind_relative_to(*m_device.owner()); m_target_int = 0; - m_adapter = m_read16.isnull() ? &devcb2_read_base::read_constant_adapter : &devcb2_read_base::read16_adapter; + m_adapter = m_read16.isnull() ? &devcb_read_base::read_constant_adapter : &devcb_read_base::read16_adapter; break; case CALLBACK_32: name = m_read32.name(); m_read32.bind_relative_to(*m_device.owner()); m_target_int = 0; - m_adapter = m_read32.isnull() ? &devcb2_read_base::read_constant_adapter : &devcb2_read_base::read32_adapter; + m_adapter = m_read32.isnull() ? &devcb_read_base::read_constant_adapter : &devcb_read_base::read32_adapter; break; case CALLBACK_64: name = m_read64.name(); m_read64.bind_relative_to(*m_device.owner()); m_target_int = 0; - m_adapter = m_read64.isnull() ? &devcb2_read_base::read_constant_adapter : &devcb2_read_base::read64_adapter; + m_adapter = m_read64.isnull() ? &devcb_read_base::read_constant_adapter : &devcb_read_base::read64_adapter; break; case CALLBACK_IOPORT: resolve_ioport(); m_target_int = 0; - m_adapter = (m_target.ioport == NULL) ? &devcb2_read_base::read_constant_adapter : &devcb2_read_base::read_ioport_adapter; + m_adapter = (m_target.ioport == NULL) ? &devcb_read_base::read_constant_adapter : &devcb_read_base::read_ioport_adapter; break; case CALLBACK_LOG: - m_adapter = &devcb2_read_base::read_logged_adapter; + m_adapter = &devcb_read_base::read_logged_adapter; break; case CALLBACK_CONSTANT: - m_adapter = &devcb2_read_base::read_constant_adapter; + m_adapter = &devcb_read_base::read_constant_adapter; break; case CALLBACK_INPUTLINE: @@ -209,7 +209,7 @@ void devcb2_read_base::resolve() } catch (binding_type_exception &binderr) { - throw emu_fatalerror("devcb2_read: Error performing a late bind of type %s to %s (name=%s)\n", binderr.m_actual_type.name(), binderr.m_target_type.name(), name); + throw emu_fatalerror("devcb_read: Error performing a late bind of type %s to %s (name=%s)\n", binderr.m_actual_type.name(), binderr.m_target_type.name(), name); } } @@ -220,7 +220,7 @@ void devcb2_read_base::resolve() // the given value //------------------------------------------------- -void devcb2_read_base::resolve_safe(UINT64 none_constant_value) +void devcb_read_base::resolve_safe(UINT64 none_constant_value) { // convert to a constant if none specified if (m_type == CALLBACK_NONE) @@ -237,7 +237,7 @@ void devcb2_read_base::resolve_safe(UINT64 none_constant_value) // unresolved adapter //------------------------------------------------- -UINT64 devcb2_read_base::read_unresolved_adapter(address_space &space, offs_t offset, UINT64 mask) +UINT64 devcb_read_base::read_unresolved_adapter(address_space &space, offs_t offset, UINT64 mask) { throw emu_fatalerror("Attempted to read through an unresolved devcb item"); } @@ -247,7 +247,7 @@ UINT64 devcb2_read_base::read_unresolved_adapter(address_space &space, offs_t of // read_line_adapter - read from a line delegate //------------------------------------------------- -UINT64 devcb2_read_base::read_line_adapter(address_space &space, offs_t offset, UINT64 mask) +UINT64 devcb_read_base::read_line_adapter(address_space &space, offs_t offset, UINT64 mask) { return shift_mask_xor(m_readline() & 1); } @@ -257,7 +257,7 @@ UINT64 devcb2_read_base::read_line_adapter(address_space &space, offs_t offset, // read8_adapter - read from an 8-bit delegate //------------------------------------------------- -UINT64 devcb2_read_base::read8_adapter(address_space &space, offs_t offset, UINT64 mask) +UINT64 devcb_read_base::read8_adapter(address_space &space, offs_t offset, UINT64 mask) { return shift_mask_xor(m_read8(space, offset, unshift_mask(mask))); } @@ -267,7 +267,7 @@ UINT64 devcb2_read_base::read8_adapter(address_space &space, offs_t offset, UINT // read16_adapter - read from a 16-bit delegate //------------------------------------------------- -UINT64 devcb2_read_base::read16_adapter(address_space &space, offs_t offset, UINT64 mask) +UINT64 devcb_read_base::read16_adapter(address_space &space, offs_t offset, UINT64 mask) { return shift_mask_xor(m_read16(space, offset, unshift_mask(mask))); } @@ -277,7 +277,7 @@ UINT64 devcb2_read_base::read16_adapter(address_space &space, offs_t offset, UIN // read32_adapter - read from a 32-bit delegate //------------------------------------------------- -UINT64 devcb2_read_base::read32_adapter(address_space &space, offs_t offset, UINT64 mask) +UINT64 devcb_read_base::read32_adapter(address_space &space, offs_t offset, UINT64 mask) { return shift_mask_xor(m_read32(space, offset, unshift_mask(mask))); } @@ -287,7 +287,7 @@ UINT64 devcb2_read_base::read32_adapter(address_space &space, offs_t offset, UIN // read64_adapter - read from a 64-bit delegate //------------------------------------------------- -UINT64 devcb2_read_base::read64_adapter(address_space &space, offs_t offset, UINT64 mask) +UINT64 devcb_read_base::read64_adapter(address_space &space, offs_t offset, UINT64 mask) { return shift_mask_xor(m_read64(space, offset, unshift_mask(mask))); } @@ -297,7 +297,7 @@ UINT64 devcb2_read_base::read64_adapter(address_space &space, offs_t offset, UIN // read_ioport - read from an I/O port //------------------------------------------------- -UINT64 devcb2_read_base::read_ioport_adapter(address_space &space, offs_t offset, UINT64 mask) +UINT64 devcb_read_base::read_ioport_adapter(address_space &space, offs_t offset, UINT64 mask) { return shift_mask_xor(m_target.ioport->read()); } @@ -308,7 +308,7 @@ UINT64 devcb2_read_base::read_ioport_adapter(address_space &space, offs_t offset // constant //------------------------------------------------- -UINT64 devcb2_read_base::read_logged_adapter(address_space &space, offs_t offset, UINT64 mask) +UINT64 devcb_read_base::read_logged_adapter(address_space &space, offs_t offset, UINT64 mask) { logerror("%s: read %s\n", m_device.machine().describe_context(), m_target_tag); return shift_mask_xor(m_target_int); @@ -319,7 +319,7 @@ UINT64 devcb2_read_base::read_logged_adapter(address_space &space, offs_t offset // read_constant - read from a constant //------------------------------------------------- -UINT64 devcb2_read_base::read_constant_adapter(address_space &space, offs_t offset, UINT64 mask) +UINT64 devcb_read_base::read_constant_adapter(address_space &space, offs_t offset, UINT64 mask) { return shift_mask_xor(m_target_int); } @@ -331,11 +331,11 @@ UINT64 devcb2_read_base::read_constant_adapter(address_space &space, offs_t offs //************************************************************************** //------------------------------------------------- -// devcb2_write_base - constructor +// devcb_write_base - constructor //------------------------------------------------- -devcb2_write_base::devcb2_write_base(device_t &device, UINT64 defmask) - : devcb2_base(device, defmask) +devcb_write_base::devcb_write_base(device_t &device, UINT64 defmask) + : devcb_base(device, defmask) { } @@ -344,10 +344,10 @@ devcb2_write_base::devcb2_write_base(device_t &device, UINT64 defmask) // reset - reset/initialize state //------------------------------------------------- -void devcb2_write_base::reset(callback_type type) +void devcb_write_base::reset(callback_type type) { // parent first - devcb2_base::reset(type); + devcb_base::reset(type); // local stuff m_writeline = write_line_delegate(); @@ -355,7 +355,7 @@ void devcb2_write_base::reset(callback_type type) m_write16 = write16_delegate(); m_write32 = write32_delegate(); m_write64 = write64_delegate(); - m_adapter = &devcb2_write_base::write_unresolved_adapter; + m_adapter = &devcb_write_base::write_unresolved_adapter; } @@ -364,7 +364,7 @@ void devcb2_write_base::reset(callback_type type) // its final form //------------------------------------------------- -void devcb2_write_base::resolve() +void devcb_write_base::resolve() { // first resolve any address spaces if (m_space_tag != NULL) @@ -384,55 +384,55 @@ void devcb2_write_base::resolve() case CALLBACK_LINE: name = m_writeline.name(); m_writeline.bind_relative_to(*m_device.owner()); - m_adapter = m_writeline.isnull() ? &devcb2_write_base::write_noop_adapter : &devcb2_write_base::write_line_adapter; + m_adapter = m_writeline.isnull() ? &devcb_write_base::write_noop_adapter : &devcb_write_base::write_line_adapter; break; case CALLBACK_8: name = m_write8.name(); m_write8.bind_relative_to(*m_device.owner()); - m_adapter = m_write8.isnull() ? &devcb2_write_base::write_noop_adapter : &devcb2_write_base::write8_adapter; + m_adapter = m_write8.isnull() ? &devcb_write_base::write_noop_adapter : &devcb_write_base::write8_adapter; break; case CALLBACK_16: name = m_write16.name(); m_write16.bind_relative_to(*m_device.owner()); - m_adapter = m_write16.isnull() ? &devcb2_write_base::write_noop_adapter : &devcb2_write_base::write16_adapter; + m_adapter = m_write16.isnull() ? &devcb_write_base::write_noop_adapter : &devcb_write_base::write16_adapter; break; case CALLBACK_32: name = m_write32.name(); m_write32.bind_relative_to(*m_device.owner()); - m_adapter = m_write32.isnull() ? &devcb2_write_base::write_noop_adapter : &devcb2_write_base::write32_adapter; + m_adapter = m_write32.isnull() ? &devcb_write_base::write_noop_adapter : &devcb_write_base::write32_adapter; break; case CALLBACK_64: name = m_write64.name(); m_write64.bind_relative_to(*m_device.owner()); - m_adapter = m_write64.isnull() ? &devcb2_write_base::write_noop_adapter : &devcb2_write_base::write64_adapter; + m_adapter = m_write64.isnull() ? &devcb_write_base::write_noop_adapter : &devcb_write_base::write64_adapter; break; case CALLBACK_IOPORT: resolve_ioport(); - m_adapter = (m_target.ioport == NULL) ? &devcb2_write_base::write_noop_adapter : &devcb2_write_base::write_ioport_adapter; + m_adapter = (m_target.ioport == NULL) ? &devcb_write_base::write_noop_adapter : &devcb_write_base::write_ioport_adapter; break; case CALLBACK_LOG: - m_adapter = &devcb2_write_base::write_logged_adapter; + m_adapter = &devcb_write_base::write_logged_adapter; break; case CALLBACK_CONSTANT: - m_adapter = &devcb2_write_base::write_noop_adapter; + m_adapter = &devcb_write_base::write_noop_adapter; break; case CALLBACK_INPUTLINE: resolve_inputline(); - m_adapter = &devcb2_write_base::write_inputline_adapter; + m_adapter = &devcb_write_base::write_inputline_adapter; break; } } catch (binding_type_exception &binderr) { - throw emu_fatalerror("devcb2_write: Error performing a late bind of type %s to %s (name=%s)\n", binderr.m_actual_type.name(), binderr.m_target_type.name(), name); + throw emu_fatalerror("devcb_write: Error performing a late bind of type %s to %s (name=%s)\n", binderr.m_actual_type.name(), binderr.m_target_type.name(), name); } } @@ -442,7 +442,7 @@ void devcb2_write_base::resolve() // specified, resolve to a no-op //------------------------------------------------- -void devcb2_write_base::resolve_safe() +void devcb_write_base::resolve_safe() { // convert to a constant if none specified if (m_type == CALLBACK_NONE) @@ -456,7 +456,7 @@ void devcb2_write_base::resolve_safe() // unresolved adapter //------------------------------------------------- -void devcb2_write_base::write_unresolved_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) +void devcb_write_base::write_unresolved_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) { throw emu_fatalerror("Attempted to write through an unresolved devcb item"); } @@ -466,7 +466,7 @@ void devcb2_write_base::write_unresolved_adapter(address_space &space, offs_t of // write_line_adapter - write from a line delegate //------------------------------------------------- -void devcb2_write_base::write_line_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) +void devcb_write_base::write_line_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) { m_writeline(unshift_mask_xor(data) & 1); } @@ -476,7 +476,7 @@ void devcb2_write_base::write_line_adapter(address_space &space, offs_t offset, // write8_adapter - write from an 8-bit delegate //------------------------------------------------- -void devcb2_write_base::write8_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) +void devcb_write_base::write8_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) { m_write8(space, offset, unshift_mask_xor(data), unshift_mask(mask)); } @@ -486,7 +486,7 @@ void devcb2_write_base::write8_adapter(address_space &space, offs_t offset, UINT // write16_adapter - write from a 16-bit delegate //------------------------------------------------- -void devcb2_write_base::write16_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) +void devcb_write_base::write16_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) { m_write16(space, offset, unshift_mask_xor(data), unshift_mask(mask)); } @@ -496,7 +496,7 @@ void devcb2_write_base::write16_adapter(address_space &space, offs_t offset, UIN // write32_adapter - write from a 32-bit delegate //------------------------------------------------- -void devcb2_write_base::write32_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) +void devcb_write_base::write32_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) { m_write32(space, offset, unshift_mask_xor(data), unshift_mask(mask)); } @@ -506,7 +506,7 @@ void devcb2_write_base::write32_adapter(address_space &space, offs_t offset, UIN // write64_adapter - write from a 64-bit delegate //------------------------------------------------- -void devcb2_write_base::write64_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) +void devcb_write_base::write64_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) { m_write64(space, offset, unshift_mask_xor(data), unshift_mask(mask)); } @@ -516,7 +516,7 @@ void devcb2_write_base::write64_adapter(address_space &space, offs_t offset, UIN // write_ioport - write from an I/O port //------------------------------------------------- -void devcb2_write_base::write_ioport_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) +void devcb_write_base::write_ioport_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) { m_target.ioport->write_safe(unshift_mask_xor(data)); } @@ -527,7 +527,7 @@ void devcb2_write_base::write_ioport_adapter(address_space &space, offs_t offset // adapter //------------------------------------------------- -void devcb2_write_base::write_logged_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) +void devcb_write_base::write_logged_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) { logerror("%s: unresolved devcb write\n", m_device.machine().describe_context()); } @@ -537,7 +537,7 @@ void devcb2_write_base::write_logged_adapter(address_space &space, offs_t offset // write_constant - write from a constant //------------------------------------------------- -void devcb2_write_base::write_noop_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) +void devcb_write_base::write_noop_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) { // constant for writes is a no-op } @@ -548,7 +548,7 @@ void devcb2_write_base::write_noop_adapter(address_space &space, offs_t offset, // input line //------------------------------------------------- -void devcb2_write_base::write_inputline_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) +void devcb_write_base::write_inputline_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) { m_target.device->execute().set_input_line(m_target_int, unshift_mask_xor(data) & 1); } diff --git a/src/emu/devcb2.h b/src/emu/devcb.h index 7047e1ecc72..9db94a78699 100644 --- a/src/emu/devcb2.h +++ b/src/emu/devcb.h @@ -2,7 +2,7 @@ // copyright-holders:Aaron Giles /*************************************************************************** - devcb2.h + devcb.h Device callback interface helpers. @@ -14,8 +14,8 @@ #error Dont include this file directly; include emu.h instead. #endif -#ifndef __DEVCB2_H__ -#define __DEVCB2_H__ +#ifndef __DEVCB_H__ +#define __DEVCB_H__ //************************************************************************** @@ -23,42 +23,42 @@ //************************************************************************** // wrappers for ioports, constants, and loggers -#define DEVCB2_NULL devcb2_base::null_desc() -#define DEVCB2_NOOP devcb2_base::null_desc() -#define DEVCB2_IOPORT(_tag) devcb2_base::ioport_desc(_tag) -#define DEVCB2_CONSTANT(_value) devcb2_base::constant_desc(_value) -#define DEVCB2_LOGGER(_string, _value) devcb2_base::logger_desc(_string, _value) -#define DEVCB2_INPUTLINE(_tag, _line) devcb2_base::inputline_desc(_tag, _line) -#define DEVCB2_VCC DEVCB2_CONSTANT(1) -#define DEVCB2_GND DEVCB2_CONSTANT(0) +#define DEVCB_NULL devcb_base::null_desc() +#define DEVCB_NOOP devcb_base::null_desc() +#define DEVCB_IOPORT(_tag) devcb_base::ioport_desc(_tag) +#define DEVCB_CONSTANT(_value) devcb_base::constant_desc(_value) +#define DEVCB_LOGGER(_string, _value) devcb_base::logger_desc(_string, _value) +#define DEVCB_INPUTLINE(_tag, _line) devcb_base::inputline_desc(_tag, _line) +#define DEVCB_VCC DEVCB_CONSTANT(1) +#define DEVCB_GND DEVCB_CONSTANT(0) // wrappers for read callbacks into the owner device -#define DEVCB2_READLINE(_class, _func) read_line_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) -#define DEVCB2_READ8(_class, _func) read8_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) -#define DEVCB2_READ16(_class, _func) read16_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) -#define DEVCB2_READ32(_class, _func) read32_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) -#define DEVCB2_READ64(_class, _func) read64_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) +#define DEVCB_READLINE(_class, _func) read_line_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) +#define DEVCB_READ8(_class, _func) read8_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) +#define DEVCB_READ16(_class, _func) read16_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) +#define DEVCB_READ32(_class, _func) read32_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) +#define DEVCB_READ64(_class, _func) read64_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) // wrappers for read callbacks into any tagged device -#define DEVCB2_DEVREADLINE(tag, _class, _func) read_line_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) -#define DEVCB2_DEVREAD8(tag, _class, _func) read8_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) -#define DEVCB2_DEVREAD16(tag, _class, _func) read16_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) -#define DEVCB2_DEVREAD32(tag, _class, _func) read32_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) -#define DEVCB2_DEVREAD64(tag, _class, _func) read64_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) +#define DEVCB_DEVREADLINE(tag, _class, _func) read_line_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) +#define DEVCB_DEVREAD8(tag, _class, _func) read8_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) +#define DEVCB_DEVREAD16(tag, _class, _func) read16_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) +#define DEVCB_DEVREAD32(tag, _class, _func) read32_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) +#define DEVCB_DEVREAD64(tag, _class, _func) read64_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) // wrappers for write callbacks into the owner device -#define DEVCB2_WRITELINE(_class, _func) write_line_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) -#define DEVCB2_WRITE8(_class, _func) write8_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) -#define DEVCB2_WRITE16(_class, _func) write16_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) -#define DEVCB2_WRITE32(_class, _func) write32_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) -#define DEVCB2_WRITE64(_class, _func) write64_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) +#define DEVCB_WRITELINE(_class, _func) write_line_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) +#define DEVCB_WRITE8(_class, _func) write8_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) +#define DEVCB_WRITE16(_class, _func) write16_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) +#define DEVCB_WRITE32(_class, _func) write32_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) +#define DEVCB_WRITE64(_class, _func) write64_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) // wrappers for write callbacks into any tagged device -#define DEVCB2_DEVWRITELINE(tag, _class, _func) write_line_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) -#define DEVCB2_DEVWRITE8(tag, _class, _func) write8_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) -#define DEVCB2_DEVWRITE16(tag, _class, _func) write16_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) -#define DEVCB2_DEVWRITE32(tag, _class, _func) write32_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) -#define DEVCB2_DEVWRITE64(tag, _class, _func) write64_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) +#define DEVCB_DEVWRITELINE(tag, _class, _func) write_line_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) +#define DEVCB_DEVWRITE8(tag, _class, _func) write8_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) +#define DEVCB_DEVWRITE16(tag, _class, _func) write16_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) +#define DEVCB_DEVWRITE32(tag, _class, _func) write32_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) +#define DEVCB_DEVWRITE64(tag, _class, _func) write64_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) // machine config helpers to add shift, mask, or address space configuration #define MCFG_DEVCB_RSHIFT(_shift) devcb->set_rshift(_shift); @@ -78,9 +78,9 @@ typedef device_delegate<int ()> read_line_delegate; typedef device_delegate<void (int)> write_line_delegate; -// ======================> devcb2_base +// ======================> devcb_base -class devcb2_base +class devcb_base { protected: // enumerate the types of callbacks @@ -99,17 +99,17 @@ protected: }; // construction/destruction - devcb2_base(device_t &device, UINT64 defmask); + devcb_base(device_t &device, UINT64 defmask); public: // getters bool isnull() const { return (m_type == CALLBACK_NONE); } // additional configuration - devcb2_base &set_space(const char *device, address_spacenum space = AS_0) { m_space_tag = device; m_space_num = space; return *this; } - devcb2_base &set_rshift(int rshift) { m_rshift = rshift; return *this; } - devcb2_base &set_mask(UINT64 mask) { m_mask = mask; return *this; } - devcb2_base &set_xor(UINT64 xorval) { m_xor = xorval; return *this; } + devcb_base &set_space(const char *device, address_spacenum space = AS_0) { m_space_tag = device; m_space_num = space; return *this; } + devcb_base &set_rshift(int rshift) { m_rshift = rshift; return *this; } + devcb_base &set_mask(UINT64 mask) { m_mask = mask; return *this; } + devcb_base &set_xor(UINT64 xorval) { m_xor = xorval; return *this; } // construction helper classes class null_desc @@ -149,11 +149,11 @@ public: }; // shared callback setters - devcb2_base &set_callback(null_desc null) { reset(CALLBACK_NONE); return *this; } - devcb2_base &set_callback(ioport_desc ioport) { reset(CALLBACK_IOPORT); m_target_tag = ioport.m_tag; return *this; } - devcb2_base &set_callback(constant_desc constant) { reset(CALLBACK_CONSTANT); m_target_int = constant.m_value; return *this; } - devcb2_base &set_callback(logger_desc logger) { reset(CALLBACK_LOG); m_target_int = logger.m_value; m_target_tag = logger.m_string; return *this; } - devcb2_base &set_callback(inputline_desc inputline) { reset(CALLBACK_INPUTLINE); m_target_tag = inputline.m_tag; m_target_int = inputline.m_inputnum; return *this; } + devcb_base &set_callback(null_desc null) { reset(CALLBACK_NONE); return *this; } + devcb_base &set_callback(ioport_desc ioport) { reset(CALLBACK_IOPORT); m_target_tag = ioport.m_tag; return *this; } + devcb_base &set_callback(constant_desc constant) { reset(CALLBACK_CONSTANT); m_target_int = constant.m_value; return *this; } + devcb_base &set_callback(logger_desc logger) { reset(CALLBACK_LOG); m_target_int = logger.m_value; m_target_tag = logger.m_string; return *this; } + devcb_base &set_callback(inputline_desc inputline) { reset(CALLBACK_INPUTLINE); m_target_tag = inputline.m_tag; m_target_int = inputline.m_inputnum; return *this; } protected: // internal helpers @@ -190,22 +190,22 @@ protected: }; -// ======================> devcb2_read_base +// ======================> devcb_read_base -class devcb2_read_base : public devcb2_base +class devcb_read_base : public devcb_base { protected: // construction/destruction - devcb2_read_base(device_t &device, UINT64 defmask); + devcb_read_base(device_t &device, UINT64 defmask); public: // callback configuration - using devcb2_base::set_callback; - devcb2_base &set_callback(read_line_delegate func) { reset(CALLBACK_LINE); m_readline = func; return *this; } - devcb2_base &set_callback(read8_delegate func) { reset(CALLBACK_8); m_read8 = func; return *this; } - devcb2_base &set_callback(read16_delegate func) { reset(CALLBACK_16); m_read16 = func; return *this; } - devcb2_base &set_callback(read32_delegate func) { reset(CALLBACK_32); m_read32 = func; return *this; } - devcb2_base &set_callback(read64_delegate func) { reset(CALLBACK_64); m_read64 = func; return *this; } + using devcb_base::set_callback; + devcb_base &set_callback(read_line_delegate func) { reset(CALLBACK_LINE); m_readline = func; return *this; } + devcb_base &set_callback(read8_delegate func) { reset(CALLBACK_8); m_read8 = func; return *this; } + devcb_base &set_callback(read16_delegate func) { reset(CALLBACK_16); m_read16 = func; return *this; } + devcb_base &set_callback(read32_delegate func) { reset(CALLBACK_32); m_read32 = func; return *this; } + devcb_base &set_callback(read64_delegate func) { reset(CALLBACK_64); m_read64 = func; return *this; } // resolution void resolve(); @@ -234,27 +234,27 @@ protected: read64_delegate m_read64; // copy of registered 64-bit reader // derived state - typedef UINT64 (devcb2_read_base::*adapter_func)(address_space &, offs_t, UINT64); + typedef UINT64 (devcb_read_base::*adapter_func)(address_space &, offs_t, UINT64); adapter_func m_adapter; // actual callback to invoke }; -// ======================> devcb2_write_base +// ======================> devcb_write_base -class devcb2_write_base : public devcb2_base +class devcb_write_base : public devcb_base { protected: // construction/destruction - devcb2_write_base(device_t &device, UINT64 defmask); + devcb_write_base(device_t &device, UINT64 defmask); public: // callback configuration - using devcb2_base::set_callback; - devcb2_base &set_callback(write_line_delegate func) { reset(CALLBACK_LINE); m_writeline = func; return *this; } - devcb2_base &set_callback(write8_delegate func) { reset(CALLBACK_8); m_write8 = func; return *this; } - devcb2_base &set_callback(write16_delegate func) { reset(CALLBACK_16); m_write16 = func; return *this; } - devcb2_base &set_callback(write32_delegate func) { reset(CALLBACK_32); m_write32 = func; return *this; } - devcb2_base &set_callback(write64_delegate func) { reset(CALLBACK_64); m_write64 = func; return *this; } + using devcb_base::set_callback; + devcb_base &set_callback(write_line_delegate func) { reset(CALLBACK_LINE); m_writeline = func; return *this; } + devcb_base &set_callback(write8_delegate func) { reset(CALLBACK_8); m_write8 = func; return *this; } + devcb_base &set_callback(write16_delegate func) { reset(CALLBACK_16); m_write16 = func; return *this; } + devcb_base &set_callback(write32_delegate func) { reset(CALLBACK_32); m_write32 = func; return *this; } + devcb_base &set_callback(write64_delegate func) { reset(CALLBACK_64); m_write64 = func; return *this; } // resolution void resolve(); @@ -284,123 +284,123 @@ protected: write64_delegate m_write64; // copy of registered 64-bit writer // derived state - typedef void (devcb2_write_base::*adapter_func)(address_space &, offs_t, UINT64, UINT64); + typedef void (devcb_write_base::*adapter_func)(address_space &, offs_t, UINT64, UINT64); adapter_func m_adapter; // actual callback to invoke }; -// ======================> devcb2_read_line +// ======================> devcb_read_line -class devcb2_read_line : public devcb2_read_base +class devcb_read_line : public devcb_read_base { public: - devcb2_read_line(device_t &device) : devcb2_read_base(device, 0xff) { } + devcb_read_line(device_t &device) : devcb_read_base(device, 0xff) { } int operator()() { return (this->*m_adapter)(*m_space, 0, U64(0xff)) & 1; } int operator()(address_space &space) { return (this->*m_adapter)((m_space_tag != NULL) ? *m_space : space, 0, U64(0xff)) & 1; } }; -// ======================> devcb2_read8 +// ======================> devcb_read8 -class devcb2_read8 : public devcb2_read_base +class devcb_read8 : public devcb_read_base { public: - devcb2_read8(device_t &device) : devcb2_read_base(device, 0xff) { } + devcb_read8(device_t &device) : devcb_read_base(device, 0xff) { } UINT8 operator()(offs_t offset = 0, UINT8 mask = 0xff) { return (this->*m_adapter)(*m_space, offset, mask) & mask; } UINT8 operator()(address_space &space, offs_t offset = 0, UINT8 mask = 0xff) { return (this->*m_adapter)((m_space_tag != NULL) ? *m_space : space, offset, mask) & mask; } }; -// ======================> devcb2_read16 +// ======================> devcb_read16 -class devcb2_read16 : public devcb2_read_base +class devcb_read16 : public devcb_read_base { public: - devcb2_read16(device_t &device) : devcb2_read_base(device, 0xffff) { } + devcb_read16(device_t &device) : devcb_read_base(device, 0xffff) { } UINT16 operator()(offs_t offset = 0, UINT16 mask = 0xffff) { return (this->*m_adapter)(*m_space, offset, mask) & mask; } UINT16 operator()(address_space &space, offs_t offset = 0, UINT16 mask = 0xffff) { return (this->*m_adapter)((m_space_tag != NULL) ? *m_space : space, offset, mask) & mask; } }; -// ======================> devcb2_read32 +// ======================> devcb_read32 -class devcb2_read32 : public devcb2_read_base +class devcb_read32 : public devcb_read_base { public: - devcb2_read32(device_t &device) : devcb2_read_base(device, 0xffffffff) { } + devcb_read32(device_t &device) : devcb_read_base(device, 0xffffffff) { } UINT32 operator()(offs_t offset = 0, UINT32 mask = 0xffffffff) { return (this->*m_adapter)(*m_space, offset, mask) & mask; } UINT32 operator()(address_space &space, offs_t offset = 0, UINT32 mask = 0xffffffff) { return (this->*m_adapter)((m_space_tag != NULL) ? *m_space : space, offset, mask) & mask; } }; -// ======================> devcb2_read64 +// ======================> devcb_read64 -class devcb2_read64 : public devcb2_read_base +class devcb_read64 : public devcb_read_base { public: - devcb2_read64(device_t &device) : devcb2_read_base(device, U64(0xffffffffffffffff)) { } + devcb_read64(device_t &device) : devcb_read_base(device, U64(0xffffffffffffffff)) { } UINT64 operator()(offs_t offset = 0, UINT64 mask = U64(0xffffffffffffffff)) { return (this->*m_adapter)(*m_space, offset, mask) & mask; } UINT64 operator()(address_space &space, offs_t offset = 0, UINT64 mask = U64(0xffffffffffffffff)) { return (this->*m_adapter)((m_space_tag != NULL) ? *m_space : space, offset, mask) & mask; } }; -// ======================> devcb2_write_line +// ======================> devcb_write_line -class devcb2_write_line : public devcb2_write_base +class devcb_write_line : public devcb_write_base { public: - devcb2_write_line(device_t &device) : devcb2_write_base(device, 0xff) { } + devcb_write_line(device_t &device) : devcb_write_base(device, 0xff) { } void operator()(int state) { (this->*m_adapter)(*m_space, 0, state & 1, U64(0xff)); } void operator()(address_space &space, int state) { (this->*m_adapter)((m_space_tag != NULL) ? *m_space : space, 0, state & 1, U64(0xff)); } }; -// ======================> devcb2_write8 +// ======================> devcb_write8 -class devcb2_write8 : public devcb2_write_base +class devcb_write8 : public devcb_write_base { public: - devcb2_write8(device_t &device) : devcb2_write_base(device, 0xff) { } + devcb_write8(device_t &device) : devcb_write_base(device, 0xff) { } void operator()(UINT8 data, UINT8 mask = 0xff) { (this->*m_adapter)(*m_space, 0, data, mask); } void operator()(offs_t offset, UINT8 data, UINT8 mask = 0xff) { (this->*m_adapter)(*m_space, offset, data, mask); } void operator()(address_space &space, offs_t offset, UINT8 data, UINT8 mask = 0xff) { (this->*m_adapter)((m_space_tag != NULL) ? *m_space : space, offset, data, mask); } }; -// ======================> devcb2_write16 +// ======================> devcb_write16 -class devcb2_write16 : public devcb2_write_base +class devcb_write16 : public devcb_write_base { public: - devcb2_write16(device_t &device) : devcb2_write_base(device, 0xffff) { } + devcb_write16(device_t &device) : devcb_write_base(device, 0xffff) { } void operator()(UINT16 data, UINT16 mask = 0xffff) { (this->*m_adapter)(*m_space, 0, data, mask); } void operator()(offs_t offset, UINT16 data, UINT16 mask = 0xffff) { (this->*m_adapter)(*m_space, offset, data, mask); } void operator()(address_space &space, offs_t offset, UINT16 data, UINT16 mask = 0xffff) { (this->*m_adapter)((m_space_tag != NULL) ? *m_space : space, offset, data, mask); } }; -// ======================> devcb2_write32 +// ======================> devcb_write32 -class devcb2_write32 : public devcb2_write_base +class devcb_write32 : public devcb_write_base { public: - devcb2_write32(device_t &device) : devcb2_write_base(device, 0xffffffff) { } + devcb_write32(device_t &device) : devcb_write_base(device, 0xffffffff) { } void operator()(UINT32 data, UINT32 mask = 0xffffffff) { (this->*m_adapter)(*m_space, 0, data, mask); } void operator()(offs_t offset, UINT32 data, UINT32 mask = 0xffffffff) { (this->*m_adapter)(*m_space, offset, data, mask); } void operator()(address_space &space, offs_t offset, UINT32 data, UINT32 mask = 0xffffffff) { (this->*m_adapter)((m_space_tag != NULL) ? *m_space : space, offset, data, mask); } }; -// ======================> devcb2_write64 +// ======================> devcb_write64 -class devcb2_write64 : public devcb2_write_base +class devcb_write64 : public devcb_write_base { public: - devcb2_write64(device_t &device) : devcb2_write_base(device, U64(0xffffffffffffffff)) { } + devcb_write64(device_t &device) : devcb_write_base(device, U64(0xffffffffffffffff)) { } void operator()(UINT64 data, UINT64 mask = U64(0xffffffffffffffff)) { (this->*m_adapter)(*m_space, 0, data, mask); } void operator()(offs_t offset, UINT64 data, UINT64 mask = U64(0xffffffffffffffff)) { (this->*m_adapter)(*m_space, offset, data, mask); } void operator()(address_space &space, offs_t offset, UINT64 data, UINT64 mask = U64(0xffffffffffffffff)) { (this->*m_adapter)((m_space_tag != NULL) ? *m_space : space, offset, data, mask); } }; -#endif /* __DEVCB2_H__ */ +#endif /* __DEVCB_H__ */ diff --git a/src/emu/dispatch.c b/src/emu/dispatch.c index 1ee010dadcf..4df4d3f610b 100644 --- a/src/emu/dispatch.c +++ b/src/emu/dispatch.c @@ -3,38 +3,38 @@ #include "emu.h" -const device_type DEVCB2_LINE_DISPATCH_2 = &device_creator<devcb2_line_dispatch_device<2> >; -const device_type DEVCB2_LINE_DISPATCH_3 = &device_creator<devcb2_line_dispatch_device<3> >; -const device_type DEVCB2_LINE_DISPATCH_4 = &device_creator<devcb2_line_dispatch_device<4> >; -const device_type DEVCB2_LINE_DISPATCH_5 = &device_creator<devcb2_line_dispatch_device<5> >; -const device_type DEVCB2_LINE_DISPATCH_6 = &device_creator<devcb2_line_dispatch_device<6> >; +const device_type DEVCB_LINE_DISPATCH_2 = &device_creator<devcb_line_dispatch_device<2> >; +const device_type DEVCB_LINE_DISPATCH_3 = &device_creator<devcb_line_dispatch_device<3> >; +const device_type DEVCB_LINE_DISPATCH_4 = &device_creator<devcb_line_dispatch_device<4> >; +const device_type DEVCB_LINE_DISPATCH_5 = &device_creator<devcb_line_dispatch_device<5> >; +const device_type DEVCB_LINE_DISPATCH_6 = &device_creator<devcb_line_dispatch_device<6> >; -template<> devcb2_line_dispatch_device<2>::devcb2_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, DEVCB2_LINE_DISPATCH_2, "Line dispatcher (2 slots)", tag, owner, clock, "devcb2_line_dispatch", __FILE__) +template<> devcb_line_dispatch_device<2>::devcb_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + device_t(mconfig, DEVCB_LINE_DISPATCH_2, "Line dispatcher (2 slots)", tag, owner, clock, "devcb_line_dispatch", __FILE__) { init_fwd(); } -template<> devcb2_line_dispatch_device<3>::devcb2_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, DEVCB2_LINE_DISPATCH_3, "Line dispatcher (3 slots)", tag, owner, clock, "devcb2_line_dispatch", __FILE__) +template<> devcb_line_dispatch_device<3>::devcb_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + device_t(mconfig, DEVCB_LINE_DISPATCH_3, "Line dispatcher (3 slots)", tag, owner, clock, "devcb_line_dispatch", __FILE__) { init_fwd(); } -template<> devcb2_line_dispatch_device<4>::devcb2_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, DEVCB2_LINE_DISPATCH_4, "Line dispatcher (4 slots)", tag, owner, clock, "devcb2_line_dispatch", __FILE__) +template<> devcb_line_dispatch_device<4>::devcb_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + device_t(mconfig, DEVCB_LINE_DISPATCH_4, "Line dispatcher (4 slots)", tag, owner, clock, "devcb_line_dispatch", __FILE__) { init_fwd(); } -template<> devcb2_line_dispatch_device<5>::devcb2_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, DEVCB2_LINE_DISPATCH_5, "Line dispatcher (5 slots)", tag, owner, clock, "devcb2_line_dispatch", __FILE__) +template<> devcb_line_dispatch_device<5>::devcb_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + device_t(mconfig, DEVCB_LINE_DISPATCH_5, "Line dispatcher (5 slots)", tag, owner, clock, "devcb_line_dispatch", __FILE__) { init_fwd(); } -template<> devcb2_line_dispatch_device<6>::devcb2_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, DEVCB2_LINE_DISPATCH_6, "Line dispatcher (6 slots)", tag, owner, clock, "devcb2_line_dispatch", __FILE__) +template<> devcb_line_dispatch_device<6>::devcb_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + device_t(mconfig, DEVCB_LINE_DISPATCH_6, "Line dispatcher (6 slots)", tag, owner, clock, "devcb_line_dispatch", __FILE__) { init_fwd(); } diff --git a/src/emu/dispatch.h b/src/emu/dispatch.h index 0248cc30456..02e3108b8c3 100644 --- a/src/emu/dispatch.h +++ b/src/emu/dispatch.h @@ -18,26 +18,26 @@ #define __DISPATCH_H__ #define MCFG_LINE_DISPATCH_ADD(_tag, _count) \ - MCFG_DEVICE_ADD(_tag, DEVCB2_LINE_DISPATCH_ ## _count, 0) + MCFG_DEVICE_ADD(_tag, DEVCB_LINE_DISPATCH_ ## _count, 0) #define MCFG_LINE_DISPATCH_FWD_CB(_entry, _count, _devcb) \ - devcb = &devcb2_line_dispatch_device<_count>::set_fwd_cb(*device, _entry, DEVCB2_##_devcb); + devcb = &devcb_line_dispatch_device<_count>::set_fwd_cb(*device, _entry, DEVCB_##_devcb); -template<int N> class devcb2_line_dispatch_device : public device_t { +template<int N> class devcb_line_dispatch_device : public device_t { public: - devcb2_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + devcb_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void init_fwd() { for(int i=0; i<N; i++) - fwd_cb[i] = new devcb2_write_line(*this); + fwd_cb[i] = new devcb_write_line(*this); } - virtual ~devcb2_line_dispatch_device() { + virtual ~devcb_line_dispatch_device() { for(int i=0; i<N; i++) delete fwd_cb[i]; } - template<class _Object> static devcb2_base &set_fwd_cb(device_t &device, int entry, _Object object) { return downcast<devcb2_line_dispatch_device<N> &>(device).fwd_cb[entry]->set_callback(object); } + template<class _Object> static devcb_base &set_fwd_cb(device_t &device, int entry, _Object object) { return downcast<devcb_line_dispatch_device<N> &>(device).fwd_cb[entry]->set_callback(object); } WRITE_LINE_MEMBER( in_w ) { for(int i=0; i<N; i++) @@ -51,13 +51,13 @@ protected: } private: - devcb2_write_line *fwd_cb[N]; + devcb_write_line *fwd_cb[N]; }; -extern const device_type DEVCB2_LINE_DISPATCH_2; -extern const device_type DEVCB2_LINE_DISPATCH_3; -extern const device_type DEVCB2_LINE_DISPATCH_4; -extern const device_type DEVCB2_LINE_DISPATCH_5; -extern const device_type DEVCB2_LINE_DISPATCH_6; +extern const device_type DEVCB_LINE_DISPATCH_2; +extern const device_type DEVCB_LINE_DISPATCH_3; +extern const device_type DEVCB_LINE_DISPATCH_4; +extern const device_type DEVCB_LINE_DISPATCH_5; +extern const device_type DEVCB_LINE_DISPATCH_6; #endif diff --git a/src/emu/emu.h b/src/emu/emu.h index b4a1b7294fb..720d0c2fdbe 100644 --- a/src/emu/emu.h +++ b/src/emu/emu.h @@ -113,7 +113,7 @@ typedef device_t * (*machine_config_constructor)(machine_config &config, device_ #include "speaker.h" // generic helpers -#include "devcb2.h" +#include "devcb.h" #include "dispatch.h" #include "drivers/xtal.h" #include "machine/generic.h" diff --git a/src/emu/emu.mak b/src/emu/emu.mak index 99708bf660c..1ea93112a57 100644 --- a/src/emu/emu.mak +++ b/src/emu/emu.mak @@ -59,7 +59,7 @@ EMUOBJS = \ $(EMUOBJ)/crsshair.o \ $(EMUOBJ)/debugger.o \ $(EMUOBJ)/devdelegate.o \ - $(EMUOBJ)/devcb2.o \ + $(EMUOBJ)/devcb.o \ $(EMUOBJ)/devcpu.o \ $(EMUOBJ)/devfind.o \ $(EMUOBJ)/device.o \ diff --git a/src/emu/imagedev/flopdrv.h b/src/emu/imagedev/flopdrv.h index edf1bdf3038..462e7d8bf29 100644 --- a/src/emu/imagedev/flopdrv.h +++ b/src/emu/imagedev/flopdrv.h @@ -83,7 +83,7 @@ struct chrn_id #define FLOPPY_DRIVE_INDEX 0x0020 #define MCFG_LEGACY_FLOPPY_IDX_CB(_devcb) \ - devcb = &legacy_floppy_image_device::set_out_idx_func(*device, DEVCB2_##_devcb); + devcb = &legacy_floppy_image_device::set_out_idx_func(*device, DEVCB_##_devcb); class legacy_floppy_image_device : public device_t, public device_image_interface @@ -94,7 +94,7 @@ public: legacy_floppy_image_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); ~legacy_floppy_image_device(); - template<class _Object> static devcb2_base &set_out_idx_func(device_t &device, _Object object) { return downcast<legacy_floppy_image_device &>(device).m_out_idx_func.set_callback(object); } + template<class _Object> static devcb_base &set_out_idx_func(device_t &device, _Object object) { return downcast<legacy_floppy_image_device &>(device).m_out_idx_func.set_callback(object); } virtual bool call_load(); virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { return load_software(swlist, swname, start_entry); } @@ -169,7 +169,7 @@ protected: virtual void device_start(); /* callbacks */ - devcb2_write_line m_out_idx_func; + devcb_write_line m_out_idx_func; /* state of input lines */ int m_drtn; /* direction */ diff --git a/src/emu/imagedev/midiin.h b/src/emu/imagedev/midiin.h index efa47f2d1ff..93dadab5a39 100644 --- a/src/emu/imagedev/midiin.h +++ b/src/emu/imagedev/midiin.h @@ -11,7 +11,7 @@ #define MCFG_MIDIIN_INPUT_CB(_devcb) \ - devcb = &midiin_device::set_input_callback(*device, DEVCB2_##_devcb); + devcb = &midiin_device::set_input_callback(*device, DEVCB_##_devcb); /*************************************************************************** @@ -26,7 +26,7 @@ public: // construction/destruction midiin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_input_callback(device_t &device, _Object object) { return downcast<midiin_device &>(device).m_input_cb.set_callback(object); } + template<class _Object> static devcb_base &set_input_callback(device_t &device, _Object object) { return downcast<midiin_device &>(device).m_input_cb.set_callback(object); } // image-level overrides virtual bool call_load(); @@ -62,7 +62,7 @@ private: osd_midi_device *m_midi; emu_timer *m_timer; - devcb2_write_line m_input_cb; + devcb_write_line m_input_cb; UINT8 m_xmitring[XMIT_RING_SIZE]; int m_xmit_read, m_xmit_write; bool m_tx_busy; diff --git a/src/emu/imagedev/printer.h b/src/emu/imagedev/printer.h index a5f5ffabf52..d5cf197dcfa 100644 --- a/src/emu/imagedev/printer.h +++ b/src/emu/imagedev/printer.h @@ -10,7 +10,7 @@ #define __PRINTER_H__ #define MCFG_PRINTER_ONLINE_CB(_devcb) \ - devcb = &printer_image_device::set_online_callback(*device, DEVCB2_##_devcb); + devcb = &printer_image_device::set_online_callback(*device, DEVCB_##_devcb); /*************************************************************************** TYPE DEFINITIONS @@ -25,7 +25,7 @@ public: // construction/destruction printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_online_callback(device_t &device, _Object object) { return downcast<printer_image_device &>(device).m_online_cb.set_callback(object); } + template<class _Object> static devcb_base &set_online_callback(device_t &device, _Object object) { return downcast<printer_image_device &>(device).m_online_cb.set_callback(object); } // image-level overrides virtual bool call_load(); @@ -53,7 +53,7 @@ protected: virtual void device_start(); virtual void device_config_complete(); - devcb2_write_line m_online_cb; + devcb_write_line m_online_cb; }; diff --git a/src/emu/machine/40105.h b/src/emu/machine/40105.h index 667e089d2f0..4498582282c 100644 --- a/src/emu/machine/40105.h +++ b/src/emu/machine/40105.h @@ -25,8 +25,8 @@ #define MCFG_40105_ADD(_tag, _dir, _dor) \ MCFG_DEVICE_ADD(_tag, CMOS_40105, 0) \ - downcast<cmos_40105_device *>(device)->set_dir_callback(DEVCB2_##_dir); \ - downcast<cmos_40105_device *>(device)->set_dor_callback(DEVCB2_##_dor); + downcast<cmos_40105_device *>(device)->set_dir_callback(DEVCB_##_dir); \ + downcast<cmos_40105_device *>(device)->set_dor_callback(DEVCB_##_dor); @@ -60,8 +60,8 @@ protected: virtual void device_reset(); private: - devcb2_write_line m_write_dir; - devcb2_write_line m_write_dor; + devcb_write_line m_write_dir; + devcb_write_line m_write_dor; std::queue<UINT8> m_fifo; diff --git a/src/emu/machine/53c7xx.h b/src/emu/machine/53c7xx.h index b812697d610..89431c5d5c1 100644 --- a/src/emu/machine/53c7xx.h +++ b/src/emu/machine/53c7xx.h @@ -57,13 +57,13 @@ #define DSTAT_DFE 0x80 #define MCFG_NCR53C7XX_IRQ_HANDLER(_devcb) \ - devcb = &ncr53c7xx_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ncr53c7xx_device::set_irq_handler(*device, DEVCB_##_devcb); #define MCFG_NCR53C7XX_HOST_WRITE(_devcb) \ - devcb = &ncr53c7xx_device::set_host_write(*device, DEVCB2_##_devcb); + devcb = &ncr53c7xx_device::set_host_write(*device, DEVCB_##_devcb); #define MCFG_NCR53C7XX_HOST_READ(_devcb) \ - devcb = &ncr53c7xx_device::set_host_read(*device, DEVCB2_##_devcb); + devcb = &ncr53c7xx_device::set_host_read(*device, DEVCB_##_devcb); class ncr53c7xx_device : public nscsi_device, public device_execute_interface @@ -73,9 +73,9 @@ public: ncr53c7xx_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<ncr53c7xx_device &>(device).m_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_host_write(device_t &device, _Object object) { return downcast<ncr53c7xx_device &>(device).m_host_write.set_callback(object); } - template<class _Object> static devcb2_base &set_host_read(device_t &device, _Object object) { return downcast<ncr53c7xx_device &>(device).m_host_read.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ncr53c7xx_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_host_write(device_t &device, _Object object) { return downcast<ncr53c7xx_device &>(device).m_host_write.set_callback(object); } + template<class _Object> static devcb_base &set_host_read(device_t &device, _Object object) { return downcast<ncr53c7xx_device &>(device).m_host_read.set_callback(object); } // our API DECLARE_READ32_MEMBER(read); @@ -217,9 +217,9 @@ private: void (ncr53c7xx_device::*m_scripts_op)(); // callbacks - devcb2_write_line m_irq_handler; - devcb2_write32 m_host_write; - devcb2_read32 m_host_read; + devcb_write_line m_irq_handler; + devcb_write32 m_host_write; + devcb_read32 m_host_read; }; // device type definition diff --git a/src/emu/machine/64h156.h b/src/emu/machine/64h156.h index 96cd57f67c6..ee642d23047 100644 --- a/src/emu/machine/64h156.h +++ b/src/emu/machine/64h156.h @@ -75,13 +75,13 @@ //************************************************************************** #define MCFG_64H156_ATN_CALLBACK(_write) \ - devcb = &c64h156_device::set_atn_wr_callback(*device, DEVCB2_##_write); + devcb = &c64h156_device::set_atn_wr_callback(*device, DEVCB_##_write); #define MCFG_64H156_SYNC_CALLBACK(_write) \ - devcb = &c64h156_device::set_sync_wr_callback(*device, DEVCB2_##_write); + devcb = &c64h156_device::set_sync_wr_callback(*device, DEVCB_##_write); #define MCFG_64H156_BYTE_CALLBACK(_write) \ - devcb = &c64h156_device::set_byte_wr_callback(*device, DEVCB2_##_write); + devcb = &c64h156_device::set_byte_wr_callback(*device, DEVCB_##_write); @@ -97,9 +97,9 @@ public: // construction/destruction c64h156_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_atn_wr_callback(device_t &device, _Object object) { return downcast<c64h156_device &>(device).m_write_atn.set_callback(object); } - template<class _Object> static devcb2_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast<c64h156_device &>(device).m_write_sync.set_callback(object); } - template<class _Object> static devcb2_base &set_byte_wr_callback(device_t &device, _Object object) { return downcast<c64h156_device &>(device).m_write_byte.set_callback(object); } + template<class _Object> static devcb_base &set_atn_wr_callback(device_t &device, _Object object) { return downcast<c64h156_device &>(device).m_write_atn.set_callback(object); } + template<class _Object> static devcb_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast<c64h156_device &>(device).m_write_sync.set_callback(object); } + template<class _Object> static devcb_base &set_byte_wr_callback(device_t &device, _Object object) { return downcast<c64h156_device &>(device).m_write_byte.set_callback(object); } DECLARE_READ8_MEMBER( yb_r ); DECLARE_WRITE8_MEMBER( yb_w ); @@ -161,9 +161,9 @@ private: int write_position; }; - devcb2_write_line m_write_atn; - devcb2_write_line m_write_sync; - devcb2_write_line m_write_byte; + devcb_write_line m_write_atn; + devcb_write_line m_write_sync; + devcb_write_line m_write_byte; floppy_image_device *m_floppy; diff --git a/src/emu/machine/6522via.h b/src/emu/machine/6522via.h index 5b0f640fd5c..94596d944e1 100644 --- a/src/emu/machine/6522via.h +++ b/src/emu/machine/6522via.h @@ -26,29 +26,29 @@ // TODO: REMOVE THESE #define MCFG_VIA6522_READPA_HANDLER(_devcb) \ - devcb = &via6522_device::set_readpa_handler(*device, DEVCB2_##_devcb); + devcb = &via6522_device::set_readpa_handler(*device, DEVCB_##_devcb); #define MCFG_VIA6522_READPB_HANDLER(_devcb) \ - devcb = &via6522_device::set_readpb_handler(*device, DEVCB2_##_devcb); + devcb = &via6522_device::set_readpb_handler(*device, DEVCB_##_devcb); // TODO: CONVERT THESE TO WRITE LINE #define MCFG_VIA6522_WRITEPA_HANDLER(_devcb) \ - devcb = &via6522_device::set_writepa_handler(*device, DEVCB2_##_devcb); + devcb = &via6522_device::set_writepa_handler(*device, DEVCB_##_devcb); #define MCFG_VIA6522_WRITEPB_HANDLER(_devcb) \ - devcb = &via6522_device::set_writepb_handler(*device, DEVCB2_##_devcb); + devcb = &via6522_device::set_writepb_handler(*device, DEVCB_##_devcb); #define MCFG_VIA6522_CA2_HANDLER(_devcb) \ - devcb = &via6522_device::set_ca2_handler(*device, DEVCB2_##_devcb); + devcb = &via6522_device::set_ca2_handler(*device, DEVCB_##_devcb); #define MCFG_VIA6522_CB1_HANDLER(_devcb) \ - devcb = &via6522_device::set_cb1_handler(*device, DEVCB2_##_devcb); + devcb = &via6522_device::set_cb1_handler(*device, DEVCB_##_devcb); #define MCFG_VIA6522_CB2_HANDLER(_devcb) \ - devcb = &via6522_device::set_cb2_handler(*device, DEVCB2_##_devcb); + devcb = &via6522_device::set_cb2_handler(*device, DEVCB_##_devcb); #define MCFG_VIA6522_IRQ_HANDLER(_devcb) \ - devcb = &via6522_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &via6522_device::set_irq_handler(*device, DEVCB_##_devcb); /*************************************************************************** @@ -65,17 +65,17 @@ public: via6522_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // TODO: REMOVE THESE - template<class _Object> static devcb2_base &set_readpa_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_in_a_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_readpb_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_in_b_handler.set_callback(object); } + template<class _Object> static devcb_base &set_readpa_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_in_a_handler.set_callback(object); } + template<class _Object> static devcb_base &set_readpb_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_in_b_handler.set_callback(object); } // TODO: CONVERT THESE TO WRITE LINE - template<class _Object> static devcb2_base &set_writepa_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_out_a_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_writepb_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_out_b_handler.set_callback(object); } + template<class _Object> static devcb_base &set_writepa_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_out_a_handler.set_callback(object); } + template<class _Object> static devcb_base &set_writepb_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_out_b_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_ca2_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_ca2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_cb1_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_cb1_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_cb2_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_cb2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ca2_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_ca2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_cb1_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_cb1_handler.set_callback(object); } + template<class _Object> static devcb_base &set_cb2_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_cb2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -152,17 +152,17 @@ private: void output_irq(); // TODO: REMOVE THESE - devcb2_read8 m_in_a_handler; - devcb2_read8 m_in_b_handler; + devcb_read8 m_in_a_handler; + devcb_read8 m_in_b_handler; // TODO: CONVERT THESE TO WRITE LINE - devcb2_write8 m_out_a_handler; - devcb2_write8 m_out_b_handler; + devcb_write8 m_out_a_handler; + devcb_write8 m_out_b_handler; - devcb2_write_line m_ca2_handler; - devcb2_write_line m_cb1_handler; - devcb2_write_line m_cb2_handler; - devcb2_write_line m_irq_handler; + devcb_write_line m_ca2_handler; + devcb_write_line m_cb1_handler; + devcb_write_line m_cb2_handler; + devcb_write_line m_irq_handler; UINT8 m_in_a; int m_in_ca1; diff --git a/src/emu/machine/6525tpi.h b/src/emu/machine/6525tpi.h index a6bcea1f3c1..87deba13e7d 100644 --- a/src/emu/machine/6525tpi.h +++ b/src/emu/machine/6525tpi.h @@ -40,15 +40,15 @@ public: tpi6525_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tpi6525_device() {} - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_in_pa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_pa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_in_pb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_pb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_pc_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_in_pc_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pc_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_pc_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_ca_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_ca_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_cb_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_cb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_in_pa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_pa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_in_pb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_pb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pc_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_in_pc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pc_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_pc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_ca_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_ca_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_cb_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_cb_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -86,19 +86,19 @@ protected: private: // internal state - devcb2_write_line m_out_irq_cb; + devcb_write_line m_out_irq_cb; - devcb2_read8 m_in_pa_cb; - devcb2_write8 m_out_pa_cb; + devcb_read8 m_in_pa_cb; + devcb_write8 m_out_pa_cb; - devcb2_read8 m_in_pb_cb; - devcb2_write8 m_out_pb_cb; + devcb_read8 m_in_pb_cb; + devcb_write8 m_out_pb_cb; - devcb2_read8 m_in_pc_cb; - devcb2_write8 m_out_pc_cb; + devcb_read8 m_in_pc_cb; + devcb_write8 m_out_pc_cb; - devcb2_write_line m_out_ca_cb; - devcb2_write_line m_out_cb_cb; + devcb_write_line m_out_ca_cb; + devcb_write_line m_out_cb_cb; UINT8 m_port_a, m_ddr_a, m_in_a; UINT8 m_port_b, m_ddr_b, m_in_b; @@ -122,31 +122,31 @@ extern const device_type TPI6525; #define MCFG_TPI6525_OUT_IRQ_CB(_devcb) \ - devcb = &tpi6525_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &tpi6525_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_TPI6525_IN_PA_CB(_devcb) \ - devcb = &tpi6525_device::set_in_pa_callback(*device, DEVCB2_##_devcb); + devcb = &tpi6525_device::set_in_pa_callback(*device, DEVCB_##_devcb); #define MCFG_TPI6525_OUT_PA_CB(_devcb) \ - devcb = &tpi6525_device::set_out_pa_callback(*device, DEVCB2_##_devcb); + devcb = &tpi6525_device::set_out_pa_callback(*device, DEVCB_##_devcb); #define MCFG_TPI6525_IN_PB_CB(_devcb) \ - devcb = &tpi6525_device::set_in_pb_callback(*device, DEVCB2_##_devcb); + devcb = &tpi6525_device::set_in_pb_callback(*device, DEVCB_##_devcb); #define MCFG_TPI6525_OUT_PB_CB(_devcb) \ - devcb = &tpi6525_device::set_out_pb_callback(*device, DEVCB2_##_devcb); + devcb = &tpi6525_device::set_out_pb_callback(*device, DEVCB_##_devcb); #define MCFG_TPI6525_IN_PC_CB(_devcb) \ - devcb = &tpi6525_device::set_in_pc_callback(*device, DEVCB2_##_devcb); + devcb = &tpi6525_device::set_in_pc_callback(*device, DEVCB_##_devcb); #define MCFG_TPI6525_OUT_PC_CB(_devcb) \ - devcb = &tpi6525_device::set_out_pc_callback(*device, DEVCB2_##_devcb); + devcb = &tpi6525_device::set_out_pc_callback(*device, DEVCB_##_devcb); #define MCFG_TPI6525_OUT_CA_CB(_devcb) \ - devcb = &tpi6525_device::set_out_ca_callback(*device, DEVCB2_##_devcb); + devcb = &tpi6525_device::set_out_ca_callback(*device, DEVCB_##_devcb); #define MCFG_TPI6525_OUT_CB_CB(_devcb) \ - devcb = &tpi6525_device::set_out_cb_callback(*device, DEVCB2_##_devcb); + devcb = &tpi6525_device::set_out_cb_callback(*device, DEVCB_##_devcb); #endif /* __TPI6525_H__ */ diff --git a/src/emu/machine/6526cia.h b/src/emu/machine/6526cia.h index e59279a6018..bd5f63fb37a 100644 --- a/src/emu/machine/6526cia.h +++ b/src/emu/machine/6526cia.h @@ -51,28 +51,28 @@ legacy_mos6526_device::static_set_tod_clock(*device, _clock); #define MCFG_MOS6526_IRQ_CALLBACK(_write) \ - devcb = &legacy_mos6526_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &legacy_mos6526_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS6526_CNT_CALLBACK(_write) \ - devcb = &legacy_mos6526_device::set_cnt_wr_callback(*device, DEVCB2_##_write); + devcb = &legacy_mos6526_device::set_cnt_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS6526_SP_CALLBACK(_write) \ - devcb = &legacy_mos6526_device::set_sp_wr_callback(*device, DEVCB2_##_write); + devcb = &legacy_mos6526_device::set_sp_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS6526_PA_INPUT_CALLBACK(_read) \ - devcb = &legacy_mos6526_device::set_pa_rd_callback(*device, DEVCB2_##_read); + devcb = &legacy_mos6526_device::set_pa_rd_callback(*device, DEVCB_##_read); #define MCFG_MOS6526_PA_OUTPUT_CALLBACK(_write) \ - devcb = &legacy_mos6526_device::set_pa_wr_callback(*device, DEVCB2_##_write); + devcb = &legacy_mos6526_device::set_pa_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS6526_PB_INPUT_CALLBACK(_read) \ - devcb = &legacy_mos6526_device::set_pb_rd_callback(*device, DEVCB2_##_read); + devcb = &legacy_mos6526_device::set_pb_rd_callback(*device, DEVCB_##_read); #define MCFG_MOS6526_PB_OUTPUT_CALLBACK(_write) \ - devcb = &legacy_mos6526_device::set_pb_wr_callback(*device, DEVCB2_##_write); + devcb = &legacy_mos6526_device::set_pb_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS6526_PC_CALLBACK(_write) \ - devcb = &legacy_mos6526_device::set_pc_wr_callback(*device, DEVCB2_##_write); + devcb = &legacy_mos6526_device::set_pc_wr_callback(*device, DEVCB_##_write); @@ -90,14 +90,14 @@ public: static void static_set_tod_clock(device_t &device, int clock) { downcast<legacy_mos6526_device &>(device).m_tod_clock = clock; } - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_cnt_wr_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_write_cnt.set_callback(object); } - template<class _Object> static devcb2_base &set_sp_wr_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_write_sp.set_callback(object); } - template<class _Object> static devcb2_base &set_pa_rd_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_read_pa.set_callback(object); } - template<class _Object> static devcb2_base &set_pa_wr_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_write_pa.set_callback(object); } - template<class _Object> static devcb2_base &set_pb_rd_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_read_pb.set_callback(object); } - template<class _Object> static devcb2_base &set_pb_wr_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_write_pb.set_callback(object); } - template<class _Object> static devcb2_base &set_pc_wr_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_write_pc.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_cnt_wr_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_write_cnt.set_callback(object); } + template<class _Object> static devcb_base &set_sp_wr_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_write_sp.set_callback(object); } + template<class _Object> static devcb_base &set_pa_rd_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_read_pa.set_callback(object); } + template<class _Object> static devcb_base &set_pa_wr_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_write_pa.set_callback(object); } + template<class _Object> static devcb_base &set_pb_rd_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_read_pb.set_callback(object); } + template<class _Object> static devcb_base &set_pb_wr_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_write_pb.set_callback(object); } + template<class _Object> static devcb_base &set_pc_wr_callback(device_t &device, _Object object) { return downcast<legacy_mos6526_device &>(device).m_write_pc.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -190,14 +190,14 @@ private: UINT8 m_mask_value; /* in READ operation the value can be forced by a extern electric circuit */ }; - devcb2_write_line m_write_irq; - devcb2_write_line m_write_pc; - devcb2_write_line m_write_cnt; - devcb2_write_line m_write_sp; - devcb2_read8 m_read_pa; - devcb2_write8 m_write_pa; - devcb2_read8 m_read_pb; - devcb2_write8 m_write_pb; + devcb_write_line m_write_irq; + devcb_write_line m_write_pc; + devcb_write_line m_write_cnt; + devcb_write_line m_write_sp; + devcb_read8 m_read_pa; + devcb_write8 m_write_pa; + devcb_read8 m_read_pb; + devcb_write8 m_write_pb; cia_port m_port[2]; cia_timer m_timer[2]; diff --git a/src/emu/machine/6532riot.h b/src/emu/machine/6532riot.h index 6dcd629b674..6abd7682dbb 100644 --- a/src/emu/machine/6532riot.h +++ b/src/emu/machine/6532riot.h @@ -17,19 +17,19 @@ //************************************************************************** #define MCFG_RIOT6532_IN_PA_CB(_devcb) \ - devcb = &riot6532_device::set_in_pa_callback(*device, DEVCB2_##_devcb); + devcb = &riot6532_device::set_in_pa_callback(*device, DEVCB_##_devcb); #define MCFG_RIOT6532_OUT_PA_CB(_devcb) \ - devcb = &riot6532_device::set_out_pa_callback(*device, DEVCB2_##_devcb); + devcb = &riot6532_device::set_out_pa_callback(*device, DEVCB_##_devcb); #define MCFG_RIOT6532_IN_PB_CB(_devcb) \ - devcb = &riot6532_device::set_in_pb_callback(*device, DEVCB2_##_devcb); + devcb = &riot6532_device::set_in_pb_callback(*device, DEVCB_##_devcb); #define MCFG_RIOT6532_OUT_PB_CB(_devcb) \ - devcb = &riot6532_device::set_out_pb_callback(*device, DEVCB2_##_devcb); + devcb = &riot6532_device::set_out_pb_callback(*device, DEVCB_##_devcb); #define MCFG_RIOT6532_IRQ_CB(_devcb) \ - devcb = &riot6532_device::set_irq_callback(*device, DEVCB2_##_devcb); + devcb = &riot6532_device::set_irq_callback(*device, DEVCB_##_devcb); /*************************************************************************** @@ -45,11 +45,11 @@ public: // construction/destruction riot6532_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_in_pa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_out_pa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_in_pb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_out_pb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_in_pa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_out_pa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_in_pb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_out_pb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_irq_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -93,11 +93,11 @@ private: riot6532_port m_port[2]; - devcb2_read8 m_in_pa_cb; - devcb2_write8 m_out_pa_cb; - devcb2_read8 m_in_pb_cb; - devcb2_write8 m_out_pb_cb; - devcb2_write_line m_irq_cb; + devcb_read8 m_in_pa_cb; + devcb_write8 m_out_pa_cb; + devcb_read8 m_in_pb_cb; + devcb_write8 m_out_pb_cb; + devcb_write_line m_irq_cb; UINT8 m_irqstate; UINT8 m_irqenable; diff --git a/src/emu/machine/6821pia.h b/src/emu/machine/6821pia.h index 96ec69edf41..0f379f18474 100644 --- a/src/emu/machine/6821pia.h +++ b/src/emu/machine/6821pia.h @@ -32,38 +32,38 @@ // TODO: REMOVE THESE #define MCFG_PIA_READPA_HANDLER(_devcb) \ - devcb = &pia6821_device::set_readpa_handler(*device, DEVCB2_##_devcb); + devcb = &pia6821_device::set_readpa_handler(*device, DEVCB_##_devcb); #define MCFG_PIA_READPB_HANDLER(_devcb) \ - devcb = &pia6821_device::set_readpb_handler(*device, DEVCB2_##_devcb); + devcb = &pia6821_device::set_readpb_handler(*device, DEVCB_##_devcb); #define MCFG_PIA_READCA1_HANDLER(_devcb) \ - devcb = &pia6821_device::set_readca1_handler(*device, DEVCB2_##_devcb); + devcb = &pia6821_device::set_readca1_handler(*device, DEVCB_##_devcb); #define MCFG_PIA_READCA2_HANDLER(_devcb) \ - devcb = &pia6821_device::set_readca2_handler(*device, DEVCB2_##_devcb); + devcb = &pia6821_device::set_readca2_handler(*device, DEVCB_##_devcb); #define MCFG_PIA_READCB1_HANDLER(_devcb) \ - devcb = &pia6821_device::set_readcb1_handler(*device, DEVCB2_##_devcb); + devcb = &pia6821_device::set_readcb1_handler(*device, DEVCB_##_devcb); // TODO: CONVERT THESE TO WRITE LINE #define MCFG_PIA_WRITEPA_HANDLER(_devcb) \ - devcb = &pia6821_device::set_writepa_handler(*device, DEVCB2_##_devcb); + devcb = &pia6821_device::set_writepa_handler(*device, DEVCB_##_devcb); #define MCFG_PIA_WRITEPB_HANDLER(_devcb) \ - devcb = &pia6821_device::set_writepb_handler(*device, DEVCB2_##_devcb); + devcb = &pia6821_device::set_writepb_handler(*device, DEVCB_##_devcb); #define MCFG_PIA_CA2_HANDLER(_devcb) \ - devcb = &pia6821_device::set_ca2_handler(*device, DEVCB2_##_devcb); + devcb = &pia6821_device::set_ca2_handler(*device, DEVCB_##_devcb); #define MCFG_PIA_CB2_HANDLER(_devcb) \ - devcb = &pia6821_device::set_cb2_handler(*device, DEVCB2_##_devcb); + devcb = &pia6821_device::set_cb2_handler(*device, DEVCB_##_devcb); #define MCFG_PIA_IRQA_HANDLER(_devcb) \ - devcb = &pia6821_device::set_irqa_handler(*device, DEVCB2_##_devcb); + devcb = &pia6821_device::set_irqa_handler(*device, DEVCB_##_devcb); #define MCFG_PIA_IRQB_HANDLER(_devcb) \ - devcb = &pia6821_device::set_irqb_handler(*device, DEVCB2_##_devcb); + devcb = &pia6821_device::set_irqb_handler(*device, DEVCB_##_devcb); /*************************************************************************** @@ -80,20 +80,20 @@ public: // static configuration helpers // TODO: REMOVE THESE - template<class _Object> static devcb2_base &set_readpa_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_in_a_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_readpb_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_in_b_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_readca1_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_in_ca1_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_readca2_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_in_ca2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_readcb1_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_in_cb1_handler.set_callback(object); } + template<class _Object> static devcb_base &set_readpa_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_in_a_handler.set_callback(object); } + template<class _Object> static devcb_base &set_readpb_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_in_b_handler.set_callback(object); } + template<class _Object> static devcb_base &set_readca1_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_in_ca1_handler.set_callback(object); } + template<class _Object> static devcb_base &set_readca2_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_in_ca2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_readcb1_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_in_cb1_handler.set_callback(object); } // TODO: CONVERT THESE TO WRITE LINE - template<class _Object> static devcb2_base &set_writepa_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_out_a_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_writepb_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_out_b_handler.set_callback(object); } + template<class _Object> static devcb_base &set_writepa_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_out_a_handler.set_callback(object); } + template<class _Object> static devcb_base &set_writepb_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_out_b_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_ca2_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_ca2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_cb2_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_cb2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_irqa_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_irqa_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_irqb_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_irqb_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ca2_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_ca2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_cb2_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_cb2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irqa_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_irqa_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irqb_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_irqb_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ) { return reg_r(offset); } DECLARE_WRITE8_MEMBER( write ) { reg_w(offset, data); } @@ -167,17 +167,17 @@ private: void control_a_w(UINT8 data); void control_b_w(UINT8 data); - devcb2_read8 m_in_a_handler; - devcb2_read8 m_in_b_handler; - devcb2_read_line m_in_ca1_handler; - devcb2_read_line m_in_cb1_handler; - devcb2_read_line m_in_ca2_handler; - devcb2_write8 m_out_a_handler; - devcb2_write8 m_out_b_handler; - devcb2_write_line m_ca2_handler; - devcb2_write_line m_cb2_handler; - devcb2_write_line m_irqa_handler; - devcb2_write_line m_irqb_handler; + devcb_read8 m_in_a_handler; + devcb_read8 m_in_b_handler; + devcb_read_line m_in_ca1_handler; + devcb_read_line m_in_cb1_handler; + devcb_read_line m_in_ca2_handler; + devcb_write8 m_out_a_handler; + devcb_write8 m_out_b_handler; + devcb_write_line m_ca2_handler; + devcb_write_line m_cb2_handler; + devcb_write_line m_irqa_handler; + devcb_write_line m_irqb_handler; UINT8 m_in_a; UINT8 m_in_ca1; diff --git a/src/emu/machine/68307.h b/src/emu/machine/68307.h index 73bdc036ef2..82f5ea25169 100644 --- a/src/emu/machine/68307.h +++ b/src/emu/machine/68307.h @@ -22,17 +22,17 @@ typedef device_delegate<void (address_space &space, bool dedicated, UINT16 data, /* trampolines so we can specify the 68681 serial configuration when adding the CPU */ #define MCFG_MC68307_SERIAL_A_TX_CALLBACK(_cb) \ - devcb = &m68307cpu_device::set_a_tx_cb(*device, DEVCB2_##_cb); + devcb = &m68307cpu_device::set_a_tx_cb(*device, DEVCB_##_cb); #define MCFG_MC68307_SERIAL_B_TX_CALLBACK(_cb) \ - devcb = &m68307cpu_device::set_b_tx_cb(*device, DEVCB2_##_cb); + devcb = &m68307cpu_device::set_b_tx_cb(*device, DEVCB_##_cb); // deprecated: use ipX_w() instead #define MCFG_MC68307_SERIAL_INPORT_CALLBACK(_cb) \ - devcb = &m68307cpu_device::set_inport_cb(*device, DEVCB2_##_cb); + devcb = &m68307cpu_device::set_inport_cb(*device, DEVCB_##_cb); #define MCFG_MC68307_SERIAL_OUTPORT_CALLBACK(_cb) \ - devcb = &m68307cpu_device::set_outport_cb(*device, DEVCB2_##_cb); + devcb = &m68307cpu_device::set_outport_cb(*device, DEVCB_##_cb); class m68307cpu_device : public m68000_device { @@ -40,20 +40,20 @@ public: m68307cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); /* trampolines so we can specify the 68681 serial configuration when adding the CPU */ - template<class _Object> static devcb2_base &set_irq_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_a_tx_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_a_tx.set_callback(object); } - template<class _Object> static devcb2_base &set_b_tx_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_b_tx.set_callback(object); } - template<class _Object> static devcb2_base &set_inport_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).read_inport.set_callback(object); } - template<class _Object> static devcb2_base &set_outport_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_outport.set_callback(object); } + template<class _Object> static devcb_base &set_irq_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_a_tx_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_a_tx.set_callback(object); } + template<class _Object> static devcb_base &set_b_tx_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_b_tx.set_callback(object); } + template<class _Object> static devcb_base &set_inport_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).read_inport.set_callback(object); } + template<class _Object> static devcb_base &set_outport_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_outport.set_callback(object); } DECLARE_WRITE_LINE_MEMBER(m68307_duart_irq_handler); DECLARE_WRITE_LINE_MEMBER(m68307_duart_txa){ write_a_tx(state); } DECLARE_WRITE_LINE_MEMBER(m68307_duart_txb){ write_b_tx(state); } DECLARE_READ8_MEMBER(m68307_duart_input_r){ return read_inport(); } DECLARE_WRITE8_MEMBER(m68307_duart_output_w){ write_outport(data); } - devcb2_write_line write_irq, write_a_tx, write_b_tx; - devcb2_read8 read_inport; - devcb2_write8 write_outport; + devcb_write_line write_irq, write_a_tx, write_b_tx; + devcb_read8 read_inport; + devcb_write8 write_outport; UINT16 simple_read_immediate_16_m68307(offs_t address); diff --git a/src/emu/machine/6840ptm.h b/src/emu/machine/6840ptm.h index 622e4ad5c52..c5075a24144 100644 --- a/src/emu/machine/6840ptm.h +++ b/src/emu/machine/6840ptm.h @@ -26,16 +26,16 @@ ptm6840_device::set_external_clocks(*device, _clk0, _clk1, _clk2); #define MCFG_PTM6840_OUT0_CB(_devcb) \ - devcb = &ptm6840_device::set_out0_callback(*device, DEVCB2_##_devcb); + devcb = &ptm6840_device::set_out0_callback(*device, DEVCB_##_devcb); #define MCFG_PTM6840_OUT1_CB(_devcb) \ - devcb = &ptm6840_device::set_out1_callback(*device, DEVCB2_##_devcb); + devcb = &ptm6840_device::set_out1_callback(*device, DEVCB_##_devcb); #define MCFG_PTM6840_OUT2_CB(_devcb) \ - devcb = &ptm6840_device::set_out2_callback(*device, DEVCB2_##_devcb); + devcb = &ptm6840_device::set_out2_callback(*device, DEVCB_##_devcb); #define MCFG_PTM6840_IRQ_CB(_devcb) \ - devcb = &ptm6840_device::set_irq_callback(*device, DEVCB2_##_devcb); + devcb = &ptm6840_device::set_irq_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -51,10 +51,10 @@ public: static void set_internal_clock(device_t &device, double clock) { downcast<ptm6840_device &>(device).m_internal_clock = clock; } static void set_external_clocks(device_t &device, double clock0, double clock1, double clock2) { downcast<ptm6840_device &>(device).m_external_clock[0] = clock0; downcast<ptm6840_device &>(device).m_external_clock[1] = clock1; downcast<ptm6840_device &>(device).m_external_clock[2] = clock2; } - template<class _Object> static devcb2_base &set_out0_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_out0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out1_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_out1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out2_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_out2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out0_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_out0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out1_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_out1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out2_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_out2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_irq_cb.set_callback(object); } int status(int clock) const { return m_enabled[clock]; } // get whether timer is enabled int irq_state() const { return m_IRQ; } // get IRQ state @@ -109,10 +109,10 @@ private: double m_internal_clock; double m_external_clock[3]; - devcb2_write8 m_out0_cb; - devcb2_write8 m_out1_cb; - devcb2_write8 m_out2_cb; - devcb2_write_line m_irq_cb; // function called if IRQ line changes + devcb_write8 m_out0_cb; + devcb_write8 m_out1_cb; + devcb_write8 m_out2_cb; + devcb_write_line m_irq_cb; // function called if IRQ line changes UINT8 m_control_reg[3]; UINT8 m_output[3]; // Output states diff --git a/src/emu/machine/6850acia.h b/src/emu/machine/6850acia.h index bebcbf97f98..1f5cae5b347 100644 --- a/src/emu/machine/6850acia.h +++ b/src/emu/machine/6850acia.h @@ -16,13 +16,13 @@ #include "emu.h" #define MCFG_ACIA6850_TXD_HANDLER(_devcb) \ - devcb = &acia6850_device::set_txd_handler(*device, DEVCB2_##_devcb); + devcb = &acia6850_device::set_txd_handler(*device, DEVCB_##_devcb); #define MCFG_ACIA6850_RTS_HANDLER(_devcb) \ - devcb = &acia6850_device::set_rts_handler(*device, DEVCB2_##_devcb); + devcb = &acia6850_device::set_rts_handler(*device, DEVCB_##_devcb); #define MCFG_ACIA6850_IRQ_HANDLER(_devcb) \ - devcb = &acia6850_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &acia6850_device::set_irq_handler(*device, DEVCB_##_devcb); class acia6850_device : public device_t { @@ -31,9 +31,9 @@ public: acia6850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_txd_handler(device_t &device, _Object object) { return downcast<acia6850_device &>(device).m_txd_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_rts_handler(device_t &device, _Object object) { return downcast<acia6850_device &>(device).m_rts_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<acia6850_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast<acia6850_device &>(device).m_txd_handler.set_callback(object); } + template<class _Object> static devcb_base &set_rts_handler(device_t &device, _Object object) { return downcast<acia6850_device &>(device).m_rts_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<acia6850_device &>(device).m_irq_handler.set_callback(object); } DECLARE_WRITE8_MEMBER( control_w ); DECLARE_READ8_MEMBER( status_r ); @@ -94,9 +94,9 @@ private: DCD_IRQ_READ_STATUS, }; - devcb2_write_line m_txd_handler; - devcb2_write_line m_rts_handler; - devcb2_write_line m_irq_handler; + devcb_write_line m_txd_handler; + devcb_write_line m_rts_handler; + devcb_write_line m_irq_handler; UINT8 m_status; UINT8 m_tdr; diff --git a/src/emu/machine/68561mpcc.h b/src/emu/machine/68561mpcc.h index 4fa38ccd0fd..4133ad95cb7 100644 --- a/src/emu/machine/68561mpcc.h +++ b/src/emu/machine/68561mpcc.h @@ -12,7 +12,7 @@ #define __68561MPCC_H__ #define MCFG_MPCC68561_INTRQ_CALLBACK(_write) \ - devcb = &mpcc68561_t::set_intrq_wr_callback(*device, DEVCB2_##_write); + devcb = &mpcc68561_t::set_intrq_wr_callback(*device, DEVCB_##_write); class mpcc68561_t : public device_t { @@ -31,7 +31,7 @@ public: mpcc68561_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<mpcc68561_t &>(device).intrq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<mpcc68561_t &>(device).intrq_cb.set_callback(object); } UINT8 get_reg_a(int reg); void set_reg_a(int reg, UINT8 data); @@ -81,7 +81,7 @@ private: Chan channel[1]; - devcb2_write_line intrq_cb; + devcb_write_line intrq_cb; void updateirqs(); void initchannel(int ch); diff --git a/src/emu/machine/7200fifo.h b/src/emu/machine/7200fifo.h index 999f25e6c7f..937a6e96978 100644 --- a/src/emu/machine/7200fifo.h +++ b/src/emu/machine/7200fifo.h @@ -65,13 +65,13 @@ The following chips are functionally equivalent and pin-compatible. fifo7200_device::set_ram_size(*device, _ramsize); #define MCFG_FIFO7200_EF_HANDLER(_devcb) \ - devcb = &fifo7200_device::set_ef_handler(*device, DEVCB2_##_devcb); + devcb = &fifo7200_device::set_ef_handler(*device, DEVCB_##_devcb); #define MCFG_FIFO7200_FF_HANDLER(_devcb) \ - devcb = &fifo7200_device::set_ff_handler(*device, DEVCB2_##_devcb); + devcb = &fifo7200_device::set_ff_handler(*device, DEVCB_##_devcb); #define MCFG_FIFO7200_HF_HANDLER(_devcb) \ - devcb = &fifo7200_device::set_hf_handler(*device, DEVCB2_##_devcb); + devcb = &fifo7200_device::set_hf_handler(*device, DEVCB_##_devcb); @@ -87,9 +87,9 @@ public: fifo7200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_ef_handler(device_t &device, _Object object) { return downcast<fifo7200_device &>(device).m_ef_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_ff_handler(device_t &device, _Object object) { return downcast<fifo7200_device &>(device).m_ff_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_hf_handler(device_t &device, _Object object) { return downcast<fifo7200_device &>(device).m_hf_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ef_handler(device_t &device, _Object object) { return downcast<fifo7200_device &>(device).m_ef_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ff_handler(device_t &device, _Object object) { return downcast<fifo7200_device &>(device).m_ff_handler.set_callback(object); } + template<class _Object> static devcb_base &set_hf_handler(device_t &device, _Object object) { return downcast<fifo7200_device &>(device).m_hf_handler.set_callback(object); } static void set_ram_size(device_t &device, int size) { downcast<fifo7200_device &>(device).m_ram_size = size; } DECLARE_READ_LINE_MEMBER( ef_r ) { return !m_ef; } // _EF @@ -123,9 +123,9 @@ private: int m_ff; // full flag int m_hf; // half-full flag - devcb2_write_line m_ef_handler; - devcb2_write_line m_ff_handler; - devcb2_write_line m_hf_handler; + devcb_write_line m_ef_handler; + devcb_write_line m_ff_handler; + devcb_write_line m_hf_handler; }; // device type definition diff --git a/src/emu/machine/74123.h b/src/emu/machine/74123.h index 14967940257..c051c3ce4e5 100644 --- a/src/emu/machine/74123.h +++ b/src/emu/machine/74123.h @@ -75,7 +75,7 @@ ttl74123_device::set_clear_pin_value(*device, _value); #define MCFG_TTL74123_OUTPUT_CHANGED_CB(_devcb) \ - devcb = &ttl74123_device::set_output_changed_callback(*device, DEVCB2_##_devcb); + devcb = &ttl74123_device::set_output_changed_callback(*device, DEVCB_##_devcb); /* constants for the different ways the cap/res can be connected. This determines the formula for calculating the pulse width */ @@ -102,7 +102,7 @@ public: static void set_a_pin_value(device_t &device, int value) { downcast<ttl74123_device &>(device).m_a = value; } static void set_b_pin_value(device_t &device, int value) { downcast<ttl74123_device &>(device).m_b = value; } static void set_clear_pin_value(device_t &device, int value) { downcast<ttl74123_device &>(device).m_clear = value; } - template<class _Object> static devcb2_base &set_output_changed_callback(device_t &device, _Object object) { return downcast<ttl74123_device &>(device).m_output_changed_cb.set_callback(object); } + template<class _Object> static devcb_base &set_output_changed_callback(device_t &device, _Object object) { return downcast<ttl74123_device &>(device).m_output_changed_cb.set_callback(object); } DECLARE_WRITE8_MEMBER(a_w); DECLARE_WRITE8_MEMBER(b_w); @@ -135,7 +135,7 @@ private: int m_a; /* initial/constant value of the A pin */ int m_b; /* initial/constant value of the B pin */ int m_clear; /* initial/constant value of the Clear pin */ - devcb2_write8 m_output_changed_cb; + devcb_write8 m_output_changed_cb; }; diff --git a/src/emu/machine/74145.h b/src/emu/machine/74145.h index 7e22abf870b..edce3e9b1cf 100644 --- a/src/emu/machine/74145.h +++ b/src/emu/machine/74145.h @@ -16,34 +16,34 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** #define MCFG_TTL74145_OUTPUT_LINE_0_CB(_devcb) \ - devcb = &ttl74145_device::set_output_line_0_callback(*device, DEVCB2_##_devcb); + devcb = &ttl74145_device::set_output_line_0_callback(*device, DEVCB_##_devcb); #define MCFG_TTL74145_OUTPUT_LINE_1_CB(_devcb) \ - devcb = &ttl74145_device::set_output_line_1_callback(*device, DEVCB2_##_devcb); + devcb = &ttl74145_device::set_output_line_1_callback(*device, DEVCB_##_devcb); #define MCFG_TTL74145_OUTPUT_LINE_2_CB(_devcb) \ - devcb = &ttl74145_device::set_output_line_2_callback(*device, DEVCB2_##_devcb); + devcb = &ttl74145_device::set_output_line_2_callback(*device, DEVCB_##_devcb); #define MCFG_TTL74145_OUTPUT_LINE_3_CB(_devcb) \ - devcb = &ttl74145_device::set_output_line_3_callback(*device, DEVCB2_##_devcb); + devcb = &ttl74145_device::set_output_line_3_callback(*device, DEVCB_##_devcb); #define MCFG_TTL74145_OUTPUT_LINE_4_CB(_devcb) \ - devcb = &ttl74145_device::set_output_line_4_callback(*device, DEVCB2_##_devcb); + devcb = &ttl74145_device::set_output_line_4_callback(*device, DEVCB_##_devcb); #define MCFG_TTL74145_OUTPUT_LINE_5_CB(_devcb) \ - devcb = &ttl74145_device::set_output_line_5_callback(*device, DEVCB2_##_devcb); + devcb = &ttl74145_device::set_output_line_5_callback(*device, DEVCB_##_devcb); #define MCFG_TTL74145_OUTPUT_LINE_6_CB(_devcb) \ - devcb = &ttl74145_device::set_output_line_6_callback(*device, DEVCB2_##_devcb); + devcb = &ttl74145_device::set_output_line_6_callback(*device, DEVCB_##_devcb); #define MCFG_TTL74145_OUTPUT_LINE_7_CB(_devcb) \ - devcb = &ttl74145_device::set_output_line_7_callback(*device, DEVCB2_##_devcb); + devcb = &ttl74145_device::set_output_line_7_callback(*device, DEVCB_##_devcb); #define MCFG_TTL74145_OUTPUT_LINE_8_CB(_devcb) \ - devcb = &ttl74145_device::set_output_line_8_callback(*device, DEVCB2_##_devcb); + devcb = &ttl74145_device::set_output_line_8_callback(*device, DEVCB_##_devcb); #define MCFG_TTL74145_OUTPUT_LINE_9_CB(_devcb) \ - devcb = &ttl74145_device::set_output_line_9_callback(*device, DEVCB2_##_devcb); + devcb = &ttl74145_device::set_output_line_9_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -57,16 +57,16 @@ public: // construction/destruction ttl74145_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_output_line_0_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_output_line_1_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_output_line_2_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_output_line_3_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_output_line_4_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_4_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_output_line_5_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_5_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_output_line_6_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_6_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_output_line_7_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_7_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_output_line_8_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_8_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_output_line_9_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_9_cb.set_callback(object); } + template<class _Object> static devcb_base &set_output_line_0_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_output_line_1_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_output_line_2_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_output_line_3_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_output_line_4_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_4_cb.set_callback(object); } + template<class _Object> static devcb_base &set_output_line_5_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_5_cb.set_callback(object); } + template<class _Object> static devcb_base &set_output_line_6_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_6_cb.set_callback(object); } + template<class _Object> static devcb_base &set_output_line_7_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_7_cb.set_callback(object); } + template<class _Object> static devcb_base &set_output_line_8_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_8_cb.set_callback(object); } + template<class _Object> static devcb_base &set_output_line_9_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_9_cb.set_callback(object); } UINT16 read(); void write(UINT8 data); @@ -76,16 +76,16 @@ protected: virtual void device_reset(); private: - devcb2_write_line m_output_line_0_cb; - devcb2_write_line m_output_line_1_cb; - devcb2_write_line m_output_line_2_cb; - devcb2_write_line m_output_line_3_cb; - devcb2_write_line m_output_line_4_cb; - devcb2_write_line m_output_line_5_cb; - devcb2_write_line m_output_line_6_cb; - devcb2_write_line m_output_line_7_cb; - devcb2_write_line m_output_line_8_cb; - devcb2_write_line m_output_line_9_cb; + devcb_write_line m_output_line_0_cb; + devcb_write_line m_output_line_1_cb; + devcb_write_line m_output_line_2_cb; + devcb_write_line m_output_line_3_cb; + devcb_write_line m_output_line_4_cb; + devcb_write_line m_output_line_5_cb; + devcb_write_line m_output_line_6_cb; + devcb_write_line m_output_line_7_cb; + devcb_write_line m_output_line_8_cb; + devcb_write_line m_output_line_9_cb; /* decoded number */ UINT16 m_number; diff --git a/src/emu/machine/7474.h b/src/emu/machine/7474.h index 67f7a8bff03..9788ce9a689 100644 --- a/src/emu/machine/7474.h +++ b/src/emu/machine/7474.h @@ -51,10 +51,10 @@ //************************************************************************** #define MCFG_7474_OUTPUT_CB(_devcb) \ - devcb = &ttl7474_device::set_output_cb(*device, DEVCB2_##_devcb); + devcb = &ttl7474_device::set_output_cb(*device, DEVCB_##_devcb); #define MCFG_7474_COMP_OUTPUT_CB(_devcb) \ - devcb = &ttl7474_device::set_comp_output_cb(*device, DEVCB2_##_devcb); + devcb = &ttl7474_device::set_comp_output_cb(*device, DEVCB_##_devcb); //************************************************************************** @@ -70,8 +70,8 @@ public: ttl7474_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_output_cb(device_t &device, _Object object) { return downcast<ttl7474_device &>(device).m_output_func.set_callback(object); } - template<class _Object> static devcb2_base &set_comp_output_cb(device_t &device, _Object object) { return downcast<ttl7474_device &>(device).m_comp_output_func.set_callback(object); } + template<class _Object> static devcb_base &set_output_cb(device_t &device, _Object object) { return downcast<ttl7474_device &>(device).m_output_func.set_callback(object); } + template<class _Object> static devcb_base &set_comp_output_cb(device_t &device, _Object object) { return downcast<ttl7474_device &>(device).m_comp_output_func.set_callback(object); } // public interfaces DECLARE_WRITE_LINE_MEMBER( clear_w ); @@ -89,8 +89,8 @@ protected: virtual void device_clock_changed() { } private: // callbacks - devcb2_write_line m_output_func; - devcb2_write_line m_comp_output_func; + devcb_write_line m_output_func; + devcb_write_line m_comp_output_func; // inputs UINT8 m_clear; // pin 1/13 diff --git a/src/emu/machine/8042kbdc.h b/src/emu/machine/8042kbdc.h index c7e14ec1609..ec0180833d1 100644 --- a/src/emu/machine/8042kbdc.h +++ b/src/emu/machine/8042kbdc.h @@ -28,19 +28,19 @@ enum kbdc8042_type_t kbdc8042_device::set_keyboard_type(*device, _kbdt); #define MCFG_KBDC8042_SYSTEM_RESET_CB(_devcb) \ - devcb = &kbdc8042_device::set_system_reset_callback(*device, DEVCB2_##_devcb); + devcb = &kbdc8042_device::set_system_reset_callback(*device, DEVCB_##_devcb); #define MCFG_KBDC8042_GATE_A20_CB(_devcb) \ - devcb = &kbdc8042_device::set_gate_a20_callback(*device, DEVCB2_##_devcb); + devcb = &kbdc8042_device::set_gate_a20_callback(*device, DEVCB_##_devcb); #define MCFG_KBDC8042_INPUT_BUFFER_FULL_CB(_devcb) \ - devcb = &kbdc8042_device::set_input_buffer_full_callback(*device, DEVCB2_##_devcb); + devcb = &kbdc8042_device::set_input_buffer_full_callback(*device, DEVCB_##_devcb); #define MCFG_KBDC8042_OUTPUT_BUFFER_EMPTY_CB(_devcb) \ - devcb = &kbdc8042_device::set_output_buffer_empty_callback(*device, DEVCB2_##_devcb); + devcb = &kbdc8042_device::set_output_buffer_empty_callback(*device, DEVCB_##_devcb); #define MCFG_KBDC8042_SPEAKER_CB(_devcb) \ - devcb = &kbdc8042_device::set_speaker_callback(*device, DEVCB2_##_devcb); + devcb = &kbdc8042_device::set_speaker_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -57,11 +57,11 @@ public: virtual machine_config_constructor device_mconfig_additions() const; static void set_keyboard_type(device_t &device, kbdc8042_type_t keybtype) { downcast<kbdc8042_device &>(device).m_keybtype = keybtype; } - template<class _Object> static devcb2_base &set_system_reset_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_system_reset_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_gate_a20_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_gate_a20_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_input_buffer_full_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_input_buffer_full_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_output_buffer_empty_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_output_buffer_empty_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_speaker_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_speaker_cb.set_callback(object); } + template<class _Object> static devcb_base &set_system_reset_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_system_reset_cb.set_callback(object); } + template<class _Object> static devcb_base &set_gate_a20_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_gate_a20_cb.set_callback(object); } + template<class _Object> static devcb_base &set_input_buffer_full_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_input_buffer_full_cb.set_callback(object); } + template<class _Object> static devcb_base &set_output_buffer_empty_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_output_buffer_empty_cb.set_callback(object); } + template<class _Object> static devcb_base &set_speaker_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_speaker_cb.set_callback(object); } DECLARE_READ8_MEMBER( data_r ); DECLARE_WRITE8_MEMBER( data_w ); @@ -110,12 +110,12 @@ protected: kbdc8042_type_t m_keybtype; - devcb2_write_line m_system_reset_cb; - devcb2_write_line m_gate_a20_cb; - devcb2_write_line m_input_buffer_full_cb; - devcb2_write_line m_output_buffer_empty_cb; + devcb_write_line m_system_reset_cb; + devcb_write_line m_gate_a20_cb; + devcb_write_line m_input_buffer_full_cb; + devcb_write_line m_output_buffer_empty_cb; - devcb2_write8 m_speaker_cb; + devcb_write8 m_speaker_cb; }; // device type definition diff --git a/src/emu/machine/8530scc.h b/src/emu/machine/8530scc.h index 97db19978d0..b26fd88c6dc 100644 --- a/src/emu/machine/8530scc.h +++ b/src/emu/machine/8530scc.h @@ -10,7 +10,7 @@ #define __8530SCC_H__ #define MCFG_Z8530_INTRQ_CALLBACK(_write) \ - devcb = &scc8530_t::set_intrq_wr_callback(*device, DEVCB2_##_write); + devcb = &scc8530_t::set_intrq_wr_callback(*device, DEVCB_##_write); class scc8530_t : public device_t { @@ -29,7 +29,7 @@ public: scc8530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<scc8530_t &>(device).intrq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<scc8530_t &>(device).intrq_cb.set_callback(object); } UINT8 get_reg_a(int reg); UINT8 get_reg_b(int reg); @@ -81,7 +81,7 @@ private: Chan channel[2]; - devcb2_write_line intrq_cb; + devcb_write_line intrq_cb; void updateirqs(); void initchannel(int ch); diff --git a/src/emu/machine/aakart.h b/src/emu/machine/aakart.h index 9048d8986e3..35d27f5bf41 100644 --- a/src/emu/machine/aakart.h +++ b/src/emu/machine/aakart.h @@ -16,10 +16,10 @@ Acorn Archimedes KART interface //************************************************************************** #define MCFG_AAKART_OUT_TX_CB(_devcb) \ - devcb = &aakart_device::set_out_tx_callback(*device, DEVCB2_##_devcb); + devcb = &aakart_device::set_out_tx_callback(*device, DEVCB_##_devcb); #define MCFG_AAKART_OUT_RX_CB(_devcb) \ - devcb = &aakart_device::set_out_rx_callback(*device, DEVCB2_##_devcb); + devcb = &aakart_device::set_out_rx_callback(*device, DEVCB_##_devcb); enum{ @@ -43,8 +43,8 @@ public: // construction/destruction aakart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<aakart_device &>(device).m_out_tx_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_rx_callback(device_t &device, _Object object) { return downcast<aakart_device &>(device).m_out_rx_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<aakart_device &>(device).m_out_tx_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_rx_callback(device_t &device, _Object object) { return downcast<aakart_device &>(device).m_out_rx_cb.set_callback(object); } // I/O operations DECLARE_WRITE8_MEMBER( write ); @@ -68,8 +68,8 @@ private: emu_timer * m_mousetimer; emu_timer * m_keybtimer; - devcb2_write_line m_out_tx_cb; - devcb2_write_line m_out_rx_cb; + devcb_write_line m_out_tx_cb; + devcb_write_line m_out_rx_cb; UINT8 m_tx_latch; //UINT8 m_rx_latch; UINT8 m_rx; diff --git a/src/emu/machine/adc0808.h b/src/emu/machine/adc0808.h index b814a67960e..1ad4215df37 100644 --- a/src/emu/machine/adc0808.h +++ b/src/emu/machine/adc0808.h @@ -60,7 +60,7 @@ typedef device_delegate<double ()> adc0808_analog_read_delegate; #define MCFG_ADC0808_OUT_EOC_CB(_devcb) \ - devcb = &adc0808_device::set_out_eoc_callback(*device, DEVCB2_##_devcb); + devcb = &adc0808_device::set_out_eoc_callback(*device, DEVCB_##_devcb); #define MCFG_ADC0808_IN_VREF_POS_CB(_class, _method) \ adc0808_device::set_in_vref_pos_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); @@ -100,7 +100,7 @@ public: // construction/destruction adc0808_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_eoc_callback(device_t &device, _Object object) { return downcast<adc0808_device &>(device).m_out_eoc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_eoc_callback(device_t &device, _Object object) { return downcast<adc0808_device &>(device).m_out_eoc_cb.set_callback(object); } static void set_in_vref_pos_callback(device_t &device, adc0808_analog_read_delegate callback) { downcast<adc0808_device &>(device).m_in_vref_pos_cb = callback; } static void set_in_vref_neg_callback(device_t &device, adc0808_analog_read_delegate callback) { downcast<adc0808_device &>(device).m_in_vref_neg_cb = callback; } static void set_in_in_0_callback(device_t &device, adc0808_analog_read_delegate callback) { downcast<adc0808_device &>(device).m_in_in_0_cb = callback; } @@ -123,7 +123,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); private: - devcb2_write_line m_out_eoc_cb; + devcb_write_line m_out_eoc_cb; adc0808_analog_read_delegate m_in_vref_pos_cb; adc0808_analog_read_delegate m_in_vref_neg_cb; adc0808_analog_read_delegate m_in_in_0_cb; diff --git a/src/emu/machine/akiko.h b/src/emu/machine/akiko.h index 47fa22fee19..e3657d9d815 100644 --- a/src/emu/machine/akiko.h +++ b/src/emu/machine/akiko.h @@ -29,13 +29,13 @@ akiko_device::set_cputag(*device, _cputag); #define MCFG_AKIKO_SCL_HANDLER(_devcb) \ - devcb = &akiko_device::set_scl_handler(*device, DEVCB2_##_devcb); + devcb = &akiko_device::set_scl_handler(*device, DEVCB_##_devcb); #define MCFG_AKIKO_SDA_READ_HANDLER(_devcb) \ - devcb = &akiko_device::set_sda_read_handler(*device, DEVCB2_##_devcb); + devcb = &akiko_device::set_sda_read_handler(*device, DEVCB_##_devcb); #define MCFG_AKIKO_SDA_WRITE_HANDLER(_devcb) \ - devcb = &akiko_device::set_sda_write_handler(*device, DEVCB2_##_devcb); + devcb = &akiko_device::set_sda_write_handler(*device, DEVCB_##_devcb); //************************************************************************** @@ -51,13 +51,13 @@ public: ~akiko_device() {} // callbacks - template<class _Object> static devcb2_base &set_scl_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_scl_handler(device_t &device, _Object object) { return downcast<akiko_device &>(device).m_scl_w.set_callback(object); } - template<class _Object> static devcb2_base &set_sda_read_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_sda_read_handler(device_t &device, _Object object) { return downcast<akiko_device &>(device).m_sda_r.set_callback(object); } - template<class _Object> static devcb2_base &set_sda_write_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_sda_write_handler(device_t &device, _Object object) { return downcast<akiko_device &>(device).m_sda_w.set_callback(object); } DECLARE_READ32_MEMBER( read ); @@ -140,9 +140,9 @@ private: void update_cdrom(); // i2c interface - devcb2_write_line m_scl_w; - devcb2_read_line m_sda_r; - devcb2_write_line m_sda_w; + devcb_write_line m_scl_w; + devcb_read_line m_sda_r; + devcb_write_line m_sda_w; const char *m_cputag; }; diff --git a/src/emu/machine/am53cf96.h b/src/emu/machine/am53cf96.h index 553fe8a09a1..d414811ece4 100644 --- a/src/emu/machine/am53cf96.h +++ b/src/emu/machine/am53cf96.h @@ -11,7 +11,7 @@ #include "legscsi.h" #define MCFG_AM53CF96_IRQ_HANDLER(_devcb) \ - devcb = &am53cf96_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &am53cf96_device::set_irq_handler(*device, DEVCB_##_devcb); // 53CF96 register set enum @@ -42,7 +42,7 @@ public: am53cf96_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<am53cf96_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<am53cf96_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -65,7 +65,7 @@ private: UINT8 last_id; emu_timer* m_transfer_timer; - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; }; // device type definition diff --git a/src/emu/machine/am9517a.h b/src/emu/machine/am9517a.h index 8bc031d50ec..c4aa7383039 100644 --- a/src/emu/machine/am9517a.h +++ b/src/emu/machine/am9517a.h @@ -53,26 +53,26 @@ public: // construction/destruction am9517a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_hreq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_eop_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_eop_cb.set_callback(object); } - - template<class _Object> static devcb2_base &set_in_memr_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_in_memr_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_memw_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_memw_cb.set_callback(object); } - - template<class _Object> static devcb2_base &set_in_ior_0_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_in_ior_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_ior_1_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_in_ior_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_ior_2_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_in_ior_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_ior_3_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_in_ior_3_cb.set_callback(object); } - - template<class _Object> static devcb2_base &set_out_iow_0_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_iow_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_iow_1_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_iow_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_iow_2_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_iow_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_iow_3_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_iow_3_cb.set_callback(object); } - - template<class _Object> static devcb2_base &set_out_dack_0_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_dack_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dack_1_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_dack_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dack_2_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_dack_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dack_3_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_dack_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_hreq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_eop_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_eop_cb.set_callback(object); } + + template<class _Object> static devcb_base &set_in_memr_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_in_memr_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_memw_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_memw_cb.set_callback(object); } + + template<class _Object> static devcb_base &set_in_ior_0_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_in_ior_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_ior_1_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_in_ior_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_ior_2_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_in_ior_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_ior_3_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_in_ior_3_cb.set_callback(object); } + + template<class _Object> static devcb_base &set_out_iow_0_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_iow_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_iow_1_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_iow_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_iow_2_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_iow_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_iow_3_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_iow_3_cb.set_callback(object); } + + template<class _Object> static devcb_base &set_out_dack_0_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_dack_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dack_1_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_dack_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dack_2_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_dack_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dack_3_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_dack_3_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -107,24 +107,24 @@ private: inline void dma_advance(); inline void end_of_process(); - devcb2_write_line m_out_hreq_cb; - devcb2_write_line m_out_eop_cb; - - devcb2_read8 m_in_memr_cb; - devcb2_write8 m_out_memw_cb; - - devcb2_read8 m_in_ior_0_cb; - devcb2_read8 m_in_ior_1_cb; - devcb2_read8 m_in_ior_2_cb; - devcb2_read8 m_in_ior_3_cb; - devcb2_write8 m_out_iow_0_cb; - devcb2_write8 m_out_iow_1_cb; - devcb2_write8 m_out_iow_2_cb; - devcb2_write8 m_out_iow_3_cb; - devcb2_write_line m_out_dack_0_cb; - devcb2_write_line m_out_dack_1_cb; - devcb2_write_line m_out_dack_2_cb; - devcb2_write_line m_out_dack_3_cb; + devcb_write_line m_out_hreq_cb; + devcb_write_line m_out_eop_cb; + + devcb_read8 m_in_memr_cb; + devcb_write8 m_out_memw_cb; + + devcb_read8 m_in_ior_0_cb; + devcb_read8 m_in_ior_1_cb; + devcb_read8 m_in_ior_2_cb; + devcb_read8 m_in_ior_3_cb; + devcb_write8 m_out_iow_0_cb; + devcb_write8 m_out_iow_1_cb; + devcb_write8 m_out_iow_2_cb; + devcb_write8 m_out_iow_3_cb; + devcb_write_line m_out_dack_0_cb; + devcb_write_line m_out_dack_1_cb; + devcb_write_line m_out_dack_2_cb; + devcb_write_line m_out_dack_3_cb; struct { @@ -159,52 +159,52 @@ extern const device_type AM9517A; ***************************************************************************/ #define MCFG_AM9517A_OUT_HREQ_CB(_devcb) \ - devcb = &am9517a_device::set_out_hreq_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_out_hreq_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_OUT_EOP_CB(_devcb) \ - devcb = &am9517a_device::set_out_eop_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_out_eop_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_IN_MEMR_CB(_devcb) \ - devcb = &am9517a_device::set_in_memr_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_in_memr_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_OUT_MEMW_CB(_devcb) \ - devcb = &am9517a_device::set_out_memw_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_out_memw_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_IN_IOR_0_CB(_devcb) \ - devcb = &am9517a_device::set_in_ior_0_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_in_ior_0_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_IN_IOR_1_CB(_devcb) \ - devcb = &am9517a_device::set_in_ior_1_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_in_ior_1_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_IN_IOR_2_CB(_devcb) \ - devcb = &am9517a_device::set_in_ior_2_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_in_ior_2_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_IN_IOR_3_CB(_devcb) \ - devcb = &am9517a_device::set_in_ior_3_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_in_ior_3_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_OUT_IOW_0_CB(_devcb) \ - devcb = &am9517a_device::set_out_iow_0_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_out_iow_0_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_OUT_IOW_1_CB(_devcb) \ - devcb = &am9517a_device::set_out_iow_1_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_out_iow_1_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_OUT_IOW_2_CB(_devcb) \ - devcb = &am9517a_device::set_out_iow_2_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_out_iow_2_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_OUT_IOW_3_CB(_devcb) \ - devcb = &am9517a_device::set_out_iow_3_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_out_iow_3_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_OUT_DACK_0_CB(_devcb) \ - devcb = &am9517a_device::set_out_dack_0_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_out_dack_0_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_OUT_DACK_1_CB(_devcb) \ - devcb = &am9517a_device::set_out_dack_1_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_out_dack_1_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_OUT_DACK_2_CB(_devcb) \ - devcb = &am9517a_device::set_out_dack_2_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_out_dack_2_callback(*device, DEVCB_##_devcb); #define MCFG_AM9517A_OUT_DACK_3_CB(_devcb) \ - devcb = &am9517a_device::set_out_dack_3_callback(*device, DEVCB2_##_devcb); + devcb = &am9517a_device::set_out_dack_3_callback(*device, DEVCB_##_devcb); #define MCFG_I8237_OUT_HREQ_CB MCFG_AM9517A_OUT_HREQ_CB #define MCFG_I8237_OUT_EOP_CB MCFG_AM9517A_OUT_EOP_CB diff --git a/src/emu/machine/amigafdc.h b/src/emu/machine/amigafdc.h index 2d442c5a043..d8b0366105d 100644 --- a/src/emu/machine/amigafdc.h +++ b/src/emu/machine/amigafdc.h @@ -5,13 +5,13 @@ #include "imagedev/floppy.h" #define MCFG_AMIGA_FDC_INDEX_CALLBACK(_write) \ - devcb = &amiga_fdc::set_index_wr_callback(*device, DEVCB2_##_write); + devcb = &amiga_fdc::set_index_wr_callback(*device, DEVCB_##_write); class amiga_fdc : public device_t { public: amiga_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_index_wr_callback(device_t &device, _Object object) { return downcast<amiga_fdc &>(device).m_write_index.set_callback(object); } + template<class _Object> static devcb_base &set_index_wr_callback(device_t &device, _Object object) { return downcast<amiga_fdc &>(device).m_write_index.set_callback(object); } DECLARE_WRITE8_MEMBER(ciaaprb_w); @@ -75,7 +75,7 @@ private: pll_t pll; }; - devcb2_write_line m_write_index; + devcb_write_line m_write_index; floppy_image_device *floppy; floppy_image_device *floppy_devices[4]; diff --git a/src/emu/machine/at45dbxx.h b/src/emu/machine/at45dbxx.h index 6091a36359f..5e2131c1508 100644 --- a/src/emu/machine/at45dbxx.h +++ b/src/emu/machine/at45dbxx.h @@ -30,7 +30,7 @@ MCFG_DEVICE_ADD(_tag, AT45DB161, 0) #define MCFG_AT45DBXXX_SO_CALLBACK(_cb) \ - devcb = &at45db041_device::set_so_cb(*device, DEVCB2_##_cb); + devcb = &at45db041_device::set_so_cb(*device, DEVCB_##_cb); // ======================> at45db041_device @@ -49,8 +49,8 @@ public: UINT8 *get_ptr() { return m_data; } - template<class _Object> static devcb2_base &set_so_cb(device_t &device, _Object object) { return downcast<at45db041_device &>(device).write_so.set_callback(object); } - devcb2_write_line write_so; + template<class _Object> static devcb_base &set_so_cb(device_t &device, _Object object) { return downcast<at45db041_device &>(device).write_so.set_callback(object); } + devcb_write_line write_so; protected: // device-level overrides diff --git a/src/emu/machine/at_keybc.h b/src/emu/machine/at_keybc.h index 5f5cd1c2cb4..5ce533cc9f7 100644 --- a/src/emu/machine/at_keybc.h +++ b/src/emu/machine/at_keybc.h @@ -18,22 +18,22 @@ //************************************************************************** #define MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(_devcb) \ - devcb = &at_keyboard_controller_device::set_system_reset_callback(*device, DEVCB2_##_devcb); + devcb = &at_keyboard_controller_device::set_system_reset_callback(*device, DEVCB_##_devcb); #define MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(_devcb) \ - devcb = &at_keyboard_controller_device::set_gate_a20_callback(*device, DEVCB2_##_devcb); + devcb = &at_keyboard_controller_device::set_gate_a20_callback(*device, DEVCB_##_devcb); #define MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(_devcb) \ - devcb = &at_keyboard_controller_device::set_input_buffer_full_callback(*device, DEVCB2_##_devcb); + devcb = &at_keyboard_controller_device::set_input_buffer_full_callback(*device, DEVCB_##_devcb); #define MCFG_AT_KEYBOARD_CONTROLLER_OUTPUT_BUFFER_EMPTY_CB(_devcb) \ - devcb = &at_keyboard_controller_device::set_output_buffer_empty_callback(*device, DEVCB2_##_devcb); + devcb = &at_keyboard_controller_device::set_output_buffer_empty_callback(*device, DEVCB_##_devcb); #define MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_CLOCK_CB(_devcb) \ - devcb = &at_keyboard_controller_device::set_keyboard_clock_callback(*device, DEVCB2_##_devcb); + devcb = &at_keyboard_controller_device::set_keyboard_clock_callback(*device, DEVCB_##_devcb); #define MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_DATA_CB(_devcb) \ - devcb = &at_keyboard_controller_device::set_keyboard_data_callback(*device, DEVCB2_##_devcb); + devcb = &at_keyboard_controller_device::set_keyboard_data_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -47,12 +47,12 @@ public: // construction/destruction at_keyboard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_system_reset_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_system_reset_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_gate_a20_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_gate_a20_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_input_buffer_full_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_input_buffer_full_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_output_buffer_empty_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_output_buffer_empty_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_keyboard_clock_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_keyboard_clock_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_keyboard_data_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_keyboard_data_cb.set_callback(object); } + template<class _Object> static devcb_base &set_system_reset_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_system_reset_cb.set_callback(object); } + template<class _Object> static devcb_base &set_gate_a20_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_gate_a20_cb.set_callback(object); } + template<class _Object> static devcb_base &set_input_buffer_full_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_input_buffer_full_cb.set_callback(object); } + template<class _Object> static devcb_base &set_output_buffer_empty_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_output_buffer_empty_cb.set_callback(object); } + template<class _Object> static devcb_base &set_keyboard_clock_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_keyboard_clock_cb.set_callback(object); } + template<class _Object> static devcb_base &set_keyboard_data_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_keyboard_data_cb.set_callback(object); } // internal 8042 interface DECLARE_READ8_MEMBER( t0_r ); @@ -84,14 +84,14 @@ private: upi41_cpu_device *m_cpu; // interface to the host pc - devcb2_write_line m_system_reset_cb; - devcb2_write_line m_gate_a20_cb; - devcb2_write_line m_input_buffer_full_cb; - devcb2_write_line m_output_buffer_empty_cb; + devcb_write_line m_system_reset_cb; + devcb_write_line m_gate_a20_cb; + devcb_write_line m_input_buffer_full_cb; + devcb_write_line m_output_buffer_empty_cb; // interface to the keyboard - devcb2_write_line m_keyboard_clock_cb; - devcb2_write_line m_keyboard_data_cb; + devcb_write_line m_keyboard_clock_cb; + devcb_write_line m_keyboard_data_cb; UINT8 m_clock_signal; UINT8 m_data_signal; diff --git a/src/emu/machine/atadev.h b/src/emu/machine/atadev.h index b612f70ae2f..a63fc04f059 100644 --- a/src/emu/machine/atadev.h +++ b/src/emu/machine/atadev.h @@ -38,10 +38,10 @@ public: virtual DECLARE_WRITE_LINE_MEMBER(write_dasp) = 0; virtual DECLARE_WRITE_LINE_MEMBER(write_pdiag) = 0; - devcb2_write_line m_irq_handler; - devcb2_write_line m_dmarq_handler; - devcb2_write_line m_dasp_handler; - devcb2_write_line m_pdiag_handler; + devcb_write_line m_irq_handler; + devcb_write_line m_dmarq_handler; + devcb_write_line m_dasp_handler; + devcb_write_line m_pdiag_handler; }; #endif diff --git a/src/emu/machine/ataintf.c b/src/emu/machine/ataintf.c index 974c9e1d162..905daffb988 100644 --- a/src/emu/machine/ataintf.c +++ b/src/emu/machine/ataintf.c @@ -254,17 +254,17 @@ void ata_interface_device::device_start() { if (i == 0) { - dev->m_irq_handler.set_callback(DEVCB2_DEVWRITELINE("^", ata_interface_device, irq0_write_line)); - dev->m_dmarq_handler.set_callback(DEVCB2_DEVWRITELINE("^", ata_interface_device, dmarq0_write_line)); - dev->m_dasp_handler.set_callback(DEVCB2_DEVWRITELINE("^", ata_interface_device, dasp0_write_line)); - dev->m_pdiag_handler.set_callback(DEVCB2_DEVWRITELINE("^", ata_interface_device, pdiag0_write_line)); + dev->m_irq_handler.set_callback(DEVCB_DEVWRITELINE("^", ata_interface_device, irq0_write_line)); + dev->m_dmarq_handler.set_callback(DEVCB_DEVWRITELINE("^", ata_interface_device, dmarq0_write_line)); + dev->m_dasp_handler.set_callback(DEVCB_DEVWRITELINE("^", ata_interface_device, dasp0_write_line)); + dev->m_pdiag_handler.set_callback(DEVCB_DEVWRITELINE("^", ata_interface_device, pdiag0_write_line)); } else { - dev->m_irq_handler.set_callback(DEVCB2_DEVWRITELINE("^", ata_interface_device, irq1_write_line)); - dev->m_dmarq_handler.set_callback(DEVCB2_DEVWRITELINE("^", ata_interface_device, dmarq1_write_line)); - dev->m_dasp_handler.set_callback(DEVCB2_DEVWRITELINE("^", ata_interface_device, dasp1_write_line)); - dev->m_pdiag_handler.set_callback(DEVCB2_DEVWRITELINE("^", ata_interface_device, pdiag1_write_line)); + dev->m_irq_handler.set_callback(DEVCB_DEVWRITELINE("^", ata_interface_device, irq1_write_line)); + dev->m_dmarq_handler.set_callback(DEVCB_DEVWRITELINE("^", ata_interface_device, dmarq1_write_line)); + dev->m_dasp_handler.set_callback(DEVCB_DEVWRITELINE("^", ata_interface_device, dasp1_write_line)); + dev->m_pdiag_handler.set_callback(DEVCB_DEVWRITELINE("^", ata_interface_device, pdiag1_write_line)); } dev->write_csel(i); diff --git a/src/emu/machine/ataintf.h b/src/emu/machine/ataintf.h index ec9492d1fdd..3b83165fb42 100644 --- a/src/emu/machine/ataintf.h +++ b/src/emu/machine/ataintf.h @@ -49,13 +49,13 @@ extern const device_type ATA_SLOT; ***************************************************************************/ #define MCFG_ATA_INTERFACE_IRQ_HANDLER(_devcb) \ - devcb = &ata_interface_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ata_interface_device::set_irq_handler(*device, DEVCB_##_devcb); #define MCFG_ATA_INTERFACE_DMARQ_HANDLER(_devcb) \ - devcb = &ata_interface_device::set_dmarq_handler(*device, DEVCB2_##_devcb); + devcb = &ata_interface_device::set_dmarq_handler(*device, DEVCB_##_devcb); #define MCFG_ATA_INTERFACE_DASP_HANDLER(_devcb) \ - devcb = &ata_interface_device::set_dasp_handler(*device, DEVCB2_##_devcb); + devcb = &ata_interface_device::set_dasp_handler(*device, DEVCB_##_devcb); SLOT_INTERFACE_EXTERN(ata_devices); @@ -84,9 +84,9 @@ public: ata_interface_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); // static configuration helpers - template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<ata_interface_device &>(device).m_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_dmarq_handler(device_t &device, _Object object) { return downcast<ata_interface_device &>(device).m_dmarq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_dasp_handler(device_t &device, _Object object) { return downcast<ata_interface_device &>(device).m_dasp_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ata_interface_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_dmarq_handler(device_t &device, _Object object) { return downcast<ata_interface_device &>(device).m_dmarq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_dasp_handler(device_t &device, _Object object) { return downcast<ata_interface_device &>(device).m_dasp_handler.set_callback(object); } UINT16 read_dma(); virtual DECLARE_READ16_MEMBER(read_cs0); virtual DECLARE_READ16_MEMBER(read_cs1); @@ -122,9 +122,9 @@ private: int m_dasp[2]; int m_pdiag[2]; - devcb2_write_line m_irq_handler; - devcb2_write_line m_dmarq_handler; - devcb2_write_line m_dasp_handler; + devcb_write_line m_irq_handler; + devcb_write_line m_dmarq_handler; + devcb_write_line m_dasp_handler; }; extern const device_type ATA_INTERFACE; diff --git a/src/emu/machine/ay31015.h b/src/emu/machine/ay31015.h index 9852494c76a..3745cc7deac 100644 --- a/src/emu/machine/ay31015.h +++ b/src/emu/machine/ay31015.h @@ -65,9 +65,9 @@ public: static void set_tx_clock(device_t &device, double tx_clock) { downcast<ay31015_device &>(device).m_tx_clock = tx_clock; } static void set_rx_clock(device_t &device, double rx_clock) { downcast<ay31015_device &>(device).m_rx_clock = rx_clock; } - template<class _Object> static devcb2_base &set_read_si_callback(device_t &device, _Object object) { return downcast<ay31015_device &>(device).m_read_si_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_write_so_callback(device_t &device, _Object object) { return downcast<ay31015_device &>(device).m_write_so_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_status_changed_callback(device_t &device, _Object object) { return downcast<ay31015_device &>(device).m_status_changed_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_si_callback(device_t &device, _Object object) { return downcast<ay31015_device &>(device).m_read_si_cb.set_callback(object); } + template<class _Object> static devcb_base &set_write_so_callback(device_t &device, _Object object) { return downcast<ay31015_device &>(device).m_write_so_cb.set_callback(object); } + template<class _Object> static devcb_base &set_status_changed_callback(device_t &device, _Object object) { return downcast<ay31015_device &>(device).m_status_changed_cb.set_callback(object); } /* Set an input pin */ void set_input_pin( ay31015_input_pin_t pin, int data ); @@ -137,9 +137,9 @@ protected: double m_tx_clock; /* TCP - pin 40 */ emu_timer *m_tx_timer; - devcb2_read8 m_read_si_cb; /* SI - pin 20 - This will be called whenever the SI pin is sampled. Optional */ - devcb2_write8 m_write_so_cb; /* SO - pin 25 - This will be called whenever data is put on the SO pin. Optional */ - devcb2_write8 m_status_changed_cb; /* This will be called whenever one of the status pins may have changed. Optional */ + devcb_read8 m_read_si_cb; /* SI - pin 20 - This will be called whenever the SI pin is sampled. Optional */ + devcb_write8 m_write_so_cb; /* SO - pin 25 - This will be called whenever data is put on the SO pin. Optional */ + devcb_write8 m_status_changed_cb; /* This will be called whenever one of the status pins may have changed. Optional */ }; class ay51013_device : public ay31015_device @@ -169,13 +169,13 @@ extern const device_type AY51013; // For AY-3-1014, AY-5-1013 and AY-6-1013 va ay31015_device::set_rx_clock(*device, _rxclk); #define MCFG_AY31015_READ_SI_CB(_devcb) \ - devcb = &ay31015_device::set_read_si_callback(*device, DEVCB2_##_devcb); + devcb = &ay31015_device::set_read_si_callback(*device, DEVCB_##_devcb); #define MCFG_AY31015_WRITE_SO_CB(_devcb) \ - devcb = &ay31015_device::set_write_so_callback(*device, DEVCB2_##_devcb); + devcb = &ay31015_device::set_write_so_callback(*device, DEVCB_##_devcb); #define MCFG_AY31015_STATUS_CHANGED_CB(_devcb) \ - devcb = &ay31015_device::set_status_changed_callback(*device, DEVCB2_##_devcb); + devcb = &ay31015_device::set_status_changed_callback(*device, DEVCB_##_devcb); #define MCFG_AY51013_TX_CLOCK(_txclk) \ @@ -185,12 +185,12 @@ extern const device_type AY51013; // For AY-3-1014, AY-5-1013 and AY-6-1013 va ay51013_device::set_rx_clock(*device, _rxclk); #define MCFG_AY51013_READ_SI_CB(_devcb) \ - devcb = &ay51013_device::set_read_si_callback(*device, DEVCB2_##_devcb); + devcb = &ay51013_device::set_read_si_callback(*device, DEVCB_##_devcb); #define MCFG_AY51013_WRITE_SO_CB(_devcb) \ - devcb = &ay51013_device::set_write_so_callback(*device, DEVCB2_##_devcb); + devcb = &ay51013_device::set_write_so_callback(*device, DEVCB_##_devcb); #define MCFG_AY51013_STATUS_CHANGED_CB(_devcb) \ - devcb = &ay51013_device::set_status_changed_callback(*device, DEVCB2_##_devcb); + devcb = &ay51013_device::set_status_changed_callback(*device, DEVCB_##_devcb); #endif diff --git a/src/emu/machine/cdp1852.h b/src/emu/machine/cdp1852.h index 4c0a2158b5c..d0c9a65fede 100644 --- a/src/emu/machine/cdp1852.h +++ b/src/emu/machine/cdp1852.h @@ -38,16 +38,16 @@ //************************************************************************** #define MCFG_CDP1852_MODE_CALLBACK(_read) \ - devcb = &cdp1852_device::set_mode_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1852_device::set_mode_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1852_SR_CALLBACK(_write) \ - devcb = &cdp1852_device::set_sr_wr_callback(*device, DEVCB2_##_write); + devcb = &cdp1852_device::set_sr_wr_callback(*device, DEVCB_##_write); #define MCFG_CDP1852_DI_CALLBACK(_read) \ - devcb = &cdp1852_device::set_data_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1852_device::set_data_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1852_DO_CALLBACK(_write) \ - devcb = &cdp1852_device::set_data_wr_callback(*device, DEVCB2_##_write); + devcb = &cdp1852_device::set_data_wr_callback(*device, DEVCB_##_write); @@ -63,10 +63,10 @@ public: // construction/destruction cdp1852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_mode_rd_callback(device_t &device, _Object object) { return downcast<cdp1852_device &>(device).m_read_mode.set_callback(object); } - template<class _Object> static devcb2_base &set_sr_wr_callback(device_t &device, _Object object) { return downcast<cdp1852_device &>(device).m_write_sr.set_callback(object); } - template<class _Object> static devcb2_base &set_data_rd_callback(device_t &device, _Object object) { return downcast<cdp1852_device &>(device).m_read_data.set_callback(object); } - template<class _Object> static devcb2_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<cdp1852_device &>(device).m_write_data.set_callback(object); } + template<class _Object> static devcb_base &set_mode_rd_callback(device_t &device, _Object object) { return downcast<cdp1852_device &>(device).m_read_mode.set_callback(object); } + template<class _Object> static devcb_base &set_sr_wr_callback(device_t &device, _Object object) { return downcast<cdp1852_device &>(device).m_write_sr.set_callback(object); } + template<class _Object> static devcb_base &set_data_rd_callback(device_t &device, _Object object) { return downcast<cdp1852_device &>(device).m_read_data.set_callback(object); } + template<class _Object> static devcb_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<cdp1852_device &>(device).m_write_data.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -80,10 +80,10 @@ protected: private: void set_sr_line(int state); - devcb2_read_line m_read_mode; - devcb2_write_line m_write_sr; - devcb2_read8 m_read_data; - devcb2_write8 m_write_data; + devcb_read_line m_read_mode; + devcb_write_line m_write_sr; + devcb_read8 m_read_data; + devcb_write8 m_write_data; int m_new_data; // new data written UINT8 m_data; // data latch diff --git a/src/emu/machine/cdp1871.h b/src/emu/machine/cdp1871.h index 42470b20fba..9fc47aed2ba 100644 --- a/src/emu/machine/cdp1871.h +++ b/src/emu/machine/cdp1871.h @@ -46,43 +46,43 @@ //************************************************************************** #define MCFG_CDP1871_D1_CALLBACK(_read) \ - devcb = &cdp1871_device::set_d1_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1871_device::set_d1_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1871_D2_CALLBACK(_read) \ - devcb = &cdp1871_device::set_d2_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1871_device::set_d2_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1871_D3_CALLBACK(_read) \ - devcb = &cdp1871_device::set_d3_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1871_device::set_d3_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1871_D4_CALLBACK(_read) \ - devcb = &cdp1871_device::set_d4_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1871_device::set_d4_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1871_D5_CALLBACK(_read) \ - devcb = &cdp1871_device::set_d5_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1871_device::set_d5_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1871_D6_CALLBACK(_read) \ - devcb = &cdp1871_device::set_d6_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1871_device::set_d6_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1871_D7_CALLBACK(_read) \ - devcb = &cdp1871_device::set_d7_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1871_device::set_d7_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1871_D8_CALLBACK(_read) \ - devcb = &cdp1871_device::set_d8_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1871_device::set_d8_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1871_D9_CALLBACK(_read) \ - devcb = &cdp1871_device::set_d9_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1871_device::set_d9_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1871_D10_CALLBACK(_read) \ - devcb = &cdp1871_device::set_d10_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1871_device::set_d10_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1871_D11_CALLBACK(_read) \ - devcb = &cdp1871_device::set_d11_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1871_device::set_d11_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1871_DA_CALLBACK(_write) \ - devcb = &cdp1871_device::set_da_wr_callback(*device, DEVCB2_##_write); + devcb = &cdp1871_device::set_da_wr_callback(*device, DEVCB_##_write); #define MCFG_CDP1871_RPT_CALLBACK(_write) \ - devcb = &cdp1871_device::set_rpt_wr_callback(*device, DEVCB2_##_write); + devcb = &cdp1871_device::set_rpt_wr_callback(*device, DEVCB_##_write); @@ -98,19 +98,19 @@ public: // construction/destruction cdp1871_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_d1_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d1.set_callback(object); } - template<class _Object> static devcb2_base &set_d2_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d2.set_callback(object); } - template<class _Object> static devcb2_base &set_d3_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d3.set_callback(object); } - template<class _Object> static devcb2_base &set_d4_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d4.set_callback(object); } - template<class _Object> static devcb2_base &set_d5_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d5.set_callback(object); } - template<class _Object> static devcb2_base &set_d6_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d6.set_callback(object); } - template<class _Object> static devcb2_base &set_d7_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d7.set_callback(object); } - template<class _Object> static devcb2_base &set_d8_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d8.set_callback(object); } - template<class _Object> static devcb2_base &set_d9_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d9.set_callback(object); } - template<class _Object> static devcb2_base &set_d10_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d10.set_callback(object); } - template<class _Object> static devcb2_base &set_d11_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d11.set_callback(object); } - template<class _Object> static devcb2_base &set_da_wr_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_write_da.set_callback(object); } - template<class _Object> static devcb2_base &set_rpt_wr_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_write_rpt.set_callback(object); } + template<class _Object> static devcb_base &set_d1_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d1.set_callback(object); } + template<class _Object> static devcb_base &set_d2_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d2.set_callback(object); } + template<class _Object> static devcb_base &set_d3_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d3.set_callback(object); } + template<class _Object> static devcb_base &set_d4_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d4.set_callback(object); } + template<class _Object> static devcb_base &set_d5_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d5.set_callback(object); } + template<class _Object> static devcb_base &set_d6_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d6.set_callback(object); } + template<class _Object> static devcb_base &set_d7_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d7.set_callback(object); } + template<class _Object> static devcb_base &set_d8_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d8.set_callback(object); } + template<class _Object> static devcb_base &set_d9_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d9.set_callback(object); } + template<class _Object> static devcb_base &set_d10_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d10.set_callback(object); } + template<class _Object> static devcb_base &set_d11_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d11.set_callback(object); } + template<class _Object> static devcb_base &set_da_wr_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_write_da.set_callback(object); } + template<class _Object> static devcb_base &set_rpt_wr_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_write_rpt.set_callback(object); } DECLARE_READ8_MEMBER( read ); @@ -131,19 +131,19 @@ protected: void detect_keypress(); private: - devcb2_read8 m_read_d1; - devcb2_read8 m_read_d2; - devcb2_read8 m_read_d3; - devcb2_read8 m_read_d4; - devcb2_read8 m_read_d5; - devcb2_read8 m_read_d6; - devcb2_read8 m_read_d7; - devcb2_read8 m_read_d8; - devcb2_read8 m_read_d9; - devcb2_read8 m_read_d10; - devcb2_read8 m_read_d11; - devcb2_write_line m_write_da; - devcb2_write_line m_write_rpt; + devcb_read8 m_read_d1; + devcb_read8 m_read_d2; + devcb_read8 m_read_d3; + devcb_read8 m_read_d4; + devcb_read8 m_read_d5; + devcb_read8 m_read_d6; + devcb_read8 m_read_d7; + devcb_read8 m_read_d8; + devcb_read8 m_read_d9; + devcb_read8 m_read_d10; + devcb_read8 m_read_d11; + devcb_write_line m_write_da; + devcb_write_line m_write_rpt; bool m_inhibit; // scan counter clock inhibit int m_sense; // sense input scan counter diff --git a/src/emu/machine/clock.h b/src/emu/machine/clock.h index 5352eb106ba..2fd83b46c04 100644 --- a/src/emu/machine/clock.h +++ b/src/emu/machine/clock.h @@ -6,14 +6,14 @@ #include "emu.h" #define MCFG_CLOCK_SIGNAL_HANDLER(_devcb) \ - devcb = &clock_device::set_signal_handler(*device, DEVCB2_##_devcb); + devcb = &clock_device::set_signal_handler(*device, DEVCB_##_devcb); class clock_device : public device_t { public: clock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_signal_handler(device_t &device, _Object object) { return downcast<clock_device &>(device).m_signal_handler.set_callback(object); } + template<class _Object> static devcb_base &set_signal_handler(device_t &device, _Object object) { return downcast<clock_device &>(device).m_signal_handler.set_callback(object); } protected: virtual void device_start(); @@ -27,7 +27,7 @@ private: int m_signal; emu_timer *m_timer; - devcb2_write_line m_signal_handler; + devcb_write_line m_signal_handler; }; extern const device_type CLOCK; diff --git a/src/emu/machine/com8116.h b/src/emu/machine/com8116.h index 43eb1b21856..e34122304cd 100644 --- a/src/emu/machine/com8116.h +++ b/src/emu/machine/com8116.h @@ -35,13 +35,13 @@ ///************************************************************************* #define MCFG_COM8116_FX4_HANDLER(_devcb) \ - devcb = &com8116_device::set_fx4_handler(*device, DEVCB2_##_devcb); + devcb = &com8116_device::set_fx4_handler(*device, DEVCB_##_devcb); #define MCFG_COM8116_FR_HANDLER(_devcb) \ - devcb = &com8116_device::set_fr_handler(*device, DEVCB2_##_devcb); + devcb = &com8116_device::set_fr_handler(*device, DEVCB_##_devcb); #define MCFG_COM8116_FT_HANDLER(_devcb) \ - devcb = &com8116_device::set_ft_handler(*device, DEVCB2_##_devcb); + devcb = &com8116_device::set_ft_handler(*device, DEVCB_##_devcb); ///************************************************************************* @@ -56,9 +56,9 @@ public: // construction/destruction com8116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_fx4_handler(device_t &device, _Object object) { return downcast<com8116_device &>(device).m_fx4_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_fr_handler(device_t &device, _Object object) { return downcast<com8116_device &>(device).m_fr_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_ft_handler(device_t &device, _Object object) { return downcast<com8116_device &>(device).m_ft_handler.set_callback(object); } + template<class _Object> static devcb_base &set_fx4_handler(device_t &device, _Object object) { return downcast<com8116_device &>(device).m_fx4_handler.set_callback(object); } + template<class _Object> static devcb_base &set_fr_handler(device_t &device, _Object object) { return downcast<com8116_device &>(device).m_fr_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ft_handler(device_t &device, _Object object) { return downcast<com8116_device &>(device).m_ft_handler.set_callback(object); } void str_w(UINT8 data); DECLARE_WRITE8_MEMBER( str_w ); @@ -83,9 +83,9 @@ private: TIMER_FT }; - devcb2_write_line m_fx4_handler; - devcb2_write_line m_fr_handler; - devcb2_write_line m_ft_handler; + devcb_write_line m_fx4_handler; + devcb_write_line m_fr_handler; + devcb_write_line m_ft_handler; int m_fx4; int m_fr; diff --git a/src/emu/machine/cr511b.h b/src/emu/machine/cr511b.h index 912bafc8bae..98380826de7 100644 --- a/src/emu/machine/cr511b.h +++ b/src/emu/machine/cr511b.h @@ -49,22 +49,22 @@ MCFG_DEVICE_ADD(_tag, CR511B, 0) \ #define MCFG_CR511B_STCH_HANDLER(_devcb) \ - devcb = &cr511b_device::set_stch_handler(*device, DEVCB2_##_devcb); + devcb = &cr511b_device::set_stch_handler(*device, DEVCB_##_devcb); #define MCFG_CR511B_STEN_HANDLER(_devcb) \ - devcb = &cr511b_device::set_sten_handler(*device, DEVCB2_##_devcb); + devcb = &cr511b_device::set_sten_handler(*device, DEVCB_##_devcb); #define MCFG_CR511B_DRQ_HANDLER(_devcb) \ - devcb = &cr511b_device::set_drq_handler(*device, DEVCB2_##_devcb); + devcb = &cr511b_device::set_drq_handler(*device, DEVCB_##_devcb); #define MCFG_CR511B_DTEN_HANDLER(_devcb) \ - devcb = &cr511b_device::set_dten_handler(*device, DEVCB2_##_devcb); + devcb = &cr511b_device::set_dten_handler(*device, DEVCB_##_devcb); #define MCFG_CR511B_SCOR_HANDLER(_devcb) \ - devcb = &cr511b_device::set_scor_handler(*device, DEVCB2_##_devcb); + devcb = &cr511b_device::set_scor_handler(*device, DEVCB_##_devcb); #define MCFG_CR511B_XAEN_HANDLER(_devcb) \ - devcb = &cr511b_device::set_xaen_handler(*device, DEVCB2_##_devcb); + devcb = &cr511b_device::set_xaen_handler(*device, DEVCB_##_devcb); //************************************************************************** @@ -80,22 +80,22 @@ public: cr511b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // callbacks - template<class _Object> static devcb2_base &set_stch_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_stch_handler(device_t &device, _Object object) { return downcast<cr511b_device &>(device).m_stch_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_sten_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_sten_handler(device_t &device, _Object object) { return downcast<cr511b_device &>(device).m_sten_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_drq_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_drq_handler(device_t &device, _Object object) { return downcast<cr511b_device &>(device).m_drq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_dten_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_dten_handler(device_t &device, _Object object) { return downcast<cr511b_device &>(device).m_dten_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_scor_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_scor_handler(device_t &device, _Object object) { return downcast<cr511b_device &>(device).m_scor_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_xaen_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_xaen_handler(device_t &device, _Object object) { return downcast<cr511b_device &>(device).m_xaen_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); @@ -127,12 +127,12 @@ private: required_device<cdrom_image_device> m_cdrom; required_device<cdda_device> m_cdda; - devcb2_write_line m_stch_handler; - devcb2_write_line m_sten_handler; - devcb2_write_line m_drq_handler; - devcb2_write_line m_dten_handler; - devcb2_write_line m_scor_handler; - devcb2_write_line m_xaen_handler; + devcb_write_line m_stch_handler; + devcb_write_line m_sten_handler; + devcb_write_line m_drq_handler; + devcb_write_line m_dten_handler; + devcb_write_line m_scor_handler; + devcb_write_line m_xaen_handler; emu_timer *m_frame_timer; diff --git a/src/emu/machine/cs4031.h b/src/emu/machine/cs4031.h index 982c8441f40..ce60e42321d 100644 --- a/src/emu/machine/cs4031.h +++ b/src/emu/machine/cs4031.h @@ -46,31 +46,31 @@ cs4031_device::static_set_keybctag(*device, _keybctag); #define MCFG_CS4031_IOR(_ior) \ - downcast<cs4031_device *>(device)->set_ior_callback(DEVCB2_##_ior); + downcast<cs4031_device *>(device)->set_ior_callback(DEVCB_##_ior); #define MCFG_CS4031_IOW(_iow) \ - downcast<cs4031_device *>(device)->set_iow_callback(DEVCB2_##_iow); + downcast<cs4031_device *>(device)->set_iow_callback(DEVCB_##_iow); #define MCFG_CS4031_TC(_tc) \ - downcast<cs4031_device *>(device)->set_tc_callback(DEVCB2_##_tc); + downcast<cs4031_device *>(device)->set_tc_callback(DEVCB_##_tc); #define MCFG_CS4031_HOLD(_hold) \ - downcast<cs4031_device *>(device)->set_hold_callback(DEVCB2_##_hold); + downcast<cs4031_device *>(device)->set_hold_callback(DEVCB_##_hold); #define MCFG_CS4031_NMI(_nmi) \ - downcast<cs4031_device *>(device)->set_nmi_callback(DEVCB2_##_nmi); + downcast<cs4031_device *>(device)->set_nmi_callback(DEVCB_##_nmi); #define MCFG_CS4031_INTR(_intr) \ - downcast<cs4031_device *>(device)->set_intr_callback(DEVCB2_##_intr); + downcast<cs4031_device *>(device)->set_intr_callback(DEVCB_##_intr); #define MCFG_CS4031_CPURESET(_cpureset) \ - downcast<cs4031_device *>(device)->set_cpureset_callback(DEVCB2_##_cpureset); + downcast<cs4031_device *>(device)->set_cpureset_callback(DEVCB_##_cpureset); #define MCFG_CS4031_A20M(_a20m) \ - downcast<cs4031_device *>(device)->set_a20m_callback(DEVCB2_##_a20m); + downcast<cs4031_device *>(device)->set_a20m_callback(DEVCB_##_a20m); #define MCFG_CS4031_SPKR(_spkr) \ - downcast<cs4031_device *>(device)->set_spkr_callback(DEVCB2_##_spkr); + downcast<cs4031_device *>(device)->set_spkr_callback(DEVCB_##_spkr); //************************************************************************** @@ -194,15 +194,15 @@ protected: virtual void device_reset_after_children(); private: - devcb2_read16 m_read_ior; - devcb2_write16 m_write_iow; - devcb2_write8 m_write_tc; - devcb2_write_line m_write_hold; - devcb2_write_line m_write_nmi; - devcb2_write_line m_write_intr; - devcb2_write_line m_write_cpureset; - devcb2_write_line m_write_a20m; - devcb2_write_line m_write_spkr; + devcb_read16 m_read_ior; + devcb_write16 m_write_iow; + devcb_write8 m_write_tc; + devcb_write_line m_write_hold; + devcb_write_line m_write_nmi; + devcb_write_line m_write_intr; + devcb_write_line m_write_cpureset; + devcb_write_line m_write_a20m; + devcb_write_line m_write_spkr; offs_t page_offset(); void set_dma_channel(int channel, bool state); diff --git a/src/emu/machine/dmac.h b/src/emu/machine/dmac.h index ce3849d9ea5..aff36e3f0c3 100644 --- a/src/emu/machine/dmac.h +++ b/src/emu/machine/dmac.h @@ -26,25 +26,25 @@ MCFG_DEVICE_ADD(_tag, DMAC, _clock) \ #define MCFG_DMAC_CFGOUT_HANDLER(_devcb) \ - devcb = &dmac_device::set_cfgout_handler(*device, DEVCB2_##_devcb); + devcb = &dmac_device::set_cfgout_handler(*device, DEVCB_##_devcb); #define MCFG_DMAC_INT_HANDLER(_devcb) \ - devcb = &dmac_device::set_int_handler(*device, DEVCB2_##_devcb); + devcb = &dmac_device::set_int_handler(*device, DEVCB_##_devcb); #define MCFG_DMAC_XDACK_HANDLER(_devcb) \ - devcb = &dmac_device::set_xdack_handler(*device, DEVCB2_##_devcb); + devcb = &dmac_device::set_xdack_handler(*device, DEVCB_##_devcb); #define MCFG_DMAC_SCSI_READ_HANDLER(_devcb) \ - devcb = &dmac_device::set_scsi_read_handler(*device, DEVCB2_##_devcb); + devcb = &dmac_device::set_scsi_read_handler(*device, DEVCB_##_devcb); #define MCFG_DMAC_SCSI_WRITE_HANDLER(_devcb) \ - devcb = &dmac_device::set_scsi_write_handler(*device, DEVCB2_##_devcb); + devcb = &dmac_device::set_scsi_write_handler(*device, DEVCB_##_devcb); #define MCFG_DMAC_IO_READ_HANDLER(_devcb) \ - devcb = &dmac_device::set_io_read_handler(*device, DEVCB2_##_devcb); + devcb = &dmac_device::set_io_read_handler(*device, DEVCB_##_devcb); #define MCFG_DMAC_IO_WRITE_HANDLER(_devcb) \ - devcb = &dmac_device::set_io_write_handler(*device, DEVCB2_##_devcb); + devcb = &dmac_device::set_io_write_handler(*device, DEVCB_##_devcb); //************************************************************************** @@ -60,25 +60,25 @@ public: dmac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // callbacks - template<class _Object> static devcb2_base &set_cfgout_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_cfgout_handler(device_t &device, _Object object) { return downcast<dmac_device &>(device).m_cfgout_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_int_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_int_handler(device_t &device, _Object object) { return downcast<dmac_device &>(device).m_int_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_xdack_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_xdack_handler(device_t &device, _Object object) { return downcast<dmac_device &>(device).m_xdack_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_scsi_read_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_scsi_read_handler(device_t &device, _Object object) { return downcast<dmac_device &>(device).m_scsi_read_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_scsi_write_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_scsi_write_handler(device_t &device, _Object object) { return downcast<dmac_device &>(device).m_scsi_write_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_io_read_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_io_read_handler(device_t &device, _Object object) { return downcast<dmac_device &>(device).m_io_read_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_io_write_handler(device_t &device, _Object object) + template<class _Object> static devcb_base &set_io_write_handler(device_t &device, _Object object) { return downcast<dmac_device &>(device).m_io_write_handler.set_callback(object); } void set_address_space(address_space *space) { m_space = space; }; @@ -133,13 +133,13 @@ private: static const int ISTR_INT_MASK = 0x1fc; // callbacks - devcb2_write_line m_cfgout_handler; - devcb2_write_line m_int_handler; - devcb2_write_line m_xdack_handler; - devcb2_read8 m_scsi_read_handler; - devcb2_write8 m_scsi_write_handler; - devcb2_read8 m_io_read_handler; - devcb2_write8 m_io_write_handler; + devcb_write_line m_cfgout_handler; + devcb_write_line m_int_handler; + devcb_write_line m_xdack_handler; + devcb_read8 m_scsi_read_handler; + devcb_write8 m_scsi_write_handler; + devcb_read8 m_io_read_handler; + devcb_write8 m_io_write_handler; address_space *m_space; UINT8 *m_rom; diff --git a/src/emu/machine/dp8390.h b/src/emu/machine/dp8390.h index 9913f376ce7..8a3fe0d7441 100644 --- a/src/emu/machine/dp8390.h +++ b/src/emu/machine/dp8390.h @@ -7,28 +7,28 @@ // device stuff #define MCFG_DP8390D_IRQ_CB(_devcb) \ - devcb = &dp8390d_device::set_irq_callback(*device, DEVCB2_##_devcb); + devcb = &dp8390d_device::set_irq_callback(*device, DEVCB_##_devcb); #define MCFG_DP8390D_BREQ_CB(_devcb) \ - devcb = &dp8390d_device::set_breq_callback(*device, DEVCB2_##_devcb); + devcb = &dp8390d_device::set_breq_callback(*device, DEVCB_##_devcb); #define MCFG_DP8390D_MEM_READ_CB(_devcb) \ - devcb = &dp8390d_device::set_mem_read_callback(*device, DEVCB2_##_devcb); + devcb = &dp8390d_device::set_mem_read_callback(*device, DEVCB_##_devcb); #define MCFG_DP8390D_MEM_WRITE_CB(_devcb) \ - devcb = &dp8390d_device::set_mem_write_callback(*device, DEVCB2_##_devcb); + devcb = &dp8390d_device::set_mem_write_callback(*device, DEVCB_##_devcb); #define MCFG_RTL8019A_IRQ_CB(_devcb) \ - devcb = &rtl8019a_device::set_irq_callback(*device, DEVCB2_##_devcb); + devcb = &rtl8019a_device::set_irq_callback(*device, DEVCB_##_devcb); #define MCFG_RTL8019A_BREQ_CB(_devcb) \ - devcb = &rtl8019a_device::set_breq_callback(*device, DEVCB2_##_devcb); + devcb = &rtl8019a_device::set_breq_callback(*device, DEVCB_##_devcb); #define MCFG_RTL8019A_MEM_READ_CB(_devcb) \ - devcb = &rtl8019a_device::set_mem_read_callback(*device, DEVCB2_##_devcb); + devcb = &rtl8019a_device::set_mem_read_callback(*device, DEVCB_##_devcb); #define MCFG_RTL8019A_MEM_WRITE_CB(_devcb) \ - devcb = &rtl8019a_device::set_mem_write_callback(*device, DEVCB2_##_devcb); + devcb = &rtl8019a_device::set_mem_write_callback(*device, DEVCB_##_devcb); class dp8390_device : public device_t, @@ -38,10 +38,10 @@ public: // construction/destruction dp8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source); - template<class _Object> static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_breq_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_breq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_mem_read_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_mem_read_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_mem_write_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_mem_write_cb.set_callback(object); } + template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_breq_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_breq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_mem_read_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_mem_read_cb.set_callback(object); } + template<class _Object> static devcb_base &set_mem_write_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_mem_write_cb.set_callback(object); } DECLARE_WRITE16_MEMBER( dp8390_w ); DECLARE_READ16_MEMBER( dp8390_r ); @@ -62,10 +62,10 @@ protected: }; private: - devcb2_write_line m_irq_cb; - devcb2_write_line m_breq_cb; - devcb2_read8 m_mem_read_cb; - devcb2_write8 m_mem_write_cb; + devcb_write_line m_irq_cb; + devcb_write_line m_breq_cb; + devcb_read8 m_mem_read_cb; + devcb_write8 m_mem_write_cb; void set_cr(UINT8 newcr); void check_dma_complete(); diff --git a/src/emu/machine/ds75160a.h b/src/emu/machine/ds75160a.h index 95ccec24478..89672dd8c81 100644 --- a/src/emu/machine/ds75160a.h +++ b/src/emu/machine/ds75160a.h @@ -37,7 +37,7 @@ #define MCFG_DS75160A_ADD(_tag, _read, _write) \ MCFG_DEVICE_ADD(_tag, DS75160A, 0) \ - downcast<ds75160a_device *>(device)->set_callbacks(DEVCB2_##_read, DEVCB2_##_write); + downcast<ds75160a_device *>(device)->set_callbacks(DEVCB_##_read, DEVCB_##_write); @@ -69,8 +69,8 @@ protected: virtual void device_start(); private: - devcb2_read8 m_read; - devcb2_write8 m_write; + devcb_read8 m_read; + devcb_write8 m_write; UINT8 m_data; diff --git a/src/emu/machine/ds75161a.h b/src/emu/machine/ds75161a.h index e5241ecb085..598ef23c26b 100644 --- a/src/emu/machine/ds75161a.h +++ b/src/emu/machine/ds75161a.h @@ -36,52 +36,52 @@ ///************************************************************************* #define MCFG_DS75161A_IN_REN_CB(_devcb) \ - devcb = &ds75161a_device::set_in_ren_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_in_ren_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_IN_IFC_CB(_devcb) \ - devcb = &ds75161a_device::set_in_ifc_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_in_ifc_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_IN_NDAC_CB(_devcb) \ - devcb = &ds75161a_device::set_in_ndac_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_in_ndac_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_IN_NRFD_CB(_devcb) \ - devcb = &ds75161a_device::set_in_nrfd_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_in_nrfd_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_IN_DAV_CB(_devcb) \ - devcb = &ds75161a_device::set_in_dav_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_in_dav_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_IN_EOI_CB(_devcb) \ - devcb = &ds75161a_device::set_in_eoi_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_in_eoi_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_IN_ATN_CB(_devcb) \ - devcb = &ds75161a_device::set_in_atn_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_in_atn_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_IN_SRQ_CB(_devcb) \ - devcb = &ds75161a_device::set_in_srq_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_in_srq_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_OUT_REN_CB(_devcb) \ - devcb = &ds75161a_device::set_out_ren_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_out_ren_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_OUT_IFC_CB(_devcb) \ - devcb = &ds75161a_device::set_out_ifc_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_out_ifc_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_OUT_NDAC_CB(_devcb) \ - devcb = &ds75161a_device::set_out_ndac_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_out_ndac_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_OUT_NRFD_CB(_devcb) \ - devcb = &ds75161a_device::set_out_nrfd_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_out_nrfd_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_OUT_DAV_CB(_devcb) \ - devcb = &ds75161a_device::set_out_dav_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_out_dav_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_OUT_EOI_CB(_devcb) \ - devcb = &ds75161a_device::set_out_eoi_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_out_eoi_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_OUT_ATN_CB(_devcb) \ - devcb = &ds75161a_device::set_out_atn_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_out_atn_callback(*device, DEVCB_##_devcb); #define MCFG_DS75161A_OUT_SRQ_CB(_devcb) \ - devcb = &ds75161a_device::set_out_srq_callback(*device, DEVCB2_##_devcb); + devcb = &ds75161a_device::set_out_srq_callback(*device, DEVCB_##_devcb); ///************************************************************************* // TYPE DEFINITIONS @@ -95,22 +95,22 @@ public: // construction/destruction ds75161a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_in_ren_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_ren_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_ifc_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_ifc_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_ndac_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_ndac_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_nrfd_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_nrfd_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_dav_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_dav_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_eoi_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_eoi_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_atn_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_atn_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_srq_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_srq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_ren_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_ren_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_ifc_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_ifc_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_ndac_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_ndac_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_nrfd_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_nrfd_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dav_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_dav_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_eoi_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_eoi_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_atn_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_atn_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_srq_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_srq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_ren_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_ren_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_ifc_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_ifc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_ndac_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_ndac_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_nrfd_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_nrfd_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_dav_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_dav_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_eoi_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_eoi_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_atn_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_atn_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_srq_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_srq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_ren_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_ren_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_ifc_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_ifc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_ndac_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_ndac_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_nrfd_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_nrfd_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dav_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_dav_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_eoi_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_eoi_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_atn_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_atn_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_srq_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_out_srq_cb.set_callback(object); } DECLARE_WRITE_LINE_MEMBER( te_w ); DECLARE_WRITE_LINE_MEMBER( dc_w ); @@ -140,23 +140,23 @@ protected: private: void update_signals(); - devcb2_read_line m_in_ren_cb; - devcb2_read_line m_in_ifc_cb; - devcb2_read_line m_in_ndac_cb; - devcb2_read_line m_in_nrfd_cb; - devcb2_read_line m_in_dav_cb; - devcb2_read_line m_in_eoi_cb; - devcb2_read_line m_in_atn_cb; - devcb2_read_line m_in_srq_cb; - - devcb2_write_line m_out_ren_cb; - devcb2_write_line m_out_ifc_cb; - devcb2_write_line m_out_ndac_cb; - devcb2_write_line m_out_nrfd_cb; - devcb2_write_line m_out_dav_cb; - devcb2_write_line m_out_eoi_cb; - devcb2_write_line m_out_atn_cb; - devcb2_write_line m_out_srq_cb; + devcb_read_line m_in_ren_cb; + devcb_read_line m_in_ifc_cb; + devcb_read_line m_in_ndac_cb; + devcb_read_line m_in_nrfd_cb; + devcb_read_line m_in_dav_cb; + devcb_read_line m_in_eoi_cb; + devcb_read_line m_in_atn_cb; + devcb_read_line m_in_srq_cb; + + devcb_write_line m_out_ren_cb; + devcb_write_line m_out_ifc_cb; + devcb_write_line m_out_ndac_cb; + devcb_write_line m_out_nrfd_cb; + devcb_write_line m_out_dav_cb; + devcb_write_line m_out_eoi_cb; + devcb_write_line m_out_atn_cb; + devcb_write_line m_out_srq_cb; int m_ren; int m_ifc; diff --git a/src/emu/machine/hd63450.h b/src/emu/machine/hd63450.h index 1b6f07a3db6..edfba7a4d20 100644 --- a/src/emu/machine/hd63450.h +++ b/src/emu/machine/hd63450.h @@ -6,34 +6,34 @@ #define MCFG_HD63450_DMA_END_CB(_devcb) \ - devcb = &hd63450_device::set_dma_end_callback(*device, DEVCB2_##_devcb); + devcb = &hd63450_device::set_dma_end_callback(*device, DEVCB_##_devcb); #define MCFG_HD63450_DMA_ERROR_CB(_devcb) \ - devcb = &hd63450_device::set_dma_error_callback(*device, DEVCB2_##_devcb); + devcb = &hd63450_device::set_dma_error_callback(*device, DEVCB_##_devcb); #define MCFG_HD63450_DMA_READ_0_CB(_devcb) \ - devcb = &hd63450_device::set_dma_read_0_callback(*device, DEVCB2_##_devcb); + devcb = &hd63450_device::set_dma_read_0_callback(*device, DEVCB_##_devcb); #define MCFG_HD63450_DMA_READ_1_CB(_devcb) \ - devcb = &hd63450_device::set_dma_read_1_callback(*device, DEVCB2_##_devcb); + devcb = &hd63450_device::set_dma_read_1_callback(*device, DEVCB_##_devcb); #define MCFG_HD63450_DMA_READ_2_CB(_devcb) \ - devcb = &hd63450_device::set_dma_read_2_callback(*device, DEVCB2_##_devcb); + devcb = &hd63450_device::set_dma_read_2_callback(*device, DEVCB_##_devcb); #define MCFG_HD63450_DMA_READ_3_CB(_devcb) \ - devcb = &hd63450_device::set_dma_read_3_callback(*device, DEVCB2_##_devcb); + devcb = &hd63450_device::set_dma_read_3_callback(*device, DEVCB_##_devcb); #define MCFG_HD63450_DMA_WRITE_0_CB(_devcb) \ - devcb = &hd63450_device::set_dma_write_0_callback(*device, DEVCB2_##_devcb); + devcb = &hd63450_device::set_dma_write_0_callback(*device, DEVCB_##_devcb); #define MCFG_HD63450_DMA_WRITE_1_CB(_devcb) \ - devcb = &hd63450_device::set_dma_write_1_callback(*device, DEVCB2_##_devcb); + devcb = &hd63450_device::set_dma_write_1_callback(*device, DEVCB_##_devcb); #define MCFG_HD63450_DMA_WRITE_2_CB(_devcb) \ - devcb = &hd63450_device::set_dma_write_2_callback(*device, DEVCB2_##_devcb); + devcb = &hd63450_device::set_dma_write_2_callback(*device, DEVCB_##_devcb); #define MCFG_HD63450_DMA_WRITE_3_CB(_devcb) \ - devcb = &hd63450_device::set_dma_write_3_callback(*device, DEVCB2_##_devcb); + devcb = &hd63450_device::set_dma_write_3_callback(*device, DEVCB_##_devcb); struct hd63450_regs @@ -72,16 +72,16 @@ public: hd63450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~hd63450_device() {} - template<class _Object> static devcb2_base &set_dma_end_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_end.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_error_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_error.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_read_0_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_read_0.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_read_1_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_read_1.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_read_2_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_read_2.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_read_3_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_read_3.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_write_0_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_write_0.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_write_1_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_write_1.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_write_2_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_write_2.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_write_3_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_write_3.set_callback(object); } + template<class _Object> static devcb_base &set_dma_end_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_end.set_callback(object); } + template<class _Object> static devcb_base &set_dma_error_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_error.set_callback(object); } + template<class _Object> static devcb_base &set_dma_read_0_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_read_0.set_callback(object); } + template<class _Object> static devcb_base &set_dma_read_1_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_read_1.set_callback(object); } + template<class _Object> static devcb_base &set_dma_read_2_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_read_2.set_callback(object); } + template<class _Object> static devcb_base &set_dma_read_3_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_read_3.set_callback(object); } + template<class _Object> static devcb_base &set_dma_write_0_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_write_0.set_callback(object); } + template<class _Object> static devcb_base &set_dma_write_1_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_write_1.set_callback(object); } + template<class _Object> static devcb_base &set_dma_write_2_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_write_2.set_callback(object); } + template<class _Object> static devcb_base &set_dma_write_3_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_write_3.set_callback(object); } DECLARE_READ16_MEMBER( read ); DECLARE_WRITE16_MEMBER( write ); @@ -102,16 +102,16 @@ protected: virtual void device_reset(); private: - devcb2_write8 m_dma_end; - devcb2_write8 m_dma_error; - devcb2_read8 m_dma_read_0; - devcb2_read8 m_dma_read_1; - devcb2_read8 m_dma_read_2; - devcb2_read8 m_dma_read_3; - devcb2_write8 m_dma_write_0; - devcb2_write8 m_dma_write_1; - devcb2_write8 m_dma_write_2; - devcb2_write8 m_dma_write_3; + devcb_write8 m_dma_end; + devcb_write8 m_dma_error; + devcb_read8 m_dma_read_0; + devcb_read8 m_dma_read_1; + devcb_read8 m_dma_read_2; + devcb_read8 m_dma_read_3; + devcb_write8 m_dma_write_0; + devcb_write8 m_dma_write_1; + devcb_write8 m_dma_write_2; + devcb_write8 m_dma_write_3; // internal state hd63450_regs m_reg[4]; diff --git a/src/emu/machine/hd64610.h b/src/emu/machine/hd64610.h index da8856f3d7f..cb1d79d8388 100644 --- a/src/emu/machine/hd64610.h +++ b/src/emu/machine/hd64610.h @@ -35,10 +35,10 @@ //************************************************************************** #define MCFG_HD64610_OUT_IRQ_CB(_devcb) \ - devcb = &hd64610_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &hd64610_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_HD64610_OUT_1HZ_CB(_devcb) \ - devcb = &hd64610_device::set_out_1hz_callback(*device, DEVCB2_##_devcb); + devcb = &hd64610_device::set_out_1hz_callback(*device, DEVCB_##_devcb); //************************************************************************** @@ -55,8 +55,8 @@ public: // construction/destruction hd64610_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<hd64610_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_1hz_callback(device_t &device, _Object object) { return downcast<hd64610_device &>(device).m_out_1hz_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<hd64610_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_1hz_callback(device_t &device, _Object object) { return downcast<hd64610_device &>(device).m_out_1hz_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -86,8 +86,8 @@ private: static const device_timer_id TIMER_UPDATE_COUNTER = 0; - devcb2_write_line m_out_irq_cb; - devcb2_write_line m_out_1hz_cb; + devcb_write_line m_out_irq_cb; + devcb_write_line m_out_1hz_cb; UINT8 m_regs[0x10]; // Internal registers int m_hline_state; // H-Start/Stop line diff --git a/src/emu/machine/i80130.h b/src/emu/machine/i80130.h index 0514f000bb7..45140331581 100644 --- a/src/emu/machine/i80130.h +++ b/src/emu/machine/i80130.h @@ -25,22 +25,22 @@ ///************************************************************************* #define MCFG_I80130_IRQ_CALLBACK(_write) \ - devcb = &i80130_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &i80130_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_I80130_ACK_CALLBACK(_write) \ - devcb = &i80130_device::set_ack_wr_callback(*device, DEVCB2_##_write); + devcb = &i80130_device::set_ack_wr_callback(*device, DEVCB_##_write); #define MCFG_I80130_LIR_CALLBACK(_write) \ - devcb = &i80130_device::set_lir_wr_callback(*device, DEVCB2_##_write); + devcb = &i80130_device::set_lir_wr_callback(*device, DEVCB_##_write); #define MCFG_I80130_SYSTICK_CALLBACK(_write) \ - devcb = &i80130_device::set_systick_wr_callback(*device, DEVCB2_##_write); + devcb = &i80130_device::set_systick_wr_callback(*device, DEVCB_##_write); #define MCFG_I80130_DELAY_CALLBACK(_write) \ - devcb = &i80130_device::set_delay_wr_callback(*device, DEVCB2_##_write); + devcb = &i80130_device::set_delay_wr_callback(*device, DEVCB_##_write); #define MCFG_I80130_BAUD_CALLBACK(_write) \ - devcb = &i80130_device::set_baud_wr_callback(*device, DEVCB2_##_write); + devcb = &i80130_device::set_baud_wr_callback(*device, DEVCB_##_write); @@ -56,12 +56,12 @@ public: // construction/destruction i80130_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<i80130_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_ack_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_ack.set_callback(object); } - template<class _Object> static devcb2_base &set_lir_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_lir.set_callback(object); } - template<class _Object> static devcb2_base &set_systick_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_systick.set_callback(object); } - template<class _Object> static devcb2_base &set_delay_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_delay.set_callback(object); } - template<class _Object> static devcb2_base &set_baud_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_baud.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_ack_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_ack.set_callback(object); } + template<class _Object> static devcb_base &set_lir_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_lir.set_callback(object); } + template<class _Object> static devcb_base &set_systick_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_systick.set_callback(object); } + template<class _Object> static devcb_base &set_delay_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_delay.set_callback(object); } + template<class _Object> static devcb_base &set_baud_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_baud.set_callback(object); } virtual DECLARE_ADDRESS_MAP(rom_map, 16); virtual DECLARE_ADDRESS_MAP(io_map, 16); @@ -97,12 +97,12 @@ protected: required_device<pic8259_device> m_pic; required_device<pit8254_device> m_pit; - devcb2_write_line m_write_irq; - devcb2_write_line m_write_ack; - devcb2_write_line m_write_lir; - devcb2_write_line m_write_systick; - devcb2_write_line m_write_delay; - devcb2_write_line m_write_baud; + devcb_write_line m_write_irq; + devcb_write_line m_write_ack; + devcb_write_line m_write_lir; + devcb_write_line m_write_systick; + devcb_write_line m_write_delay; + devcb_write_line m_write_baud; }; diff --git a/src/emu/machine/i8155.h b/src/emu/machine/i8155.h index 572cc83ee22..d6d5f3acb6d 100644 --- a/src/emu/machine/i8155.h +++ b/src/emu/machine/i8155.h @@ -46,25 +46,25 @@ //************************************************************************** #define MCFG_I8155_IN_PORTA_CB(_devcb) \ - devcb = &i8155_device::set_in_pa_callback(*device, DEVCB2_##_devcb); + devcb = &i8155_device::set_in_pa_callback(*device, DEVCB_##_devcb); #define MCFG_I8155_IN_PORTB_CB(_devcb) \ - devcb = &i8155_device::set_in_pb_callback(*device, DEVCB2_##_devcb); + devcb = &i8155_device::set_in_pb_callback(*device, DEVCB_##_devcb); #define MCFG_I8155_IN_PORTC_CB(_devcb) \ - devcb = &i8155_device::set_in_pc_callback(*device, DEVCB2_##_devcb); + devcb = &i8155_device::set_in_pc_callback(*device, DEVCB_##_devcb); #define MCFG_I8155_OUT_PORTA_CB(_devcb) \ - devcb = &i8155_device::set_out_pa_callback(*device, DEVCB2_##_devcb); + devcb = &i8155_device::set_out_pa_callback(*device, DEVCB_##_devcb); #define MCFG_I8155_OUT_PORTB_CB(_devcb) \ - devcb = &i8155_device::set_out_pb_callback(*device, DEVCB2_##_devcb); + devcb = &i8155_device::set_out_pb_callback(*device, DEVCB_##_devcb); #define MCFG_I8155_OUT_PORTC_CB(_devcb) \ - devcb = &i8155_device::set_out_pc_callback(*device, DEVCB2_##_devcb); + devcb = &i8155_device::set_out_pc_callback(*device, DEVCB_##_devcb); #define MCFG_I8155_OUT_TIMEROUT_CB(_devcb) \ - devcb = &i8155_device::set_out_to_callback(*device, DEVCB2_##_devcb); + devcb = &i8155_device::set_out_to_callback(*device, DEVCB_##_devcb); //************************************************************************** @@ -80,13 +80,13 @@ public: // construction/destruction i8155_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_in_pa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_in_pb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_pc_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_in_pc_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_out_pa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_out_pb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pc_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_out_pc_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_to_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_out_to_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_in_pa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_in_pb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pc_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_in_pc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_out_pa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_out_pb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pc_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_out_pc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_to_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_out_to_cb.set_callback(object); } DECLARE_READ8_MEMBER( io_r ); DECLARE_WRITE8_MEMBER( io_w ); @@ -116,16 +116,16 @@ protected: void register_w(int offset, UINT8 data); private: - devcb2_read8 m_in_pa_cb; - devcb2_read8 m_in_pb_cb; - devcb2_read8 m_in_pc_cb; + devcb_read8 m_in_pa_cb; + devcb_read8 m_in_pb_cb; + devcb_read8 m_in_pc_cb; - devcb2_write8 m_out_pa_cb; - devcb2_write8 m_out_pb_cb; - devcb2_write8 m_out_pc_cb; + devcb_write8 m_out_pa_cb; + devcb_write8 m_out_pb_cb; + devcb_write8 m_out_pc_cb; // this gets called for each change of the TIMER OUT pin (pin 6) - devcb2_write_line m_out_to_cb; + devcb_write_line m_out_to_cb; // CPU interface int m_io_m; // I/O or memory select diff --git a/src/emu/machine/i8212.h b/src/emu/machine/i8212.h index 2f8995b5c5a..4530ad2802a 100644 --- a/src/emu/machine/i8212.h +++ b/src/emu/machine/i8212.h @@ -50,13 +50,13 @@ enum ///************************************************************************* #define MCFG_I8212_IRQ_CALLBACK(_write) \ - devcb = &i8212_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &i8212_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_I8212_DI_CALLBACK(_read) \ - devcb = &i8212_device::set_di_rd_callback(*device, DEVCB2_##_read); + devcb = &i8212_device::set_di_rd_callback(*device, DEVCB_##_read); #define MCFG_I8212_DO_CALLBACK(_write) \ - devcb = &i8212_device::set_do_wr_callback(*device, DEVCB2_##_write); + devcb = &i8212_device::set_do_wr_callback(*device, DEVCB_##_write); @@ -72,9 +72,9 @@ public: // construction/destruction i8212_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<i8212_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_di_rd_callback(device_t &device, _Object object) { return downcast<i8212_device &>(device).m_read_di.set_callback(object); } - template<class _Object> static devcb2_base &set_do_wr_callback(device_t &device, _Object object) { return downcast<i8212_device &>(device).m_write_do.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i8212_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_di_rd_callback(device_t &device, _Object object) { return downcast<i8212_device &>(device).m_read_di.set_callback(object); } + template<class _Object> static devcb_base &set_do_wr_callback(device_t &device, _Object object) { return downcast<i8212_device &>(device).m_write_do.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -88,9 +88,9 @@ protected: virtual void device_reset(); private: - devcb2_write_line m_write_irq; - devcb2_read8 m_read_di; - devcb2_write8 m_write_do; + devcb_write_line m_write_irq; + devcb_read8 m_read_di; + devcb_write8 m_write_do; int m_md; // mode int m_stb; // strobe diff --git a/src/emu/machine/i8214.h b/src/emu/machine/i8214.h index deae3c2fa45..c229ec84f0d 100644 --- a/src/emu/machine/i8214.h +++ b/src/emu/machine/i8214.h @@ -38,10 +38,10 @@ ///************************************************************************* #define MCFG_I8214_IRQ_CALLBACK(_write) \ - devcb = &i8214_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &i8214_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_I8214_ENLG_CALLBACK(_write) \ - devcb = &i8214_device::set_enlg_wr_callback(*device, DEVCB2_##_write); + devcb = &i8214_device::set_enlg_wr_callback(*device, DEVCB_##_write); @@ -57,8 +57,8 @@ public: // construction/destruction i8214_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<i8214_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_enlg_wr_callback(device_t &device, _Object object) { return downcast<i8214_device &>(device).m_write_enlg.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i8214_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_enlg_wr_callback(device_t &device, _Object object) { return downcast<i8214_device &>(device).m_write_enlg.set_callback(object); } DECLARE_WRITE_LINE_MEMBER( sgs_w ); DECLARE_WRITE_LINE_MEMBER( etlg_w ); @@ -76,8 +76,8 @@ private: inline void trigger_interrupt(int level); inline void check_interrupt(); - devcb2_write_line m_write_irq; - devcb2_write_line m_write_enlg; + devcb_write_line m_write_irq; + devcb_write_line m_write_enlg; int m_inte; // interrupt enable int m_int_dis; // interrupt disable flip-flop diff --git a/src/emu/machine/i8243.h b/src/emu/machine/i8243.h index 8266a71b6a5..7ac782f3496 100644 --- a/src/emu/machine/i8243.h +++ b/src/emu/machine/i8243.h @@ -27,9 +27,9 @@ MCFG_I8243_READHANDLER(_read) \ MCFG_I8243_WRITEHANDLER(_write) #define MCFG_I8243_READHANDLER(_devcb) \ - devcb = &i8243_device::set_read_handler(*device, DEVCB2_##_devcb); + devcb = &i8243_device::set_read_handler(*device, DEVCB_##_devcb); #define MCFG_I8243_WRITEHANDLER(_devcb) \ - devcb = &i8243_device::set_write_handler(*device, DEVCB2_##_devcb); + devcb = &i8243_device::set_write_handler(*device, DEVCB_##_devcb); /*************************************************************************** TYPE DEFINITIONS ***************************************************************************/ @@ -44,8 +44,8 @@ public: i8243_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_read_handler(device_t &device, _Object object) { return downcast<i8243_device &>(device).m_readhandler.set_callback(object); } - template<class _Object> static devcb2_base &set_write_handler(device_t &device, _Object object) { return downcast<i8243_device &>(device).m_writehandler.set_callback(object); } + template<class _Object> static devcb_base &set_read_handler(device_t &device, _Object object) { return downcast<i8243_device &>(device).m_readhandler.set_callback(object); } + template<class _Object> static devcb_base &set_write_handler(device_t &device, _Object object) { return downcast<i8243_device &>(device).m_writehandler.set_callback(object); } DECLARE_READ8_MEMBER(i8243_p2_r); DECLARE_WRITE8_MEMBER(i8243_p2_w); @@ -67,8 +67,8 @@ private: UINT8 m_opcode; /* latched opcode */ UINT8 m_prog; /* previous PROG state */ - devcb2_read8 m_readhandler; - devcb2_write8 m_writehandler; + devcb_read8 m_readhandler; + devcb_write8 m_writehandler; }; diff --git a/src/emu/machine/i8251.h b/src/emu/machine/i8251.h index 9cfb4a341be..cd42f114254 100644 --- a/src/emu/machine/i8251.h +++ b/src/emu/machine/i8251.h @@ -15,25 +15,25 @@ //************************************************************************** #define MCFG_I8251_TXD_HANDLER(_devcb) \ - devcb = &i8251_device::set_txd_handler(*device, DEVCB2_##_devcb); + devcb = &i8251_device::set_txd_handler(*device, DEVCB_##_devcb); #define MCFG_I8251_DTR_HANDLER(_devcb) \ - devcb = &i8251_device::set_dtr_handler(*device, DEVCB2_##_devcb); + devcb = &i8251_device::set_dtr_handler(*device, DEVCB_##_devcb); #define MCFG_I8251_RTS_HANDLER(_devcb) \ - devcb = &i8251_device::set_rts_handler(*device, DEVCB2_##_devcb); + devcb = &i8251_device::set_rts_handler(*device, DEVCB_##_devcb); #define MCFG_I8251_RXRDY_HANDLER(_devcb) \ - devcb = &i8251_device::set_rxrdy_handler(*device, DEVCB2_##_devcb); + devcb = &i8251_device::set_rxrdy_handler(*device, DEVCB_##_devcb); #define MCFG_I8251_TXRDY_HANDLER(_devcb) \ - devcb = &i8251_device::set_txrdy_handler(*device, DEVCB2_##_devcb); + devcb = &i8251_device::set_txrdy_handler(*device, DEVCB_##_devcb); #define MCFG_I8251_TXEMPTY_HANDLER(_devcb) \ - devcb = &i8251_device::set_txempty_handler(*device, DEVCB2_##_devcb); + devcb = &i8251_device::set_txempty_handler(*device, DEVCB_##_devcb); #define MCFG_I8251_SYNDET_HANDLER(_devcb) \ - devcb = &i8251_device::set_syndet_handler(*device, DEVCB2_##_devcb); + devcb = &i8251_device::set_syndet_handler(*device, DEVCB_##_devcb); class i8251_device : public device_t, public device_serial_interface @@ -43,13 +43,13 @@ public: i8251_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_txd_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_txd_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_dtr_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_dtr_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_rts_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_rts_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_rxrdy_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_rxrdy_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_txrdy_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_txrdy_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_txempty_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_txempty_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_syndet_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_syndet_handler.set_callback(object); } + template<class _Object> static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_txd_handler.set_callback(object); } + template<class _Object> static devcb_base &set_dtr_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_dtr_handler.set_callback(object); } + template<class _Object> static devcb_base &set_rts_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_rts_handler.set_callback(object); } + template<class _Object> static devcb_base &set_rxrdy_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_rxrdy_handler.set_callback(object); } + template<class _Object> static devcb_base &set_txrdy_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_txrdy_handler.set_callback(object); } + template<class _Object> static devcb_base &set_txempty_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_txempty_handler.set_callback(object); } + template<class _Object> static devcb_base &set_syndet_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_syndet_handler.set_callback(object); } DECLARE_READ8_MEMBER(data_r); DECLARE_WRITE8_MEMBER(data_w); @@ -95,13 +95,13 @@ protected: }; private: - devcb2_write_line m_txd_handler; - devcb2_write_line m_dtr_handler; - devcb2_write_line m_rts_handler; - devcb2_write_line m_rxrdy_handler; - devcb2_write_line m_txrdy_handler; - devcb2_write_line m_txempty_handler; - devcb2_write_line m_syndet_handler; + devcb_write_line m_txd_handler; + devcb_write_line m_dtr_handler; + devcb_write_line m_rts_handler; + devcb_write_line m_rxrdy_handler; + devcb_write_line m_txrdy_handler; + devcb_write_line m_txempty_handler; + devcb_write_line m_syndet_handler; /* flags controlling how i8251_control_w operates */ UINT8 m_flags; diff --git a/src/emu/machine/i8255.h b/src/emu/machine/i8255.h index 1cd037ece17..2b6c3aedf12 100644 --- a/src/emu/machine/i8255.h +++ b/src/emu/machine/i8255.h @@ -44,22 +44,22 @@ //************************************************************************** #define MCFG_I8255_IN_PORTA_CB(_devcb) \ - devcb = &i8255_device::set_in_pa_callback(*device, DEVCB2_##_devcb); + devcb = &i8255_device::set_in_pa_callback(*device, DEVCB_##_devcb); #define MCFG_I8255_IN_PORTB_CB(_devcb) \ - devcb = &i8255_device::set_in_pb_callback(*device, DEVCB2_##_devcb); + devcb = &i8255_device::set_in_pb_callback(*device, DEVCB_##_devcb); #define MCFG_I8255_IN_PORTC_CB(_devcb) \ - devcb = &i8255_device::set_in_pc_callback(*device, DEVCB2_##_devcb); + devcb = &i8255_device::set_in_pc_callback(*device, DEVCB_##_devcb); #define MCFG_I8255_OUT_PORTA_CB(_devcb) \ - devcb = &i8255_device::set_out_pa_callback(*device, DEVCB2_##_devcb); + devcb = &i8255_device::set_out_pa_callback(*device, DEVCB_##_devcb); #define MCFG_I8255_OUT_PORTB_CB(_devcb) \ - devcb = &i8255_device::set_out_pb_callback(*device, DEVCB2_##_devcb); + devcb = &i8255_device::set_out_pb_callback(*device, DEVCB_##_devcb); #define MCFG_I8255_OUT_PORTC_CB(_devcb) \ - devcb = &i8255_device::set_out_pc_callback(*device, DEVCB2_##_devcb); + devcb = &i8255_device::set_out_pc_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -73,12 +73,12 @@ public: // construction/destruction i8255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_in_pa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_in_pb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_pc_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_in_pc_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_out_pa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_out_pb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pc_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_out_pc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_in_pa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_in_pb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pc_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_in_pc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_out_pa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_out_pb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pc_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_out_pc_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -122,13 +122,13 @@ private: void set_mode(UINT8 data); void set_pc_bit(int bit, int state); - devcb2_read8 m_in_pa_cb; - devcb2_read8 m_in_pb_cb; - devcb2_read8 m_in_pc_cb; + devcb_read8 m_in_pa_cb; + devcb_read8 m_in_pb_cb; + devcb_read8 m_in_pc_cb; - devcb2_write8 m_out_pa_cb; - devcb2_write8 m_out_pb_cb; - devcb2_write8 m_out_pc_cb; + devcb_write8 m_out_pa_cb; + devcb_write8 m_out_pb_cb; + devcb_write8 m_out_pc_cb; UINT8 m_control; // mode control word UINT8 m_output[3]; // output latch diff --git a/src/emu/machine/i8257.h b/src/emu/machine/i8257.h index a09358b63d4..c4c17c74d65 100644 --- a/src/emu/machine/i8257.h +++ b/src/emu/machine/i8257.h @@ -50,52 +50,52 @@ MCFG_DEVICE_CONFIG(_config) #define MCFG_I8257_OUT_HRQ_CB(_devcb) \ - devcb = &i8257_device::set_out_hrq_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_out_hrq_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_OUT_TC_CB(_devcb) \ - devcb = &i8257_device::set_out_tc_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_out_tc_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_IN_MEMR_CB(_devcb) \ - devcb = &i8257_device::set_in_memr_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_in_memr_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_OUT_MEMW_CB(_devcb) \ - devcb = &i8257_device::set_out_memw_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_out_memw_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_IN_IOR_0_CB(_devcb) \ - devcb = &i8257_device::set_in_ior_0_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_in_ior_0_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_IN_IOR_1_CB(_devcb) \ - devcb = &i8257_device::set_in_ior_1_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_in_ior_1_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_IN_IOR_2_CB(_devcb) \ - devcb = &i8257_device::set_in_ior_2_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_in_ior_2_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_IN_IOR_3_CB(_devcb) \ - devcb = &i8257_device::set_in_ior_3_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_in_ior_3_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_OUT_IOW_0_CB(_devcb) \ - devcb = &i8257_device::set_out_iow_0_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_out_iow_0_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_OUT_IOW_1_CB(_devcb) \ - devcb = &i8257_device::set_out_iow_1_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_out_iow_1_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_OUT_IOW_2_CB(_devcb) \ - devcb = &i8257_device::set_out_iow_2_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_out_iow_2_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_OUT_IOW_3_CB(_devcb) \ - devcb = &i8257_device::set_out_iow_3_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_out_iow_3_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_OUT_DACK_0_CB(_devcb) \ - devcb = &i8257_device::set_out_dack_0_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_out_dack_0_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_OUT_DACK_1_CB(_devcb) \ - devcb = &i8257_device::set_out_dack_1_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_out_dack_1_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_OUT_DACK_2_CB(_devcb) \ - devcb = &i8257_device::set_out_dack_2_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_out_dack_2_callback(*device, DEVCB_##_devcb); #define MCFG_I8257_OUT_DACK_3_CB(_devcb) \ - devcb = &i8257_device::set_out_dack_3_callback(*device, DEVCB2_##_devcb); + devcb = &i8257_device::set_out_dack_3_callback(*device, DEVCB_##_devcb); // HACK: the radio86 and alikes require this, is it a bug in the soviet clone or is there something else happening? #define MCFG_I8257_REVERSE_RW_MODE(_flag) \ @@ -121,26 +121,26 @@ public: DECLARE_WRITE_LINE_MEMBER( dreq2_w ); DECLARE_WRITE_LINE_MEMBER( dreq3_w ); - template<class _Object> static devcb2_base &set_out_hrq_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_hrq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_tc_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_tc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_hrq_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_hrq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_tc_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_tc_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_memr_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_in_memr_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_memw_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_memw_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_memr_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_in_memr_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_memw_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_memw_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_ior_0_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_in_ior_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_ior_1_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_in_ior_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_ior_2_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_in_ior_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_ior_3_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_in_ior_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_ior_0_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_in_ior_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_ior_1_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_in_ior_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_ior_2_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_in_ior_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_ior_3_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_in_ior_3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_iow_0_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_iow_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_iow_1_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_iow_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_iow_2_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_iow_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_iow_3_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_iow_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_iow_0_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_iow_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_iow_1_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_iow_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_iow_2_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_iow_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_iow_3_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_iow_3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dack_0_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_dack_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dack_1_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_dack_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dack_2_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_dack_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dack_3_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_dack_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dack_0_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_dack_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dack_1_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_dack_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dack_2_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_dack_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dack_3_callback(device_t &device, _Object object) { return downcast<i8257_device &>(device).m_out_dack_3_cb.set_callback(object); } static void static_set_reverse_rw_mode(device_t &device, bool flag) { downcast<i8257_device &>(device).m_reverse_rw = flag; } protected: @@ -176,26 +176,26 @@ private: UINT8 m_request; UINT8 m_temp; - devcb2_write_line m_out_hrq_cb; - devcb2_write_line m_out_tc_cb; + devcb_write_line m_out_hrq_cb; + devcb_write_line m_out_tc_cb; /* accessors to main memory */ - devcb2_read8 m_in_memr_cb; - devcb2_write8 m_out_memw_cb; + devcb_read8 m_in_memr_cb; + devcb_write8 m_out_memw_cb; /* channel accessors */ - devcb2_read8 m_in_ior_0_cb; - devcb2_read8 m_in_ior_1_cb; - devcb2_read8 m_in_ior_2_cb; - devcb2_read8 m_in_ior_3_cb; - devcb2_write8 m_out_iow_0_cb; - devcb2_write8 m_out_iow_1_cb; - devcb2_write8 m_out_iow_2_cb; - devcb2_write8 m_out_iow_3_cb; - devcb2_write_line m_out_dack_0_cb; - devcb2_write_line m_out_dack_1_cb; - devcb2_write_line m_out_dack_2_cb; - devcb2_write_line m_out_dack_3_cb; + devcb_read8 m_in_ior_0_cb; + devcb_read8 m_in_ior_1_cb; + devcb_read8 m_in_ior_2_cb; + devcb_read8 m_in_ior_3_cb; + devcb_write8 m_out_iow_0_cb; + devcb_write8 m_out_iow_1_cb; + devcb_write8 m_out_iow_2_cb; + devcb_write8 m_out_iow_3_cb; + devcb_write_line m_out_dack_0_cb; + devcb_write_line m_out_dack_1_cb; + devcb_write_line m_out_dack_2_cb; + devcb_write_line m_out_dack_3_cb; struct { diff --git a/src/emu/machine/i8271.h b/src/emu/machine/i8271.h index a3f204b5745..97712511d8a 100644 --- a/src/emu/machine/i8271.h +++ b/src/emu/machine/i8271.h @@ -10,10 +10,10 @@ #include "imagedev/flopdrv.h" #define MCFG_I8271_IRQ_CALLBACK(_write) \ - devcb = &i8271_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &i8271_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_I8271_DRQ_CALLBACK(_write) \ - devcb = &i8271_device::set_drq_wr_callback(*device, DEVCB2_##_write); + devcb = &i8271_device::set_drq_wr_callback(*device, DEVCB_##_write); #define MCFG_I8271_FLOPPIES(_tag1, _tag2) \ i8271_device::set_floppy_tags(*device, _tag1, _tag2); @@ -28,8 +28,8 @@ public: i8271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~i8271_device() {} - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i8271_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<i8271_device &>(device).m_write_drq.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i8271_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<i8271_device &>(device).m_write_drq.set_callback(object); } static void set_floppy_tags(device_t &device, const char *tag1, const char *tag2) { @@ -61,8 +61,8 @@ private: TIMER_TIMED_COMMAND_COMPLETE }; - devcb2_write_line m_write_irq; - devcb2_write_line m_write_drq; + devcb_write_line m_write_irq; + devcb_write_line m_write_drq; const char *m_floppy_tag1, *m_floppy_tag2; legacy_floppy_image_device *m_floppy[2]; diff --git a/src/emu/machine/i8279.h b/src/emu/machine/i8279.h index b00eabcd964..162e50585d5 100644 --- a/src/emu/machine/i8279.h +++ b/src/emu/machine/i8279.h @@ -45,25 +45,25 @@ ***************************************************************************/ #define MCFG_I8279_OUT_IRQ_CB(_devcb) \ - devcb = &i8279_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &i8279_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_I8279_OUT_SL_CB(_devcb) \ - devcb = &i8279_device::set_out_sl_callback(*device, DEVCB2_##_devcb); + devcb = &i8279_device::set_out_sl_callback(*device, DEVCB_##_devcb); #define MCFG_I8279_OUT_DISP_CB(_devcb) \ - devcb = &i8279_device::set_out_disp_callback(*device, DEVCB2_##_devcb); + devcb = &i8279_device::set_out_disp_callback(*device, DEVCB_##_devcb); #define MCFG_I8279_OUT_BD_CB(_devcb) \ - devcb = &i8279_device::set_out_bd_callback(*device, DEVCB2_##_devcb); + devcb = &i8279_device::set_out_bd_callback(*device, DEVCB_##_devcb); #define MCFG_I8279_IN_RL_CB(_devcb) \ - devcb = &i8279_device::set_in_rl_callback(*device, DEVCB2_##_devcb); + devcb = &i8279_device::set_in_rl_callback(*device, DEVCB_##_devcb); #define MCFG_I8279_IN_SHIFT_CB(_devcb) \ - devcb = &i8279_device::set_in_shift_callback(*device, DEVCB2_##_devcb); + devcb = &i8279_device::set_in_shift_callback(*device, DEVCB_##_devcb); #define MCFG_I8279_IN_CTRL_CB(_devcb) \ - devcb = &i8279_device::set_in_ctrl_callback(*device, DEVCB2_##_devcb); + devcb = &i8279_device::set_in_ctrl_callback(*device, DEVCB_##_devcb); /*************************************************************************** TYPE DEFINITIONS @@ -77,13 +77,13 @@ public: // construction/destruction i8279_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_sl_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_out_sl_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_disp_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_out_disp_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_bd_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_out_bd_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_rl_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_in_rl_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_shift_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_in_shift_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_ctrl_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_in_ctrl_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_sl_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_out_sl_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_disp_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_out_disp_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_bd_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_out_bd_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_rl_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_in_rl_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_shift_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_in_shift_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_ctrl_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_in_ctrl_cb.set_callback(object); } // read & write handlers DECLARE_READ8_MEMBER(status_r); @@ -111,13 +111,13 @@ private: void set_irq(bool state); void set_display_mode(UINT8 data); - devcb2_write_line m_out_irq_cb; // IRQ - devcb2_write8 m_out_sl_cb; // Scanlines SL0-3 - devcb2_write8 m_out_disp_cb; // B0-3,A0-3 - devcb2_write_line m_out_bd_cb; // BD - devcb2_read8 m_in_rl_cb; // kbd readlines RL0-7 - devcb2_read_line m_in_shift_cb; // Shift key - devcb2_read_line m_in_ctrl_cb; // Ctrl-Strobe line + devcb_write_line m_out_irq_cb; // IRQ + devcb_write8 m_out_sl_cb; // Scanlines SL0-3 + devcb_write8 m_out_disp_cb; // B0-3,A0-3 + devcb_write_line m_out_bd_cb; // BD + devcb_read8 m_in_rl_cb; // kbd readlines RL0-7 + devcb_read_line m_in_shift_cb; // Shift key + devcb_read_line m_in_ctrl_cb; // Ctrl-Strobe line emu_timer *m_timer; diff --git a/src/emu/machine/i8355.h b/src/emu/machine/i8355.h index 1316c2ffa21..731081ed32e 100644 --- a/src/emu/machine/i8355.h +++ b/src/emu/machine/i8355.h @@ -53,16 +53,16 @@ ///************************************************************************* #define MCFG_I8355_IN_PA_CB(_devcb) \ - devcb = &i8355_device::set_in_pa_callback(*device, DEVCB2_##_devcb); + devcb = &i8355_device::set_in_pa_callback(*device, DEVCB_##_devcb); #define MCFG_I8355_OUT_PA_CB(_devcb) \ - devcb = &i8355_device::set_out_pa_callback(*device, DEVCB2_##_devcb); + devcb = &i8355_device::set_out_pa_callback(*device, DEVCB_##_devcb); #define MCFG_I8355_IN_PB_CB(_devcb) \ - devcb = &i8355_device::set_in_pb_callback(*device, DEVCB2_##_devcb); + devcb = &i8355_device::set_in_pb_callback(*device, DEVCB_##_devcb); #define MCFG_I8355_OUT_PB_CB(_devcb) \ - devcb = &i8355_device::set_out_pb_callback(*device, DEVCB2_##_devcb); + devcb = &i8355_device::set_out_pb_callback(*device, DEVCB_##_devcb); ///************************************************************************* @@ -78,10 +78,10 @@ public: // construction/destruction i8355_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<i8355_device &>(device).m_in_pa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<i8355_device &>(device).m_out_pa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<i8355_device &>(device).m_in_pb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<i8355_device &>(device).m_out_pb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<i8355_device &>(device).m_in_pa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<i8355_device &>(device).m_out_pa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<i8355_device &>(device).m_in_pb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<i8355_device &>(device).m_out_pb_cb.set_callback(object); } DECLARE_READ8_MEMBER( io_r ); DECLARE_WRITE8_MEMBER( io_w ); @@ -101,11 +101,11 @@ protected: inline void write_port(int port, UINT8 data); private: - devcb2_read8 m_in_pa_cb; - devcb2_write8 m_out_pa_cb; + devcb_read8 m_in_pa_cb; + devcb_write8 m_out_pa_cb; - devcb2_read8 m_in_pb_cb; - devcb2_write8 m_out_pb_cb; + devcb_read8 m_in_pb_cb; + devcb_write8 m_out_pb_cb; // registers UINT8 m_output[2]; // output latches diff --git a/src/emu/machine/im6402.h b/src/emu/machine/im6402.h index 7c45743bbf7..d843ad374a1 100644 --- a/src/emu/machine/im6402.h +++ b/src/emu/machine/im6402.h @@ -58,16 +58,16 @@ im6402_device::set_trc(*device, _trc); #define MCFG_IM6402_TRO_CALLBACK(_write) \ - devcb = &im6402_device::set_tro_wr_callback(*device, DEVCB2_##_write); + devcb = &im6402_device::set_tro_wr_callback(*device, DEVCB_##_write); #define MCFG_IM6402_DR_CALLBACK(_write) \ - devcb = &im6402_device::set_dr_wr_callback(*device, DEVCB2_##_write); + devcb = &im6402_device::set_dr_wr_callback(*device, DEVCB_##_write); #define MCFG_IM6402_TBRE_CALLBACK(_write) \ - devcb = &im6402_device::set_tbre_wr_callback(*device, DEVCB2_##_write); + devcb = &im6402_device::set_tbre_wr_callback(*device, DEVCB_##_write); #define MCFG_IM6402_TRE_CALLBACK(_write) \ - devcb = &im6402_device::set_tre_wr_callback(*device, DEVCB2_##_write); + devcb = &im6402_device::set_tre_wr_callback(*device, DEVCB_##_write); @@ -86,10 +86,10 @@ public: static void set_rrc(device_t &device, int rrc) { downcast<im6402_device &>(device).m_rrc = rrc; } static void set_trc(device_t &device, int trc) { downcast<im6402_device &>(device).m_trc = trc; } - template<class _Object> static devcb2_base &set_tro_wr_callback(device_t &device, _Object object) { return downcast<im6402_device &>(device).m_write_tro.set_callback(object); } - template<class _Object> static devcb2_base &set_dr_wr_callback(device_t &device, _Object object) { return downcast<im6402_device &>(device).m_write_dr.set_callback(object); } - template<class _Object> static devcb2_base &set_tbre_wr_callback(device_t &device, _Object object) { return downcast<im6402_device &>(device).m_write_tbre.set_callback(object); } - template<class _Object> static devcb2_base &set_tre_wr_callback(device_t &device, _Object object) { return downcast<im6402_device &>(device).m_write_tre.set_callback(object); } + template<class _Object> static devcb_base &set_tro_wr_callback(device_t &device, _Object object) { return downcast<im6402_device &>(device).m_write_tro.set_callback(object); } + template<class _Object> static devcb_base &set_dr_wr_callback(device_t &device, _Object object) { return downcast<im6402_device &>(device).m_write_dr.set_callback(object); } + template<class _Object> static devcb_base &set_tbre_wr_callback(device_t &device, _Object object) { return downcast<im6402_device &>(device).m_write_tbre.set_callback(object); } + template<class _Object> static devcb_base &set_tre_wr_callback(device_t &device, _Object object) { return downcast<im6402_device &>(device).m_write_tre.set_callback(object); } DECLARE_READ8_MEMBER( read ) { return m_rbr; } DECLARE_WRITE8_MEMBER( write ); @@ -132,10 +132,10 @@ private: inline void set_tbre(int state); inline void set_tre(int state); - devcb2_write_line m_write_tro; - devcb2_write_line m_write_dr; - devcb2_write_line m_write_tbre; - devcb2_write_line m_write_tre; + devcb_write_line m_write_tro; + devcb_write_line m_write_dr; + devcb_write_line m_write_tbre; + devcb_write_line m_write_tre; // status int m_dr; diff --git a/src/emu/machine/ins8154.h b/src/emu/machine/ins8154.h index 238685582f7..3b272b70a9e 100644 --- a/src/emu/machine/ins8154.h +++ b/src/emu/machine/ins8154.h @@ -45,19 +45,19 @@ ***************************************************************************/ #define MCFG_INS8154_IN_A_CB(_devcb) \ - devcb = &ins8154_device::set_in_a_callback(*device, DEVCB2_##_devcb); + devcb = &ins8154_device::set_in_a_callback(*device, DEVCB_##_devcb); #define MCFG_INS8154_OUT_A_CB(_devcb) \ - devcb = &ins8154_device::set_out_a_callback(*device, DEVCB2_##_devcb); + devcb = &ins8154_device::set_out_a_callback(*device, DEVCB_##_devcb); #define MCFG_INS8154_IN_B_CB(_devcb) \ - devcb = &ins8154_device::set_in_b_callback(*device, DEVCB2_##_devcb); + devcb = &ins8154_device::set_in_b_callback(*device, DEVCB_##_devcb); #define MCFG_INS8154_OUT_B_CB(_devcb) \ - devcb = &ins8154_device::set_out_b_callback(*device, DEVCB2_##_devcb); + devcb = &ins8154_device::set_out_b_callback(*device, DEVCB_##_devcb); #define MCFG_INS8154_OUT_IRQ_CB(_devcb) \ - devcb = &ins8154_device::set_out_irq_callback(*device, DEVCB2_##_devcb); //currently unused + devcb = &ins8154_device::set_out_irq_callback(*device, DEVCB_##_devcb); //currently unused /*************************************************************************** TYPE DEFINITIONS @@ -71,11 +71,11 @@ public: // construction/destruction ins8154_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_in_a_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_in_a_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_a_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_out_a_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_b_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_in_b_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_b_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_out_b_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_a_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_in_a_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_a_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_out_a_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_b_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_in_b_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_b_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_out_b_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_out_irq_cb.set_callback(object); } DECLARE_READ8_MEMBER( ins8154_r ); DECLARE_WRITE8_MEMBER( ins8154_w ); @@ -93,11 +93,11 @@ protected: private: /* i/o lines */ - devcb2_read8 m_in_a_cb; - devcb2_write8 m_out_a_cb; - devcb2_read8 m_in_b_cb; - devcb2_write8 m_out_b_cb; - devcb2_write_line m_out_irq_cb; + devcb_read8 m_in_a_cb; + devcb_write8 m_out_a_cb; + devcb_read8 m_in_b_cb; + devcb_write8 m_out_b_cb; + devcb_write_line m_out_irq_cb; /* registers */ UINT8 m_in_a; /* Input Latch Port A */ diff --git a/src/emu/machine/ins8250.h b/src/emu/machine/ins8250.h index c979d853a4e..1b80ddf646d 100644 --- a/src/emu/machine/ins8250.h +++ b/src/emu/machine/ins8250.h @@ -19,12 +19,12 @@ class ins8250_uart_device : public device_t, public: ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); - template<class _Object> static devcb2_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_tx_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dtr_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_dtr_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_rts_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_rts_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_int_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_int_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_out1_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_out1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_out2_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_out2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_tx_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dtr_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_dtr_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_rts_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_rts_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_int_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_out1_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_out1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_out2_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_out2_cb.set_callback(object); } DECLARE_WRITE8_MEMBER( ins8250_w ); DECLARE_READ8_MEMBER( ins8250_r ); @@ -73,12 +73,12 @@ protected: private: UINT8 m_int_pending; - devcb2_write_line m_out_tx_cb; - devcb2_write_line m_out_dtr_cb; - devcb2_write_line m_out_rts_cb; - devcb2_write_line m_out_int_cb; - devcb2_write_line m_out_out1_cb; - devcb2_write_line m_out_out2_cb; + devcb_write_line m_out_tx_cb; + devcb_write_line m_out_dtr_cb; + devcb_write_line m_out_rts_cb; + devcb_write_line m_out_int_cb; + devcb_write_line m_out_out1_cb; + devcb_write_line m_out_out2_cb; void update_interrupt(); void update_msr(int bit, UINT8 state); @@ -145,21 +145,21 @@ extern const device_type NS16550; ***************************************************************************/ #define MCFG_INS8250_OUT_TX_CB(_devcb) \ - devcb = &ins8250_uart_device::set_out_tx_callback(*device, DEVCB2_##_devcb); + devcb = &ins8250_uart_device::set_out_tx_callback(*device, DEVCB_##_devcb); #define MCFG_INS8250_OUT_DTR_CB(_devcb) \ - devcb = &ins8250_uart_device::set_out_dtr_callback(*device, DEVCB2_##_devcb); + devcb = &ins8250_uart_device::set_out_dtr_callback(*device, DEVCB_##_devcb); #define MCFG_INS8250_OUT_RTS_CB(_devcb) \ - devcb = &ins8250_uart_device::set_out_rts_callback(*device, DEVCB2_##_devcb); + devcb = &ins8250_uart_device::set_out_rts_callback(*device, DEVCB_##_devcb); #define MCFG_INS8250_OUT_INT_CB(_devcb) \ - devcb = &ins8250_uart_device::set_out_int_callback(*device, DEVCB2_##_devcb); + devcb = &ins8250_uart_device::set_out_int_callback(*device, DEVCB_##_devcb); #define MCFG_INS8250_OUT_OUT1_CB(_devcb) \ - devcb = &ins8250_uart_device::set_out_out1_callback(*device, DEVCB2_##_devcb); + devcb = &ins8250_uart_device::set_out_out1_callback(*device, DEVCB_##_devcb); #define MCFG_INS8250_OUT_OUT2_CB(_devcb) \ - devcb = &ins8250_uart_device::set_out_out2_callback(*device, DEVCB2_##_devcb); + devcb = &ins8250_uart_device::set_out_out2_callback(*device, DEVCB_##_devcb); #endif diff --git a/src/emu/machine/k053252.h b/src/emu/machine/k053252.h index 027c2144f03..acde8f2b770 100644 --- a/src/emu/machine/k053252.h +++ b/src/emu/machine/k053252.h @@ -7,19 +7,19 @@ #define MCFG_K053252_INT1_EN_CB(_devcb) \ - devcb = &k053252_device::set_int1_en_callback(*device, DEVCB2_##_devcb); + devcb = &k053252_device::set_int1_en_callback(*device, DEVCB_##_devcb); #define MCFG_K053252_INT2_EN_CB(_devcb) \ - devcb = &k053252_device::set_int2_en_callback(*device, DEVCB2_##_devcb); + devcb = &k053252_device::set_int2_en_callback(*device, DEVCB_##_devcb); #define MCFG_K053252_INT1_ACK_CB(_devcb) \ - devcb = &k053252_device::set_int1_ack_callback(*device, DEVCB2_##_devcb); + devcb = &k053252_device::set_int1_ack_callback(*device, DEVCB_##_devcb); #define MCFG_K053252_INT2_ACK_CB(_devcb) \ - devcb = &k053252_device::set_int2_ack_callback(*device, DEVCB2_##_devcb); + devcb = &k053252_device::set_int2_ack_callback(*device, DEVCB_##_devcb); /*#define MCFG_K053252_INT_TIME_CB(_devcb) \ - devcb = &k053252_device::set_int_time_callback(*device, DEVCB2_##_devcb); */ + devcb = &k053252_device::set_int_time_callback(*device, DEVCB_##_devcb); */ #define MCFG_K053252_OFFSETS(_offsx, _offsy) \ k053252_device::set_offsets(*device, _offsx, _offsy); @@ -32,11 +32,11 @@ public: k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k053252_device() {} - template<class _Object> static devcb2_base &set_int1_en_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int1_en_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_int2_en_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int2_en_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_int1_ack_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int1_ack_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_int2_ack_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int2_ack_cb.set_callback(object); } - //template<class _Object> static devcb2_base &set_int_time_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int_time_cb.set_callback(object); } + template<class _Object> static devcb_base &set_int1_en_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int1_en_cb.set_callback(object); } + template<class _Object> static devcb_base &set_int2_en_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int2_en_cb.set_callback(object); } + template<class _Object> static devcb_base &set_int1_ack_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int1_ack_cb.set_callback(object); } + template<class _Object> static devcb_base &set_int2_ack_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int2_ack_cb.set_callback(object); } + //template<class _Object> static devcb_base &set_int_time_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int_time_cb.set_callback(object); } static void set_offsets(device_t &device, int offsx, int offsy) { downcast<k053252_device &>(device).m_offsx = offsx; downcast<k053252_device &>(device).m_offsy = offsy;} DECLARE_READ8_MEMBER( read ); // CCU registers @@ -56,11 +56,11 @@ protected: UINT16 m_vc,m_vfp,m_vbp; UINT8 m_vsw,m_hsw; - devcb2_write_line m_int1_en_cb; - devcb2_write_line m_int2_en_cb; - devcb2_write_line m_int1_ack_cb; - devcb2_write_line m_int2_ack_cb; -// devcb2_write8 m_int_time_cb; + devcb_write_line m_int1_en_cb; + devcb_write_line m_int2_en_cb; + devcb_write_line m_int1_ack_cb; + devcb_write_line m_int2_ack_cb; +// devcb_write8 m_int_time_cb; int m_offsx; int m_offsy; }; diff --git a/src/emu/machine/kb3600.h b/src/emu/machine/kb3600.h index 2feaaf4b2ba..b9f7c02624d 100644 --- a/src/emu/machine/kb3600.h +++ b/src/emu/machine/kb3600.h @@ -66,31 +66,31 @@ //************************************************************************** #define MCFG_AY3600_MATRIX_X0(_cb) \ - devcb = &ay3600_device::set_x0_cb(*device, DEVCB2_##_cb); + devcb = &ay3600_device::set_x0_cb(*device, DEVCB_##_cb); #define MCFG_AY3600_MATRIX_X1(_cb) \ - devcb = &ay3600_device::set_x1_cb(*device, DEVCB2_##_cb); + devcb = &ay3600_device::set_x1_cb(*device, DEVCB_##_cb); #define MCFG_AY3600_MATRIX_X2(_cb) \ - devcb = &ay3600_device::set_x2_cb(*device, DEVCB2_##_cb); + devcb = &ay3600_device::set_x2_cb(*device, DEVCB_##_cb); #define MCFG_AY3600_MATRIX_X3(_cb) \ - devcb = &ay3600_device::set_x3_cb(*device, DEVCB2_##_cb); + devcb = &ay3600_device::set_x3_cb(*device, DEVCB_##_cb); #define MCFG_AY3600_MATRIX_X4(_cb) \ - devcb = &ay3600_device::set_x4_cb(*device, DEVCB2_##_cb); + devcb = &ay3600_device::set_x4_cb(*device, DEVCB_##_cb); #define MCFG_AY3600_MATRIX_X5(_cb) \ - devcb = &ay3600_device::set_x5_cb(*device, DEVCB2_##_cb); + devcb = &ay3600_device::set_x5_cb(*device, DEVCB_##_cb); #define MCFG_AY3600_MATRIX_X6(_cb) \ - devcb = &ay3600_device::set_x6_cb(*device, DEVCB2_##_cb); + devcb = &ay3600_device::set_x6_cb(*device, DEVCB_##_cb); #define MCFG_AY3600_MATRIX_X7(_cb) \ - devcb = &ay3600_device::set_x7_cb(*device, DEVCB2_##_cb); + devcb = &ay3600_device::set_x7_cb(*device, DEVCB_##_cb); #define MCFG_AY3600_MATRIX_X8(_cb) \ - devcb = &ay3600_device::set_x8_cb(*device, DEVCB2_##_cb); + devcb = &ay3600_device::set_x8_cb(*device, DEVCB_##_cb); #define MCFG_AY3600_SHIFT_CB(_cb) \ - devcb = &ay3600_device::set_shift_cb(*device, DEVCB2_##_cb); + devcb = &ay3600_device::set_shift_cb(*device, DEVCB_##_cb); #define MCFG_AY3600_CONTROL_CB(_cb) \ - devcb = &ay3600_device::set_control_cb(*device, DEVCB2_##_cb); + devcb = &ay3600_device::set_control_cb(*device, DEVCB_##_cb); #define MCFG_AY3600_DATA_READY_CB(_cb) \ - devcb = &ay3600_device::set_data_ready_cb(*device, DEVCB2_##_cb); + devcb = &ay3600_device::set_data_ready_cb(*device, DEVCB_##_cb); #define MCFG_AY3600_AKO_CB(_cb) \ - devcb = &ay3600_device::set_ako_cb(*device, DEVCB2_##_cb); + devcb = &ay3600_device::set_ako_cb(*device, DEVCB_##_cb); //************************************************************************** // TYPE DEFINITIONS @@ -107,23 +107,23 @@ public: // public interface UINT16 b_r(); - template<class _Object> static devcb2_base &set_x0_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x0.set_callback(rd); } - template<class _Object> static devcb2_base &set_x1_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x1.set_callback(rd); } - template<class _Object> static devcb2_base &set_x2_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x2.set_callback(rd); } - template<class _Object> static devcb2_base &set_x3_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x3.set_callback(rd); } - template<class _Object> static devcb2_base &set_x4_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x4.set_callback(rd); } - template<class _Object> static devcb2_base &set_x5_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x5.set_callback(rd); } - template<class _Object> static devcb2_base &set_x6_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x6.set_callback(rd); } - template<class _Object> static devcb2_base &set_x7_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x7.set_callback(rd); } - template<class _Object> static devcb2_base &set_x8_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x8.set_callback(rd); } - template<class _Object> static devcb2_base &set_shift_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_shift.set_callback(rd); } - template<class _Object> static devcb2_base &set_control_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_control.set_callback(rd); } - template<class _Object> static devcb2_base &set_data_ready_cb(device_t &device, _Object wr) { return downcast<ay3600_device &>(device).m_write_data_ready.set_callback(wr); } - template<class _Object> static devcb2_base &set_ako_cb(device_t &device, _Object wr) { return downcast<ay3600_device &>(device).m_write_ako.set_callback(wr); } - - devcb2_read16 m_read_x0, m_read_x1, m_read_x2, m_read_x3, m_read_x4, m_read_x5, m_read_x6, m_read_x7, m_read_x8; - devcb2_read_line m_read_shift, m_read_control; - devcb2_write_line m_write_data_ready, m_write_ako; + template<class _Object> static devcb_base &set_x0_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x0.set_callback(rd); } + template<class _Object> static devcb_base &set_x1_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x1.set_callback(rd); } + template<class _Object> static devcb_base &set_x2_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x2.set_callback(rd); } + template<class _Object> static devcb_base &set_x3_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x3.set_callback(rd); } + template<class _Object> static devcb_base &set_x4_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x4.set_callback(rd); } + template<class _Object> static devcb_base &set_x5_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x5.set_callback(rd); } + template<class _Object> static devcb_base &set_x6_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x6.set_callback(rd); } + template<class _Object> static devcb_base &set_x7_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x7.set_callback(rd); } + template<class _Object> static devcb_base &set_x8_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_x8.set_callback(rd); } + template<class _Object> static devcb_base &set_shift_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_shift.set_callback(rd); } + template<class _Object> static devcb_base &set_control_cb(device_t &device, _Object rd) { return downcast<ay3600_device &>(device).m_read_control.set_callback(rd); } + template<class _Object> static devcb_base &set_data_ready_cb(device_t &device, _Object wr) { return downcast<ay3600_device &>(device).m_write_data_ready.set_callback(wr); } + template<class _Object> static devcb_base &set_ako_cb(device_t &device, _Object wr) { return downcast<ay3600_device &>(device).m_write_ako.set_callback(wr); } + + devcb_read16 m_read_x0, m_read_x1, m_read_x2, m_read_x3, m_read_x4, m_read_x5, m_read_x6, m_read_x7, m_read_x8; + devcb_read_line m_read_shift, m_read_control; + devcb_write_line m_write_data_ready, m_write_ako; protected: // device-level overrides diff --git a/src/emu/machine/keyboard.h b/src/emu/machine/keyboard.h index 5bf2ab7721b..bcb3dec1800 100644 --- a/src/emu/machine/keyboard.h +++ b/src/emu/machine/keyboard.h @@ -8,7 +8,7 @@ ***************************************************************************/ #define MCFG_GENERIC_KEYBOARD_CB(_devcb) \ - devcb = &generic_keyboard_device::set_keyboard_callback(*device, DEVCB2_##_devcb); + devcb = &generic_keyboard_device::set_keyboard_callback(*device, DEVCB_##_devcb); /*************************************************************************** FUNCTION PROTOTYPES @@ -22,7 +22,7 @@ public: generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); generic_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<generic_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<generic_keyboard_device &>(device).m_keyboard_cb.set_callback(object); } virtual ioport_constructor device_input_ports() const; virtual machine_config_constructor device_mconfig_additions() const; @@ -48,7 +48,7 @@ private: UINT8 m_last_code; UINT8 m_scan_line; - devcb2_write8 m_keyboard_cb; + devcb_write8 m_keyboard_cb; }; extern const device_type GENERIC_KEYBOARD; diff --git a/src/emu/machine/kr2376.h b/src/emu/machine/kr2376.h index dad802f94e6..b922056b807 100644 --- a/src/emu/machine/kr2376.h +++ b/src/emu/machine/kr2376.h @@ -35,7 +35,7 @@ #define MCFG_KR2376_STROBE_CALLBACK(_write) \ - devcb = &kr2376_device::set_strobe_wr_callback(*device, DEVCB2_##_write); + devcb = &kr2376_device::set_strobe_wr_callback(*device, DEVCB_##_write); /* * Input pins @@ -58,7 +58,7 @@ public: kr2376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~kr2376_device() {} - template<class _Object> static devcb2_base &set_strobe_wr_callback(device_t &device, _Object object) { return downcast<kr2376_device &>(device).m_write_strobe.set_callback(object); } + template<class _Object> static devcb_base &set_strobe_wr_callback(device_t &device, _Object object) { return downcast<kr2376_device &>(device).m_write_strobe.set_callback(object); } /* keyboard data */ DECLARE_READ8_MEMBER( data_r ); @@ -90,7 +90,7 @@ private: /* timers */ emu_timer *m_scan_timer; /* keyboard scan timer */ - devcb2_write_line m_write_strobe; + devcb_write_line m_write_strobe; enum { diff --git a/src/emu/machine/latch.c b/src/emu/machine/latch.c index 7d0952cafa8..4cb5ecd06b3 100644 --- a/src/emu/machine/latch.c +++ b/src/emu/machine/latch.c @@ -41,7 +41,7 @@ void output_latch_device::write(UINT8 data) { if (!m_resolved) { - // HACK: move to device_config_complete() when devcb2 supports that + // HACK: move to device_config_complete() when devcb supports that m_bit0_handler.resolve_safe(); m_bit1_handler.resolve_safe(); m_bit2_handler.resolve_safe(); diff --git a/src/emu/machine/latch.h b/src/emu/machine/latch.h index b9fc1cfe745..f4ceeb93da4 100644 --- a/src/emu/machine/latch.h +++ b/src/emu/machine/latch.h @@ -2,42 +2,42 @@ #define __LATCH_H__ #define MCFG_OUTPUT_LATCH_BIT0_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit0_handler(*device, DEVCB2_##_devcb); + devcb = &output_latch_device::set_bit0_handler(*device, DEVCB_##_devcb); #define MCFG_OUTPUT_LATCH_BIT1_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit1_handler(*device, DEVCB2_##_devcb); + devcb = &output_latch_device::set_bit1_handler(*device, DEVCB_##_devcb); #define MCFG_OUTPUT_LATCH_BIT2_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit2_handler(*device, DEVCB2_##_devcb); + devcb = &output_latch_device::set_bit2_handler(*device, DEVCB_##_devcb); #define MCFG_OUTPUT_LATCH_BIT3_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit3_handler(*device, DEVCB2_##_devcb); + devcb = &output_latch_device::set_bit3_handler(*device, DEVCB_##_devcb); #define MCFG_OUTPUT_LATCH_BIT4_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit4_handler(*device, DEVCB2_##_devcb); + devcb = &output_latch_device::set_bit4_handler(*device, DEVCB_##_devcb); #define MCFG_OUTPUT_LATCH_BIT5_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit5_handler(*device, DEVCB2_##_devcb); + devcb = &output_latch_device::set_bit5_handler(*device, DEVCB_##_devcb); #define MCFG_OUTPUT_LATCH_BIT6_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit6_handler(*device, DEVCB2_##_devcb); + devcb = &output_latch_device::set_bit6_handler(*device, DEVCB_##_devcb); #define MCFG_OUTPUT_LATCH_BIT7_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit7_handler(*device, DEVCB2_##_devcb); + devcb = &output_latch_device::set_bit7_handler(*device, DEVCB_##_devcb); class output_latch_device : public device_t { public: output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_bit0_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit0_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_bit1_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit1_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_bit2_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_bit3_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit3_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_bit4_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit4_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_bit5_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit5_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_bit6_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit6_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_bit7_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit7_handler.set_callback(object); } + template<class _Object> static devcb_base &set_bit0_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit0_handler.set_callback(object); } + template<class _Object> static devcb_base &set_bit1_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit1_handler.set_callback(object); } + template<class _Object> static devcb_base &set_bit2_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_bit3_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit3_handler.set_callback(object); } + template<class _Object> static devcb_base &set_bit4_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit4_handler.set_callback(object); } + template<class _Object> static devcb_base &set_bit5_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit5_handler.set_callback(object); } + template<class _Object> static devcb_base &set_bit6_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit6_handler.set_callback(object); } + template<class _Object> static devcb_base &set_bit7_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit7_handler.set_callback(object); } void write(UINT8 data); DECLARE_WRITE8_MEMBER(write) { write(data); } @@ -57,14 +57,14 @@ private: int m_bit6; int m_bit7; - devcb2_write_line m_bit0_handler; - devcb2_write_line m_bit1_handler; - devcb2_write_line m_bit2_handler; - devcb2_write_line m_bit3_handler; - devcb2_write_line m_bit4_handler; - devcb2_write_line m_bit5_handler; - devcb2_write_line m_bit6_handler; - devcb2_write_line m_bit7_handler; + devcb_write_line m_bit0_handler; + devcb_write_line m_bit1_handler; + devcb_write_line m_bit2_handler; + devcb_write_line m_bit3_handler; + devcb_write_line m_bit4_handler; + devcb_write_line m_bit5_handler; + devcb_write_line m_bit6_handler; + devcb_write_line m_bit7_handler; }; extern const device_type OUTPUT_LATCH; diff --git a/src/emu/machine/latch8.h b/src/emu/machine/latch8.h index 50048dfb246..9cf8aa7449e 100644 --- a/src/emu/machine/latch8.h +++ b/src/emu/machine/latch8.h @@ -77,23 +77,23 @@ public: static void set_xorvalue(device_t &device, UINT32 xorvalue) { downcast<latch8_device &>(device).m_xorvalue = xorvalue; } static void set_nosync(device_t &device, UINT32 nosync) { downcast<latch8_device &>(device).m_nosync = nosync; } - template<class _Object> static devcb2_base &set_write_0(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[0] = offset; return downcast<latch8_device &>(device).m_write_0.set_callback(object); } - template<class _Object> static devcb2_base &set_write_1(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[1] = offset; return downcast<latch8_device &>(device).m_write_1.set_callback(object); } - template<class _Object> static devcb2_base &set_write_2(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[2] = offset; return downcast<latch8_device &>(device).m_write_2.set_callback(object); } - template<class _Object> static devcb2_base &set_write_3(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[3] = offset; return downcast<latch8_device &>(device).m_write_3.set_callback(object); } - template<class _Object> static devcb2_base &set_write_4(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[4] = offset; return downcast<latch8_device &>(device).m_write_4.set_callback(object); } - template<class _Object> static devcb2_base &set_write_5(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[5] = offset; return downcast<latch8_device &>(device).m_write_5.set_callback(object); } - template<class _Object> static devcb2_base &set_write_6(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[6] = offset; return downcast<latch8_device &>(device).m_write_6.set_callback(object); } - template<class _Object> static devcb2_base &set_write_7(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[7] = offset; return downcast<latch8_device &>(device).m_write_7.set_callback(object); } - - template<class _Object> static devcb2_base &set_read_0(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[0] = offset; return downcast<latch8_device &>(device).m_read_0.set_callback(object); } - template<class _Object> static devcb2_base &set_read_1(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[1] = offset; return downcast<latch8_device &>(device).m_read_1.set_callback(object); } - template<class _Object> static devcb2_base &set_read_2(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[2] = offset; return downcast<latch8_device &>(device).m_read_2.set_callback(object); } - template<class _Object> static devcb2_base &set_read_3(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[3] = offset; return downcast<latch8_device &>(device).m_read_3.set_callback(object); } - template<class _Object> static devcb2_base &set_read_4(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[4] = offset; return downcast<latch8_device &>(device).m_read_4.set_callback(object); } - template<class _Object> static devcb2_base &set_read_5(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[5] = offset; return downcast<latch8_device &>(device).m_read_5.set_callback(object); } - template<class _Object> static devcb2_base &set_read_6(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[6] = offset; return downcast<latch8_device &>(device).m_read_6.set_callback(object); } - template<class _Object> static devcb2_base &set_read_7(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[7] = offset; return downcast<latch8_device &>(device).m_read_7.set_callback(object); } + template<class _Object> static devcb_base &set_write_0(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[0] = offset; return downcast<latch8_device &>(device).m_write_0.set_callback(object); } + template<class _Object> static devcb_base &set_write_1(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[1] = offset; return downcast<latch8_device &>(device).m_write_1.set_callback(object); } + template<class _Object> static devcb_base &set_write_2(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[2] = offset; return downcast<latch8_device &>(device).m_write_2.set_callback(object); } + template<class _Object> static devcb_base &set_write_3(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[3] = offset; return downcast<latch8_device &>(device).m_write_3.set_callback(object); } + template<class _Object> static devcb_base &set_write_4(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[4] = offset; return downcast<latch8_device &>(device).m_write_4.set_callback(object); } + template<class _Object> static devcb_base &set_write_5(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[5] = offset; return downcast<latch8_device &>(device).m_write_5.set_callback(object); } + template<class _Object> static devcb_base &set_write_6(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[6] = offset; return downcast<latch8_device &>(device).m_write_6.set_callback(object); } + template<class _Object> static devcb_base &set_write_7(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[7] = offset; return downcast<latch8_device &>(device).m_write_7.set_callback(object); } + + template<class _Object> static devcb_base &set_read_0(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[0] = offset; return downcast<latch8_device &>(device).m_read_0.set_callback(object); } + template<class _Object> static devcb_base &set_read_1(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[1] = offset; return downcast<latch8_device &>(device).m_read_1.set_callback(object); } + template<class _Object> static devcb_base &set_read_2(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[2] = offset; return downcast<latch8_device &>(device).m_read_2.set_callback(object); } + template<class _Object> static devcb_base &set_read_3(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[3] = offset; return downcast<latch8_device &>(device).m_read_3.set_callback(object); } + template<class _Object> static devcb_base &set_read_4(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[4] = offset; return downcast<latch8_device &>(device).m_read_4.set_callback(object); } + template<class _Object> static devcb_base &set_read_5(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[5] = offset; return downcast<latch8_device &>(device).m_read_5.set_callback(object); } + template<class _Object> static devcb_base &set_read_6(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[6] = offset; return downcast<latch8_device &>(device).m_read_6.set_callback(object); } + template<class _Object> static devcb_base &set_read_7(device_t &device, _Object object, UINT32 offset) { downcast<latch8_device &>(device).m_offset[7] = offset; return downcast<latch8_device &>(device).m_read_7.set_callback(object); } protected: // device-level overrides @@ -116,23 +116,23 @@ private: UINT32 m_xorvalue; /* after mask */ UINT32 m_nosync; - devcb2_write8 m_write_0; - devcb2_write8 m_write_1; - devcb2_write8 m_write_2; - devcb2_write8 m_write_3; - devcb2_write8 m_write_4; - devcb2_write8 m_write_5; - devcb2_write8 m_write_6; - devcb2_write8 m_write_7; - - devcb2_read8 m_read_0; - devcb2_read8 m_read_1; - devcb2_read8 m_read_2; - devcb2_read8 m_read_3; - devcb2_read8 m_read_4; - devcb2_read8 m_read_5; - devcb2_read8 m_read_6; - devcb2_read8 m_read_7; + devcb_write8 m_write_0; + devcb_write8 m_write_1; + devcb_write8 m_write_2; + devcb_write8 m_write_3; + devcb_write8 m_write_4; + devcb_write8 m_write_5; + devcb_write8 m_write_6; + devcb_write8 m_write_7; + + devcb_read8 m_read_0; + devcb_read8 m_read_1; + devcb_read8 m_read_2; + devcb_read8 m_read_3; + devcb_read8 m_read_4; + devcb_read8 m_read_5; + devcb_read8 m_read_6; + devcb_read8 m_read_7; UINT32 m_offset[8]; }; @@ -160,53 +160,53 @@ extern const device_type LATCH8; /* Write bit to discrete node */ #define MCFG_LATCH8_WRITE_0(_devcb, _node) \ - devcb = &latch8_device::set_write_0(*device, DEVCB2_##_devcb, _node); + devcb = &latch8_device::set_write_0(*device, DEVCB_##_devcb, _node); #define MCFG_LATCH8_WRITE_1(_devcb, _node) \ - devcb = &latch8_device::set_write_1(*device, DEVCB2_##_devcb, _node); + devcb = &latch8_device::set_write_1(*device, DEVCB_##_devcb, _node); #define MCFG_LATCH8_WRITE_2(_devcb, _node) \ - devcb = &latch8_device::set_write_2(*device, DEVCB2_##_devcb, _node); + devcb = &latch8_device::set_write_2(*device, DEVCB_##_devcb, _node); #define MCFG_LATCH8_WRITE_3(_devcb, _node) \ - devcb = &latch8_device::set_write_3(*device, DEVCB2_##_devcb, _node); + devcb = &latch8_device::set_write_3(*device, DEVCB_##_devcb, _node); #define MCFG_LATCH8_WRITE_4(_devcb, _node) \ - devcb = &latch8_device::set_write_4(*device, DEVCB2_##_devcb, _node); + devcb = &latch8_device::set_write_4(*device, DEVCB_##_devcb, _node); #define MCFG_LATCH8_WRITE_5(_devcb, _node) \ - devcb = &latch8_device::set_write_5(*device, DEVCB2_##_devcb, _node); + devcb = &latch8_device::set_write_5(*device, DEVCB_##_devcb, _node); #define MCFG_LATCH8_WRITE_6(_devcb, _node) \ - devcb = &latch8_device::set_write_6(*device, DEVCB2_##_devcb, _node); + devcb = &latch8_device::set_write_6(*device, DEVCB_##_devcb, _node); #define MCFG_LATCH8_WRITE_7(_devcb, _node) \ - devcb = &latch8_device::set_write_7(*device, DEVCB2_##_devcb, _node); + devcb = &latch8_device::set_write_7(*device, DEVCB_##_devcb, _node); /* Upon read, replace bits by reading from another device handler */ #define MCFG_LATCH8_READ_0(_devcb, _from_bit) \ - devcb = &latch8_device::set_read_0(*device, DEVCB2_##_devcb, _from_bit); + devcb = &latch8_device::set_read_0(*device, DEVCB_##_devcb, _from_bit); #define MCFG_LATCH8_READ_1(_devcb, _from_bit) \ - devcb = &latch8_device::set_read_1(*device, DEVCB2_##_devcb, _from_bit); + devcb = &latch8_device::set_read_1(*device, DEVCB_##_devcb, _from_bit); #define MCFG_LATCH8_READ_2(_devcb, _from_bit) \ - devcb = &latch8_device::set_read_2(*device, DEVCB2_##_devcb, _from_bit); + devcb = &latch8_device::set_read_2(*device, DEVCB_##_devcb, _from_bit); #define MCFG_LATCH8_READ_3(_devcb, _from_bit) \ - devcb = &latch8_device::set_read_3(*device, DEVCB2_##_devcb, _from_bit); + devcb = &latch8_device::set_read_3(*device, DEVCB_##_devcb, _from_bit); #define MCFG_LATCH8_READ_4(_devcb, _from_bit) \ - devcb = &latch8_device::set_read_4(*device, DEVCB2_##_devcb, _from_bit); + devcb = &latch8_device::set_read_4(*device, DEVCB_##_devcb, _from_bit); #define MCFG_LATCH8_READ_5(_devcb, _from_bit) \ - devcb = &latch8_device::set_read_5(*device, DEVCB2_##_devcb, _from_bit); + devcb = &latch8_device::set_read_5(*device, DEVCB_##_devcb, _from_bit); #define MCFG_LATCH8_READ_6(_devcb, _from_bit) \ - devcb = &latch8_device::set_read_6(*device, DEVCB2_##_devcb, _from_bit); + devcb = &latch8_device::set_read_6(*device, DEVCB_##_devcb, _from_bit); #define MCFG_LATCH8_READ_7(_devcb, _from_bit) \ - devcb = &latch8_device::set_read_7(*device, DEVCB2_##_devcb, _from_bit); + devcb = &latch8_device::set_read_7(*device, DEVCB_##_devcb, _from_bit); /* Accessor macros */ diff --git a/src/emu/machine/lh5810.h b/src/emu/machine/lh5810.h index 901740dc510..d78458ca172 100644 --- a/src/emu/machine/lh5810.h +++ b/src/emu/machine/lh5810.h @@ -39,22 +39,22 @@ enum //************************************************************************* #define MCFG_LH5810_PORTA_R_CB(_devcb) \ - devcb = &lh5810_device::set_porta_r_callback(*device, DEVCB2_##_devcb); + devcb = &lh5810_device::set_porta_r_callback(*device, DEVCB_##_devcb); #define MCFG_LH5810_PORTA_W_CB(_devcb) \ - devcb = &lh5810_device::set_porta_w_callback(*device, DEVCB2_##_devcb); + devcb = &lh5810_device::set_porta_w_callback(*device, DEVCB_##_devcb); #define MCFG_LH5810_PORTB_R_CB(_devcb) \ - devcb = &lh5810_device::set_portb_r_callback(*device, DEVCB2_##_devcb); + devcb = &lh5810_device::set_portb_r_callback(*device, DEVCB_##_devcb); #define MCFG_LH5810_PORTB_W_CB(_devcb) \ - devcb = &lh5810_device::set_portb_w_callback(*device, DEVCB2_##_devcb); + devcb = &lh5810_device::set_portb_w_callback(*device, DEVCB_##_devcb); #define MCFG_LH5810_PORTC_W_CB(_devcb) \ - devcb = &lh5810_device::set_portc_w_callback(*device, DEVCB2_##_devcb); + devcb = &lh5810_device::set_portc_w_callback(*device, DEVCB_##_devcb); #define MCFG_LH5810_OUT_INT_CB(_devcb) \ - devcb = &lh5810_device::set_out_int_callback(*device, DEVCB2_##_devcb); //currently unused + devcb = &lh5810_device::set_out_int_callback(*device, DEVCB_##_devcb); //currently unused @@ -70,12 +70,12 @@ public: // construction/destruction lh5810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_porta_r_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_porta_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_porta_w_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_porta_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_portb_r_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_portb_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_portb_w_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_portb_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_portc_w_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_portc_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_int_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_out_int_cb.set_callback(object); } + template<class _Object> static devcb_base &set_porta_r_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_porta_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_porta_w_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_porta_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_portb_r_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_portb_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_portb_w_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_portb_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_portc_w_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_portc_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_out_int_cb.set_callback(object); } DECLARE_READ8_MEMBER( data_r ); DECLARE_WRITE8_MEMBER( data_w ); @@ -87,13 +87,13 @@ protected: private: - devcb2_read8 m_porta_r_cb; //port A read - devcb2_write8 m_porta_w_cb; //port A write - devcb2_read8 m_portb_r_cb; //port B read - devcb2_write8 m_portb_w_cb; //port B write - devcb2_write8 m_portc_w_cb; //port C write + devcb_read8 m_porta_r_cb; //port A read + devcb_write8 m_porta_w_cb; //port A write + devcb_read8 m_portb_r_cb; //port B read + devcb_write8 m_portb_w_cb; //port B write + devcb_write8 m_portc_w_cb; //port C write - devcb2_write_line m_out_int_cb; //IRQ callback + devcb_write_line m_out_int_cb; //IRQ callback UINT8 m_reg[0x10]; UINT8 m_irq; diff --git a/src/emu/machine/mb87078.h b/src/emu/machine/mb87078.h index 3b578ebd961..633e027fe41 100644 --- a/src/emu/machine/mb87078.h +++ b/src/emu/machine/mb87078.h @@ -14,7 +14,7 @@ ***************************************************************************/ #define MCFG_MB87078_GAIN_CHANGED_CB(_devcb) \ - devcb = &mb87078_device::set_gain_changed_callback(*device, DEVCB2_##_devcb); + devcb = &mb87078_device::set_gain_changed_callback(*device, DEVCB_##_devcb); /*************************************************************************** TYPE DEFINITIONS @@ -26,7 +26,7 @@ public: mb87078_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mb87078_device() {} - template<class _Object> static devcb2_base &set_gain_changed_callback(device_t &device, _Object object) { return downcast<mb87078_device &>(device).m_gain_changed_cb.set_callback(object); } + template<class _Object> static devcb_base &set_gain_changed_callback(device_t &device, _Object object) { return downcast<mb87078_device &>(device).m_gain_changed_cb.set_callback(object); } void data_w(int data, int dsel); void reset_comp_w(int level); @@ -58,7 +58,7 @@ private: UINT8 m_latch[2][4]; /* 6bit+3bit 4 data latches */ UINT8 m_reset_comp; - devcb2_write8 m_gain_changed_cb; + devcb_write8 m_gain_changed_cb; }; extern const device_type MB87078; diff --git a/src/emu/machine/mb8795.h b/src/emu/machine/mb8795.h index 5fb6cd9c5e1..aaad0c0ba49 100644 --- a/src/emu/machine/mb8795.h +++ b/src/emu/machine/mb8795.h @@ -7,16 +7,16 @@ downcast<mb8795_device *>(device)->set_drq_cb(_tx_drq, _rx_drq); #define MCFG_MB8795_TX_IRQ_CALLBACK(_write) \ - devcb = &mb8795_device::set_tx_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &mb8795_device::set_tx_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_MB8795_RX_IRQ_CALLBACK(_write) \ - devcb = &mb8795_device::set_rx_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &mb8795_device::set_rx_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_MB8795_TX_DRQ_CALLBACK(_write) \ - devcb = &mb8795_device::set_tx_drq_wr_callback(*device, DEVCB2_##_write); + devcb = &mb8795_device::set_tx_drq_wr_callback(*device, DEVCB_##_write); #define MCFG_MB8795_RX_DRQ_CALLBACK(_write) \ - devcb = &mb8795_device::set_rx_drq_wr_callback(*device, DEVCB2_##_write); + devcb = &mb8795_device::set_rx_drq_wr_callback(*device, DEVCB_##_write); class mb8795_device : public device_t, public device_network_interface @@ -24,10 +24,10 @@ class mb8795_device : public device_t, public: mb8795_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_tx_irq_wr_callback(device_t &device, _Object object) { return downcast<mb8795_device &>(device).irq_tx_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_rx_irq_wr_callback(device_t &device, _Object object) { return downcast<mb8795_device &>(device).irq_rx_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_tx_drq_wr_callback(device_t &device, _Object object) { return downcast<mb8795_device &>(device).drq_tx_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_rx_drq_wr_callback(device_t &device, _Object object) { return downcast<mb8795_device &>(device).drq_rx_cb.set_callback(object); } + template<class _Object> static devcb_base &set_tx_irq_wr_callback(device_t &device, _Object object) { return downcast<mb8795_device &>(device).irq_tx_cb.set_callback(object); } + template<class _Object> static devcb_base &set_rx_irq_wr_callback(device_t &device, _Object object) { return downcast<mb8795_device &>(device).irq_rx_cb.set_callback(object); } + template<class _Object> static devcb_base &set_tx_drq_wr_callback(device_t &device, _Object object) { return downcast<mb8795_device &>(device).drq_tx_cb.set_callback(object); } + template<class _Object> static devcb_base &set_rx_drq_wr_callback(device_t &device, _Object object) { return downcast<mb8795_device &>(device).drq_rx_cb.set_callback(object); } DECLARE_ADDRESS_MAP(map, 8); @@ -106,7 +106,7 @@ private: bool drq_tx, drq_rx, irq_tx, irq_rx; emu_timer *timer_tx, *timer_rx; - devcb2_write_line irq_tx_cb, irq_rx_cb, drq_tx_cb, drq_rx_cb; + devcb_write_line irq_tx_cb, irq_rx_cb, drq_tx_cb, drq_rx_cb; void check_irq(); void start_send(); diff --git a/src/emu/machine/mb89352.h b/src/emu/machine/mb89352.h index 1fc96b122e0..1e76def92e4 100644 --- a/src/emu/machine/mb89352.h +++ b/src/emu/machine/mb89352.h @@ -49,10 +49,10 @@ #define MCFG_MB89352A_IRQ_CB(_devcb) \ - devcb = &mb89352_device::set_irq_callback(*device, DEVCB2_##_devcb); + devcb = &mb89352_device::set_irq_callback(*device, DEVCB_##_devcb); #define MCFG_MB89352A_DRQ_CB(_devcb) \ - devcb = &mb89352_device::set_drq_callback(*device, DEVCB2_##_devcb); + devcb = &mb89352_device::set_drq_callback(*device, DEVCB_##_devcb); class mb89352_device : public legacy_scsi_host_adapter { @@ -60,8 +60,8 @@ public: // construction/destruction mb89352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast<mb89352_device &>(device).m_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_drq_callback(device_t &device, _Object object) { return downcast<mb89352_device &>(device).m_drq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<mb89352_device &>(device).m_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast<mb89352_device &>(device).m_drq_cb.set_callback(object); } // any publically accessible interfaces needed for runtime DECLARE_READ8_MEMBER( mb89352_r ); @@ -83,8 +83,8 @@ private: int get_scsi_cmd_len(UINT8 cbyte); //void set_ints(UINT8 flag); - devcb2_write_line m_irq_cb; /* irq callback */ - devcb2_write_line m_drq_cb; /* drq callback */ + devcb_write_line m_irq_cb; /* irq callback */ + devcb_write_line m_drq_cb; /* drq callback */ UINT8 m_phase; // current SCSI phase UINT8 m_target; // current SCSI target diff --git a/src/emu/machine/mc146818.h b/src/emu/machine/mc146818.h index 1529c9a0e9c..474f5621235 100644 --- a/src/emu/machine/mc146818.h +++ b/src/emu/machine/mc146818.h @@ -22,7 +22,7 @@ MCFG_DEVICE_ADD(_tag, MC146818, _xtal) #define MCFG_MC146818_IRQ_HANDLER(_irq) \ - downcast<mc146818_device *>(device)->set_irq_callback(DEVCB2_##_irq); + downcast<mc146818_device *>(device)->set_irq_callback(DEVCB_##_irq); // The MC146818 doesn't have century support, but when syncing the date & time at startup we can optionally store the century. #define MCFG_MC146818_CENTURY_INDEX(_century_index) \ @@ -162,7 +162,7 @@ private: emu_timer *m_clock_timer; emu_timer *m_periodic_timer; - devcb2_write_line m_write_irq; + devcb_write_line m_write_irq; int m_century_index; bool m_use_utc; }; diff --git a/src/emu/machine/mc2661.h b/src/emu/machine/mc2661.h index 3994adc94a5..760f3bb0f77 100644 --- a/src/emu/machine/mc2661.h +++ b/src/emu/machine/mc2661.h @@ -46,28 +46,28 @@ mc2661_device::static_set_txc(*device, _clock); #define MCFG_MC2661_TXD_HANDLER(_write) \ - devcb = &mc2661_device::set_txd_callback(*device, DEVCB2_##_write); + devcb = &mc2661_device::set_txd_callback(*device, DEVCB_##_write); #define MCFG_MC2661_RXRDY_HANDLER(_write) \ - devcb = &mc2661_device::set_rxrdy_callback(*device, DEVCB2_##_write); + devcb = &mc2661_device::set_rxrdy_callback(*device, DEVCB_##_write); #define MCFG_MC2661_TXRDY_HANDLER(_write) \ - devcb = &mc2661_device::set_txrdy_callback(*device, DEVCB2_##_write); + devcb = &mc2661_device::set_txrdy_callback(*device, DEVCB_##_write); #define MCFG_MC2661_RTS_HANDLER(_write) \ - devcb = &mc2661_device::set_rts_callback(*device, DEVCB2_##_write); + devcb = &mc2661_device::set_rts_callback(*device, DEVCB_##_write); #define MCFG_MC2661_DTR_HANDLER(_write) \ - devcb = &mc2661_device::set_dtr_callback(*device, DEVCB2_##_write); + devcb = &mc2661_device::set_dtr_callback(*device, DEVCB_##_write); #define MCFG_MC2661_TXEMT_DSCHG_HANDLER(_write) \ - devcb = &mc2661_device::set_txemt_dschg_callback(*device, DEVCB2_##_write); + devcb = &mc2661_device::set_txemt_dschg_callback(*device, DEVCB_##_write); #define MCFG_MC2661_BKDET_HANDLER(_write) \ - devcb = &mc2661_device::set_bkdet_callback(*device, DEVCB2_##_write); + devcb = &mc2661_device::set_bkdet_callback(*device, DEVCB_##_write); #define MCFG_MC2661_XSYNC_HANDLER(_write) \ - devcb = &mc2661_device::set_xsync_callback(*device, DEVCB2_##_write); + devcb = &mc2661_device::set_xsync_callback(*device, DEVCB_##_write); @@ -87,14 +87,14 @@ public: static void static_set_rxc(device_t &device, int clock) { downcast<mc2661_device &>(device).m_rxc = clock; } static void static_set_txc(device_t &device, int clock) { downcast<mc2661_device &>(device).m_txc = clock; } - template<class _Object> static devcb2_base &set_txd_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_txd.set_callback(object); } - template<class _Object> static devcb2_base &set_rxrdy_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_rxrdy.set_callback(object); } - template<class _Object> static devcb2_base &set_txrdy_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_txrdy.set_callback(object); } - template<class _Object> static devcb2_base &set_rts_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_rts.set_callback(object); } - template<class _Object> static devcb2_base &set_dtr_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_dtr.set_callback(object); } - template<class _Object> static devcb2_base &set_txemt_dschg_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_txemt_dschg.set_callback(object); } - template<class _Object> static devcb2_base &set_bkdet_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_bkdet.set_callback(object); } - template<class _Object> static devcb2_base &set_xsync_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_xsync.set_callback(object); } + template<class _Object> static devcb_base &set_txd_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_txd.set_callback(object); } + template<class _Object> static devcb_base &set_rxrdy_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_rxrdy.set_callback(object); } + template<class _Object> static devcb_base &set_txrdy_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_txrdy.set_callback(object); } + template<class _Object> static devcb_base &set_rts_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_rts.set_callback(object); } + template<class _Object> static devcb_base &set_dtr_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_dtr.set_callback(object); } + template<class _Object> static devcb_base &set_txemt_dschg_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_txemt_dschg.set_callback(object); } + template<class _Object> static devcb_base &set_bkdet_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_bkdet.set_callback(object); } + template<class _Object> static devcb_base &set_xsync_callback(device_t &device, _Object object) { return downcast<mc2661_device &>(device).m_write_xsync.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -120,14 +120,14 @@ protected: virtual void rcv_complete(); private: - devcb2_write_line m_write_txd; - devcb2_write_line m_write_rxrdy; - devcb2_write_line m_write_txrdy; - devcb2_write_line m_write_rts; - devcb2_write_line m_write_dtr; - devcb2_write_line m_write_txemt_dschg; - devcb2_write_line m_write_bkdet; - devcb2_write_line m_write_xsync; + devcb_write_line m_write_txd; + devcb_write_line m_write_rxrdy; + devcb_write_line m_write_txrdy; + devcb_write_line m_write_rts; + devcb_write_line m_write_dtr; + devcb_write_line m_write_txemt_dschg; + devcb_write_line m_write_bkdet; + devcb_write_line m_write_xsync; int m_rxc; int m_txc; diff --git a/src/emu/machine/mc68328.h b/src/emu/machine/mc68328.h index f8198250a44..73b27a0c538 100644 --- a/src/emu/machine/mc68328.h +++ b/src/emu/machine/mc68328.h @@ -609,30 +609,30 @@ public: ~mc68328_device() {} static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<mc68328_device &>(device).m_cpu.set_tag(tag); } - template<class _Object> static devcb2_base &set_out_port_a_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_a_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_port_b_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_b_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_port_c_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_c_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_port_d_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_d_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_port_e_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_e_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_port_f_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_f_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_port_g_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_g_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_port_j_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_j_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_port_k_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_k_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_port_m_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_m_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_port_a_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_a_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_port_b_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_b_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_port_c_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_c_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_port_d_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_d_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_port_e_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_e_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_port_f_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_f_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_port_g_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_g_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_port_j_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_j_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_port_k_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_k_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_port_m_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_m_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pwm_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_pwm_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_spim_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_spim_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_spim_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_spim_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_spim_xch_trigger_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_spim_xch_trigger_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_port_a_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_a_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_port_b_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_b_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_port_c_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_c_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_port_d_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_d_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_port_e_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_e_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_port_f_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_f_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_port_g_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_g_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_port_j_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_j_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_port_k_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_k_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_port_m_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_m_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_port_a_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_a_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_port_b_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_b_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_port_c_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_c_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_port_d_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_d_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_port_e_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_e_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_port_f_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_f_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_port_g_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_g_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_port_j_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_j_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_port_k_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_k_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_port_m_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_port_m_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pwm_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_pwm_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_spim_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_spim_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_spim_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_in_spim_cb.set_callback(object); } + template<class _Object> static devcb_base &set_spim_xch_trigger_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_spim_xch_trigger_cb.set_callback(object); } DECLARE_WRITE16_MEMBER(write); @@ -668,34 +668,34 @@ private: emu_timer *m_rtc; emu_timer *m_pwm; - devcb2_write8 m_out_port_a_cb; /* 8-bit output */ - devcb2_write8 m_out_port_b_cb; /* 8-bit output */ - devcb2_write8 m_out_port_c_cb; /* 8-bit output */ - devcb2_write8 m_out_port_d_cb; /* 8-bit output */ - devcb2_write8 m_out_port_e_cb; /* 8-bit output */ - devcb2_write8 m_out_port_f_cb; /* 8-bit output */ - devcb2_write8 m_out_port_g_cb; /* 8-bit output */ - devcb2_write8 m_out_port_j_cb; /* 8-bit output */ - devcb2_write8 m_out_port_k_cb; /* 8-bit output */ - devcb2_write8 m_out_port_m_cb; /* 8-bit output */ - - devcb2_read8 m_in_port_a_cb; /* 8-bit input */ - devcb2_read8 m_in_port_b_cb; /* 8-bit input */ - devcb2_read8 m_in_port_c_cb; /* 8-bit input */ - devcb2_read8 m_in_port_d_cb; /* 8-bit input */ - devcb2_read8 m_in_port_e_cb; /* 8-bit input */ - devcb2_read8 m_in_port_f_cb; /* 8-bit input */ - devcb2_read8 m_in_port_g_cb; /* 8-bit input */ - devcb2_read8 m_in_port_j_cb; /* 8-bit input */ - devcb2_read8 m_in_port_k_cb; /* 8-bit input */ - devcb2_read8 m_in_port_m_cb; /* 8-bit input */ - - devcb2_write8 m_out_pwm_cb; /* 1-bit output */ - - devcb2_write16 m_out_spim_cb; /* 16-bit output */ - devcb2_read16 m_in_spim_cb; /* 16-bit input */ - - devcb2_write_line m_spim_xch_trigger_cb; /* SPIM exchange trigger */ /*todo: not really a write line, fix*/ + devcb_write8 m_out_port_a_cb; /* 8-bit output */ + devcb_write8 m_out_port_b_cb; /* 8-bit output */ + devcb_write8 m_out_port_c_cb; /* 8-bit output */ + devcb_write8 m_out_port_d_cb; /* 8-bit output */ + devcb_write8 m_out_port_e_cb; /* 8-bit output */ + devcb_write8 m_out_port_f_cb; /* 8-bit output */ + devcb_write8 m_out_port_g_cb; /* 8-bit output */ + devcb_write8 m_out_port_j_cb; /* 8-bit output */ + devcb_write8 m_out_port_k_cb; /* 8-bit output */ + devcb_write8 m_out_port_m_cb; /* 8-bit output */ + + devcb_read8 m_in_port_a_cb; /* 8-bit input */ + devcb_read8 m_in_port_b_cb; /* 8-bit input */ + devcb_read8 m_in_port_c_cb; /* 8-bit input */ + devcb_read8 m_in_port_d_cb; /* 8-bit input */ + devcb_read8 m_in_port_e_cb; /* 8-bit input */ + devcb_read8 m_in_port_f_cb; /* 8-bit input */ + devcb_read8 m_in_port_g_cb; /* 8-bit input */ + devcb_read8 m_in_port_j_cb; /* 8-bit input */ + devcb_read8 m_in_port_k_cb; /* 8-bit input */ + devcb_read8 m_in_port_m_cb; /* 8-bit input */ + + devcb_write8 m_out_pwm_cb; /* 1-bit output */ + + devcb_write16 m_out_spim_cb; /* 16-bit output */ + devcb_read16 m_in_spim_cb; /* 16-bit input */ + + devcb_write_line m_spim_xch_trigger_cb; /* SPIM exchange trigger */ /*todo: not really a write line, fix*/ required_device<cpu_device> m_cpu; }; @@ -707,76 +707,76 @@ extern const device_type MC68328; mc68328_device::static_set_cpu_tag(*device, "^"_tag); #define MCFG_MC68328_OUT_PORT_A_CB(_devcb) \ - devcb = &mc68328_device::set_out_port_a_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_out_port_a_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_OUT_PORT_B_CB(_devcb) \ - devcb = &mc68328_device::set_out_port_b_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_out_port_b_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_OUT_PORT_C_CB(_devcb) \ - devcb = &mc68328_device::set_out_port_c_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_out_port_c_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_OUT_PORT_D_CB(_devcb) \ - devcb = &mc68328_device::set_out_port_d_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_out_port_d_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_OUT_PORT_E_CB(_devcb) \ - devcb = &mc68328_device::set_out_port_e_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_out_port_e_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_OUT_PORT_F_CB(_devcb) \ - devcb = &mc68328_device::set_out_port_f_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_out_port_f_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_OUT_PORT_G_CB(_devcb) \ - devcb = &mc68328_device::set_out_port_g_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_out_port_g_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_OUT_PORT_J_CB(_devcb) \ - devcb = &mc68328_device::set_out_port_j_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_out_port_j_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_OUT_PORT_K_CB(_devcb) \ - devcb = &mc68328_device::set_out_port_k_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_out_port_k_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_OUT_PORT_M_CB(_devcb) \ - devcb = &mc68328_device::set_out_port_m_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_out_port_m_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_IN_PORT_A_CB(_devcb) \ - devcb = &mc68328_device::set_in_port_a_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_in_port_a_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_IN_PORT_B_CB(_devcb) \ - devcb = &mc68328_device::set_in_port_b_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_in_port_b_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_IN_PORT_C_CB(_devcb) \ - devcb = &mc68328_device::set_in_port_c_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_in_port_c_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_IN_PORT_D_CB(_devcb) \ - devcb = &mc68328_device::set_in_port_d_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_in_port_d_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_IN_PORT_E_CB(_devcb) \ - devcb = &mc68328_device::set_in_port_e_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_in_port_e_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_IN_PORT_F_CB(_devcb) \ - devcb = &mc68328_device::set_in_port_f_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_in_port_f_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_IN_PORT_G_CB(_devcb) \ - devcb = &mc68328_device::set_in_port_g_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_in_port_g_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_IN_PORT_J_CB(_devcb) \ - devcb = &mc68328_device::set_in_port_j_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_in_port_j_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_IN_PORT_K_CB(_devcb) \ - devcb = &mc68328_device::set_in_port_k_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_in_port_k_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_IN_PORT_M_CB(_devcb) \ - devcb = &mc68328_device::set_in_port_m_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_in_port_m_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_OUT_PWM_CB(_devcb) \ - devcb = &mc68328_device::set_out_pwm_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_out_pwm_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_OUT_SPIM_CB(_devcb) \ - devcb = &mc68328_device::set_out_spim_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_out_spim_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_IN_SPIM_CB(_devcb) \ - devcb = &mc68328_device::set_in_spim_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_in_spim_callback(*device, DEVCB_##_devcb); #define MCFG_MC68328_SPIM_XCH_TRIGGER_CB(_devcb) \ - devcb = &mc68328_device::set_spim_xch_trigger_callback(*device, DEVCB2_##_devcb); + devcb = &mc68328_device::set_spim_xch_trigger_callback(*device, DEVCB_##_devcb); #endif diff --git a/src/emu/machine/mc6843.h b/src/emu/machine/mc6843.h index b86ffa5e05b..ebe2868b05a 100644 --- a/src/emu/machine/mc6843.h +++ b/src/emu/machine/mc6843.h @@ -12,7 +12,7 @@ #include "imagedev/flopdrv.h" #define MCFG_MC6843_IRQ_CALLBACK(_write) \ - devcb = &mc6843_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &mc6843_device::set_irq_wr_callback(*device, DEVCB_##_write); class mc6843_device : public device_t { @@ -20,7 +20,7 @@ public: mc6843_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mc6843_device() {} - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<mc6843_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<mc6843_device &>(device).m_write_irq.set_callback(object); } DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -41,7 +41,7 @@ private: TIMER_CONT }; - devcb2_write_line m_write_irq; + devcb_write_line m_write_irq; /* registers */ UINT8 m_CTAR; /* current track */ diff --git a/src/emu/machine/mc6846.h b/src/emu/machine/mc6846.h index 8e420ecaa81..ef6247e87ad 100644 --- a/src/emu/machine/mc6846.h +++ b/src/emu/machine/mc6846.h @@ -11,22 +11,22 @@ #define MCFG_MC6846_OUT_PORT_CB(_devcb) \ - devcb = &mc6846_device::set_out_port_callback(*device, DEVCB2_##_devcb); + devcb = &mc6846_device::set_out_port_callback(*device, DEVCB_##_devcb); #define MCFG_MC6846_OUT_CP1_CB(_devcb) \ - devcb = &mc6846_device::set_out_cp1_callback(*device, DEVCB2_##_devcb); + devcb = &mc6846_device::set_out_cp1_callback(*device, DEVCB_##_devcb); #define MCFG_MC6846_OUT_CP2_CB(_devcb) \ - devcb = &mc6846_device::set_out_cp2_callback(*device, DEVCB2_##_devcb); + devcb = &mc6846_device::set_out_cp2_callback(*device, DEVCB_##_devcb); #define MCFG_MC6846_IN_PORT_CB(_devcb) \ - devcb = &mc6846_device::set_in_port_callback(*device, DEVCB2_##_devcb); + devcb = &mc6846_device::set_in_port_callback(*device, DEVCB_##_devcb); #define MCFG_MC6846_OUT_CTO_CB(_devcb) \ - devcb = &mc6846_device::set_out_cto_callback(*device, DEVCB2_##_devcb); + devcb = &mc6846_device::set_out_cto_callback(*device, DEVCB_##_devcb); #define MCFG_MC6846_IRQ_CB(_devcb) \ - devcb = &mc6846_device::set_irq_callback(*device, DEVCB2_##_devcb); + devcb = &mc6846_device::set_irq_callback(*device, DEVCB_##_devcb); class mc6846_device : public device_t @@ -35,12 +35,12 @@ public: mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mc6846_device() {} - template<class _Object> static devcb2_base &set_out_port_callback(device_t &device, _Object object) { return downcast<mc6846_device &>(device).m_out_port_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_cp1_callback(device_t &device, _Object object) { return downcast<mc6846_device &>(device).m_out_cp1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_cp2_callback(device_t &device, _Object object) { return downcast<mc6846_device &>(device).m_out_cp2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_port_callback(device_t &device, _Object object) { return downcast<mc6846_device &>(device).m_in_port_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_cto_callback(device_t &device, _Object object) { return downcast<mc6846_device &>(device).m_out_cto_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast<mc6846_device &>(device).m_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_port_callback(device_t &device, _Object object) { return downcast<mc6846_device &>(device).m_out_port_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_cp1_callback(device_t &device, _Object object) { return downcast<mc6846_device &>(device).m_out_cp1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_cp2_callback(device_t &device, _Object object) { return downcast<mc6846_device &>(device).m_out_cp2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_port_callback(device_t &device, _Object object) { return downcast<mc6846_device &>(device).m_in_port_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_cto_callback(device_t &device, _Object object) { return downcast<mc6846_device &>(device).m_out_cto_cb.set_callback(object); } + template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<mc6846_device &>(device).m_irq_cb.set_callback(object); } /* interface to CPU via address/data bus*/ DECLARE_READ8_MEMBER(read); @@ -93,18 +93,18 @@ private: emu_timer *m_one_shot; /* 1-us x factor one-shot timer */ /* CPU write to the outside through chip */ - devcb2_write8 m_out_port_cb; /* 8-bit output */ - devcb2_write8 m_out_cp1_cb; /* 1-bit output */ - devcb2_write8 m_out_cp2_cb; /* 1-bit output */ + devcb_write8 m_out_port_cb; /* 8-bit output */ + devcb_write8 m_out_cp1_cb; /* 1-bit output */ + devcb_write8 m_out_cp2_cb; /* 1-bit output */ /* CPU read from the outside through chip */ - devcb2_read8 m_in_port_cb; /* 8-bit input */ + devcb_read8 m_in_port_cb; /* 8-bit input */ /* asynchronous timer output to outside world */ - devcb2_write8 m_out_cto_cb; /* 1-bit output */ + devcb_write8 m_out_cto_cb; /* 1-bit output */ /* timer interrupt */ - devcb2_write_line m_irq_cb; + devcb_write_line m_irq_cb; int m_old_cif; int m_old_cto; diff --git a/src/emu/machine/mc6852.h b/src/emu/machine/mc6852.h index 2cde8a92366..971c2f063bb 100644 --- a/src/emu/machine/mc6852.h +++ b/src/emu/machine/mc6852.h @@ -45,16 +45,16 @@ mc6852_device::set_tx_clock(*device, _clock); #define MCFG_MC6852_TX_DATA_CALLBACK(_write) \ - devcb = &mc6852_device::set_tx_data_wr_callback(*device, DEVCB2_##_write); + devcb = &mc6852_device::set_tx_data_wr_callback(*device, DEVCB_##_write); #define MCFG_MC6852_IRQ_CALLBACK(_write) \ - devcb = &mc6852_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &mc6852_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_MC6852_SM_DTR_CALLBACK(_write) \ - devcb = &mc6852_device::set_sm_dtr_wr_callback(*device, DEVCB2_##_write); + devcb = &mc6852_device::set_sm_dtr_wr_callback(*device, DEVCB_##_write); #define MCFG_MC6852_TUF_CALLBACK(_write) \ - devcb = &mc6852_device::set_tuf_wr_callback(*device, DEVCB2_##_write); + devcb = &mc6852_device::set_tuf_wr_callback(*device, DEVCB_##_write); @@ -73,10 +73,10 @@ public: static void set_rx_clock(device_t &device, int clock) { downcast<mc6852_device &>(device).m_rx_clock = clock; } static void set_tx_clock(device_t &device, int clock) { downcast<mc6852_device &>(device).m_tx_clock = clock; } - template<class _Object> static devcb2_base &set_tx_data_wr_callback(device_t &device, _Object object) { return downcast<mc6852_device &>(device).m_write_tx_data.set_callback(object); } - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<mc6852_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_sm_dtr_wr_callback(device_t &device, _Object object) { return downcast<mc6852_device &>(device).m_write_sm_dtr.set_callback(object); } - template<class _Object> static devcb2_base &set_tuf_wr_callback(device_t &device, _Object object) { return downcast<mc6852_device &>(device).m_write_tuf.set_callback(object); } + template<class _Object> static devcb_base &set_tx_data_wr_callback(device_t &device, _Object object) { return downcast<mc6852_device &>(device).m_write_tx_data.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<mc6852_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_sm_dtr_wr_callback(device_t &device, _Object object) { return downcast<mc6852_device &>(device).m_write_sm_dtr.set_callback(object); } + template<class _Object> static devcb_base &set_tuf_wr_callback(device_t &device, _Object object) { return downcast<mc6852_device &>(device).m_write_tuf.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -102,10 +102,10 @@ protected: virtual void rcv_complete(); private: - devcb2_write_line m_write_tx_data; - devcb2_write_line m_write_irq; - devcb2_write_line m_write_sm_dtr; - devcb2_write_line m_write_tuf; + devcb_write_line m_write_tx_data; + devcb_write_line m_write_irq; + devcb_write_line m_write_sm_dtr; + devcb_write_line m_write_tuf; UINT8 m_status; // status register UINT8 m_cr[3]; // control registers diff --git a/src/emu/machine/mc6854.h b/src/emu/machine/mc6854.h index fb38ec03d03..40a7c694232 100644 --- a/src/emu/machine/mc6854.h +++ b/src/emu/machine/mc6854.h @@ -21,19 +21,19 @@ typedef device_delegate<void (UINT8 *data, int length)> mc6854_out_frame_delegat #define MCFG_MC6854_OUT_IRQ_CB(_devcb) \ - devcb = &mc6854_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &mc6854_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_MC6854_OUT_TXD_CB(_devcb) \ - devcb = &mc6854_device::set_out_txd_callback(*device, DEVCB2_##_devcb); + devcb = &mc6854_device::set_out_txd_callback(*device, DEVCB_##_devcb); #define MCFG_MC6854_OUT_FRAME_CB(_class, _method) \ mc6854_device::set_out_frame_callback(*device, mc6854_out_frame_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); #define MCFG_MC6854_OUT_RTS_CB(_devcb) \ - devcb = &mc6854_device::set_out_rts_callback(*device, DEVCB2_##_devcb); + devcb = &mc6854_device::set_out_rts_callback(*device, DEVCB_##_devcb); #define MCFG_MC6854_OUT_DTR_CB(_devcb) \ - devcb = &mc6854_device::set_out_dtr_callback(*device, DEVCB2_##_devcb); + devcb = &mc6854_device::set_out_dtr_callback(*device, DEVCB_##_devcb); class mc6854_device : public device_t @@ -42,11 +42,11 @@ public: mc6854_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mc6854_device() {} - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<mc6854_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_txd_callback(device_t &device, _Object object) { return downcast<mc6854_device &>(device).m_out_txd_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<mc6854_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_txd_callback(device_t &device, _Object object) { return downcast<mc6854_device &>(device).m_out_txd_cb.set_callback(object); } static void set_out_frame_callback(device_t &device, mc6854_out_frame_delegate callback) { downcast<mc6854_device &>(device).m_out_frame_cb = callback; } - template<class _Object> static devcb2_base &set_out_rts_callback(device_t &device, _Object object) { return downcast<mc6854_device &>(device).m_out_rts_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dtr_callback(device_t &device, _Object object) { return downcast<mc6854_device &>(device).m_out_dtr_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_rts_callback(device_t &device, _Object object) { return downcast<mc6854_device &>(device).m_out_rts_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dtr_callback(device_t &device, _Object object) { return downcast<mc6854_device &>(device).m_out_dtr_cb.set_callback(object); } /* interface to CPU via address/data bus*/ DECLARE_READ8_MEMBER( read ); @@ -73,17 +73,17 @@ protected: private: // internal state - devcb2_write_line m_out_irq_cb; /* interrupt request */ + devcb_write_line m_out_irq_cb; /* interrupt request */ /* low-level, bit-based interface */ - devcb2_write_line m_out_txd_cb; /* transmit bit */ + devcb_write_line m_out_txd_cb; /* transmit bit */ /* high-level, frame-based interface */ mc6854_out_frame_delegate m_out_frame_cb; /* control lines */ - devcb2_write_line m_out_rts_cb; /* 1 = transmitting, 0 = idle */ - devcb2_write_line m_out_dtr_cb; /* 1 = data transmit ready, 0 = busy */ + devcb_write_line m_out_rts_cb; /* 1 = transmitting, 0 = idle */ + devcb_write_line m_out_dtr_cb; /* 1 = data transmit ready, 0 = busy */ /* registers */ UINT8 m_cr1, m_cr2, m_cr3, m_cr4; /* control registers */ diff --git a/src/emu/machine/mc68681.h b/src/emu/machine/mc68681.h index 304160304e1..be928c7b7c7 100644 --- a/src/emu/machine/mc68681.h +++ b/src/emu/machine/mc68681.h @@ -9,20 +9,20 @@ MCFG_DEVICE_REPLACE(_tag, MC68681, _clock) #define MCFG_MC68681_IRQ_CALLBACK(_cb) \ - devcb = &mc68681_device::set_irq_cb(*device, DEVCB2_##_cb); + devcb = &mc68681_device::set_irq_cb(*device, DEVCB_##_cb); #define MCFG_MC68681_A_TX_CALLBACK(_cb) \ - devcb = &mc68681_device::set_a_tx_cb(*device, DEVCB2_##_cb); + devcb = &mc68681_device::set_a_tx_cb(*device, DEVCB_##_cb); #define MCFG_MC68681_B_TX_CALLBACK(_cb) \ - devcb = &mc68681_device::set_b_tx_cb(*device, DEVCB2_##_cb); + devcb = &mc68681_device::set_b_tx_cb(*device, DEVCB_##_cb); // deprecated: use ipX_w() instead #define MCFG_MC68681_INPORT_CALLBACK(_cb) \ - devcb = &mc68681_device::set_inport_cb(*device, DEVCB2_##_cb); + devcb = &mc68681_device::set_inport_cb(*device, DEVCB_##_cb); #define MCFG_MC68681_OUTPORT_CALLBACK(_cb) \ - devcb = &mc68681_device::set_outport_cb(*device, DEVCB2_##_cb); + devcb = &mc68681_device::set_outport_cb(*device, DEVCB_##_cb); #define MCFG_MC68681_SET_EXTERNAL_CLOCKS(_a, _b, _c, _d) \ mc68681_device::static_set_clocks(*device, _a, _b, _c, _d); @@ -113,15 +113,15 @@ public: DECLARE_WRITE_LINE_MEMBER( rx_a_w ) { m_chanA->device_serial_interface::rx_w((UINT8)state); } DECLARE_WRITE_LINE_MEMBER( rx_b_w ) { m_chanB->device_serial_interface::rx_w((UINT8)state); } - template<class _Object> static devcb2_base &set_irq_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_a_tx_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).write_a_tx.set_callback(object); } - template<class _Object> static devcb2_base &set_b_tx_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).write_b_tx.set_callback(object); } - template<class _Object> static devcb2_base &set_inport_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).read_inport.set_callback(object); } - template<class _Object> static devcb2_base &set_outport_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).write_outport.set_callback(object); } + template<class _Object> static devcb_base &set_irq_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_a_tx_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).write_a_tx.set_callback(object); } + template<class _Object> static devcb_base &set_b_tx_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).write_b_tx.set_callback(object); } + template<class _Object> static devcb_base &set_inport_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).read_inport.set_callback(object); } + template<class _Object> static devcb_base &set_outport_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).write_outport.set_callback(object); } - devcb2_write_line write_irq, write_a_tx, write_b_tx; - devcb2_read8 read_inport; - devcb2_write8 write_outport; + devcb_write_line write_irq, write_a_tx, write_b_tx; + devcb_read8 read_inport; + devcb_write8 write_outport; INT32 ip3clk, ip4clk, ip5clk, ip6clk; // new-style push handlers for input port bits diff --git a/src/emu/machine/mc68901.h b/src/emu/machine/mc68901.h index d3612c6d111..7db2dcb3b95 100644 --- a/src/emu/machine/mc68901.h +++ b/src/emu/machine/mc68901.h @@ -58,31 +58,31 @@ mc68901_device::set_tx_clock(*device, _clk); #define MCFG_MC68901_OUT_IRQ_CB(_devcb) \ - devcb = &mc68901_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &mc68901_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_MC68901_OUT_GPIO_CB(_devcb) \ - devcb = &mc68901_device::set_out_gpio_callback(*device, DEVCB2_##_devcb); + devcb = &mc68901_device::set_out_gpio_callback(*device, DEVCB_##_devcb); #define MCFG_MC68901_OUT_TAO_CB(_devcb) \ - devcb = &mc68901_device::set_out_tao_callback(*device, DEVCB2_##_devcb); + devcb = &mc68901_device::set_out_tao_callback(*device, DEVCB_##_devcb); #define MCFG_MC68901_OUT_TBO_CB(_devcb) \ - devcb = &mc68901_device::set_out_tbo_callback(*device, DEVCB2_##_devcb); + devcb = &mc68901_device::set_out_tbo_callback(*device, DEVCB_##_devcb); #define MCFG_MC68901_OUT_TCO_CB(_devcb) \ - devcb = &mc68901_device::set_out_tco_callback(*device, DEVCB2_##_devcb); + devcb = &mc68901_device::set_out_tco_callback(*device, DEVCB_##_devcb); #define MCFG_MC68901_OUT_TDO_CB(_devcb) \ - devcb = &mc68901_device::set_out_tdo_callback(*device, DEVCB2_##_devcb); + devcb = &mc68901_device::set_out_tdo_callback(*device, DEVCB_##_devcb); #define MCFG_MC68901_OUT_SO_CB(_devcb) \ - devcb = &mc68901_device::set_out_so_callback(*device, DEVCB2_##_devcb); + devcb = &mc68901_device::set_out_so_callback(*device, DEVCB_##_devcb); /*#define MCFG_MC68901_OUT_RR_CB(_devcb) \ - devcb = &mc68901_device::set_out_rr_callback(*device, DEVCB2_##_devcb); + devcb = &mc68901_device::set_out_rr_callback(*device, DEVCB_##_devcb); #define MCFG_MC68901_OUT_TR_CB(_devcb) \ - devcb = &mc68901_device::set_out_tr_callback(*device, DEVCB2_##_devcb);*/ + devcb = &mc68901_device::set_out_tr_callback(*device, DEVCB_##_devcb);*/ //************************************************************************** @@ -102,15 +102,15 @@ public: static void set_timer_clock(device_t &device, int timer_clock) { downcast<mc68901_device &>(device).m_timer_clock = timer_clock; } static void set_rx_clock(device_t &device, int rx_clock) { downcast<mc68901_device &>(device).m_rx_clock = rx_clock; } static void set_tx_clock(device_t &device, int tx_clock) { downcast<mc68901_device &>(device).m_tx_clock = tx_clock; } - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_gpio_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_gpio_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_tao_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_tao_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_tbo_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_tbo_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_tco_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_tco_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_tdo_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_tdo_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_so_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_so_cb.set_callback(object); } - //template<class _Object> static devcb2_base &set_rr_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_rr_cb.set_callback(object); } - //template<class _Object> static devcb2_base &set_tr_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_tr_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_gpio_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_gpio_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_tao_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_tao_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_tbo_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_tbo_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_tco_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_tco_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_tdo_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_tdo_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_so_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_so_cb.set_callback(object); } + //template<class _Object> static devcb_base &set_rr_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_rr_cb.set_callback(object); } + //template<class _Object> static devcb_base &set_tr_callback(device_t &device, _Object object) { return downcast<mc68901_device &>(device).m_out_tr_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -247,18 +247,18 @@ private: int m_rx_clock; /* serial receive clock */ int m_tx_clock; /* serial transmit clock */ - devcb2_write_line m_out_irq_cb; + devcb_write_line m_out_irq_cb; - devcb2_write8 m_out_gpio_cb; + devcb_write8 m_out_gpio_cb; - devcb2_write_line m_out_tao_cb; - devcb2_write_line m_out_tbo_cb; - devcb2_write_line m_out_tco_cb; - devcb2_write_line m_out_tdo_cb; + devcb_write_line m_out_tao_cb; + devcb_write_line m_out_tbo_cb; + devcb_write_line m_out_tco_cb; + devcb_write_line m_out_tdo_cb; - devcb2_write_line m_out_so_cb; - //devcb2_write_line m_out_rr_cb; - //devcb2_write_line m_out_tr_cb; + devcb_write_line m_out_so_cb; + //devcb_write_line m_out_rr_cb; + //devcb_write_line m_out_tr_cb; //int m_device_type; /* device type */ diff --git a/src/emu/machine/mccs1850.h b/src/emu/machine/mccs1850.h index ee94deef977..c37a0886c2e 100644 --- a/src/emu/machine/mccs1850.h +++ b/src/emu/machine/mccs1850.h @@ -34,13 +34,13 @@ //************************************************************************** #define MCFG_MCCS1850_INT_CALLBACK(_write) \ - devcb = &mccs1850_device::set_int_wr_callback(*device, DEVCB2_##_write); + devcb = &mccs1850_device::set_int_wr_callback(*device, DEVCB_##_write); #define MCFG_MCCS1850_PSE_CALLBACK(_write) \ - devcb = &mccs1850_device::set_pse_wr_callback(*device, DEVCB2_##_write); + devcb = &mccs1850_device::set_pse_wr_callback(*device, DEVCB_##_write); #define MCFG_MCCS1850_NUC_CALLBACK(_write) \ - devcb = &mccs1850_device::set_nuc_wr_callback(*device, DEVCB2_##_write); + devcb = &mccs1850_device::set_nuc_wr_callback(*device, DEVCB_##_write); @@ -58,9 +58,9 @@ public: // construction/destruction mccs1850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<mccs1850_device &>(device).int_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_pse_wr_callback(device_t &device, _Object object) { return downcast<mccs1850_device &>(device).pse_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_nuc_wr_callback(device_t &device, _Object object) { return downcast<mccs1850_device &>(device).nuc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<mccs1850_device &>(device).int_cb.set_callback(object); } + template<class _Object> static devcb_base &set_pse_wr_callback(device_t &device, _Object object) { return downcast<mccs1850_device &>(device).pse_cb.set_callback(object); } + template<class _Object> static devcb_base &set_nuc_wr_callback(device_t &device, _Object object) { return downcast<mccs1850_device &>(device).nuc_cb.set_callback(object); } DECLARE_WRITE_LINE_MEMBER( ce_w ); DECLARE_WRITE_LINE_MEMBER( sck_w ); @@ -93,7 +93,7 @@ private: static const device_timer_id TIMER_CLOCK = 0; - devcb2_write_line int_cb, pse_cb, nuc_cb; + devcb_write_line int_cb, pse_cb, nuc_cb; UINT8 m_ram[0x80]; // RAM diff --git a/src/emu/machine/microtch.h b/src/emu/machine/microtch.h index 60e2e280bb3..43c2b2ab7d0 100644 --- a/src/emu/machine/microtch.h +++ b/src/emu/machine/microtch.h @@ -10,7 +10,7 @@ class microtouch_device : public: microtouch_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); microtouch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &static_set_tx_callback(device_t &device, _Object object) { return downcast<microtouch_device &>(device).m_out_tx_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_tx_callback(device_t &device, _Object object) { return downcast<microtouch_device &>(device).m_out_tx_func.set_callback(object); } virtual ioport_constructor device_input_ports() const; DECLARE_WRITE8_MEMBER(rx); @@ -52,7 +52,7 @@ private: int m_last_touch_state; int m_last_x; int m_last_y; - devcb2_write8 m_out_tx_func; + devcb_write8 m_out_tx_func; touch_cb m_out_touch_cb; required_ioport m_touch; required_ioport m_touchx; @@ -63,7 +63,7 @@ extern const device_type MICROTOUCH; #define MCFG_MICROTOUCH_ADD(_tag, _devcb) \ MCFG_DEVICE_ADD(_tag, MICROTOUCH, 0) \ - devcb = µtouch_serial_device::static_set_tx_callback(*device, DEVCB2_##_devcb); + devcb = µtouch_serial_device::static_set_tx_callback(*device, DEVCB_##_devcb); class microtouch_serial_device @@ -72,7 +72,7 @@ class microtouch_serial_device { public: microtouch_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &static_set_stx_callback(device_t &device, _Object object) { return downcast<microtouch_serial_device &>(device).m_out_stx_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_stx_callback(device_t &device, _Object object) { return downcast<microtouch_serial_device &>(device).m_out_stx_func.set_callback(object); } DECLARE_WRITE_LINE_MEMBER(rx) { device_serial_interface::rx_w(state); } protected: @@ -85,14 +85,14 @@ protected: private: bool m_output_valid; UINT8 m_output; - devcb2_write_line m_out_stx_func; + devcb_write_line m_out_stx_func; }; extern const device_type MICROTOUCH_SERIAL; #define MCFG_MICROTOUCH_SERIAL_ADD(_tag, _clock, _devcb) \ MCFG_DEVICE_ADD(_tag, MICROTOUCH_SERIAL, _clock) \ - devcb = µtouch_serial_device::static_set_stx_callback(*device, DEVCB2_##_devcb); + devcb = µtouch_serial_device::static_set_stx_callback(*device, DEVCB_##_devcb); #define MCFG_MICROTOUCH_TOUCH_CB(_class, _touch_cb) \ microtouch_device::static_set_touch_callback(*device, microtouch_device::touch_cb(FUNC(_class::_touch_cb), (_class *)owner)); diff --git a/src/emu/machine/mm58167.h b/src/emu/machine/mm58167.h index 830209bffa0..b54c743fc13 100644 --- a/src/emu/machine/mm58167.h +++ b/src/emu/machine/mm58167.h @@ -20,7 +20,7 @@ //************************************************************************** #define MCFG_MM58167_IRQ_CALLBACK(_cb) \ - devcb = &mm58167_device::set_irq_cb(*device, DEVCB2_##_cb); + devcb = &mm58167_device::set_irq_cb(*device, DEVCB_##_cb); //************************************************************************** @@ -39,9 +39,9 @@ public: DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); - template<class _Object> static devcb2_base &set_irq_cb(device_t &device, _Object wr) { return downcast<mm58167_device &>(device).m_irq_w.set_callback(wr); } + template<class _Object> static devcb_base &set_irq_cb(device_t &device, _Object wr) { return downcast<mm58167_device &>(device).m_irq_w.set_callback(wr); } - devcb2_write_line m_irq_w; + devcb_write_line m_irq_w; protected: // device-level overrides diff --git a/src/emu/machine/mm74c922.h b/src/emu/machine/mm74c922.h index d30f5ac9314..9ae7c44959d 100644 --- a/src/emu/machine/mm74c922.h +++ b/src/emu/machine/mm74c922.h @@ -53,22 +53,22 @@ mm74c922_device::static_set_cap_debounce(*device, _value); #define MCFG_MM74C922_DA_CALLBACK(_write) \ - devcb = &mm74c922_device::set_da_wr_callback(*device, DEVCB2_##_write); + devcb = &mm74c922_device::set_da_wr_callback(*device, DEVCB_##_write); #define MCFG_MM74C922_X1_CALLBACK(_read) \ - devcb = &mm74c922_device::set_x1_rd_callback(*device, DEVCB2_##_read); + devcb = &mm74c922_device::set_x1_rd_callback(*device, DEVCB_##_read); #define MCFG_MM74C922_X2_CALLBACK(_read) \ - devcb = &mm74c922_device::set_x2_rd_callback(*device, DEVCB2_##_read); + devcb = &mm74c922_device::set_x2_rd_callback(*device, DEVCB_##_read); #define MCFG_MM74C922_X3_CALLBACK(_read) \ - devcb = &mm74c922_device::set_x3_rd_callback(*device, DEVCB2_##_read); + devcb = &mm74c922_device::set_x3_rd_callback(*device, DEVCB_##_read); #define MCFG_MM74C922_X4_CALLBACK(_read) \ - devcb = &mm74c922_device::set_x4_rd_callback(*device, DEVCB2_##_read); + devcb = &mm74c922_device::set_x4_rd_callback(*device, DEVCB_##_read); #define MCFG_MM74C922_X5_CALLBACK(_read) \ - devcb = &mm74c922_device::set_x5_rd_callback(*device, DEVCB2_##_read); + devcb = &mm74c922_device::set_x5_rd_callback(*device, DEVCB_##_read); @@ -87,12 +87,12 @@ public: static void static_set_cap_osc(device_t &device, double value) { downcast<mm74c922_device &>(device).m_cap_osc = value; } static void static_set_cap_debounce(device_t &device, double value) { downcast<mm74c922_device &>(device).m_cap_debounce = value; } - template<class _Object> static devcb2_base &set_da_wr_callback(device_t &device, _Object object) { return downcast<mm74c922_device &>(device).m_write_da.set_callback(object); } - template<class _Object> static devcb2_base &set_x1_rd_callback(device_t &device, _Object object) { return downcast<mm74c922_device &>(device).m_read_x1.set_callback(object); } - template<class _Object> static devcb2_base &set_x2_rd_callback(device_t &device, _Object object) { return downcast<mm74c922_device &>(device).m_read_x2.set_callback(object); } - template<class _Object> static devcb2_base &set_x3_rd_callback(device_t &device, _Object object) { return downcast<mm74c922_device &>(device).m_read_x3.set_callback(object); } - template<class _Object> static devcb2_base &set_x4_rd_callback(device_t &device, _Object object) { return downcast<mm74c922_device &>(device).m_read_x4.set_callback(object); } - template<class _Object> static devcb2_base &set_x5_rd_callback(device_t &device, _Object object) { return downcast<mm74c922_device &>(device).m_read_x5.set_callback(object); } + template<class _Object> static devcb_base &set_da_wr_callback(device_t &device, _Object object) { return downcast<mm74c922_device &>(device).m_write_da.set_callback(object); } + template<class _Object> static devcb_base &set_x1_rd_callback(device_t &device, _Object object) { return downcast<mm74c922_device &>(device).m_read_x1.set_callback(object); } + template<class _Object> static devcb_base &set_x2_rd_callback(device_t &device, _Object object) { return downcast<mm74c922_device &>(device).m_read_x2.set_callback(object); } + template<class _Object> static devcb_base &set_x3_rd_callback(device_t &device, _Object object) { return downcast<mm74c922_device &>(device).m_read_x3.set_callback(object); } + template<class _Object> static devcb_base &set_x4_rd_callback(device_t &device, _Object object) { return downcast<mm74c922_device &>(device).m_read_x4.set_callback(object); } + template<class _Object> static devcb_base &set_x5_rd_callback(device_t &device, _Object object) { return downcast<mm74c922_device &>(device).m_read_x5.set_callback(object); } UINT8 read(); @@ -106,12 +106,12 @@ private: void clock_scan_counters(); void detect_keypress(); - devcb2_write_line m_write_da; - devcb2_read8 m_read_x1; - devcb2_read8 m_read_x2; - devcb2_read8 m_read_x3; - devcb2_read8 m_read_x4; - devcb2_read8 m_read_x5; + devcb_write_line m_write_da; + devcb_read8 m_read_x1; + devcb_read8 m_read_x2; + devcb_read8 m_read_x3; + devcb_read8 m_read_x4; + devcb_read8 m_read_x5; double m_cap_osc; double m_cap_debounce; diff --git a/src/emu/machine/mos6526.h b/src/emu/machine/mos6526.h index 04e5b618f17..fa16d146024 100644 --- a/src/emu/machine/mos6526.h +++ b/src/emu/machine/mos6526.h @@ -75,28 +75,28 @@ mos6526_device::static_set_tod_clock(*device, _clock); #define MCFG_MOS6526_IRQ_CALLBACK(_write) \ - devcb = &mos6526_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &mos6526_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS6526_CNT_CALLBACK(_write) \ - devcb = &mos6526_device::set_cnt_wr_callback(*device, DEVCB2_##_write); + devcb = &mos6526_device::set_cnt_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS6526_SP_CALLBACK(_write) \ - devcb = &mos6526_device::set_sp_wr_callback(*device, DEVCB2_##_write); + devcb = &mos6526_device::set_sp_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS6526_PA_INPUT_CALLBACK(_read) \ - devcb = &mos6526_device::set_pa_rd_callback(*device, DEVCB2_##_read); + devcb = &mos6526_device::set_pa_rd_callback(*device, DEVCB_##_read); #define MCFG_MOS6526_PA_OUTPUT_CALLBACK(_write) \ - devcb = &mos6526_device::set_pa_wr_callback(*device, DEVCB2_##_write); + devcb = &mos6526_device::set_pa_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS6526_PB_INPUT_CALLBACK(_read) \ - devcb = &mos6526_device::set_pb_rd_callback(*device, DEVCB2_##_read); + devcb = &mos6526_device::set_pb_rd_callback(*device, DEVCB_##_read); #define MCFG_MOS6526_PB_OUTPUT_CALLBACK(_write) \ - devcb = &mos6526_device::set_pb_wr_callback(*device, DEVCB2_##_write); + devcb = &mos6526_device::set_pb_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS6526_PC_CALLBACK(_write) \ - devcb = &mos6526_device::set_pc_wr_callback(*device, DEVCB2_##_write); + devcb = &mos6526_device::set_pc_wr_callback(*device, DEVCB_##_write); @@ -116,14 +116,14 @@ public: static void static_set_tod_clock(device_t &device, int clock) { downcast<mos6526_device &>(device).m_tod_clock = clock; } - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_cnt_wr_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_write_cnt.set_callback(object); } - template<class _Object> static devcb2_base &set_sp_wr_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_write_sp.set_callback(object); } - template<class _Object> static devcb2_base &set_pa_rd_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_read_pa.set_callback(object); } - template<class _Object> static devcb2_base &set_pa_wr_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_write_pa.set_callback(object); } - template<class _Object> static devcb2_base &set_pb_rd_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_read_pb.set_callback(object); } - template<class _Object> static devcb2_base &set_pb_wr_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_write_pb.set_callback(object); } - template<class _Object> static devcb2_base &set_pc_wr_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_write_pc.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_cnt_wr_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_write_cnt.set_callback(object); } + template<class _Object> static devcb_base &set_sp_wr_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_write_sp.set_callback(object); } + template<class _Object> static devcb_base &set_pa_rd_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_read_pa.set_callback(object); } + template<class _Object> static devcb_base &set_pa_wr_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_write_pa.set_callback(object); } + template<class _Object> static devcb_base &set_pb_rd_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_read_pb.set_callback(object); } + template<class _Object> static devcb_base &set_pb_wr_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_write_pb.set_callback(object); } + template<class _Object> static devcb_base &set_pc_wr_callback(device_t &device, _Object object) { return downcast<mos6526_device &>(device).m_write_pc.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -176,14 +176,14 @@ protected: inline void write_tod(int offset, UINT8 data); inline void synchronize(); - devcb2_write_line m_write_irq; - devcb2_write_line m_write_pc; - devcb2_write_line m_write_cnt; - devcb2_write_line m_write_sp; - devcb2_read8 m_read_pa; - devcb2_write8 m_write_pa; - devcb2_read8 m_read_pb; - devcb2_write8 m_write_pb; + devcb_write_line m_write_irq; + devcb_write_line m_write_pc; + devcb_write_line m_write_cnt; + devcb_write_line m_write_sp; + devcb_read8 m_read_pa; + devcb_write8 m_write_pa; + devcb_read8 m_read_pb; + devcb_write8 m_write_pb; // interrupts bool m_irq; diff --git a/src/emu/machine/mos6529.h b/src/emu/machine/mos6529.h index 4b284b1f38b..c14562c8e68 100644 --- a/src/emu/machine/mos6529.h +++ b/src/emu/machine/mos6529.h @@ -36,28 +36,28 @@ //************************************************************************** #define MCFG_MOS6529_P0_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p0_handler(*device, DEVCB2_##_devcb); + devcb = &mos6529_device::set_p0_handler(*device, DEVCB_##_devcb); #define MCFG_MOS6529_P1_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p1_handler(*device, DEVCB2_##_devcb); + devcb = &mos6529_device::set_p1_handler(*device, DEVCB_##_devcb); #define MCFG_MOS6529_P2_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p2_handler(*device, DEVCB2_##_devcb); + devcb = &mos6529_device::set_p2_handler(*device, DEVCB_##_devcb); #define MCFG_MOS6529_P3_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p3_handler(*device, DEVCB2_##_devcb); + devcb = &mos6529_device::set_p3_handler(*device, DEVCB_##_devcb); #define MCFG_MOS6529_P4_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p4_handler(*device, DEVCB2_##_devcb); + devcb = &mos6529_device::set_p4_handler(*device, DEVCB_##_devcb); #define MCFG_MOS6529_P5_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p5_handler(*device, DEVCB2_##_devcb); + devcb = &mos6529_device::set_p5_handler(*device, DEVCB_##_devcb); #define MCFG_MOS6529_P6_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p6_handler(*device, DEVCB2_##_devcb); + devcb = &mos6529_device::set_p6_handler(*device, DEVCB_##_devcb); #define MCFG_MOS6529_P7_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p7_handler(*device, DEVCB2_##_devcb); + devcb = &mos6529_device::set_p7_handler(*device, DEVCB_##_devcb); //************************************************************************** @@ -72,14 +72,14 @@ public: // construction/destruction mos6529_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_p0_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p0_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_p1_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p1_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_p2_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_p3_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p3_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_p4_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p4_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_p5_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p5_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_p6_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p6_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_p7_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p7_handler.set_callback(object); } + template<class _Object> static devcb_base &set_p0_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p0_handler.set_callback(object); } + template<class _Object> static devcb_base &set_p1_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p1_handler.set_callback(object); } + template<class _Object> static devcb_base &set_p2_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_p3_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p3_handler.set_callback(object); } + template<class _Object> static devcb_base &set_p4_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p4_handler.set_callback(object); } + template<class _Object> static devcb_base &set_p5_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p5_handler.set_callback(object); } + template<class _Object> static devcb_base &set_p6_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p6_handler.set_callback(object); } + template<class _Object> static devcb_base &set_p7_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p7_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -99,14 +99,14 @@ protected: UINT8 m_input; - devcb2_write_line m_p0_handler; - devcb2_write_line m_p1_handler; - devcb2_write_line m_p2_handler; - devcb2_write_line m_p3_handler; - devcb2_write_line m_p4_handler; - devcb2_write_line m_p5_handler; - devcb2_write_line m_p6_handler; - devcb2_write_line m_p7_handler; + devcb_write_line m_p0_handler; + devcb_write_line m_p1_handler; + devcb_write_line m_p2_handler; + devcb_write_line m_p3_handler; + devcb_write_line m_p4_handler; + devcb_write_line m_p5_handler; + devcb_write_line m_p6_handler; + devcb_write_line m_p7_handler; }; diff --git a/src/emu/machine/mos6530.h b/src/emu/machine/mos6530.h index 7bd2dec488c..a9753235772 100644 --- a/src/emu/machine/mos6530.h +++ b/src/emu/machine/mos6530.h @@ -55,10 +55,10 @@ public: mos6530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mos6530_device() {} - template<class _Object> static devcb2_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<mos6530_device &>(device).m_in_pa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<mos6530_device &>(device).m_out_pa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<mos6530_device &>(device).m_in_pb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<mos6530_device &>(device).m_out_pb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<mos6530_device &>(device).m_in_pa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<mos6530_device &>(device).m_out_pa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<mos6530_device &>(device).m_in_pb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<mos6530_device &>(device).m_out_pb_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -77,11 +77,11 @@ protected: private: // internal state - devcb2_read8 m_in_pa_cb; - devcb2_write8 m_out_pa_cb; + devcb_read8 m_in_pa_cb; + devcb_write8 m_out_pa_cb; - devcb2_read8 m_in_pb_cb; - devcb2_write8 m_out_pb_cb; + devcb_read8 m_in_pb_cb; + devcb_write8 m_out_pb_cb; mos6530_port m_port[2]; @@ -110,16 +110,16 @@ extern const device_type MOS6530; #define MCFG_MOS6530_IN_PA_CB(_devcb) \ - devcb = &mos6530_device::set_in_pa_callback(*device, DEVCB2_##_devcb); + devcb = &mos6530_device::set_in_pa_callback(*device, DEVCB_##_devcb); #define MCFG_MOS6530_OUT_PA_CB(_devcb) \ - devcb = &mos6530_device::set_out_pa_callback(*device, DEVCB2_##_devcb); + devcb = &mos6530_device::set_out_pa_callback(*device, DEVCB_##_devcb); #define MCFG_MOS6530_IN_PB_CB(_devcb) \ - devcb = &mos6530_device::set_in_pb_callback(*device, DEVCB2_##_devcb); + devcb = &mos6530_device::set_in_pb_callback(*device, DEVCB_##_devcb); #define MCFG_MOS6530_OUT_PB_CB(_devcb) \ - devcb = &mos6530_device::set_out_pb_callback(*device, DEVCB2_##_devcb); + devcb = &mos6530_device::set_out_pb_callback(*device, DEVCB_##_devcb); #endif diff --git a/src/emu/machine/mos6551.h b/src/emu/machine/mos6551.h index ba9e23d226b..635e7b486a5 100644 --- a/src/emu/machine/mos6551.h +++ b/src/emu/machine/mos6551.h @@ -37,19 +37,19 @@ mos6551_device::set_xtal(*device, _xtal); #define MCFG_MOS6551_IRQ_HANDLER(_devcb) \ - devcb = &mos6551_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &mos6551_device::set_irq_handler(*device, DEVCB_##_devcb); #define MCFG_MOS6551_TXD_HANDLER(_devcb) \ - devcb = &mos6551_device::set_txd_handler(*device, DEVCB2_##_devcb); + devcb = &mos6551_device::set_txd_handler(*device, DEVCB_##_devcb); #define MCFG_MOS6551_RXC_HANDLER(_devcb) \ - devcb = &mos6551_device::set_rxc_handler(*device, DEVCB2_##_devcb); + devcb = &mos6551_device::set_rxc_handler(*device, DEVCB_##_devcb); #define MCFG_MOS6551_RTS_HANDLER(_devcb) \ - devcb = &mos6551_device::set_rts_handler(*device, DEVCB2_##_devcb); + devcb = &mos6551_device::set_rts_handler(*device, DEVCB_##_devcb); #define MCFG_MOS6551_DTR_HANDLER(_devcb) \ - devcb = &mos6551_device::set_dtr_handler(*device, DEVCB2_##_devcb); + devcb = &mos6551_device::set_dtr_handler(*device, DEVCB_##_devcb); class mos6551_device : public device_t { @@ -57,11 +57,11 @@ public: mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_xtal(device_t &device, UINT32 xtal) { downcast<mos6551_device &>(device).set_xtal(xtal); } - template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<mos6551_device &>(device).m_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_txd_handler(device_t &device, _Object object) { return downcast<mos6551_device &>(device).m_txd_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_rxc_handler(device_t &device, _Object object) { return downcast<mos6551_device &>(device).m_rxc_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_rts_handler(device_t &device, _Object object) { return downcast<mos6551_device &>(device).m_rts_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_dtr_handler(device_t &device, _Object object) { return downcast<mos6551_device &>(device).m_dtr_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<mos6551_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast<mos6551_device &>(device).m_txd_handler.set_callback(object); } + template<class _Object> static devcb_base &set_rxc_handler(device_t &device, _Object object) { return downcast<mos6551_device &>(device).m_rxc_handler.set_callback(object); } + template<class _Object> static devcb_base &set_rts_handler(device_t &device, _Object object) { return downcast<mos6551_device &>(device).m_rts_handler.set_callback(object); } + template<class _Object> static devcb_base &set_dtr_handler(device_t &device, _Object object) { return downcast<mos6551_device &>(device).m_dtr_handler.set_callback(object); } DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -155,11 +155,11 @@ private: static const int transmitter_controls[4][3]; required_device<clock_device> m_internal_clock; - devcb2_write_line m_irq_handler; - devcb2_write_line m_txd_handler; - devcb2_write_line m_rxc_handler; - devcb2_write_line m_rts_handler; - devcb2_write_line m_dtr_handler; + devcb_write_line m_irq_handler; + devcb_write_line m_txd_handler; + devcb_write_line m_rxc_handler; + devcb_write_line m_rts_handler; + devcb_write_line m_dtr_handler; UINT8 m_control; UINT8 m_command; diff --git a/src/emu/machine/mos8722.h b/src/emu/machine/mos8722.h index 0cb0b71dea8..96b0089de8a 100644 --- a/src/emu/machine/mos8722.h +++ b/src/emu/machine/mos8722.h @@ -50,19 +50,19 @@ //************************************************************************** #define MCFG_MOS8722_Z80EN_CALLBACK(_write) \ - devcb = &mos8722_device::set_z80en_wr_callback(*device, DEVCB2_##_write); + devcb = &mos8722_device::set_z80en_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS8722_FSDIR_CALLBACK(_write) \ - devcb = &mos8722_device::set_fsdir_wr_callback(*device, DEVCB2_##_write); + devcb = &mos8722_device::set_fsdir_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS8722_GAME_CALLBACK(_read) \ - devcb = &mos8722_device::set_game_rd_callback(*device, DEVCB2_##_read); + devcb = &mos8722_device::set_game_rd_callback(*device, DEVCB_##_read); #define MCFG_MOS8722_EXROM_CALLBACK(_read) \ - devcb = &mos8722_device::set_exrom_rd_callback(*device, DEVCB2_##_read); + devcb = &mos8722_device::set_exrom_rd_callback(*device, DEVCB_##_read); #define MCFG_MOS8722_SENSE40_CALLBACK(_read) \ - devcb = &mos8722_device::set_sense40_rd_callback(*device, DEVCB2_##_read); + devcb = &mos8722_device::set_sense40_rd_callback(*device, DEVCB_##_read); @@ -78,11 +78,11 @@ public: // construction/destruction mos8722_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_z80en_wr_callback(device_t &device, _Object object) { return downcast<mos8722_device &>(device).m_write_z80en.set_callback(object); } - template<class _Object> static devcb2_base &set_fsdir_wr_callback(device_t &device, _Object object) { return downcast<mos8722_device &>(device).m_write_fsdir.set_callback(object); } - template<class _Object> static devcb2_base &set_game_rd_callback(device_t &device, _Object object) { return downcast<mos8722_device &>(device).m_read_game.set_callback(object); } - template<class _Object> static devcb2_base &set_exrom_rd_callback(device_t &device, _Object object) { return downcast<mos8722_device &>(device).m_read_exrom.set_callback(object); } - template<class _Object> static devcb2_base &set_sense40_rd_callback(device_t &device, _Object object) { return downcast<mos8722_device &>(device).m_read_sense40.set_callback(object); } + template<class _Object> static devcb_base &set_z80en_wr_callback(device_t &device, _Object object) { return downcast<mos8722_device &>(device).m_write_z80en.set_callback(object); } + template<class _Object> static devcb_base &set_fsdir_wr_callback(device_t &device, _Object object) { return downcast<mos8722_device &>(device).m_write_fsdir.set_callback(object); } + template<class _Object> static devcb_base &set_game_rd_callback(device_t &device, _Object object) { return downcast<mos8722_device &>(device).m_read_game.set_callback(object); } + template<class _Object> static devcb_base &set_exrom_rd_callback(device_t &device, _Object object) { return downcast<mos8722_device &>(device).m_read_exrom.set_callback(object); } + template<class _Object> static devcb_base &set_sense40_rd_callback(device_t &device, _Object object) { return downcast<mos8722_device &>(device).m_read_sense40.set_callback(object); } UINT8 read(offs_t offset, UINT8 data); @@ -136,11 +136,11 @@ private: RCR_SHARE_16K }; - devcb2_write_line m_write_z80en; - devcb2_write_line m_write_fsdir; - devcb2_read_line m_read_game; - devcb2_read_line m_read_exrom; - devcb2_read_line m_read_sense40; + devcb_write_line m_write_z80en; + devcb_write_line m_write_fsdir; + devcb_read_line m_read_game; + devcb_read_line m_read_exrom; + devcb_read_line m_read_sense40; UINT8 m_reg[16]; diff --git a/src/emu/machine/mpu401.h b/src/emu/machine/mpu401.h index 972484cb27c..0381bafccb6 100644 --- a/src/emu/machine/mpu401.h +++ b/src/emu/machine/mpu401.h @@ -11,7 +11,7 @@ MCFG_IRQ_FUNC(_irqf) #define MCFG_IRQ_FUNC(_irqf) \ - downcast<mpu401_device *>(device)->set_irqf(DEVCB2_##_irqf); + downcast<mpu401_device *>(device)->set_irqf(DEVCB_##_irqf); //************************************************************************** // TYPE DEFINITIONS @@ -33,7 +33,7 @@ public: write_irq.set_callback(wr); } - devcb2_write_line write_irq; + devcb_write_line write_irq; DECLARE_READ8_MEMBER(regs_mode2_r); DECLARE_WRITE8_MEMBER(regs_mode2_w); diff --git a/src/emu/machine/msm58321.h b/src/emu/machine/msm58321.h index f759328bc80..ca05aebf31b 100644 --- a/src/emu/machine/msm58321.h +++ b/src/emu/machine/msm58321.h @@ -34,19 +34,19 @@ //************************************************************************** #define MCFG_MSM58321_D0_HANDLER(_devcb) \ - devcb = &msm58321_device::set_d0_handler(*device, DEVCB2_##_devcb); + devcb = &msm58321_device::set_d0_handler(*device, DEVCB_##_devcb); #define MCFG_MSM58321_D1_HANDLER(_devcb) \ - devcb = &msm58321_device::set_d1_handler(*device, DEVCB2_##_devcb); + devcb = &msm58321_device::set_d1_handler(*device, DEVCB_##_devcb); #define MCFG_MSM58321_D2_HANDLER(_devcb) \ - devcb = &msm58321_device::set_d2_handler(*device, DEVCB2_##_devcb); + devcb = &msm58321_device::set_d2_handler(*device, DEVCB_##_devcb); #define MCFG_MSM58321_D3_HANDLER(_devcb) \ - devcb = &msm58321_device::set_d3_handler(*device, DEVCB2_##_devcb); + devcb = &msm58321_device::set_d3_handler(*device, DEVCB_##_devcb); #define MCFG_MSM58321_BUSY_HANDLER(_devcb) \ - devcb = &msm58321_device::set_busy_handler(*device, DEVCB2_##_devcb); + devcb = &msm58321_device::set_busy_handler(*device, DEVCB_##_devcb); #define MCFG_MSM58321_YEAR0(_year0) \ msm58321_device::set_year0(*device, _year0); @@ -65,11 +65,11 @@ public: msm58321_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_d0_handler(device_t &device, _Object object) { return downcast<msm58321_device &>(device).m_d0_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d1_handler(device_t &device, _Object object) { return downcast<msm58321_device &>(device).m_d1_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d2_handler(device_t &device, _Object object) { return downcast<msm58321_device &>(device).m_d2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d3_handler(device_t &device, _Object object) { return downcast<msm58321_device &>(device).m_d3_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_busy_handler(device_t &device, _Object object) { return downcast<msm58321_device &>(device).m_busy_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d0_handler(device_t &device, _Object object) { return downcast<msm58321_device &>(device).m_d0_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d1_handler(device_t &device, _Object object) { return downcast<msm58321_device &>(device).m_d1_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d2_handler(device_t &device, _Object object) { return downcast<msm58321_device &>(device).m_d2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d3_handler(device_t &device, _Object object) { return downcast<msm58321_device &>(device).m_d3_handler.set_callback(object); } + template<class _Object> static devcb_base &set_busy_handler(device_t &device, _Object object) { return downcast<msm58321_device &>(device).m_busy_handler.set_callback(object); } static void set_year0(device_t &device, int year0) { downcast<msm58321_device &>(device).m_year0 = year0; } static void set_default_24h(device_t &device, bool default_24h) { downcast<msm58321_device &>(device).m_default_24h = default_24h; } @@ -111,11 +111,11 @@ private: int m_year0; bool m_default_24h; - devcb2_write_line m_d0_handler; - devcb2_write_line m_d1_handler; - devcb2_write_line m_d2_handler; - devcb2_write_line m_d3_handler; - devcb2_write_line m_busy_handler; + devcb_write_line m_d0_handler; + devcb_write_line m_d1_handler; + devcb_write_line m_d2_handler; + devcb_write_line m_d3_handler; + devcb_write_line m_busy_handler; int m_cs2; // chip select 2 int m_write; // write data diff --git a/src/emu/machine/msm6242.h b/src/emu/machine/msm6242.h index 4a3deb6639c..acf86cc6472 100644 --- a/src/emu/machine/msm6242.h +++ b/src/emu/machine/msm6242.h @@ -16,7 +16,7 @@ #define MCFG_MSM6242_OUT_INT_HANDLER(_devcb) \ - devcb = &msm6242_device::set_out_int_handler(*device, DEVCB2_##_devcb); + devcb = &msm6242_device::set_out_int_handler(*device, DEVCB_##_devcb); // ======================> msm6242_device @@ -29,7 +29,7 @@ public: msm6242_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_int_handler(device_t &device, _Object object) { return downcast<msm6242_device &>(device).m_out_int_handler.set_callback(object); } + template<class _Object> static devcb_base &set_out_int_handler(device_t &device, _Object object) { return downcast<msm6242_device &>(device).m_out_int_handler.set_callback(object); } // I/O operations DECLARE_WRITE8_MEMBER( write ); @@ -61,7 +61,7 @@ private: UINT16 m_tick; // incidentals - devcb2_write_line m_out_int_handler; + devcb_write_line m_out_int_handler; emu_timer * m_timer; UINT64 m_last_update_time; // last update time, in clock cycles diff --git a/src/emu/machine/ncr5380.h b/src/emu/machine/ncr5380.h index be8a198cc1e..1304fd01c8b 100644 --- a/src/emu/machine/ncr5380.h +++ b/src/emu/machine/ncr5380.h @@ -33,7 +33,7 @@ enum // device stuff #define MCFG_NCR5380_IRQ_CB(_devcb) \ - devcb = &ncr5380_device::set_irq_callback(*device, DEVCB2_##_devcb); + devcb = &ncr5380_device::set_irq_callback(*device, DEVCB_##_devcb); class ncr5380_device : public legacy_scsi_host_adapter { @@ -41,7 +41,7 @@ public: // construction/destruction ncr5380_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast<ncr5380_device &>(device).m_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<ncr5380_device &>(device).m_irq_cb.set_callback(object); } // our API UINT8 ncr5380_read_reg(UINT32 offset); @@ -59,7 +59,7 @@ private: UINT8 m_5380_Command[32]; INT32 m_cmd_ptr, m_d_ptr, m_d_limit, m_next_req_flag; UINT8 m_5380_Data[512]; - devcb2_write_line m_irq_cb; /* irq callback */ + devcb_write_line m_irq_cb; /* irq callback */ }; // device type definition diff --git a/src/emu/machine/ncr5380n.h b/src/emu/machine/ncr5380n.h index 27e2b65e629..d80dbd2a094 100644 --- a/src/emu/machine/ncr5380n.h +++ b/src/emu/machine/ncr5380n.h @@ -12,10 +12,10 @@ #include "machine/nscsi_bus.h" #define MCFG_NCR5380N_IRQ_HANDLER(_devcb) \ - devcb = &ncr5380n_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ncr5380n_device::set_irq_handler(*device, DEVCB_##_devcb); #define MCFG_NCR5380N_DRQ_HANDLER(_devcb) \ - devcb = &ncr5380n_device::set_drq_handler(*device, DEVCB2_##_devcb); + devcb = &ncr5380n_device::set_drq_handler(*device, DEVCB_##_devcb); class ncr5380n_device : public nscsi_device { @@ -23,8 +23,8 @@ public: ncr5380n_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<ncr5380n_device &>(device).m_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_drq_handler(device_t &device, _Object object) { return downcast<ncr5380n_device &>(device).m_drq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ncr5380n_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_drq_handler(device_t &device, _Object object) { return downcast<ncr5380n_device &>(device).m_drq_handler.set_callback(object); } DECLARE_ADDRESS_MAP(map, 8); @@ -216,8 +216,8 @@ private: void delay(int cycles); void delay_cycles(int cycles); - devcb2_write_line m_irq_handler; - devcb2_write_line m_drq_handler; + devcb_write_line m_irq_handler; + devcb_write_line m_drq_handler; }; extern const device_type NCR5380N; diff --git a/src/emu/machine/ncr5390.h b/src/emu/machine/ncr5390.h index 38b9283ccc7..72cb4ff391d 100644 --- a/src/emu/machine/ncr5390.h +++ b/src/emu/machine/ncr5390.h @@ -4,10 +4,10 @@ #include "machine/nscsi_bus.h" #define MCFG_NCR5390_IRQ_HANDLER(_devcb) \ - devcb = &ncr5390_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ncr5390_device::set_irq_handler(*device, DEVCB_##_devcb); #define MCFG_NCR5390_DRQ_HANDLER(_devcb) \ - devcb = &ncr5390_device::set_drq_handler(*device, DEVCB2_##_devcb); + devcb = &ncr5390_device::set_drq_handler(*device, DEVCB_##_devcb); class ncr5390_device : public nscsi_device { @@ -15,8 +15,8 @@ public: ncr5390_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<ncr5390_device &>(device).m_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_drq_handler(device_t &device, _Object object) { return downcast<ncr5390_device &>(device).m_drq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ncr5390_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_drq_handler(device_t &device, _Object object) { return downcast<ncr5390_device &>(device).m_drq_handler.set_callback(object); } DECLARE_ADDRESS_MAP(map, 8); @@ -221,8 +221,8 @@ private: void delay(int cycles); void delay_cycles(int cycles); - devcb2_write_line m_irq_handler; - devcb2_write_line m_drq_handler; + devcb_write_line m_irq_handler; + devcb_write_line m_drq_handler; }; extern const device_type NCR5390; diff --git a/src/emu/machine/ncr539x.h b/src/emu/machine/ncr539x.h index 90ec8c2bd58..f5308ccd95b 100644 --- a/src/emu/machine/ncr539x.h +++ b/src/emu/machine/ncr539x.h @@ -16,10 +16,10 @@ // device stuff #define MCFG_NCR539X_OUT_IRQ_CB(_devcb) \ - devcb = &ncr539x_device::set_out_irq_callback(*device, DEVCB2_##_devcb); + devcb = &ncr539x_device::set_out_irq_callback(*device, DEVCB_##_devcb); #define MCFG_NCR539X_OUT_DRQ_CB(_devcb) \ - devcb = &ncr539x_device::set_out_drq_callback(*device, DEVCB2_##_devcb); + devcb = &ncr539x_device::set_out_drq_callback(*device, DEVCB_##_devcb); class ncr539x_device : public legacy_scsi_host_adapter { @@ -27,8 +27,8 @@ public: // construction/destruction ncr539x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<ncr539x_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_drq_callback(device_t &device, _Object object) { return downcast<ncr539x_device &>(device).m_out_drq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<ncr539x_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_drq_callback(device_t &device, _Object object) { return downcast<ncr539x_device &>(device).m_out_drq_cb.set_callback(object); } // our API DECLARE_READ8_MEMBER(read); @@ -79,8 +79,8 @@ private: emu_timer *m_operation_timer; - devcb2_write_line m_out_irq_cb; /* IRQ line */ - devcb2_write_line m_out_drq_cb; /* DRQ line */ + devcb_write_line m_out_irq_cb; /* IRQ line */ + devcb_write_line m_out_drq_cb; /* DRQ line */ }; // device type definition diff --git a/src/emu/machine/nsc810.h b/src/emu/machine/nsc810.h index 81636057462..4112a8cab65 100644 --- a/src/emu/machine/nsc810.h +++ b/src/emu/machine/nsc810.h @@ -15,14 +15,14 @@ public: // construction/destruction nsc810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_portA_read_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portA_r.set_callback(object); } - template<class _Object> static devcb2_base &set_portB_read_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portB_r.set_callback(object); } - template<class _Object> static devcb2_base &set_portC_read_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portC_r.set_callback(object); } - template<class _Object> static devcb2_base &set_portA_write_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portA_w.set_callback(object); } - template<class _Object> static devcb2_base &set_portB_write_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portB_w.set_callback(object); } - template<class _Object> static devcb2_base &set_portC_write_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portC_w.set_callback(object); } - template<class _Object> static devcb2_base &set_timer0_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_timer0_out.set_callback(object); } - template<class _Object> static devcb2_base &set_timer1_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_timer1_out.set_callback(object); } + template<class _Object> static devcb_base &set_portA_read_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portA_r.set_callback(object); } + template<class _Object> static devcb_base &set_portB_read_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portB_r.set_callback(object); } + template<class _Object> static devcb_base &set_portC_read_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portC_r.set_callback(object); } + template<class _Object> static devcb_base &set_portA_write_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portA_w.set_callback(object); } + template<class _Object> static devcb_base &set_portB_write_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portB_w.set_callback(object); } + template<class _Object> static devcb_base &set_portC_write_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portC_w.set_callback(object); } + template<class _Object> static devcb_base &set_timer0_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_timer0_out.set_callback(object); } + template<class _Object> static devcb_base &set_timer1_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_timer1_out.set_callback(object); } void set_timer0_clock(UINT32 clk) { m_timer0_clock = clk; } void set_timer1_clock(UINT32 clk) { m_timer1_clock = clk; } @@ -57,14 +57,14 @@ private: UINT32 m_timer1_clock; bool m_ramselect; - devcb2_read8 m_portA_r; - devcb2_read8 m_portB_r; - devcb2_read8 m_portC_r; - devcb2_write8 m_portA_w; - devcb2_write8 m_portB_w; - devcb2_write8 m_portC_w; - devcb2_write_line m_timer0_out; - devcb2_write_line m_timer1_out; + devcb_read8 m_portA_r; + devcb_read8 m_portB_r; + devcb_read8 m_portC_r; + devcb_write8 m_portA_w; + devcb_write8 m_portB_w; + devcb_write8 m_portC_w; + devcb_write_line m_timer0_out; + devcb_write_line m_timer1_out; static const device_timer_id TIMER0_CLOCK = 0; static const device_timer_id TIMER1_CLOCK = 1; @@ -103,28 +103,28 @@ private: downcast<nsc810_device *>(device)->set_timer1_clock(_t1clk); #define MCFG_NSC810_PORTA_READ(_read) \ - devcb = &nsc810_device::set_portA_read_callback(*device, DEVCB2_##_read); + devcb = &nsc810_device::set_portA_read_callback(*device, DEVCB_##_read); #define MCFG_NSC810_PORTB_READ(_read) \ - devcb = &nsc810_device::set_portB_read_callback(*device, DEVCB2_##_read); + devcb = &nsc810_device::set_portB_read_callback(*device, DEVCB_##_read); #define MCFG_NSC810_PORTC_READ(_read) \ - devcb = &nsc810_device::set_portC_read_callback(*device, DEVCB2_##_read); + devcb = &nsc810_device::set_portC_read_callback(*device, DEVCB_##_read); #define MCFG_NSC810_PORTA_WRITE(_write) \ - devcb = &nsc810_device::set_portA_write_callback(*device, DEVCB2_##_write); + devcb = &nsc810_device::set_portA_write_callback(*device, DEVCB_##_write); #define MCFG_NSC810_PORTB_WRITE(_write) \ - devcb = &nsc810_device::set_portB_write_callback(*device, DEVCB2_##_write); + devcb = &nsc810_device::set_portB_write_callback(*device, DEVCB_##_write); #define MCFG_NSC810_PORTC_WRITE(_write) \ - devcb = &nsc810_device::set_portC_write_callback(*device, DEVCB2_##_write); + devcb = &nsc810_device::set_portC_write_callback(*device, DEVCB_##_write); #define MCFG_NSC810_TIMER0_OUT(_write) \ - devcb = &nsc810_device::set_timer0_callback(*device, DEVCB2_##_write); + devcb = &nsc810_device::set_timer0_callback(*device, DEVCB_##_write); #define MCFG_NSC810_TIMER1_OUT(_write) \ - devcb = &nsc810_device::set_timer1_callback(*device, DEVCB2_##_write); + devcb = &nsc810_device::set_timer1_callback(*device, DEVCB_##_write); // device type definition extern const device_type NSC810; diff --git a/src/emu/machine/nscsi_cb.h b/src/emu/machine/nscsi_cb.h index 4f0d7845ff7..fbeea187559 100644 --- a/src/emu/machine/nscsi_cb.h +++ b/src/emu/machine/nscsi_cb.h @@ -5,31 +5,31 @@ #include "machine/nscsi_bus.h" #define MCFG_NSCSICB_RST_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_rst_callback(DEVCB2_##_line); + downcast<nscsi_callback_device *>(device)->set_rst_callback(DEVCB_##_line); #define MCFG_NSCSICB_ATN_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_atn_callback(DEVCB2_##_line); + downcast<nscsi_callback_device *>(device)->set_atn_callback(DEVCB_##_line); #define MCFG_NSCSICB_ACK_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_ack_callback(DEVCB2_##_line); + downcast<nscsi_callback_device *>(device)->set_ack_callback(DEVCB_##_line); #define MCFG_NSCSICB_REQ_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_req_callback(DEVCB2_##_line); + downcast<nscsi_callback_device *>(device)->set_req_callback(DEVCB_##_line); #define MCFG_NSCSICB_MSG_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_msg_callback(DEVCB2_##_line); + downcast<nscsi_callback_device *>(device)->set_msg_callback(DEVCB_##_line); #define MCFG_NSCSICB_IO_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_io_callback(DEVCB2_##_line); + downcast<nscsi_callback_device *>(device)->set_io_callback(DEVCB_##_line); #define MCFG_NSCSICB_CD_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_cd_callback(DEVCB2_##_line); + downcast<nscsi_callback_device *>(device)->set_cd_callback(DEVCB_##_line); #define MCFG_NSCSICB_SEL_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_sel_callback(DEVCB2_##_line); + downcast<nscsi_callback_device *>(device)->set_sel_callback(DEVCB_##_line); #define MCFG_NSCSICB_BSY_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_bsy_callback(DEVCB2_##_line); + downcast<nscsi_callback_device *>(device)->set_bsy_callback(DEVCB_##_line); class nscsi_callback_device : public nscsi_device { @@ -77,15 +77,15 @@ protected: virtual void device_start(); virtual void device_reset(); - devcb2_write_line m_write_rst; - devcb2_write_line m_write_atn; - devcb2_write_line m_write_ack; - devcb2_write_line m_write_req; - devcb2_write_line m_write_msg; - devcb2_write_line m_write_io; - devcb2_write_line m_write_cd; - devcb2_write_line m_write_sel; - devcb2_write_line m_write_bsy; + devcb_write_line m_write_rst; + devcb_write_line m_write_atn; + devcb_write_line m_write_ack; + devcb_write_line m_write_req; + devcb_write_line m_write_msg; + devcb_write_line m_write_io; + devcb_write_line m_write_cd; + devcb_write_line m_write_sel; + devcb_write_line m_write_bsy; UINT32 m_ctrl; }; diff --git a/src/emu/machine/pc_fdc.h b/src/emu/machine/pc_fdc.h index c578982fb09..41ddbc9694c 100644 --- a/src/emu/machine/pc_fdc.h +++ b/src/emu/machine/pc_fdc.h @@ -17,17 +17,17 @@ MCFG_DEVICE_ADD(_tag, PC_FDC_AT, 0) #define MCFG_PC_FDC_INTRQ_CALLBACK(_write) \ - devcb = &pc_fdc_family_device::set_intrq_wr_callback(*device, DEVCB2_##_write); + devcb = &pc_fdc_family_device::set_intrq_wr_callback(*device, DEVCB_##_write); #define MCFG_PC_FDC_DRQ_CALLBACK(_write) \ - devcb = &pc_fdc_family_device::set_drq_wr_callback(*device, DEVCB2_##_write); + devcb = &pc_fdc_family_device::set_drq_wr_callback(*device, DEVCB_##_write); class pc_fdc_family_device : public pc_fdc_interface { public: pc_fdc_family_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_intrq_wr_callback(device_t &device, _Object object) { return downcast<pc_fdc_family_device &>(device).intrq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<pc_fdc_family_device &>(device).drq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<pc_fdc_family_device &>(device).intrq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<pc_fdc_family_device &>(device).drq_cb.set_callback(object); } required_device<upd765a_device> fdc; @@ -51,7 +51,7 @@ protected: virtual machine_config_constructor device_mconfig_additions() const; bool irq, drq, fdc_drq, fdc_irq; - devcb2_write_line intrq_cb, drq_cb; + devcb_write_line intrq_cb, drq_cb; UINT8 dor; floppy_image_device *floppy[4]; diff --git a/src/emu/machine/pc_lpt.h b/src/emu/machine/pc_lpt.h index 04e8e9a8105..582ac30b45b 100644 --- a/src/emu/machine/pc_lpt.h +++ b/src/emu/machine/pc_lpt.h @@ -10,7 +10,7 @@ #include "bus/centronics/ctronics.h" #define MCFG_PC_LPT_IRQ_HANDLER(_devcb) \ - devcb = &pc_lpt_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &pc_lpt_device::set_irq_handler(*device, DEVCB_##_devcb); /*************************************************************************** DEVICE CONFIGURATION MACROS @@ -22,7 +22,7 @@ public: pc_lpt_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<pc_lpt_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<pc_lpt_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -72,7 +72,7 @@ private: int m_irq_enabled; int m_centronics_ack; - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; required_device<input_buffer_device> m_cent_data_in; required_device<output_latch_device> m_cent_data_out; required_device<input_buffer_device> m_cent_status_in; diff --git a/src/emu/machine/pckeybrd.h b/src/emu/machine/pckeybrd.h index cf65ed85c2c..3bfd399d92a 100644 --- a/src/emu/machine/pckeybrd.h +++ b/src/emu/machine/pckeybrd.h @@ -23,7 +23,7 @@ public: DECLARE_READ8_MEMBER(read); DECLARE_WRITE_LINE_MEMBER(enable); - template<class _Object> static devcb2_base &static_set_keypress_callback(device_t &device, _Object object) + template<class _Object> static devcb_base &static_set_keypress_callback(device_t &device, _Object object) { return downcast<pc_keyboard_device &>(device).m_out_keypress_func.set_callback(object); } enum KEYBOARD_TYPE @@ -74,7 +74,7 @@ private: optional_ioport m_ioport_6; optional_ioport m_ioport_7; - devcb2_write_line m_out_keypress_func; + devcb_write_line m_out_keypress_func; emu_timer *m_keyboard_timer; }; @@ -120,16 +120,16 @@ extern const device_type AT_KEYB; #define MCFG_PC_KEYB_ADD(_tag, _cb) \ MCFG_DEVICE_ADD(_tag, PC_KEYB, 0) \ - devcb = &pc_keyboard_device::static_set_keypress_callback(*device, DEVCB2_##_cb); + devcb = &pc_keyboard_device::static_set_keypress_callback(*device, DEVCB_##_cb); #define MCFG_AT_KEYB_ADD(_tag, _def_set, _cb) \ MCFG_DEVICE_ADD(_tag, AT_KEYB, 0) \ at_keyboard_device::static_set_type(*device, pc_keyboard_device::KEYBOARD_TYPE_AT, _def_set); \ - devcb = &pc_keyboard_device::static_set_keypress_callback(*device, DEVCB2_##_cb); + devcb = &pc_keyboard_device::static_set_keypress_callback(*device, DEVCB_##_cb); #define MCFG_AT_MF2_KEYB_ADD(_tag, _def_set, _cb) \ MCFG_DEVICE_ADD(_tag, AT_KEYB, 0) \ at_keyboard_device::static_set_type(*device, pc_keyboard_device::KEYBOARD_TYPE_MF2, _def_set); \ - devcb = &pc_keyboard_device::static_set_keypress_callback(*device, DEVCB2_##_cb); + devcb = &pc_keyboard_device::static_set_keypress_callback(*device, DEVCB_##_cb); #endif /* PCKEYBRD_H */ diff --git a/src/emu/machine/pic8259.h b/src/emu/machine/pic8259.h index 70667da7450..739d9955c8b 100644 --- a/src/emu/machine/pic8259.h +++ b/src/emu/machine/pic8259.h @@ -32,9 +32,9 @@ #define MCFG_PIC8259_ADD(_tag, _out_int, _sp_en, _read_slave_ack) \ MCFG_DEVICE_ADD(_tag, PIC8259, 0) \ - devcb = &pic8259_device::static_set_out_int_callback( *device, DEVCB2_##_out_int ); \ - devcb = &pic8259_device::static_set_sp_en_callback( *device, DEVCB2_##_sp_en ); \ - devcb = &pic8259_device::static_set_read_slave_ack_callback( *device, DEVCB2_##_read_slave_ack ); + devcb = &pic8259_device::static_set_out_int_callback( *device, DEVCB_##_out_int ); \ + devcb = &pic8259_device::static_set_sp_en_callback( *device, DEVCB_##_sp_en ); \ + devcb = &pic8259_device::static_set_read_slave_ack_callback( *device, DEVCB_##_read_slave_ack ); class pic8259_device : public device_t @@ -42,9 +42,9 @@ class pic8259_device : public device_t public: pic8259_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &static_set_out_int_callback(device_t &device, _Object object) { return downcast<pic8259_device &>(device).m_out_int_func.set_callback(object); } - template<class _Object> static devcb2_base &static_set_sp_en_callback(device_t &device, _Object object) { return downcast<pic8259_device &>(device).m_sp_en_func.set_callback(object); } - template<class _Object> static devcb2_base &static_set_read_slave_ack_callback(device_t &device, _Object object) { return downcast<pic8259_device &>(device).m_read_slave_ack_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_out_int_callback(device_t &device, _Object object) { return downcast<pic8259_device &>(device).m_out_int_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_sp_en_callback(device_t &device, _Object object) { return downcast<pic8259_device &>(device).m_sp_en_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_read_slave_ack_callback(device_t &device, _Object object) { return downcast<pic8259_device &>(device).m_read_slave_ack_func.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -83,9 +83,9 @@ private: STATE_READY }; - devcb2_write_line m_out_int_func; - devcb2_read_line m_sp_en_func; - devcb2_read8 m_read_slave_ack_func; + devcb_write_line m_out_int_func; + devcb_read_line m_sp_en_func; + devcb_read8 m_read_slave_ack_func; pic8259_state_t m_state; diff --git a/src/emu/machine/pit8253.h b/src/emu/machine/pit8253.h index f40e20cadbb..abb77a2c83f 100644 --- a/src/emu/machine/pit8253.h +++ b/src/emu/machine/pit8253.h @@ -37,13 +37,13 @@ pit8253_device::set_clk2(*device, _clk); #define MCFG_PIT8253_OUT0_HANDLER(_devcb) \ - devcb = &pit8253_device::set_out0_handler(*device, DEVCB2_##_devcb); + devcb = &pit8253_device::set_out0_handler(*device, DEVCB_##_devcb); #define MCFG_PIT8253_OUT1_HANDLER(_devcb) \ - devcb = &pit8253_device::set_out1_handler(*device, DEVCB2_##_devcb); + devcb = &pit8253_device::set_out1_handler(*device, DEVCB_##_devcb); #define MCFG_PIT8253_OUT2_HANDLER(_devcb) \ - devcb = &pit8253_device::set_out2_handler(*device, DEVCB2_##_devcb); + devcb = &pit8253_device::set_out2_handler(*device, DEVCB_##_devcb); struct pit8253_timer @@ -86,9 +86,9 @@ public: static void set_clk0(device_t &device, double clk0) { downcast<pit8253_device &>(device).m_clk0 = clk0; } static void set_clk1(device_t &device, double clk1) { downcast<pit8253_device &>(device).m_clk1 = clk1; } static void set_clk2(device_t &device, double clk2) { downcast<pit8253_device &>(device).m_clk2 = clk2; } - template<class _Object> static devcb2_base &set_out0_handler(device_t &device, _Object object) { return downcast<pit8253_device &>(device).m_out0_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_out1_handler(device_t &device, _Object object) { return downcast<pit8253_device &>(device).m_out1_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_out2_handler(device_t &device, _Object object) { return downcast<pit8253_device &>(device).m_out2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_out0_handler(device_t &device, _Object object) { return downcast<pit8253_device &>(device).m_out0_handler.set_callback(object); } + template<class _Object> static devcb_base &set_out1_handler(device_t &device, _Object object) { return downcast<pit8253_device &>(device).m_out1_handler.set_callback(object); } + template<class _Object> static devcb_base &set_out2_handler(device_t &device, _Object object) { return downcast<pit8253_device &>(device).m_out2_handler.set_callback(object); } DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -148,9 +148,9 @@ private: double m_clk0; double m_clk1; double m_clk2; - devcb2_write_line m_out0_handler; - devcb2_write_line m_out1_handler; - devcb2_write_line m_out2_handler; + devcb_write_line m_out0_handler; + devcb_write_line m_out1_handler; + devcb_write_line m_out2_handler; }; extern const device_type PIT8253; diff --git a/src/emu/machine/rp5c01.h b/src/emu/machine/rp5c01.h index d201b8c82bf..caaf5441078 100644 --- a/src/emu/machine/rp5c01.h +++ b/src/emu/machine/rp5c01.h @@ -35,7 +35,7 @@ //************************************************************************** #define MCFG_RP5C01_OUT_ALARM_CB(_devcb) \ - devcb = &rp5c01_device::set_out_alarm_callback(*device, DEVCB2_##_devcb); + devcb = &rp5c01_device::set_out_alarm_callback(*device, DEVCB_##_devcb); //************************************************************************** @@ -52,7 +52,7 @@ public: // construction/destruction rp5c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_alarm_callback(device_t &device, _Object object) { return downcast<rp5c01_device &>(device).m_out_alarm_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_alarm_callback(device_t &device, _Object object) { return downcast<rp5c01_device &>(device).m_out_alarm_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -82,7 +82,7 @@ private: static const device_timer_id TIMER_CLOCK = 0; static const device_timer_id TIMER_16HZ = 1; - devcb2_write_line m_out_alarm_cb; + devcb_write_line m_out_alarm_cb; UINT8 m_reg[2][13]; // clock registers UINT8 m_ram[13]; // RAM diff --git a/src/emu/machine/rp5c15.h b/src/emu/machine/rp5c15.h index 37a57b9a61c..9badb665ac0 100644 --- a/src/emu/machine/rp5c15.h +++ b/src/emu/machine/rp5c15.h @@ -35,10 +35,10 @@ //************************************************************************** #define MCFG_RP5C15_OUT_ALARM_CB(_devcb) \ - devcb = &rp5c15_device::set_out_alarm_callback(*device, DEVCB2_##_devcb); + devcb = &rp5c15_device::set_out_alarm_callback(*device, DEVCB_##_devcb); #define MCFG_RP5C15_OUT_CLKOUT_CB(_devcb) \ - devcb = &rp5c15_device::set_out_clkout_callback(*device, DEVCB2_##_devcb); + devcb = &rp5c15_device::set_out_clkout_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -53,8 +53,8 @@ public: // construction/destruction rp5c15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_alarm_callback(device_t &device, _Object object) { return downcast<rp5c15_device &>(device).m_out_alarm_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_clkout_callback(device_t &device, _Object object) { return downcast<rp5c15_device &>(device).m_out_clkout_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_alarm_callback(device_t &device, _Object object) { return downcast<rp5c15_device &>(device).m_out_alarm_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_clkout_callback(device_t &device, _Object object) { return downcast<rp5c15_device &>(device).m_out_clkout_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -80,8 +80,8 @@ private: static const device_timer_id TIMER_16HZ = 1; static const device_timer_id TIMER_CLKOUT = 2; - devcb2_write_line m_out_alarm_cb; - devcb2_write_line m_out_clkout_cb; + devcb_write_line m_out_alarm_cb; + devcb_write_line m_out_clkout_cb; UINT8 m_reg[2][13]; // clock registers UINT8 m_ram[13]; // RAM diff --git a/src/emu/machine/rtc4543.h b/src/emu/machine/rtc4543.h index 9c94bcb207e..dd7c11cf392 100644 --- a/src/emu/machine/rtc4543.h +++ b/src/emu/machine/rtc4543.h @@ -22,7 +22,7 @@ MCFG_DEVICE_ADD(_tag, RTC4543, _clock) #define MCFG_RTC4543_DATA_CALLBACK(_devcb) \ - devcb = &rtc4543_device::set_data_cb(*device, DEVCB2_##_devcb); + devcb = &rtc4543_device::set_data_cb(*device, DEVCB_##_devcb); @@ -45,7 +45,7 @@ public: DECLARE_READ_LINE_MEMBER( data_r ); DECLARE_WRITE_LINE_MEMBER( data_w ); - template<class _Object> static devcb2_base &set_data_cb(device_t &device, _Object object) { return downcast<rtc4543_device &>(device).data_cb.set_callback(object); } + template<class _Object> static devcb_base &set_data_cb(device_t &device, _Object object) { return downcast<rtc4543_device &>(device).data_cb.set_callback(object); } protected: // device-level overrides @@ -58,7 +58,7 @@ protected: virtual bool rtc_feature_leap_year() { return true; } private: - devcb2_write_line data_cb; + devcb_write_line data_cb; int m_ce; int m_clk; diff --git a/src/emu/machine/rtc65271.h b/src/emu/machine/rtc65271.h index 8f496897459..05f7db48f67 100644 --- a/src/emu/machine/rtc65271.h +++ b/src/emu/machine/rtc65271.h @@ -10,7 +10,7 @@ //************************************************************************** #define MCFG_RTC65271_INTERRUPT_CB(_devcb) \ - devcb = &rtc65271_device::set_interrupt_callback(*device, DEVCB2_##_devcb); + devcb = &rtc65271_device::set_interrupt_callback(*device, DEVCB_##_devcb); // ======================> rtc65271_device @@ -30,7 +30,7 @@ protected: virtual void nvram_write(emu_file &file); public: - template<class _Object> static devcb2_base &set_interrupt_callback(device_t &device, _Object object) { return downcast<rtc65271_device &>(device).m_interrupt_cb.set_callback(object); } + template<class _Object> static devcb_base &set_interrupt_callback(device_t &device, _Object object) { return downcast<rtc65271_device &>(device).m_interrupt_cb.set_callback(object); } DECLARE_READ8_MEMBER( rtc_r ); DECLARE_READ8_MEMBER( xram_r ); @@ -65,7 +65,7 @@ private: UINT8 m_SQW_internal_state; /* callback called when interrupt pin state changes (may be NULL) */ - devcb2_write_line m_interrupt_cb; + devcb_write_line m_interrupt_cb; }; // device type definition diff --git a/src/emu/machine/s3c2400.h b/src/emu/machine/s3c2400.h index 05970018237..b456b080095 100644 --- a/src/emu/machine/s3c2400.h +++ b/src/emu/machine/s3c2400.h @@ -18,31 +18,31 @@ s3c2400_device::static_set_palette_tag(*device, "^" _palette_tag); #define MCFG_S3C2400_CORE_PIN_R_CB(_devcb) \ - devcb = &s3c2400_device::set_core_pin_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2400_device::set_core_pin_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2400_CORE_PIN_W_CB(_devcb) \ - devcb = &s3c2400_device::set_core_pin_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2400_device::set_core_pin_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2400_GPIO_PORT_R_CB(_devcb) \ - devcb = &s3c2400_device::set_gpio_port_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2400_device::set_gpio_port_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2400_GPIO_PORT_W_CB(_devcb) \ - devcb = &s3c2400_device::set_gpio_port_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2400_device::set_gpio_port_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2400_I2C_SCL_W_CB(_devcb) \ - devcb = &s3c2400_device::set_i2c_scl_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2400_device::set_i2c_scl_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2400_I2C_SDA_R_CB(_devcb) \ - devcb = &s3c2400_device::set_i2c_sda_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2400_device::set_i2c_sda_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2400_I2C_SDA_W_CB(_devcb) \ - devcb = &s3c2400_device::set_i2c_sda_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2400_device::set_i2c_sda_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2400_ADC_DATA_R_CB(_devcb) \ - devcb = &s3c2400_device::set_adc_data_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2400_device::set_adc_data_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2400_I2S_DATA_W_CB(_devcb) \ - devcb = &s3c2400_device::set_i2s_data_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2400_device::set_i2s_data_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2400_LCD_FLAGS(_flags) \ s3c2400_device::set_lcd_flags(*device, _flags); @@ -355,15 +355,15 @@ public: // static configuration static void static_set_palette_tag(device_t &device, const char *tag); - template<class _Object> static devcb2_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_pin_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_pin_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_port_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_gpio_port_w_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_port_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2c_scl_w_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_scl_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2c_sda_r_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_sda_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2c_sda_w_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_sda_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_adc_data_r_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_data_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2s_data_w_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_data_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_pin_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_pin_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_port_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_gpio_port_w_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_port_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2c_scl_w_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_scl_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2c_sda_r_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_sda_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2c_sda_w_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_sda_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_adc_data_r_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_data_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2s_data_w_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_data_w_cb.set_callback(object); } static void set_lcd_flags(device_t &device, int flags) { downcast<s3c2400_device &>(device).m_flags = flags; } // device-level overrides @@ -874,15 +874,15 @@ public: s3c24xx_spi_t m_spi[S3C24XX_SPI_COUNT]; s3c24xx_mmc_t m_mmc; required_device<device_t> m_cpu; - devcb2_read32 m_pin_r_cb; - devcb2_write32 m_pin_w_cb; - devcb2_read32 m_port_r_cb; - devcb2_write32 m_port_w_cb; - devcb2_write_line m_scl_w_cb; - devcb2_read_line m_sda_r_cb; - devcb2_write_line m_sda_w_cb; - devcb2_read32 m_data_r_cb; - devcb2_write16 m_data_w_cb; + devcb_read32 m_pin_r_cb; + devcb_write32 m_pin_w_cb; + devcb_read32 m_port_r_cb; + devcb_write32 m_port_w_cb; + devcb_write_line m_scl_w_cb; + devcb_read_line m_sda_r_cb; + devcb_write_line m_sda_w_cb; + devcb_read32 m_data_r_cb; + devcb_write16 m_data_w_cb; int m_flags; }; diff --git a/src/emu/machine/s3c2410.h b/src/emu/machine/s3c2410.h index ba5ba82abaf..da42c393ae7 100644 --- a/src/emu/machine/s3c2410.h +++ b/src/emu/machine/s3c2410.h @@ -18,43 +18,43 @@ s3c2410_device::static_set_palette_tag(*device, "^" _palette_tag); #define MCFG_S3C2410_CORE_PIN_R_CB(_devcb) \ - devcb = &s3c2410_device::set_core_pin_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2410_device::set_core_pin_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2410_CORE_PIN_W_CB(_devcb) \ - devcb = &s3c2410_device::set_core_pin_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2410_device::set_core_pin_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2410_GPIO_PORT_R_CB(_devcb) \ - devcb = &s3c2410_device::set_gpio_port_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2410_device::set_gpio_port_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2410_GPIO_PORT_W_CB(_devcb) \ - devcb = &s3c2410_device::set_gpio_port_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2410_device::set_gpio_port_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2410_I2C_SCL_W_CB(_devcb) \ - devcb = &s3c2410_device::set_i2c_scl_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2410_device::set_i2c_scl_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2410_I2C_SDA_R_CB(_devcb) \ - devcb = &s3c2410_device::set_i2c_sda_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2410_device::set_i2c_sda_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2410_I2C_SDA_W_CB(_devcb) \ - devcb = &s3c2410_device::set_i2c_sda_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2410_device::set_i2c_sda_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2410_ADC_DATA_R_CB(_devcb) \ - devcb = &s3c2410_device::set_adc_data_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2410_device::set_adc_data_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2410_I2S_DATA_W_CB(_devcb) \ - devcb = &s3c2410_device::set_i2s_data_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2410_device::set_i2s_data_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2410_NAND_COMMAND_W_CB(_devcb) \ - devcb = &s3c2410_device::set_nand_command_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2410_device::set_nand_command_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2410_NAND_ADDRESS_W_CB(_devcb) \ - devcb = &s3c2410_device::set_nand_address_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2410_device::set_nand_address_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2410_NAND_DATA_R_CB(_devcb) \ - devcb = &s3c2410_device::set_nand_data_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2410_device::set_nand_data_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2410_NAND_DATA_W_CB(_devcb) \ - devcb = &s3c2410_device::set_nand_data_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2410_device::set_nand_data_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2410_LCD_FLAGS(_flags) \ s3c2410_device::set_lcd_flags(*device, _flags); @@ -441,19 +441,19 @@ public: // static configuration static void static_set_palette_tag(device_t &device, const char *tag); - template<class _Object> static devcb2_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_pin_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_pin_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_port_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_gpio_port_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_port_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2c_scl_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_scl_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2c_sda_r_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_sda_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2c_sda_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_sda_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_adc_data_r_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_data_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2s_data_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_data_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_nand_command_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_command_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_nand_address_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_address_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_nand_data_r_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_nand_data_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_nand_data_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_nand_data_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_pin_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_pin_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_port_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_gpio_port_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_port_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2c_scl_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_scl_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2c_sda_r_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_sda_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2c_sda_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_sda_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_adc_data_r_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_data_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2s_data_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_data_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_nand_command_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_command_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_nand_address_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_address_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_nand_data_r_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_nand_data_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_nand_data_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_nand_data_w_cb.set_callback(object); } static void set_lcd_flags(device_t &device, int flags) { downcast<s3c2410_device &>(device).m_flags = flags; } DECLARE_WRITE_LINE_MEMBER( frnb_w ); @@ -1049,19 +1049,19 @@ public: s3c24xx_spi_t m_spi[S3C24XX_SPI_COUNT]; s3c24xx_sdi_t m_sdi; required_device<device_t> m_cpu; - devcb2_read32 m_pin_r_cb; - devcb2_write32 m_pin_w_cb; - devcb2_read32 m_port_r_cb; - devcb2_write32 m_port_w_cb; - devcb2_write_line m_scl_w_cb; - devcb2_read_line m_sda_r_cb; - devcb2_write_line m_sda_w_cb; - devcb2_read32 m_data_r_cb; - devcb2_write16 m_data_w_cb; - devcb2_write8 m_command_w_cb; - devcb2_write8 m_address_w_cb; - devcb2_read8 m_nand_data_r_cb; - devcb2_write8 m_nand_data_w_cb; + devcb_read32 m_pin_r_cb; + devcb_write32 m_pin_w_cb; + devcb_read32 m_port_r_cb; + devcb_write32 m_port_w_cb; + devcb_write_line m_scl_w_cb; + devcb_read_line m_sda_r_cb; + devcb_write_line m_sda_w_cb; + devcb_read32 m_data_r_cb; + devcb_write16 m_data_w_cb; + devcb_write8 m_command_w_cb; + devcb_write8 m_address_w_cb; + devcb_read8 m_nand_data_r_cb; + devcb_write8 m_nand_data_w_cb; int m_flags; }; diff --git a/src/emu/machine/s3c2440.h b/src/emu/machine/s3c2440.h index baba35a8538..b4a737b3776 100644 --- a/src/emu/machine/s3c2440.h +++ b/src/emu/machine/s3c2440.h @@ -17,43 +17,43 @@ s3c2440_device::static_set_palette_tag(*device, "^" _palette_tag); #define MCFG_S3C2440_CORE_PIN_R_CB(_devcb) \ - devcb = &s3c2440_device::set_core_pin_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2440_device::set_core_pin_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2440_CORE_PIN_W_CB(_devcb) \ - devcb = &s3c2440_device::set_core_pin_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2440_device::set_core_pin_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2440_GPIO_PORT_R_CB(_devcb) \ - devcb = &s3c2440_device::set_gpio_port_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2440_device::set_gpio_port_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2440_GPIO_PORT_W_CB(_devcb) \ - devcb = &s3c2440_device::set_gpio_port_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2440_device::set_gpio_port_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2440_I2C_SCL_W_CB(_devcb) \ - devcb = &s3c2440_device::set_i2c_scl_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2440_device::set_i2c_scl_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2440_I2C_SDA_R_CB(_devcb) \ - devcb = &s3c2440_device::set_i2c_sda_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2440_device::set_i2c_sda_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2440_I2C_SDA_W_CB(_devcb) \ - devcb = &s3c2440_device::set_i2c_sda_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2440_device::set_i2c_sda_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2440_ADC_DATA_R_CB(_devcb) \ - devcb = &s3c2440_device::set_adc_data_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2440_device::set_adc_data_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2440_I2S_DATA_W_CB(_devcb) \ - devcb = &s3c2440_device::set_i2s_data_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2440_device::set_i2s_data_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2440_NAND_COMMAND_W_CB(_devcb) \ - devcb = &s3c2440_device::set_nand_command_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2440_device::set_nand_command_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2440_NAND_ADDRESS_W_CB(_devcb) \ - devcb = &s3c2440_device::set_nand_address_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2440_device::set_nand_address_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2440_NAND_DATA_R_CB(_devcb) \ - devcb = &s3c2440_device::set_nand_data_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2440_device::set_nand_data_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2440_NAND_DATA_W_CB(_devcb) \ - devcb = &s3c2440_device::set_nand_data_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c2440_device::set_nand_data_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C2440_LCD_FLAGS(_flags) \ s3c2440_device::set_lcd_flags(*device, _flags); @@ -472,19 +472,19 @@ public: // static configuration static void static_set_palette_tag(device_t &device, const char *tag); - template<class _Object> static devcb2_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_pin_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_pin_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_port_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_gpio_port_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_port_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2c_scl_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_scl_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2c_sda_r_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_sda_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2c_sda_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_sda_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_adc_data_r_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_data_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2s_data_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_data_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_nand_command_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_command_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_nand_address_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_address_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_nand_data_r_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_nand_data_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_nand_data_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_nand_data_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_pin_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_pin_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_port_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_gpio_port_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_port_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2c_scl_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_scl_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2c_sda_r_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_sda_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2c_sda_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_sda_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_adc_data_r_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_data_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2s_data_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_data_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_nand_command_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_command_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_nand_address_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_address_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_nand_data_r_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_nand_data_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_nand_data_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_nand_data_w_cb.set_callback(object); } static void set_lcd_flags(device_t &device, int flags) { downcast<s3c2440_device &>(device).m_flags = flags; } DECLARE_WRITE_LINE_MEMBER( frnb_w ); @@ -1133,19 +1133,19 @@ public: s3c24xx_sdi_t m_sdi; s3c24xx_ac97_t m_ac97; required_device<device_t> m_cpu; - devcb2_read32 m_pin_r_cb; - devcb2_write32 m_pin_w_cb; - devcb2_read32 m_port_r_cb; - devcb2_write32 m_port_w_cb; - devcb2_write_line m_scl_w_cb; - devcb2_read_line m_sda_r_cb; - devcb2_write_line m_sda_w_cb; - devcb2_read32 m_data_r_cb; - devcb2_write16 m_data_w_cb; - devcb2_write8 m_command_w_cb; - devcb2_write8 m_address_w_cb; - devcb2_read8 m_nand_data_r_cb; - devcb2_write8 m_nand_data_w_cb; + devcb_read32 m_pin_r_cb; + devcb_write32 m_pin_w_cb; + devcb_read32 m_port_r_cb; + devcb_write32 m_port_w_cb; + devcb_write_line m_scl_w_cb; + devcb_read_line m_sda_r_cb; + devcb_write_line m_sda_w_cb; + devcb_read32 m_data_r_cb; + devcb_write16 m_data_w_cb; + devcb_write8 m_command_w_cb; + devcb_write8 m_address_w_cb; + devcb_read8 m_nand_data_r_cb; + devcb_write8 m_nand_data_w_cb; int m_flags; }; diff --git a/src/emu/machine/s3c24xx.inc b/src/emu/machine/s3c24xx.inc index 3466f94962e..7dc0c2f7220 100644 --- a/src/emu/machine/s3c24xx.inc +++ b/src/emu/machine/s3c24xx.inc @@ -1757,7 +1757,7 @@ UINT32 S3C24_CLASS_NAME::iface_gpio_port_r(int port, UINT32 mask) if (!m_port_r_cb.isnull()) { // TO CHECK : masking is not done in any of handlers - // devcb2 do it automatically so guess is masks are not proper right now + // devcb do it automatically so guess is masks are not proper right now // without masking works fine return (m_port_r_cb)( port ); //, mask); } diff --git a/src/emu/machine/s3c44b0.h b/src/emu/machine/s3c44b0.h index 553dd6381f4..96b86240160 100644 --- a/src/emu/machine/s3c44b0.h +++ b/src/emu/machine/s3c44b0.h @@ -601,13 +601,13 @@ public: s3c44b0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~s3c44b0_device() {} - template<class _Object> static devcb2_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_port_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_gpio_port_w_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_port_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2c_scl_w_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_scl_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2c_sda_r_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_sda_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2c_sda_w_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_sda_w_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_adc_data_r_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_data_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_i2s_data_w_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_data_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_port_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_gpio_port_w_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_port_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2c_scl_w_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_scl_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2c_sda_r_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_sda_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2c_sda_w_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_sda_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_adc_data_r_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_data_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_i2s_data_w_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_data_w_cb.set_callback(object); } DECLARE_READ32_MEMBER(lcd_r); DECLARE_READ32_MEMBER(clkpow_r); @@ -773,13 +773,13 @@ private: s3c44b0_adc_t m_adc; s3c44b0_cpuwrap_t m_cpuwrap; - devcb2_read32 m_port_r_cb; - devcb2_write32 m_port_w_cb; - devcb2_write_line m_scl_w_cb; - devcb2_read_line m_sda_r_cb; - devcb2_write_line m_sda_w_cb; - devcb2_read32 m_data_r_cb; - devcb2_write16 m_data_w_cb; + devcb_read32 m_port_r_cb; + devcb_write32 m_port_w_cb; + devcb_write_line m_scl_w_cb; + devcb_read_line m_sda_r_cb; + devcb_write_line m_sda_w_cb; + devcb_read32 m_data_r_cb; + devcb_write16 m_data_w_cb; void s3c44b0_postload(); }; @@ -788,25 +788,25 @@ extern const device_type S3C44B0; #define MCFG_S3C44B0_GPIO_PORT_R_CB(_devcb) \ - devcb = &s3c44b0_device::set_gpio_port_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c44b0_device::set_gpio_port_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C44B0_GPIO_PORT_W_CB(_devcb) \ - devcb = &s3c44b0_device::set_gpio_port_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c44b0_device::set_gpio_port_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C44B0_I2C_SCL_W_CB(_devcb) \ - devcb = &s3c44b0_device::set_i2c_scl_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c44b0_device::set_i2c_scl_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C44B0_I2C_SDA_R_CB(_devcb) \ - devcb = &s3c44b0_device::set_i2c_sda_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c44b0_device::set_i2c_sda_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C44B0_I2C_SDA_W_CB(_devcb) \ - devcb = &s3c44b0_device::set_i2c_sda_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c44b0_device::set_i2c_sda_w_callback(*device, DEVCB_##_devcb); #define MCFG_S3C44B0_ADC_DATA_R_CB(_devcb) \ - devcb = &s3c44b0_device::set_adc_data_r_callback(*device, DEVCB2_##_devcb); + devcb = &s3c44b0_device::set_adc_data_r_callback(*device, DEVCB_##_devcb); #define MCFG_S3C44B0_I2S_DATA_W_CB(_devcb) \ - devcb = &s3c44b0_device::set_i2s_data_w_callback(*device, DEVCB2_##_devcb); + devcb = &s3c44b0_device::set_i2s_data_w_callback(*device, DEVCB_##_devcb); #endif diff --git a/src/emu/machine/seibu_cop.h b/src/emu/machine/seibu_cop.h index 5c1a22cf64a..ec2aaea1271 100644 --- a/src/emu/machine/seibu_cop.h +++ b/src/emu/machine/seibu_cop.h @@ -16,22 +16,22 @@ //************************************************************************** #define MCFG_SEIBU_COP_IN_BYTE_CB(_devcb) \ - devcb = &seibu_cop_device::set_in_byte_callback(*device, DEVCB2_##_devcb); + devcb = &seibu_cop_device::set_in_byte_callback(*device, DEVCB_##_devcb); #define MCFG_SEIBU_COP_IN_WORD_CB(_devcb) \ - devcb = &seibu_cop_device::set_in_word_callback(*device, DEVCB2_##_devcb); + devcb = &seibu_cop_device::set_in_word_callback(*device, DEVCB_##_devcb); #define MCFG_SEIBU_COP_IN_DWORD_CB(_devcb) \ - devcb = &seibu_cop_device::set_in_dword_callback(*device, DEVCB2_##_devcb); + devcb = &seibu_cop_device::set_in_dword_callback(*device, DEVCB_##_devcb); #define MCFG_SEIBU_COP_OUT_BYTE_CB(_devcb) \ - devcb = &seibu_cop_device::set_out_byte_callback(*device, DEVCB2_##_devcb); + devcb = &seibu_cop_device::set_out_byte_callback(*device, DEVCB_##_devcb); #define MCFG_SEIBU_COP_OUT_WORD_CB(_devcb) \ - devcb = &seibu_cop_device::set_out_word_callback(*device, DEVCB2_##_devcb); + devcb = &seibu_cop_device::set_out_word_callback(*device, DEVCB_##_devcb); #define MCFG_SEIBU_COP_OUT_DWORD_CB(_devcb) \ - devcb = &seibu_cop_device::set_out_dword_callback(*device, DEVCB2_##_devcb); + devcb = &seibu_cop_device::set_out_dword_callback(*device, DEVCB_##_devcb); @@ -48,12 +48,12 @@ public: // construction/destruction seibu_cop_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_in_byte_callback(device_t &device, _Object object) { return downcast<seibu_cop_device &>(device).m_in_byte_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_word_callback(device_t &device, _Object object) { return downcast<seibu_cop_device &>(device).m_in_word_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_dword_callback(device_t &device, _Object object) { return downcast<seibu_cop_device &>(device).m_in_dword_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_byte_callback(device_t &device, _Object object) { return downcast<seibu_cop_device &>(device).m_out_byte_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_word_callback(device_t &device, _Object object) { return downcast<seibu_cop_device &>(device).m_out_word_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dword_callback(device_t &device, _Object object) { return downcast<seibu_cop_device &>(device).m_out_dword_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_byte_callback(device_t &device, _Object object) { return downcast<seibu_cop_device &>(device).m_in_byte_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_word_callback(device_t &device, _Object object) { return downcast<seibu_cop_device &>(device).m_in_word_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_dword_callback(device_t &device, _Object object) { return downcast<seibu_cop_device &>(device).m_in_dword_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_byte_callback(device_t &device, _Object object) { return downcast<seibu_cop_device &>(device).m_out_byte_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_word_callback(device_t &device, _Object object) { return downcast<seibu_cop_device &>(device).m_out_word_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dword_callback(device_t &device, _Object object) { return downcast<seibu_cop_device &>(device).m_out_dword_cb.set_callback(object); } // I/O operations DECLARE_WRITE16_MEMBER( write ); @@ -79,12 +79,12 @@ protected: virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; private: - devcb2_read16 m_in_byte_cb; - devcb2_read16 m_in_word_cb; - devcb2_read16 m_in_dword_cb; - devcb2_write16 m_out_byte_cb; - devcb2_write16 m_out_word_cb; - devcb2_write16 m_out_dword_cb; + devcb_read16 m_in_byte_cb; + devcb_read16 m_in_word_cb; + devcb_read16 m_in_dword_cb; + devcb_write16 m_out_byte_cb; + devcb_write16 m_out_word_cb; + devcb_write16 m_out_dword_cb; inline UINT16 read_word(offs_t address); inline void write_word(offs_t address, UINT16 data); diff --git a/src/emu/machine/smc91c9x.h b/src/emu/machine/smc91c9x.h index f3ca0eefc9e..799af951928 100644 --- a/src/emu/machine/smc91c9x.h +++ b/src/emu/machine/smc91c9x.h @@ -24,7 +24,7 @@ public: smc91c9x_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); ~smc91c9x_device() {} - template<class _Object> static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast<smc91c9x_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<smc91c9x_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ16_MEMBER( read ); DECLARE_WRITE16_MEMBER( write ); @@ -36,7 +36,7 @@ protected: private: // internal state - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; /* raw register data and masks */ UINT16 m_reg[64]; @@ -88,13 +88,13 @@ extern const device_type SMC91C96; MCFG_DEVICE_ADD(_tag, SMC91C94, 0) #define MCFG_SMC91C94_IRQ_CALLBACK(_write) \ - devcb = &smc91c94_device::set_irq_callback(*device, DEVCB2_##_write); + devcb = &smc91c94_device::set_irq_callback(*device, DEVCB_##_write); #define MCFG_SMC91C96_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, SMC91C96, 0) #define MCFG_SMC91C96_IRQ_CALLBACK(_write) \ - devcb = &smc91c96_device::set_irq_callback(*device, DEVCB2_##_write); + devcb = &smc91c96_device::set_irq_callback(*device, DEVCB_##_write); #endif diff --git a/src/emu/machine/smc92x4.h b/src/emu/machine/smc92x4.h index e451f8590f5..5140929b151 100644 --- a/src/emu/machine/smc92x4.h +++ b/src/emu/machine/smc92x4.h @@ -38,33 +38,33 @@ extern const device_type SMC92X4; // Interrupt line. To be connected with the controller PCB. #define MCFG_SMC92X4_INTRQ_CALLBACK(_write) \ - devcb = &smc92x4_device::set_intrq_wr_callback(*device, DEVCB2_##_write); + devcb = &smc92x4_device::set_intrq_wr_callback(*device, DEVCB_##_write); // DMA in progress line. To be connected with the controller PCB. #define MCFG_SMC92X4_DIP_CALLBACK(_write) \ - devcb = &smc92x4_device::set_dip_wr_callback(*device, DEVCB2_##_write); + devcb = &smc92x4_device::set_dip_wr_callback(*device, DEVCB_##_write); // Auxiliary Bus. These 8 lines need to be connected to external latches // and to a counter circuitry which works together with the external RAM. // We use the S0/S1 lines as address lines. #define MCFG_SMC92X4_AUXBUS_OUT_CALLBACK(_write) \ - devcb = &smc92x4_device::set_auxbus_wr_callback(*device, DEVCB2_##_write); + devcb = &smc92x4_device::set_auxbus_wr_callback(*device, DEVCB_##_write); // Auxiliary Bus. This is only used for S0=S1=0. #define MCFG_SMC92X4_AUXBUS_IN_CALLBACK(_read) \ - devcb = &smc92x4_device::set_auxbus_rd_callback(*device, DEVCB2_##_read); + devcb = &smc92x4_device::set_auxbus_rd_callback(*device, DEVCB_##_read); // Callback to read the contents of the external RAM via the data bus. // Note that the address must be set and automatically increased // by external circuitry. #define MCFG_SMC92X4_DMA_IN_CALLBACK(_read) \ - devcb = &smc92x4_device::set_dma_rd_callback(*device, DEVCB2_##_read); + devcb = &smc92x4_device::set_dma_rd_callback(*device, DEVCB_##_read); // Callback to write the contents of the external RAM via the data bus. // Note that the address must be set and automatically increased // by external circuitry. */ #define MCFG_SMC92X4_DMA_OUT_CALLBACK(_write) \ - devcb = &smc92x4_device::set_dma_wr_callback(*device, DEVCB2_##_write); + devcb = &smc92x4_device::set_dma_wr_callback(*device, DEVCB_##_write); // Disk format support. This flag allows to choose between the full // FM/MFM format and an abbreviated track layout. The difference results @@ -81,12 +81,12 @@ class smc92x4_device : public device_t public: smc92x4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<smc92x4_device &>(device).m_out_intrq.set_callback(object); } - template<class _Object> static devcb2_base &set_dip_wr_callback(device_t &device, _Object object) { return downcast<smc92x4_device &>(device).m_out_dip.set_callback(object); } - template<class _Object> static devcb2_base &set_auxbus_wr_callback(device_t &device, _Object object) { return downcast<smc92x4_device &>(device).m_out_auxbus.set_callback(object); } - template<class _Object> static devcb2_base &set_auxbus_rd_callback(device_t &device, _Object object) { return downcast<smc92x4_device &>(device).m_in_auxbus.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_rd_callback(device_t &device, _Object object) { return downcast<smc92x4_device &>(device).m_in_dma.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_wr_callback(device_t &device, _Object object) { return downcast<smc92x4_device &>(device).m_out_dma.set_callback(object); } + template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<smc92x4_device &>(device).m_out_intrq.set_callback(object); } + template<class _Object> static devcb_base &set_dip_wr_callback(device_t &device, _Object object) { return downcast<smc92x4_device &>(device).m_out_dip.set_callback(object); } + template<class _Object> static devcb_base &set_auxbus_wr_callback(device_t &device, _Object object) { return downcast<smc92x4_device &>(device).m_out_auxbus.set_callback(object); } + template<class _Object> static devcb_base &set_auxbus_rd_callback(device_t &device, _Object object) { return downcast<smc92x4_device &>(device).m_in_auxbus.set_callback(object); } + template<class _Object> static devcb_base &set_dma_rd_callback(device_t &device, _Object object) { return downcast<smc92x4_device &>(device).m_in_dma.set_callback(object); } + template<class _Object> static devcb_base &set_dma_wr_callback(device_t &device, _Object object) { return downcast<smc92x4_device &>(device).m_out_dma.set_callback(object); } static void set_full_track_layout(device_t &device, bool lay) { downcast<smc92x4_device &>(device).m_full_track_layout = lay; } @@ -108,12 +108,12 @@ protected: virtual void device_reset(void); private: - devcb2_write_line m_out_intrq; // INT line - devcb2_write_line m_out_dip; // DMA in progress line - devcb2_write8 m_out_auxbus; // AB0-7 lines (using S0,S1 as address) - devcb2_read8 m_in_auxbus; // AB0-7 lines (S0=S1=0) - devcb2_read8 m_in_dma; // DMA read access to the cache buffer - devcb2_write8 m_out_dma; // DMA write access to the cache buffer + devcb_write_line m_out_intrq; // INT line + devcb_write_line m_out_dip; // DMA in progress line + devcb_write8 m_out_auxbus; // AB0-7 lines (using S0,S1 as address) + devcb_read8 m_in_auxbus; // AB0-7 lines (S0=S1=0) + devcb_read8 m_in_dma; // DMA read access to the cache buffer + devcb_write8 m_out_dma; // DMA write access to the cache buffer UINT8 m_output1; // internal register "output1" UINT8 m_output2; // internal register "output2" diff --git a/src/emu/machine/terminal.h b/src/emu/machine/terminal.h index fc47a0cde9c..9684cb691db 100644 --- a/src/emu/machine/terminal.h +++ b/src/emu/machine/terminal.h @@ -10,7 +10,7 @@ ***************************************************************************/ #define MCFG_GENERIC_TERMINAL_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 @@ -27,7 +27,7 @@ public: generic_terminal_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); generic_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<generic_terminal_device &>(device).m_keyboard_cb.set_callback(object); } + template<class _Object> static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<generic_terminal_device &>(device).m_keyboard_cb.set_callback(object); } DECLARE_WRITE8_MEMBER(write) { term_write(data); } DECLARE_WRITE8_MEMBER(kbd_put); @@ -53,7 +53,7 @@ private: UINT8 m_framecnt; UINT8 m_y_pos; - devcb2_write8 m_keyboard_cb; + devcb_write8 m_keyboard_cb; }; extern const device_type GENERIC_TERMINAL; diff --git a/src/emu/machine/tmp68301.h b/src/emu/machine/tmp68301.h index f3683afbbb9..692bfdc0f38 100644 --- a/src/emu/machine/tmp68301.h +++ b/src/emu/machine/tmp68301.h @@ -7,10 +7,10 @@ /* TODO: serial ports, frequency & hook it up with m68k */ #define MCFG_TMP68301_IN_PARALLEL_CB(_devcb) \ - devcb = &tmp68301_device::set_in_parallel_callback(*device, DEVCB2_##_devcb); + devcb = &tmp68301_device::set_in_parallel_callback(*device, DEVCB_##_devcb); #define MCFG_TMP68301_OUT_PARALLEL_CB(_devcb) \ - devcb = &tmp68301_device::set_out_parallel_callback(*device, DEVCB2_##_devcb); + devcb = &tmp68301_device::set_out_parallel_callback(*device, DEVCB_##_devcb); //************************************************************************** @@ -26,8 +26,8 @@ public: tmp68301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tmp68301_device() {} - template<class _Object> static devcb2_base &set_in_parallel_callback(device_t &device, _Object object) { return downcast<tmp68301_device &>(device).m_in_parallel_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_parallel_callback(device_t &device, _Object object) { return downcast<tmp68301_device &>(device).m_out_parallel_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_parallel_callback(device_t &device, _Object object) { return downcast<tmp68301_device &>(device).m_in_parallel_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_parallel_callback(device_t &device, _Object object) { return downcast<tmp68301_device &>(device).m_out_parallel_cb.set_callback(object); } // Hardware Registers DECLARE_READ16_MEMBER( regs_r ); @@ -57,8 +57,8 @@ protected: virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; private: - devcb2_read16 m_in_parallel_cb; - devcb2_write16 m_out_parallel_cb; + devcb_read16 m_in_parallel_cb; + devcb_write16 m_out_parallel_cb; // internal state UINT16 m_regs[0x400]; diff --git a/src/emu/machine/tms5501.h b/src/emu/machine/tms5501.h index 87faaa341f3..03b8377b9e6 100644 --- a/src/emu/machine/tms5501.h +++ b/src/emu/machine/tms5501.h @@ -46,16 +46,16 @@ //************************************************************************** #define MCFG_TMS5501_IRQ_CALLBACK(_write) \ - devcb = &tms5501_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &tms5501_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_TMS5501_XMT_CALLBACK(_write) \ - devcb = &tms5501_device::set_xmt_wr_callback(*device, DEVCB2_##_write); + devcb = &tms5501_device::set_xmt_wr_callback(*device, DEVCB_##_write); #define MCFG_TMS5501_XI_CALLBACK(_read) \ - devcb = &tms5501_device::set_xi_rd_callback(*device, DEVCB2_##_read); + devcb = &tms5501_device::set_xi_rd_callback(*device, DEVCB_##_read); #define MCFG_TMS5501_XO_CALLBACK(_write) \ - devcb = &tms5501_device::set_xo_wr_callback(*device, DEVCB2_##_write); + devcb = &tms5501_device::set_xo_wr_callback(*device, DEVCB_##_write); @@ -72,10 +72,10 @@ public: // construction/destruction tms5501_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<tms5501_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_xmt_wr_callback(device_t &device, _Object object) { return downcast<tms5501_device &>(device).m_write_xmt.set_callback(object); } - template<class _Object> static devcb2_base &set_xi_rd_callback(device_t &device, _Object object) { return downcast<tms5501_device &>(device).m_read_xi.set_callback(object); } - template<class _Object> static devcb2_base &set_xo_wr_callback(device_t &device, _Object object) { return downcast<tms5501_device &>(device).m_write_xo.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<tms5501_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_xmt_wr_callback(device_t &device, _Object object) { return downcast<tms5501_device &>(device).m_write_xmt.set_callback(object); } + template<class _Object> static devcb_base &set_xi_rd_callback(device_t &device, _Object object) { return downcast<tms5501_device &>(device).m_read_xi.set_callback(object); } + template<class _Object> static devcb_base &set_xo_wr_callback(device_t &device, _Object object) { return downcast<tms5501_device &>(device).m_write_xo.set_callback(object); } virtual DECLARE_ADDRESS_MAP(io_map, 8); @@ -170,10 +170,10 @@ private: void set_interrupt(UINT8 mask); void check_interrupt(); - devcb2_write_line m_write_irq; - devcb2_write_line m_write_xmt; - devcb2_read8 m_read_xi; - devcb2_write8 m_write_xo; + devcb_write_line m_write_irq; + devcb_write_line m_write_xmt; + devcb_read8 m_read_xi; + devcb_write8 m_write_xo; UINT8 m_irq; UINT8 m_rb; diff --git a/src/emu/machine/tms9901.h b/src/emu/machine/tms9901.h index 096a654046a..d6859bf21c5 100644 --- a/src/emu/machine/tms9901.h +++ b/src/emu/machine/tms9901.h @@ -63,26 +63,26 @@ public: DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); - template<class _Object> static devcb2_base &static_set_readblock_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_read_block.set_callback(object); } - - template<class _Object> static devcb2_base &static_set_p0_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p0.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p1_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p1.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p2_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p2.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p3_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p3.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p4_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p4.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p5_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p5.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p6_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p6.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p7_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p7.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p8_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p8.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p9_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p9.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p10_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p10.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p11_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p11.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p12_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p12.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p13_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p13.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p14_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p14.set_callback(object); } - template<class _Object> static devcb2_base &static_set_p15_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p15.set_callback(object); } - - template<class _Object> static devcb2_base &static_set_intlevel_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_interrupt.set_callback(object); } + template<class _Object> static devcb_base &static_set_readblock_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_read_block.set_callback(object); } + + template<class _Object> static devcb_base &static_set_p0_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p0.set_callback(object); } + template<class _Object> static devcb_base &static_set_p1_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p1.set_callback(object); } + template<class _Object> static devcb_base &static_set_p2_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p2.set_callback(object); } + template<class _Object> static devcb_base &static_set_p3_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p3.set_callback(object); } + template<class _Object> static devcb_base &static_set_p4_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p4.set_callback(object); } + template<class _Object> static devcb_base &static_set_p5_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p5.set_callback(object); } + template<class _Object> static devcb_base &static_set_p6_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p6.set_callback(object); } + template<class _Object> static devcb_base &static_set_p7_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p7.set_callback(object); } + template<class _Object> static devcb_base &static_set_p8_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p8.set_callback(object); } + template<class _Object> static devcb_base &static_set_p9_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p9.set_callback(object); } + template<class _Object> static devcb_base &static_set_p10_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p10.set_callback(object); } + template<class _Object> static devcb_base &static_set_p11_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p11.set_callback(object); } + template<class _Object> static devcb_base &static_set_p12_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p12.set_callback(object); } + template<class _Object> static devcb_base &static_set_p13_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p13.set_callback(object); } + template<class _Object> static devcb_base &static_set_p14_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p14.set_callback(object); } + template<class _Object> static devcb_base &static_set_p15_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_write_p15.set_callback(object); } + + template<class _Object> static devcb_base &static_set_intlevel_callback(device_t &device, _Object object) { return downcast<tms9901_device &>(device).m_interrupt.set_callback(object); } private: static const device_timer_id DECREMENTER = 0; @@ -138,29 +138,29 @@ private: // ======================================================================= // Read callback. - devcb2_read8 m_read_block; + devcb_read8 m_read_block; // I/O lines, used for output. When used as inputs, the levels are delivered via the m_read_block - devcb2_write_line m_write_p0; - devcb2_write_line m_write_p1; - devcb2_write_line m_write_p2; - devcb2_write_line m_write_p3; - devcb2_write_line m_write_p4; - devcb2_write_line m_write_p5; - devcb2_write_line m_write_p6; - devcb2_write_line m_write_p7; - devcb2_write_line m_write_p8; - devcb2_write_line m_write_p9; - devcb2_write_line m_write_p10; - devcb2_write_line m_write_p11; - devcb2_write_line m_write_p12; - devcb2_write_line m_write_p13; - devcb2_write_line m_write_p14; - devcb2_write_line m_write_p15; + devcb_write_line m_write_p0; + devcb_write_line m_write_p1; + devcb_write_line m_write_p2; + devcb_write_line m_write_p3; + devcb_write_line m_write_p4; + devcb_write_line m_write_p5; + devcb_write_line m_write_p6; + devcb_write_line m_write_p7; + devcb_write_line m_write_p8; + devcb_write_line m_write_p9; + devcb_write_line m_write_p10; + devcb_write_line m_write_p11; + devcb_write_line m_write_p12; + devcb_write_line m_write_p13; + devcb_write_line m_write_p14; + devcb_write_line m_write_p15; // The invocation corresponds to the INTREQ signal (with the level passed as data) // and the address delivers the interrupt level (0-15) - devcb2_write8 m_interrupt; + devcb_write8 m_interrupt; }; /*************************************************************************** @@ -168,57 +168,57 @@ private: ***************************************************************************/ #define MCFG_TMS9901_READBLOCK_HANDLER( _read ) \ - devcb = &tms9901_device::static_set_readblock_callback( *device, DEVCB2_##_read ); + devcb = &tms9901_device::static_set_readblock_callback( *device, DEVCB_##_read ); #define MCFG_TMS9901_P0_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p0_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p0_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P1_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p1_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p1_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P2_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p2_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p2_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P3_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p3_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p3_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P4_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p4_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p4_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P5_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p5_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p5_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P6_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p6_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p6_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P7_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p7_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p7_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P8_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p8_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p8_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P9_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p9_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p9_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P10_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p10_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p10_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P11_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p11_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p11_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P12_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p12_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p12_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P13_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p13_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p13_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P14_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p14_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p14_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_P15_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p15_callback( *device, DEVCB2_##_write ); + devcb = &tms9901_device::static_set_p15_callback( *device, DEVCB_##_write ); #define MCFG_TMS9901_INTLEVEL_HANDLER( _intlevel ) \ - devcb = &tms9901_device::static_set_intlevel_callback( *device, DEVCB2_##_intlevel ); + devcb = &tms9901_device::static_set_intlevel_callback( *device, DEVCB_##_intlevel ); #endif /* __TMS9901_H__ */ diff --git a/src/emu/machine/tms9902.h b/src/emu/machine/tms9902.h index 8f9e5be6cc4..9d34a48a240 100644 --- a/src/emu/machine/tms9902.h +++ b/src/emu/machine/tms9902.h @@ -49,10 +49,10 @@ class tms9902_device : public device_t public: tms9902_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_int_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_int_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_rcv_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_rcv_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_xmit_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_xmit_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_ctrl_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_ctrl_cb.set_callback(object); } + template<class _Object> static devcb_base &set_int_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_int_cb.set_callback(object); } + template<class _Object> static devcb_base &set_rcv_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_rcv_cb.set_callback(object); } + template<class _Object> static devcb_base &set_xmit_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_xmit_cb.set_callback(object); } + template<class _Object> static devcb_base &set_ctrl_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_ctrl_cb.set_callback(object); } void set_clock(bool state); @@ -90,10 +90,10 @@ private: void initiate_transmit(); void reset_uart(); - devcb2_write_line m_int_cb; - devcb2_write_line m_rcv_cb; - devcb2_write8 m_xmit_cb; - devcb2_write8 m_ctrl_cb; // needs to be used with get_config_value + devcb_write_line m_int_cb; + devcb_write_line m_rcv_cb; + devcb_write8 m_xmit_cb; + devcb_write8 m_ctrl_cb; // needs to be used with get_config_value // tms9902 clock rate (PHI* pin, normally connected to TMS9900 Phi3*) // Official range is 2MHz-3.3MHz. Some tms9902s were sold as "MP9214", and @@ -189,15 +189,15 @@ private: ***************************************************************************/ #define MCFG_TMS9902_INT_CB(_devcb) \ - devcb = &tms9902_device::set_int_callback(*device, DEVCB2_##_devcb); + devcb = &tms9902_device::set_int_callback(*device, DEVCB_##_devcb); #define MCFG_TMS9902_RCV_CB(_devcb) \ - devcb = &tms9902_device::set_rcv_callback(*device, DEVCB2_##_devcb); + devcb = &tms9902_device::set_rcv_callback(*device, DEVCB_##_devcb); #define MCFG_TMS9902_XMIT_CB(_devcb) \ - devcb = &tms9902_device::set_xmit_callback(*device, DEVCB2_##_devcb); + devcb = &tms9902_device::set_xmit_callback(*device, DEVCB_##_devcb); #define MCFG_TMS9902_CTRL_CB(_devcb) \ - devcb = &tms9902_device::set_ctrl_callback(*device, DEVCB2_##_devcb); + devcb = &tms9902_device::set_ctrl_callback(*device, DEVCB_##_devcb); #endif /* __TMS9902_H__ */ diff --git a/src/emu/machine/upd1990a.h b/src/emu/machine/upd1990a.h index 4bd421521d9..269fbc6fd72 100644 --- a/src/emu/machine/upd1990a.h +++ b/src/emu/machine/upd1990a.h @@ -34,13 +34,13 @@ #define MCFG_UPD1990A_ADD(_tag, _clock, _data, _tp) \ MCFG_DEVICE_ADD((_tag), UPD1990A, _clock) \ - downcast<upd1990a_device *>(device)->set_data_callback(DEVCB2_##_data); \ - downcast<upd1990a_device *>(device)->set_tp_callback(DEVCB2_##_tp); + downcast<upd1990a_device *>(device)->set_data_callback(DEVCB_##_data); \ + downcast<upd1990a_device *>(device)->set_tp_callback(DEVCB_##_tp); #define MCFG_UPD4990A_ADD(_tag, _clock, _data, _tp) \ MCFG_DEVICE_ADD((_tag), UPD4990A, _clock) \ - downcast<upd1990a_device *>(device)->set_data_callback(DEVCB2_##_data); \ - downcast<upd1990a_device *>(device)->set_tp_callback(DEVCB2_##_tp); + downcast<upd1990a_device *>(device)->set_data_callback(DEVCB_##_data); \ + downcast<upd1990a_device *>(device)->set_tp_callback(DEVCB_##_tp); @@ -115,8 +115,8 @@ private: MODE_TEST }; - devcb2_write_line m_write_data; - devcb2_write_line m_write_tp; + devcb_write_line m_write_data; + devcb_write_line m_write_tp; UINT8 m_time_counter[6]; // time counter UINT8 m_shift_reg[7]; // shift register (40 bits, or 48 bits + serial command register) diff --git a/src/emu/machine/upd71071.h b/src/emu/machine/upd71071.h index 1a390afb46a..3f8f11bb3ed 100644 --- a/src/emu/machine/upd71071.h +++ b/src/emu/machine/upd71071.h @@ -29,23 +29,23 @@ public: static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<upd71071_device &>(device).m_cpu.set_tag(tag); } static void set_clock(device_t &device, int clock) { downcast<upd71071_device &>(device).m_upd_clock = clock; } - template<class _Object> static devcb2_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_hreq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_eop_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_eop_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_hreq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_eop_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_eop_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_read_0_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_read_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_read_1_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_read_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_read_2_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_read_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_read_3_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_read_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_dma_read_0_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_read_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_dma_read_1_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_read_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_dma_read_2_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_read_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_dma_read_3_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_read_3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_write_0_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_write_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_write_1_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_write_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_write_2_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_write_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_write_3_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_write_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_dma_write_0_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_write_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_dma_write_1_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_write_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_dma_write_2_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_write_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_dma_write_3_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_write_3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dack_0_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_dack_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dack_1_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_dack_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dack_2_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_dack_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dack_3_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_dack_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dack_0_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_dack_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dack_1_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_dack_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dack_2_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_dack_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dack_3_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_dack_3_cb.set_callback(object); } DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -72,20 +72,20 @@ private: //int m_transfer_size[4]; int m_base; int m_upd_clock; - devcb2_write_line m_out_hreq_cb; - devcb2_write_line m_out_eop_cb; - devcb2_read16 m_dma_read_0_cb; - devcb2_read16 m_dma_read_1_cb; - devcb2_read16 m_dma_read_2_cb; - devcb2_read16 m_dma_read_3_cb; - devcb2_write16 m_dma_write_0_cb; - devcb2_write16 m_dma_write_1_cb; - devcb2_write16 m_dma_write_2_cb; - devcb2_write16 m_dma_write_3_cb; - devcb2_write_line m_out_dack_0_cb; - devcb2_write_line m_out_dack_1_cb; - devcb2_write_line m_out_dack_2_cb; - devcb2_write_line m_out_dack_3_cb; + devcb_write_line m_out_hreq_cb; + devcb_write_line m_out_eop_cb; + devcb_read16 m_dma_read_0_cb; + devcb_read16 m_dma_read_1_cb; + devcb_read16 m_dma_read_2_cb; + devcb_read16 m_dma_read_3_cb; + devcb_write16 m_dma_write_0_cb; + devcb_write16 m_dma_write_1_cb; + devcb_write16 m_dma_write_2_cb; + devcb_write16 m_dma_write_3_cb; + devcb_write_line m_out_dack_0_cb; + devcb_write_line m_out_dack_1_cb; + devcb_write_line m_out_dack_2_cb; + devcb_write_line m_out_dack_3_cb; int m_hreq; int m_eop; required_device<cpu_device> m_cpu; @@ -100,45 +100,45 @@ extern const device_type UPD71071; upd71071_device::set_clock(*device, _clk); #define MCFG_UPD71071_OUT_HREQ_CB(_devcb) \ - devcb = &upd71071_device::set_out_hreq_callback(*device, DEVCB2_##_devcb); + devcb = &upd71071_device::set_out_hreq_callback(*device, DEVCB_##_devcb); #define MCFG_UPD71071_OUT_EOP_CB(_devcb) \ - devcb = &upd71071_device::set_out_eop_callback(*device, DEVCB2_##_devcb); + devcb = &upd71071_device::set_out_eop_callback(*device, DEVCB_##_devcb); #define MCFG_UPD71071_DMA_READ_0_CB(_devcb) \ - devcb = &upd71071_device::set_dma_read_0_callback(*device, DEVCB2_##_devcb); + devcb = &upd71071_device::set_dma_read_0_callback(*device, DEVCB_##_devcb); #define MCFG_UPD71071_DMA_READ_1_CB(_devcb) \ - devcb = &upd71071_device::set_dma_read_1_callback(*device, DEVCB2_##_devcb); + devcb = &upd71071_device::set_dma_read_1_callback(*device, DEVCB_##_devcb); #define MCFG_UPD71071_DMA_READ_2_CB(_devcb) \ - devcb = &upd71071_device::set_dma_read_2_callback(*device, DEVCB2_##_devcb); + devcb = &upd71071_device::set_dma_read_2_callback(*device, DEVCB_##_devcb); #define MCFG_UPD71071_DMA_READ_3_CB(_devcb) \ - devcb = &upd71071_device::set_dma_read_3_callback(*device, DEVCB2_##_devcb); + devcb = &upd71071_device::set_dma_read_3_callback(*device, DEVCB_##_devcb); #define MCFG_UPD71071_DMA_WRITE_0_CB(_devcb) \ - devcb = &upd71071_device::set_dma_write_0_callback(*device, DEVCB2_##_devcb); + devcb = &upd71071_device::set_dma_write_0_callback(*device, DEVCB_##_devcb); #define MCFG_UPD71071_DMA_WRITE_1_CB(_devcb) \ - devcb = &upd71071_device::set_dma_write_1_callback(*device, DEVCB2_##_devcb); + devcb = &upd71071_device::set_dma_write_1_callback(*device, DEVCB_##_devcb); #define MCFG_UPD71071_DMA_WRITE_2_CB(_devcb) \ - devcb = &upd71071_device::set_dma_write_2_callback(*device, DEVCB2_##_devcb); + devcb = &upd71071_device::set_dma_write_2_callback(*device, DEVCB_##_devcb); #define MCFG_UPD71071_DMA_WRITE_3_CB(_devcb) \ - devcb = &upd71071_device::set_dma_write_3_callback(*device, DEVCB2_##_devcb); + devcb = &upd71071_device::set_dma_write_3_callback(*device, DEVCB_##_devcb); #define MCFG_UPD71071_OUT_DACK_0_CB(_devcb) \ - devcb = &upd71071_device::set_out_dack_0_callback(*device, DEVCB2_##_devcb); + devcb = &upd71071_device::set_out_dack_0_callback(*device, DEVCB_##_devcb); #define MCFG_UPD71071_OUT_DACK_1_CB(_devcb) \ - devcb = &upd71071_device::set_out_dack_1_callback(*device, DEVCB2_##_devcb); + devcb = &upd71071_device::set_out_dack_1_callback(*device, DEVCB_##_devcb); #define MCFG_UPD71071_OUT_DACK_2_CB(_devcb) \ - devcb = &upd71071_device::set_out_dack_2_callback(*device, DEVCB2_##_devcb); + devcb = &upd71071_device::set_out_dack_2_callback(*device, DEVCB_##_devcb); #define MCFG_UPD71071_OUT_DACK_3_CB(_devcb) \ - devcb = &upd71071_device::set_out_dack_3_callback(*device, DEVCB2_##_devcb); + devcb = &upd71071_device::set_out_dack_3_callback(*device, DEVCB_##_devcb); #endif /*UPD71071_H_*/ diff --git a/src/emu/machine/upd765.h b/src/emu/machine/upd765.h index 8813565e70c..3f32f58bee3 100644 --- a/src/emu/machine/upd765.h +++ b/src/emu/machine/upd765.h @@ -53,16 +53,16 @@ MCFG_DEVICE_ADD(_tag, MCS3201, 0) #define MCFG_MCS3201_INPUT_HANDLER(_devcb) \ - devcb = &mcs3201_device::set_input_handler(*device, DEVCB2_##_devcb); + devcb = &mcs3201_device::set_input_handler(*device, DEVCB_##_devcb); #define MCFG_UPD765_INTRQ_CALLBACK(_write) \ - devcb = &upd765_family_device::set_intrq_wr_callback(*device, DEVCB2_##_write); + devcb = &upd765_family_device::set_intrq_wr_callback(*device, DEVCB_##_write); #define MCFG_UPD765_DRQ_CALLBACK(_write) \ - devcb = &upd765_family_device::set_drq_wr_callback(*device, DEVCB2_##_write); + devcb = &upd765_family_device::set_drq_wr_callback(*device, DEVCB_##_write); #define MCFG_UPD765_HDL_CALLBACK(_write) \ - devcb = &upd765_family_device::set_hdl_wr_callback(*device, DEVCB2_##_write); + devcb = &upd765_family_device::set_hdl_wr_callback(*device, DEVCB_##_write); /* Interface required for PC ISA wrapping */ class pc_fdc_interface : public device_t { @@ -92,9 +92,9 @@ public: upd765_family_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_intrq_wr_callback(device_t &device, _Object object) { return downcast<upd765_family_device &>(device).intrq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<upd765_family_device &>(device).drq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_hdl_wr_callback(device_t &device, _Object object) { return downcast<upd765_family_device &>(device).hdl_cb.set_callback(object); } + template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<upd765_family_device &>(device).intrq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<upd765_family_device &>(device).drq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_hdl_wr_callback(device_t &device, _Object object) { return downcast<upd765_family_device &>(device).hdl_cb.set_callback(object); } virtual DECLARE_ADDRESS_MAP(map, 8) = 0; @@ -308,7 +308,7 @@ protected: int main_phase; live_info cur_live, checkpoint_live; - devcb2_write_line intrq_cb, drq_cb, hdl_cb; + devcb_write_line intrq_cb, drq_cb, hdl_cb; bool cur_irq, other_irq, data_irq, drq, internal_drq, tc, tc_done, locked, mfm; floppy_info flopi[4]; @@ -478,7 +478,7 @@ public: mcs3201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_input_handler(device_t &device, _Object object) { return downcast<mcs3201_device &>(device).m_input_handler.set_callback(object); } + template<class _Object> static devcb_base &set_input_handler(device_t &device, _Object object) { return downcast<mcs3201_device &>(device).m_input_handler.set_callback(object); } virtual DECLARE_ADDRESS_MAP(map, 8); DECLARE_READ8_MEMBER( input_r ); @@ -487,7 +487,7 @@ protected: virtual void device_start(); private: - devcb2_read8 m_input_handler; + devcb_read8 m_input_handler; }; extern const device_type UPD765A; diff --git a/src/emu/machine/wd11c00_17.h b/src/emu/machine/wd11c00_17.h index acdae80ba48..fb6f702b0b4 100644 --- a/src/emu/machine/wd11c00_17.h +++ b/src/emu/machine/wd11c00_17.h @@ -24,37 +24,37 @@ //************************************************************************** #define MCFG_WD11C00_17_OUT_IRQ5_CB(_devcb) \ - devcb = &wd11c00_17_device::set_out_irq5_callback(*device, DEVCB2_##_devcb); + devcb = &wd11c00_17_device::set_out_irq5_callback(*device, DEVCB_##_devcb); #define MCFG_WD11C00_17_OUT_DRQ3_CB(_devcb) \ - devcb = &wd11c00_17_device::set_out_drq3_callback(*device, DEVCB2_##_devcb); + devcb = &wd11c00_17_device::set_out_drq3_callback(*device, DEVCB_##_devcb); #define MCFG_WD11C00_17_OUT_MR_CB(_devcb) \ - devcb = &wd11c00_17_device::set_out_mr_callback(*device, DEVCB2_##_devcb); + devcb = &wd11c00_17_device::set_out_mr_callback(*device, DEVCB_##_devcb); #define MCFG_WD11C00_17_OUT_BUSY_CB(_devcb) \ - devcb = &wd11c00_17_device::set_out_busy_callback(*device, DEVCB2_##_devcb); + devcb = &wd11c00_17_device::set_out_busy_callback(*device, DEVCB_##_devcb); #define MCFG_WD11C00_17_OUT_REQ_CB(_devcb) \ - devcb = &wd11c00_17_device::set_out_req_callback(*device, DEVCB2_##_devcb); + devcb = &wd11c00_17_device::set_out_req_callback(*device, DEVCB_##_devcb); #define MCFG_WD11C00_17_OUT_RA3_CB(_devcb) \ - devcb = &wd11c00_17_device::set_out_ra3_callback(*device, DEVCB2_##_devcb); + devcb = &wd11c00_17_device::set_out_ra3_callback(*device, DEVCB_##_devcb); #define MCFG_WD11C00_17_IN_RD322_CB(_devcb) \ - devcb = &wd11c00_17_device::set_in_rd322_callback(*device, DEVCB2_##_devcb); + devcb = &wd11c00_17_device::set_in_rd322_callback(*device, DEVCB_##_devcb); #define MCFG_WD11C00_17_IN_RAMCS_CB(_devcb) \ - devcb = &wd11c00_17_device::set_in_ramcs_callback(*device, DEVCB2_##_devcb); + devcb = &wd11c00_17_device::set_in_ramcs_callback(*device, DEVCB_##_devcb); #define MCFG_WD11C00_17_OUT_RAMWR_CB(_devcb) \ - devcb = &wd11c00_17_device::set_out_ramwr_callback(*device, DEVCB2_##_devcb); + devcb = &wd11c00_17_device::set_out_ramwr_callback(*device, DEVCB_##_devcb); #define MCFG_WD11C00_17_IN_CS1010_CB(_devcb) \ - devcb = &wd11c00_17_device::set_in_cs1010_callback(*device, DEVCB2_##_devcb); + devcb = &wd11c00_17_device::set_in_cs1010_callback(*device, DEVCB_##_devcb); #define MCFG_WD11C00_17_OUT_CS1010_CB(_devcb) \ - devcb = &wd11c00_17_device::set_out_cs1010_callback(*device, DEVCB2_##_devcb); + devcb = &wd11c00_17_device::set_out_cs1010_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -68,17 +68,17 @@ public: // construction/destruction wd11c00_17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_irq5_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_irq5_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_drq3_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_drq3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_mr_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_mr_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_busy_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_busy_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_req_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_req_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_ra3_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_ra3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_rd322_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_in_rd322_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_ramcs_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_in_ramcs_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_ramwr_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_ramwr_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_cs1010_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_in_cs1010_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_cs1010_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_cs1010_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq5_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_irq5_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_drq3_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_drq3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_mr_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_mr_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_busy_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_busy_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_req_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_req_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_ra3_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_ra3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_rd322_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_in_rd322_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_ramcs_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_in_ramcs_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_ramwr_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_ramwr_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_cs1010_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_in_cs1010_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_cs1010_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_cs1010_cb.set_callback(object); } DECLARE_READ8_MEMBER( io_r ); DECLARE_WRITE8_MEMBER( io_w ); @@ -111,17 +111,17 @@ private: inline void software_reset(); inline void select(); - devcb2_write_line m_out_irq5_cb; - devcb2_write_line m_out_drq3_cb; - devcb2_write_line m_out_mr_cb; - devcb2_write_line m_out_busy_cb; - devcb2_write_line m_out_req_cb; - devcb2_write_line m_out_ra3_cb; - devcb2_read8 m_in_rd322_cb; - devcb2_read8 m_in_ramcs_cb; - devcb2_write8 m_out_ramwr_cb; - devcb2_read8 m_in_cs1010_cb; - devcb2_write8 m_out_cs1010_cb; + devcb_write_line m_out_irq5_cb; + devcb_write_line m_out_drq3_cb; + devcb_write_line m_out_mr_cb; + devcb_write_line m_out_busy_cb; + devcb_write_line m_out_req_cb; + devcb_write_line m_out_ra3_cb; + devcb_read8 m_in_rd322_cb; + devcb_read8 m_in_ramcs_cb; + devcb_write8 m_out_ramwr_cb; + devcb_read8 m_in_cs1010_cb; + devcb_write8 m_out_cs1010_cb; UINT8 m_status; UINT8 m_mask; diff --git a/src/emu/machine/wd17xx.h b/src/emu/machine/wd17xx.h index e55014fbfe3..30280115b11 100644 --- a/src/emu/machine/wd17xx.h +++ b/src/emu/machine/wd17xx.h @@ -18,13 +18,13 @@ ***************************************************************************/ #define MCFG_WD17XX_INTRQ_CALLBACK(_write) \ - devcb = &wd1770_device::set_intrq_wr_callback(*device, DEVCB2_##_write); + devcb = &wd1770_device::set_intrq_wr_callback(*device, DEVCB_##_write); #define MCFG_WD17XX_DRQ_CALLBACK(_write) \ - devcb = &wd1770_device::set_drq_wr_callback(*device, DEVCB2_##_write); + devcb = &wd1770_device::set_drq_wr_callback(*device, DEVCB_##_write); #define MCFG_WD17XX_DDEN_CALLBACK(_write) \ - devcb = &wd1770_device::set_dden_rd_callback(*device, DEVCB2_##_write); + devcb = &wd1770_device::set_dden_rd_callback(*device, DEVCB_##_write); /* Interface */ struct wd17xx_interface @@ -46,9 +46,9 @@ public: wd1770_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); wd1770_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_intrq_wr_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_out_intrq_func.set_callback(object); } - template<class _Object> static devcb2_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_out_drq_func.set_callback(object); } - template<class _Object> static devcb2_base &set_dden_rd_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_in_dden_func.set_callback(object); } + template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_out_intrq_func.set_callback(object); } + template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_out_drq_func.set_callback(object); } + template<class _Object> static devcb_base &set_dden_rd_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_in_dden_func.set_callback(object); } /* the following are not strictly part of the wd179x hardware/emulation but will be put here for now until the flopdrv code has been finalised more */ @@ -113,9 +113,9 @@ protected: // internal state /* callbacks */ - devcb2_write_line m_out_intrq_func; - devcb2_write_line m_out_drq_func; - devcb2_read_line m_in_dden_func; + devcb_write_line m_out_intrq_func; + devcb_write_line m_out_drq_func; + devcb_read_line m_in_dden_func; /* input lines */ int m_mr; /* master reset */ diff --git a/src/emu/machine/wd2010.h b/src/emu/machine/wd2010.h index 69c4293bdfe..8e18254f30b 100644 --- a/src/emu/machine/wd2010.h +++ b/src/emu/machine/wd2010.h @@ -24,43 +24,43 @@ //************************************************************************** #define MCFG_WD2010_OUT_INTRQ_CB(_devcb) \ - devcb = &wd2010_device::set_out_intrq_callback(*device, DEVCB2_##_devcb); + devcb = &wd2010_device::set_out_intrq_callback(*device, DEVCB_##_devcb); #define MCFG_WD2010_OUT_BDRQ_CB(_devcb) \ - devcb = &wd2010_device::set_out_bdrq_callback(*device, DEVCB2_##_devcb); + devcb = &wd2010_device::set_out_bdrq_callback(*device, DEVCB_##_devcb); #define MCFG_WD2010_OUT_BCR_CB(_devcb) \ - devcb = &wd2010_device::set_out_bcr_callback(*device, DEVCB2_##_devcb); + devcb = &wd2010_device::set_out_bcr_callback(*device, DEVCB_##_devcb); #define MCFG_WD2010_IN_BCS_CB(_devcb) \ - devcb = &wd2010_device::set_in_bcs_callback(*device, DEVCB2_##_devcb); + devcb = &wd2010_device::set_in_bcs_callback(*device, DEVCB_##_devcb); #define MCFG_WD2010_OUT_BCS_CB(_devcb) \ - devcb = &wd2010_device::set_out_bcs_callback(*device, DEVCB2_##_devcb); + devcb = &wd2010_device::set_out_bcs_callback(*device, DEVCB_##_devcb); #define MCFG_WD2010_OUT_DIRIN_CB(_devcb) \ - devcb = &wd2010_device::set_out_dirin_callback(*device, DEVCB2_##_devcb); + devcb = &wd2010_device::set_out_dirin_callback(*device, DEVCB_##_devcb); #define MCFG_WD2010_OUT_STEP_CB(_devcb) \ - devcb = &wd2010_device::set_out_step_callback(*device, DEVCB2_##_devcb); + devcb = &wd2010_device::set_out_step_callback(*device, DEVCB_##_devcb); #define MCFG_WD2010_OUT_RWC_CB(_devcb) \ - devcb = &wd2010_device::set_out_rwc_callback(*device, DEVCB2_##_devcb); + devcb = &wd2010_device::set_out_rwc_callback(*device, DEVCB_##_devcb); #define MCFG_WD2010_IN_DRDY_CB(_devcb) \ - devcb = &wd2010_device::set_in_drdy_callback(*device, DEVCB2_##_devcb); + devcb = &wd2010_device::set_in_drdy_callback(*device, DEVCB_##_devcb); #define MCFG_WD2010_IN_INDEX_CB(_devcb) \ - devcb = &wd2010_device::set_in_index_callback(*device, DEVCB2_##_devcb); + devcb = &wd2010_device::set_in_index_callback(*device, DEVCB_##_devcb); #define MCFG_WD2010_IN_WF_CB(_devcb) \ - devcb = &wd2010_device::set_in_wf_callback(*device, DEVCB2_##_devcb); + devcb = &wd2010_device::set_in_wf_callback(*device, DEVCB_##_devcb); #define MCFG_WD2010_IN_TK000_CB(_devcb) \ - devcb = &wd2010_device::set_in_tk000_callback(*device, DEVCB2_##_devcb); + devcb = &wd2010_device::set_in_tk000_callback(*device, DEVCB_##_devcb); #define MCFG_WD2010_IN_SC_CB(_devcb) \ - devcb = &wd2010_device::set_in_sc_callback(*device, DEVCB2_##_devcb); + devcb = &wd2010_device::set_in_sc_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -74,19 +74,19 @@ public: // construction/destruction wd2010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_intrq_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_intrq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_bdrq_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_bdrq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_bcr_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_bcr_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_bcs_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_bcs_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_bcs_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_bcs_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dirin_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_dirin_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_step_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_step_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_rwc_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_rwc_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_drdy_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_drdy_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_index_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_index_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_wf_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_wf_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_tk000_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_tk000_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_sc_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_sc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_intrq_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_intrq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_bdrq_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_bdrq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_bcr_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_bcr_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_bcs_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_bcs_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_bcs_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_bcs_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dirin_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_dirin_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_step_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_step_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_rwc_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_rwc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_drdy_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_drdy_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_index_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_index_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_wf_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_wf_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_tk000_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_tk000_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_sc_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_sc_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -106,19 +106,19 @@ private: void scan_id(UINT8 data); void format(UINT8 data); - devcb2_write_line m_out_intrq_cb; - devcb2_write_line m_out_bdrq_cb; - devcb2_write_line m_out_bcr_cb; - devcb2_read8 m_in_bcs_cb; - devcb2_write8 m_out_bcs_cb; - devcb2_write_line m_out_dirin_cb; - devcb2_write_line m_out_step_cb; - devcb2_write_line m_out_rwc_cb; - devcb2_read_line m_in_drdy_cb; - devcb2_read_line m_in_index_cb; - devcb2_read_line m_in_wf_cb; - devcb2_read_line m_in_tk000_cb; - devcb2_read_line m_in_sc_cb; + devcb_write_line m_out_intrq_cb; + devcb_write_line m_out_bdrq_cb; + devcb_write_line m_out_bcr_cb; + devcb_read8 m_in_bcs_cb; + devcb_write8 m_out_bcs_cb; + devcb_write_line m_out_dirin_cb; + devcb_write_line m_out_step_cb; + devcb_write_line m_out_rwc_cb; + devcb_read_line m_in_drdy_cb; + devcb_read_line m_in_index_cb; + devcb_read_line m_in_wf_cb; + devcb_read_line m_in_tk000_cb; + devcb_read_line m_in_sc_cb; UINT8 m_status; UINT8 m_error; diff --git a/src/emu/machine/wd33c93.h b/src/emu/machine/wd33c93.h index cc97aaab5c9..ac9a0fb5379 100644 --- a/src/emu/machine/wd33c93.h +++ b/src/emu/machine/wd33c93.h @@ -46,7 +46,7 @@ enum #define FIFO_SIZE 12 #define MCFG_WD33C93_IRQ_CB(_devcb) \ - devcb = &wd33c93_device::set_irq_callback(*device, DEVCB2_##_devcb); + devcb = &wd33c93_device::set_irq_callback(*device, DEVCB_##_devcb); class wd33c93_device : public legacy_scsi_host_adapter { @@ -54,7 +54,7 @@ public: // construction/destruction wd33c93_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast<wd33c93_device &>(device).m_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<wd33c93_device &>(device).m_irq_cb.set_callback(object); } DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -98,7 +98,7 @@ private: emu_timer *cmd_timer; emu_timer *service_req_timer; emu_timer *deassert_cip_timer; - devcb2_write_line m_irq_cb; /* irq callback */ + devcb_write_line m_irq_cb; /* irq callback */ }; // device type definition diff --git a/src/emu/machine/wd7600.h b/src/emu/machine/wd7600.h index 1fdc927e0ae..c6640e920c2 100644 --- a/src/emu/machine/wd7600.h +++ b/src/emu/machine/wd7600.h @@ -24,31 +24,31 @@ wd7600_device::static_set_keybctag(*device, _keybctag); #define MCFG_WD7600_IOR(_ior) \ - downcast<wd7600_device *>(device)->set_ior_callback(DEVCB2_##_ior); + downcast<wd7600_device *>(device)->set_ior_callback(DEVCB_##_ior); #define MCFG_WD7600_IOW(_iow) \ - downcast<wd7600_device *>(device)->set_iow_callback(DEVCB2_##_iow); + downcast<wd7600_device *>(device)->set_iow_callback(DEVCB_##_iow); #define MCFG_WD7600_TC(_tc) \ - downcast<wd7600_device *>(device)->set_tc_callback(DEVCB2_##_tc); + downcast<wd7600_device *>(device)->set_tc_callback(DEVCB_##_tc); #define MCFG_WD7600_HOLD(_hold) \ - downcast<wd7600_device *>(device)->set_hold_callback(DEVCB2_##_hold); + downcast<wd7600_device *>(device)->set_hold_callback(DEVCB_##_hold); #define MCFG_WD7600_NMI(_nmi) \ - downcast<wd7600_device *>(device)->set_nmi_callback(DEVCB2_##_nmi); + downcast<wd7600_device *>(device)->set_nmi_callback(DEVCB_##_nmi); #define MCFG_WD7600_INTR(_intr) \ - downcast<wd7600_device *>(device)->set_intr_callback(DEVCB2_##_intr); + downcast<wd7600_device *>(device)->set_intr_callback(DEVCB_##_intr); #define MCFG_WD7600_CPURESET(_cpureset) \ - downcast<wd7600_device *>(device)->set_cpureset_callback(DEVCB2_##_cpureset); + downcast<wd7600_device *>(device)->set_cpureset_callback(DEVCB_##_cpureset); #define MCFG_WD7600_A20M(_a20m) \ - downcast<wd7600_device *>(device)->set_a20m_callback(DEVCB2_##_a20m); + downcast<wd7600_device *>(device)->set_a20m_callback(DEVCB_##_a20m); #define MCFG_WD7600_SPKR(_spkr) \ - downcast<wd7600_device *>(device)->set_spkr_callback(DEVCB2_##_spkr); + downcast<wd7600_device *>(device)->set_spkr_callback(DEVCB_##_spkr); //************************************************************************** @@ -177,15 +177,15 @@ protected: virtual void device_reset(); private: - devcb2_read16 m_read_ior; - devcb2_write16 m_write_iow; - devcb2_write8 m_write_tc; - devcb2_write_line m_write_hold; - devcb2_write_line m_write_nmi; - devcb2_write_line m_write_intr; - devcb2_write_line m_write_cpureset; - devcb2_write_line m_write_a20m; - devcb2_write_line m_write_spkr; + devcb_read16 m_read_ior; + devcb_write16 m_write_iow; + devcb_write8 m_write_tc; + devcb_write_line m_write_hold; + devcb_write_line m_write_nmi; + devcb_write_line m_write_intr; + devcb_write_line m_write_cpureset; + devcb_write_line m_write_a20m; + devcb_write_line m_write_spkr; required_device<am9517a_device> m_dma1; required_device<am9517a_device> m_dma2; diff --git a/src/emu/machine/wd_fdc.h b/src/emu/machine/wd_fdc.h index 18fe007eee7..b9e7c0f2243 100644 --- a/src/emu/machine/wd_fdc.h +++ b/src/emu/machine/wd_fdc.h @@ -112,25 +112,25 @@ downcast<wd_fdc_t *>(device)->set_force_ready(true); #define MCFG_WD_FDC_INTRQ_CALLBACK(_write) \ - devcb = &wd_fdc_t::set_intrq_wr_callback(*device, DEVCB2_##_write); + devcb = &wd_fdc_t::set_intrq_wr_callback(*device, DEVCB_##_write); #define MCFG_WD_FDC_DRQ_CALLBACK(_write) \ - devcb = &wd_fdc_t::set_drq_wr_callback(*device, DEVCB2_##_write); + devcb = &wd_fdc_t::set_drq_wr_callback(*device, DEVCB_##_write); #define MCFG_WD_FDC_HLD_CALLBACK(_write) \ - devcb = &wd_fdc_t::set_hld_wr_callback(*device, DEVCB2_##_write); + devcb = &wd_fdc_t::set_hld_wr_callback(*device, DEVCB_##_write); #define MCFG_WD_FDC_ENP_CALLBACK(_write) \ - devcb = &wd_fdc_t::set_enp_wr_callback(*device, DEVCB2_##_write); + devcb = &wd_fdc_t::set_enp_wr_callback(*device, DEVCB_##_write); class wd_fdc_t : public device_t { public: wd_fdc_t(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_intrq_wr_callback(device_t &device, _Object object) { return downcast<wd_fdc_t &>(device).intrq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<wd_fdc_t &>(device).drq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_hld_wr_callback(device_t &device, _Object object) { return downcast<wd_fdc_t &>(device).hld_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_enp_wr_callback(device_t &device, _Object object) { return downcast<wd_fdc_t &>(device).enp_cb.set_callback(object); } + template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<wd_fdc_t &>(device).intrq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<wd_fdc_t &>(device).drq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_hld_wr_callback(device_t &device, _Object object) { return downcast<wd_fdc_t &>(device).hld_cb.set_callback(object); } + template<class _Object> static devcb_base &set_enp_wr_callback(device_t &device, _Object object) { return downcast<wd_fdc_t &>(device).enp_cb.set_callback(object); } void soft_reset(); @@ -364,7 +364,7 @@ private: live_info cur_live, checkpoint_live; - devcb2_write_line intrq_cb, drq_cb, hld_cb, enp_cb; + devcb_write_line intrq_cb, drq_cb, hld_cb, enp_cb; UINT8 format_last_byte; int format_last_byte_count; diff --git a/src/emu/machine/z80ctc.h b/src/emu/machine/z80ctc.h index ff3e3324bce..d8ead13548f 100644 --- a/src/emu/machine/z80ctc.h +++ b/src/emu/machine/z80ctc.h @@ -35,16 +35,16 @@ //************************************************************************** #define MCFG_Z80CTC_INTR_CB(_devcb) \ - devcb = &z80ctc_device::set_intr_callback(*device, DEVCB2_##_devcb); + devcb = &z80ctc_device::set_intr_callback(*device, DEVCB_##_devcb); #define MCFG_Z80CTC_ZC0_CB(_devcb) \ - devcb = &z80ctc_device::set_zc0_callback(*device, DEVCB2_##_devcb); + devcb = &z80ctc_device::set_zc0_callback(*device, DEVCB_##_devcb); #define MCFG_Z80CTC_ZC1_CB(_devcb) \ - devcb = &z80ctc_device::set_zc1_callback(*device, DEVCB2_##_devcb); + devcb = &z80ctc_device::set_zc1_callback(*device, DEVCB_##_devcb); #define MCFG_Z80CTC_ZC2_CB(_devcb) \ - devcb = &z80ctc_device::set_zc2_callback(*device, DEVCB2_##_devcb); + devcb = &z80ctc_device::set_zc2_callback(*device, DEVCB_##_devcb); //************************************************************************** @@ -61,10 +61,10 @@ public: // construction/destruction z80ctc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_intr_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_intr_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_zc0_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_zc0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_zc1_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_zc1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_zc2_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_zc2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_intr_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_intr_cb.set_callback(object); } + template<class _Object> static devcb_base &set_zc0_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_zc0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_zc1_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_zc1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_zc2_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_zc2_cb.set_callback(object); } // read/write handlers DECLARE_READ8_MEMBER( read ); @@ -119,11 +119,11 @@ private: }; // internal state - devcb2_write_line m_intr_cb; // interrupt callback - devcb2_write_line m_zc0_cb; // channel 0 zero crossing callbacks - devcb2_write_line m_zc1_cb; // channel 1 zero crossing callbacks - devcb2_write_line m_zc2_cb; // channel 2 zero crossing callbacks - devcb2_write_line m_zc3_cb; // channel 3 zero crossing callbacks = NULL ? + devcb_write_line m_intr_cb; // interrupt callback + devcb_write_line m_zc0_cb; // channel 0 zero crossing callbacks + devcb_write_line m_zc1_cb; // channel 1 zero crossing callbacks + devcb_write_line m_zc2_cb; // channel 2 zero crossing callbacks + devcb_write_line m_zc3_cb; // channel 3 zero crossing callbacks = NULL ? UINT8 m_vector; // interrupt vector attotime m_period16; // 16/system clock diff --git a/src/emu/machine/z80dart.h b/src/emu/machine/z80dart.h index 377a6ca3e55..1e0114c120c 100644 --- a/src/emu/machine/z80dart.h +++ b/src/emu/machine/z80dart.h @@ -193,49 +193,49 @@ z80dart_device::configure_channels(*device, _rxa, _txa, _rxb, _txb); #define MCFG_Z80DART_OUT_TXDA_CB(_devcb) \ - devcb = &z80dart_device::set_out_txda_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_txda_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DART_OUT_DTRA_CB(_devcb) \ - devcb = &z80dart_device::set_out_dtra_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_dtra_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DART_OUT_RTSA_CB(_devcb) \ - devcb = &z80dart_device::set_out_rtsa_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_rtsa_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DART_OUT_WRDYA_CB(_devcb) \ - devcb = &z80dart_device::set_out_wrdya_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_wrdya_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DART_OUT_SYNCA_CB(_devcb) \ - devcb = &z80dart_device::set_out_synca_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_synca_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DART_OUT_TXDB_CB(_devcb) \ - devcb = &z80dart_device::set_out_txdb_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_txdb_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DART_OUT_DTRB_CB(_devcb) \ - devcb = &z80dart_device::set_out_dtrb_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_dtrb_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DART_OUT_RTSB_CB(_devcb) \ - devcb = &z80dart_device::set_out_rtsb_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_rtsb_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DART_OUT_WRDYB_CB(_devcb) \ - devcb = &z80dart_device::set_out_wrdyb_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_wrdyb_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DART_OUT_SYNCB_CB(_devcb) \ - devcb = &z80dart_device::set_out_syncb_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_syncb_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DART_OUT_INT_CB(_devcb) \ - devcb = &z80dart_device::set_out_int_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_int_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DART_OUT_RXDRQA_CB(_devcb) \ - devcb = &z80dart_device::set_out_rxdrqa_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_rxdrqa_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DART_OUT_TXDRQA_CB(_devcb) \ - devcb = &z80dart_device::set_out_txdrqa_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_txdrqa_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DART_OUT_RXDRQB_CB(_devcb) \ - devcb = &z80dart_device::set_out_rxdrqb_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_rxdrqb_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DART_OUT_TXDRQB_CB(_devcb) \ - devcb = &z80dart_device::set_out_txdrqb_callback(*device, DEVCB2_##_devcb); + devcb = &z80dart_device::set_out_txdrqb_callback(*device, DEVCB_##_devcb); //************************************************************************** @@ -473,21 +473,21 @@ public: z80dart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source); z80dart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_txda_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txda_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dtra_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_dtra_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_rtsa_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_rtsa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_wrdya_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_wrdya_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_synca_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_synca_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_txdb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txdb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_dtrb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_dtrb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_rtsb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_rtsb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_wrdyb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_wrdyb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_syncb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_syncb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_int_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_rxdrqa_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_rxdrqa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_txdrqa_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txdrqa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_rxdrqb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_rxdrqb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_txdrqb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txdrqb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txda_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dtra_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_dtra_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_rtsa_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_rtsa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_wrdya_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_wrdya_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_synca_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_synca_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_txdb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txdb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_dtrb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_dtrb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_rtsb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_rtsb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_wrdyb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_wrdyb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_syncb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_syncb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_int_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_rxdrqa_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_rxdrqa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_txdrqa_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txdrqa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_rxdrqb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_rxdrqb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_txdrqb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txdrqb_cb.set_callback(object); } static void configure_channels(device_t &device, int rxa, int txa, int rxb, int txb) { @@ -566,23 +566,23 @@ protected: int m_rxcb; int m_txcb; - devcb2_write_line m_out_txda_cb; - devcb2_write_line m_out_dtra_cb; - devcb2_write_line m_out_rtsa_cb; - devcb2_write_line m_out_wrdya_cb; - devcb2_write_line m_out_synca_cb; + devcb_write_line m_out_txda_cb; + devcb_write_line m_out_dtra_cb; + devcb_write_line m_out_rtsa_cb; + devcb_write_line m_out_wrdya_cb; + devcb_write_line m_out_synca_cb; - devcb2_write_line m_out_txdb_cb; - devcb2_write_line m_out_dtrb_cb; - devcb2_write_line m_out_rtsb_cb; - devcb2_write_line m_out_wrdyb_cb; - devcb2_write_line m_out_syncb_cb; + devcb_write_line m_out_txdb_cb; + devcb_write_line m_out_dtrb_cb; + devcb_write_line m_out_rtsb_cb; + devcb_write_line m_out_wrdyb_cb; + devcb_write_line m_out_syncb_cb; - devcb2_write_line m_out_int_cb; - devcb2_write_line m_out_rxdrqa_cb; - devcb2_write_line m_out_txdrqa_cb; - devcb2_write_line m_out_rxdrqb_cb; - devcb2_write_line m_out_txdrqb_cb; + devcb_write_line m_out_int_cb; + devcb_write_line m_out_rxdrqa_cb; + devcb_write_line m_out_txdrqa_cb; + devcb_write_line m_out_rxdrqb_cb; + devcb_write_line m_out_txdrqb_cb; int m_int_state[8]; // interrupt state diff --git a/src/emu/machine/z80dma.h b/src/emu/machine/z80dma.h index 48298524eaf..93641ff17c5 100644 --- a/src/emu/machine/z80dma.h +++ b/src/emu/machine/z80dma.h @@ -41,25 +41,25 @@ //************************************************************************** #define MCFG_Z80DMA_OUT_BUSREQ_CB(_devcb) \ - devcb = &z80dma_device::set_out_busreq_callback(*device, DEVCB2_##_devcb); + devcb = &z80dma_device::set_out_busreq_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DMA_OUT_INT_CB(_devcb) \ - devcb = &z80dma_device::set_out_int_callback(*device, DEVCB2_##_devcb); + devcb = &z80dma_device::set_out_int_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DMA_OUT_BAO_CB(_devcb) \ - devcb = &z80dma_device::set_out_bao_callback(*device, DEVCB2_##_devcb); + devcb = &z80dma_device::set_out_bao_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DMA_IN_MREQ_CB(_devcb) \ - devcb = &z80dma_device::set_in_mreq_callback(*device, DEVCB2_##_devcb); + devcb = &z80dma_device::set_in_mreq_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DMA_OUT_MREQ_CB(_devcb) \ - devcb = &z80dma_device::set_out_mreq_callback(*device, DEVCB2_##_devcb); + devcb = &z80dma_device::set_out_mreq_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DMA_IN_IORQ_CB(_devcb) \ - devcb = &z80dma_device::set_in_iorq_callback(*device, DEVCB2_##_devcb); + devcb = &z80dma_device::set_in_iorq_callback(*device, DEVCB_##_devcb); #define MCFG_Z80DMA_OUT_IORQ_CB(_devcb) \ - devcb = &z80dma_device::set_out_iorq_callback(*device, DEVCB2_##_devcb); + devcb = &z80dma_device::set_out_iorq_callback(*device, DEVCB_##_devcb); //************************************************************************** @@ -76,13 +76,13 @@ public: // construction/destruction z80dma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_busreq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_busreq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_int_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_bao_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_bao_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_mreq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_in_mreq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_mreq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_mreq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_iorq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_in_iorq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_iorq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_iorq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_busreq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_busreq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_int_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_bao_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_bao_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_mreq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_in_mreq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_mreq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_mreq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_iorq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_in_iorq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_iorq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_iorq_cb.set_callback(object); } UINT8 read(); void write(UINT8 data); @@ -121,13 +121,13 @@ private: void rdy_write_callback(int state); // internal state - devcb2_write_line m_out_busreq_cb; - devcb2_write_line m_out_int_cb; - devcb2_write_line m_out_bao_cb; - devcb2_read8 m_in_mreq_cb; - devcb2_write8 m_out_mreq_cb; - devcb2_read8 m_in_iorq_cb; - devcb2_write8 m_out_iorq_cb; + devcb_write_line m_out_busreq_cb; + devcb_write_line m_out_int_cb; + devcb_write_line m_out_bao_cb; + devcb_read8 m_in_mreq_cb; + devcb_write8 m_out_mreq_cb; + devcb_read8 m_in_iorq_cb; + devcb_write8 m_out_iorq_cb; emu_timer *m_timer; diff --git a/src/emu/machine/z80pio.h b/src/emu/machine/z80pio.h index 9f6896de17c..c6f614837db 100644 --- a/src/emu/machine/z80pio.h +++ b/src/emu/machine/z80pio.h @@ -43,25 +43,25 @@ //************************************************************************** #define MCFG_Z80PIO_OUT_INT_CB(_devcb) \ - devcb = &z80pio_device::set_out_int_callback(*device, DEVCB2_##_devcb); + devcb = &z80pio_device::set_out_int_callback(*device, DEVCB_##_devcb); #define MCFG_Z80PIO_IN_PA_CB(_devcb) \ - devcb = &z80pio_device::set_in_pa_callback(*device, DEVCB2_##_devcb); + devcb = &z80pio_device::set_in_pa_callback(*device, DEVCB_##_devcb); #define MCFG_Z80PIO_OUT_PA_CB(_devcb) \ - devcb = &z80pio_device::set_out_pa_callback(*device, DEVCB2_##_devcb); + devcb = &z80pio_device::set_out_pa_callback(*device, DEVCB_##_devcb); #define MCFG_Z80PIO_OUT_ARDY_CB(_devcb) \ - devcb = &z80pio_device::set_out_ardy_callback(*device, DEVCB2_##_devcb); + devcb = &z80pio_device::set_out_ardy_callback(*device, DEVCB_##_devcb); #define MCFG_Z80PIO_IN_PB_CB(_devcb) \ - devcb = &z80pio_device::set_in_pb_callback(*device, DEVCB2_##_devcb); + devcb = &z80pio_device::set_in_pb_callback(*device, DEVCB_##_devcb); #define MCFG_Z80PIO_OUT_PB_CB(_devcb) \ - devcb = &z80pio_device::set_out_pb_callback(*device, DEVCB2_##_devcb); + devcb = &z80pio_device::set_out_pb_callback(*device, DEVCB_##_devcb); #define MCFG_Z80PIO_OUT_BRDY_CB(_devcb) \ - devcb = &z80pio_device::set_out_brdy_callback(*device, DEVCB2_##_devcb); + devcb = &z80pio_device::set_out_brdy_callback(*device, DEVCB_##_devcb); //************************************************************************** @@ -85,13 +85,13 @@ public: // construction/destruction z80pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_int_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_in_pa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_pa_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_ardy_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_ardy_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_in_pb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_pb_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_brdy_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_brdy_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_int_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_in_pa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_pa_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_ardy_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_ardy_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_in_pb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_pb_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_brdy_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_brdy_cb.set_callback(object); } // I/O line access int rdy(int which) { return m_port[which].rdy(); } @@ -198,15 +198,15 @@ private: // internal state pio_port m_port[2]; - devcb2_write_line m_out_int_cb; + devcb_write_line m_out_int_cb; - devcb2_read8 m_in_pa_cb; - devcb2_write8 m_out_pa_cb; - devcb2_write_line m_out_ardy_cb; + devcb_read8 m_in_pa_cb; + devcb_write8 m_out_pa_cb; + devcb_write_line m_out_ardy_cb; - devcb2_read8 m_in_pb_cb; - devcb2_write8 m_out_pb_cb; - devcb2_write_line m_out_brdy_cb; + devcb_read8 m_in_pb_cb; + devcb_write8 m_out_pb_cb; + devcb_write_line m_out_brdy_cb; }; diff --git a/src/emu/machine/z80sio.h b/src/emu/machine/z80sio.h index a1e1aa91bb2..90ae3f16d95 100644 --- a/src/emu/machine/z80sio.h +++ b/src/emu/machine/z80sio.h @@ -22,13 +22,13 @@ //************************************************************************** #define MCFG_Z80SIO_INT_CALLBACK(_write) \ - devcb = &z80sio_device::set_int_callback(*device, DEVCB2_##_write); + devcb = &z80sio_device::set_int_callback(*device, DEVCB_##_write); #define MCFG_Z80SIO_TRANSMIT_CALLBACK(_write) \ - devcb = &z80sio_device::set_transmit_callback(*device, DEVCB2_##_write); + devcb = &z80sio_device::set_transmit_callback(*device, DEVCB_##_write); #define MCFG_Z80SIO_RECEIVE_CALLBACK(_read) \ - devcb = &z80sio_device::set_receive_callback(*device, DEVCB2_##_read); + devcb = &z80sio_device::set_receive_callback(*device, DEVCB_##_read); @@ -45,9 +45,9 @@ public: // construction/destruction z80sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_int_callback(device_t &device, _Object object) { return downcast<z80sio_device &>(device).m_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_transmit_callback(device_t &device, _Object object) { return downcast<z80sio_device &>(device).m_transmit.set_callback(object); } - template<class _Object> static devcb2_base &set_receive_callback(device_t &device, _Object object) { return downcast<z80sio_device &>(device).m_received_poll.set_callback(object); } + template<class _Object> static devcb_base &set_int_callback(device_t &device, _Object object) { return downcast<z80sio_device &>(device).m_irq.set_callback(object); } + template<class _Object> static devcb_base &set_transmit_callback(device_t &device, _Object object) { return downcast<z80sio_device &>(device).m_transmit.set_callback(object); } + template<class _Object> static devcb_base &set_receive_callback(device_t &device, _Object object) { return downcast<z80sio_device &>(device).m_received_poll.set_callback(object); } // control register I/O UINT8 control_read(int ch) { return m_channel[ch].control_read(); } @@ -137,12 +137,12 @@ private: UINT8 m_int_state[8]; // interrupt states // callbacks - devcb2_write_line m_irq; - devcb2_write8 m_dtr_changed; - devcb2_write8 m_rts_changed; - devcb2_write8 m_break_changed; - devcb2_write16 m_transmit; - devcb2_read16 m_received_poll; + devcb_write_line m_irq; + devcb_write8 m_dtr_changed; + devcb_write8 m_rts_changed; + devcb_write8 m_break_changed; + devcb_write16 m_transmit; + devcb_read16 m_received_poll; static const UINT8 k_int_priority[]; }; diff --git a/src/emu/machine/z80sti.h b/src/emu/machine/z80sti.h index c671f823e87..2d156706c69 100644 --- a/src/emu/machine/z80sti.h +++ b/src/emu/machine/z80sti.h @@ -49,28 +49,28 @@ z80sti_device::set_tx_clock(*device, _clock); #define MCFG_Z80STI_OUT_INT_CB(_devcb) \ - devcb = &z80sti_device::set_out_int_callback(*device, DEVCB2_##_devcb); + devcb = &z80sti_device::set_out_int_callback(*device, DEVCB_##_devcb); #define MCFG_Z80STI_IN_GPIO_CB(_devcb) \ - devcb = &z80sti_device::set_in_gpio_callback(*device, DEVCB2_##_devcb); + devcb = &z80sti_device::set_in_gpio_callback(*device, DEVCB_##_devcb); #define MCFG_Z80STI_OUT_GPIO_CB(_devcb) \ - devcb = &z80sti_device::set_out_gpio_callback(*device, DEVCB2_##_devcb); + devcb = &z80sti_device::set_out_gpio_callback(*device, DEVCB_##_devcb); #define MCFG_Z80STI_OUT_SO_CB(_devcb) \ - devcb = &z80sti_device::set_out_so_callback(*device, DEVCB2_##_devcb); + devcb = &z80sti_device::set_out_so_callback(*device, DEVCB_##_devcb); #define MCFG_Z80STI_OUT_TAO_CB(_devcb) \ - devcb = &z80sti_device::set_out_tao_callback(*device, DEVCB2_##_devcb); + devcb = &z80sti_device::set_out_tao_callback(*device, DEVCB_##_devcb); #define MCFG_Z80STI_OUT_TBO_CB(_devcb) \ - devcb = &z80sti_device::set_out_tbo_callback(*device, DEVCB2_##_devcb); + devcb = &z80sti_device::set_out_tbo_callback(*device, DEVCB_##_devcb); #define MCFG_Z80STI_OUT_TCO_CB(_devcb) \ - devcb = &z80sti_device::set_out_tco_callback(*device, DEVCB2_##_devcb); + devcb = &z80sti_device::set_out_tco_callback(*device, DEVCB_##_devcb); #define MCFG_Z80STI_OUT_TDO_CB(_devcb) \ - devcb = &z80sti_device::set_out_tdo_callback(*device, DEVCB2_##_devcb); + devcb = &z80sti_device::set_out_tdo_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -86,14 +86,14 @@ public: // construction/destruction z80sti_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_int_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_gpio_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_in_gpio_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_gpio_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_gpio_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_so_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_so_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_tao_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_tao_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_tbo_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_tbo_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_tco_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_tco_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_tdo_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_tdo_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_int_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_gpio_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_in_gpio_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_gpio_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_gpio_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_so_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_so_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_tao_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_tao_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_tbo_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_tbo_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_tco_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_tco_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_tdo_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_tdo_cb.set_callback(object); } static void set_rx_clock(device_t &device, int clock) { downcast<z80sti_device &>(device).m_rx_clock = clock; } static void set_tx_clock(device_t &device, int clock) { downcast<z80sti_device &>(device).m_tx_clock = clock; } @@ -201,14 +201,14 @@ private: void gpip_input(int bit, int state); // device callbacks - devcb2_write_line m_out_int_cb; // this gets called on each change of the _INT pin (pin 17) - devcb2_read8 m_in_gpio_cb; // this is called on each read of the GPIO pins - devcb2_write8 m_out_gpio_cb; // this is called on each write of the GPIO pins - devcb2_write_line m_out_so_cb; // this gets called for each change of the SO pin (pin 37) - devcb2_write_line m_out_tao_cb; // this gets called for each change of the TAO pin (pin 1) - devcb2_write_line m_out_tbo_cb; // this gets called for each change of the TBO pin (pin 2) - devcb2_write_line m_out_tco_cb; // this gets called for each change of the TCO pin (pin 3) - devcb2_write_line m_out_tdo_cb; // this gets called for each change of the TDO pin (pin 4) + devcb_write_line m_out_int_cb; // this gets called on each change of the _INT pin (pin 17) + devcb_read8 m_in_gpio_cb; // this is called on each read of the GPIO pins + devcb_write8 m_out_gpio_cb; // this is called on each write of the GPIO pins + devcb_write_line m_out_so_cb; // this gets called for each change of the SO pin (pin 37) + devcb_write_line m_out_tao_cb; // this gets called for each change of the TAO pin (pin 1) + devcb_write_line m_out_tbo_cb; // this gets called for each change of the TBO pin (pin 2) + devcb_write_line m_out_tco_cb; // this gets called for each change of the TCO pin (pin 3) + devcb_write_line m_out_tdo_cb; // this gets called for each change of the TDO pin (pin 4) int m_rx_clock; // serial receive clock int m_tx_clock; // serial transmit clock diff --git a/src/emu/machine/z8536.h b/src/emu/machine/z8536.h index 6136385455b..ffbc30aa9e6 100644 --- a/src/emu/machine/z8536.h +++ b/src/emu/machine/z8536.h @@ -47,25 +47,25 @@ //************************************************************************** #define MCFG_Z8536_IRQ_CALLBACK(_write) \ - devcb = &z8536_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &z8536_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_Z8536_PA_IN_CALLBACK(_read) \ - devcb = &z8536_device::set_pa_rd_callback(*device, DEVCB2_##_read); + devcb = &z8536_device::set_pa_rd_callback(*device, DEVCB_##_read); #define MCFG_Z8536_PA_OUT_CALLBACK(_write) \ - devcb = &z8536_device::set_pa_wr_callback(*device, DEVCB2_##_write); + devcb = &z8536_device::set_pa_wr_callback(*device, DEVCB_##_write); #define MCFG_Z8536_PB_IN_CALLBACK(_read) \ - devcb = &z8536_device::set_pb_rd_callback(*device, DEVCB2_##_read); + devcb = &z8536_device::set_pb_rd_callback(*device, DEVCB_##_read); #define MCFG_Z8536_PB_OUT_CALLBACK(_write) \ - devcb = &z8536_device::set_pb_wr_callback(*device, DEVCB2_##_write); + devcb = &z8536_device::set_pb_wr_callback(*device, DEVCB_##_write); #define MCFG_Z8536_PC_IN_CALLBACK(_read) \ - devcb = &z8536_device::set_pc_rd_callback(*device, DEVCB2_##_read); + devcb = &z8536_device::set_pc_rd_callback(*device, DEVCB_##_read); #define MCFG_Z8536_PC_OUT_CALLBACK(_write) \ - devcb = &z8536_device::set_pc_wr_callback(*device, DEVCB2_##_write); + devcb = &z8536_device::set_pc_wr_callback(*device, DEVCB_##_write); @@ -82,13 +82,13 @@ public: // construction/destruction z8536_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<z8536_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_pa_rd_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_read_pa.set_callback(object); } - template<class _Object> static devcb2_base &set_pa_wr_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_write_pa.set_callback(object); } - template<class _Object> static devcb2_base &set_pb_rd_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_read_pb.set_callback(object); } - template<class _Object> static devcb2_base &set_pb_wr_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_write_pb.set_callback(object); } - template<class _Object> static devcb2_base &set_pc_rd_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_read_pc.set_callback(object); } - template<class _Object> static devcb2_base &set_pc_wr_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_write_pc.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_pa_rd_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_read_pa.set_callback(object); } + template<class _Object> static devcb_base &set_pa_wr_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_write_pa.set_callback(object); } + template<class _Object> static devcb_base &set_pb_rd_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_read_pb.set_callback(object); } + template<class _Object> static devcb_base &set_pb_wr_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_write_pb.set_callback(object); } + template<class _Object> static devcb_base &set_pc_rd_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_read_pc.set_callback(object); } + template<class _Object> static devcb_base &set_pc_wr_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_write_pc.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -317,16 +317,16 @@ private: void match_pattern(int port); void external_port_w(int port, int bit, int state); - devcb2_write_line m_write_irq; + devcb_write_line m_write_irq; - devcb2_read8 m_read_pa; - devcb2_write8 m_write_pa; + devcb_read8 m_read_pa; + devcb_write8 m_write_pa; - devcb2_read8 m_read_pb; - devcb2_write8 m_write_pb; + devcb_read8 m_read_pb; + devcb_write8 m_write_pb; - devcb2_read8 m_read_pc; - devcb2_write8 m_write_pc; + devcb_read8 m_read_pc; + devcb_write8 m_write_pc; // interrupt state int m_irq; diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index ea3f6e494fe..76e439625ea 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -91,26 +91,26 @@ private: #define MACHINE_CONFIG_START(_name, _class) \ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t *owner, device_t *device) \ { \ - devcb2_base *devcb = NULL; \ + devcb_base *devcb = NULL; \ (void)devcb; \ if (owner == NULL) owner = config.device_add(NULL, "root", &driver_device_creator<_class>, 0); #define MACHINE_CONFIG_FRAGMENT(_name) \ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t *owner, device_t *device) \ { \ - devcb2_base *devcb = NULL; \ + devcb_base *devcb = NULL; \ (void)devcb; \ assert(owner != NULL); #define MACHINE_CONFIG_DERIVED(_name, _base) \ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t *owner, device_t *device) \ { \ - devcb2_base *devcb = NULL; \ + devcb_base *devcb = NULL; \ (void)devcb; \ owner = MACHINE_CONFIG_NAME(_base)(config, owner, device); \ assert(owner != NULL); #define MACHINE_CONFIG_DERIVED_CLASS(_name, _base, _class) \ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t *owner, device_t *device) \ { \ - devcb2_base *devcb = NULL; \ + devcb_base *devcb = NULL; \ (void)devcb; \ if (owner == NULL) owner = config.device_add(NULL, "root", &driver_device_creator<_class>, 0); \ owner = MACHINE_CONFIG_NAME(_base)(config, owner, device); diff --git a/src/emu/sound/2151intf.h b/src/emu/sound/2151intf.h index c0c762c10e9..b043934605c 100644 --- a/src/emu/sound/2151intf.h +++ b/src/emu/sound/2151intf.h @@ -20,9 +20,9 @@ MCFG_DEVICE_ADD(_tag, YM2151, _clock) #define MCFG_YM2151_IRQ_HANDLER(_devcb) \ - devcb = &ym2151_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ym2151_device::set_irq_handler(*device, DEVCB_##_devcb); #define MCFG_YM2151_PORT_WRITE_HANDLER(_devcb) \ - devcb = &ym2151_device::set_port_write_handler(*device, DEVCB2_##_devcb); + devcb = &ym2151_device::set_port_write_handler(*device, DEVCB_##_devcb); //************************************************************************** @@ -40,8 +40,8 @@ public: ym2151_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<ym2151_device &>(device).m_irqhandler.set_callback(object); } - template<class _Object> static devcb2_base &set_port_write_handler(device_t &device, _Object object) { return downcast<ym2151_device &>(device).m_portwritehandler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2151_device &>(device).m_irqhandler.set_callback(object); } + template<class _Object> static devcb_base &set_port_write_handler(device_t &device, _Object object) { return downcast<ym2151_device &>(device).m_portwritehandler.set_callback(object); } // read/write DECLARE_READ8_MEMBER( read ); @@ -70,8 +70,8 @@ private: //emu_timer * m_timer[2]; void * m_chip; UINT8 m_lastreg; - devcb2_write_line m_irqhandler; - devcb2_write8 m_portwritehandler; + devcb_write_line m_irqhandler; + devcb_write8 m_portwritehandler; }; diff --git a/src/emu/sound/2203intf.h b/src/emu/sound/2203intf.h index 5918ac5a1d1..4d47e8743a9 100644 --- a/src/emu/sound/2203intf.h +++ b/src/emu/sound/2203intf.h @@ -9,7 +9,7 @@ void ym2203_update_request(void *param); #define MCFG_YM2203_IRQ_HANDLER(_devcb) \ - devcb = &ym2203_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ym2203_device::set_irq_handler(*device, DEVCB_##_devcb); class ym2203_device : public ay8910_device { @@ -17,7 +17,7 @@ public: ym2203_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<ym2203_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2203_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -45,7 +45,7 @@ private: sound_stream * m_stream; emu_timer * m_timer[2]; void * m_chip; - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; }; extern const device_type YM2203; diff --git a/src/emu/sound/2608intf.h b/src/emu/sound/2608intf.h index 7638eebbb58..399c40edbd1 100644 --- a/src/emu/sound/2608intf.h +++ b/src/emu/sound/2608intf.h @@ -9,7 +9,7 @@ void ym2608_update_request(void *param); #define MCFG_YM2608_IRQ_HANDLER(_devcb) \ - devcb = &ym2608_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ym2608_device::set_irq_handler(*device, DEVCB_##_devcb); class ym2608_device : public ay8910_device { @@ -17,7 +17,7 @@ public: ym2608_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<ym2608_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2608_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -42,7 +42,7 @@ private: sound_stream * m_stream; emu_timer * m_timer[2]; void * m_chip; - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; }; extern const device_type YM2608; diff --git a/src/emu/sound/2610intf.h b/src/emu/sound/2610intf.h index 8e72d06e53d..3845105655a 100644 --- a/src/emu/sound/2610intf.h +++ b/src/emu/sound/2610intf.h @@ -9,7 +9,7 @@ void ym2610_update_request(void *param); #define MCFG_YM2610_IRQ_HANDLER(_devcb) \ - devcb = &ym2610_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ym2610_device::set_irq_handler(*device, DEVCB_##_devcb); class ym2610_device : public ay8910_device { @@ -18,7 +18,7 @@ public: ym2610_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); // static configuration helpers - template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2610_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2610_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -44,7 +44,7 @@ private: // internal state sound_stream * m_stream; emu_timer * m_timer[2]; - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; }; extern const device_type YM2610; diff --git a/src/emu/sound/2612intf.h b/src/emu/sound/2612intf.h index 425f020f54e..3020a548d70 100644 --- a/src/emu/sound/2612intf.h +++ b/src/emu/sound/2612intf.h @@ -8,7 +8,7 @@ void ym2612_update_request(void *param); #define MCFG_YM2612_IRQ_HANDLER(_devcb) \ - devcb = &ym2612_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ym2612_device::set_irq_handler(*device, DEVCB_##_devcb); class ym2612_device : public device_t, public device_sound_interface @@ -18,7 +18,7 @@ public: ym2612_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); // static configuration helpers - template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2612_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2612_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -44,7 +44,7 @@ private: sound_stream * m_stream; emu_timer * m_timer[2]; void * m_chip; - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; }; extern const device_type YM2612; diff --git a/src/emu/sound/262intf.h b/src/emu/sound/262intf.h index af36bbd226c..76b12d1c54f 100644 --- a/src/emu/sound/262intf.h +++ b/src/emu/sound/262intf.h @@ -6,7 +6,7 @@ #include "emu.h" #define MCFG_YMF262_IRQ_HANDLER(_devcb) \ - devcb = &ymf262_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ymf262_device::set_irq_handler(*device, DEVCB_##_devcb); class ymf262_device : public device_t, public device_sound_interface @@ -15,7 +15,7 @@ public: ymf262_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<ymf262_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ymf262_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -40,7 +40,7 @@ private: sound_stream * m_stream; emu_timer * m_timer[2]; void * m_chip; - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; }; extern const device_type YMF262; diff --git a/src/emu/sound/3526intf.h b/src/emu/sound/3526intf.h index 89e74fd835e..226fd399881 100644 --- a/src/emu/sound/3526intf.h +++ b/src/emu/sound/3526intf.h @@ -6,7 +6,7 @@ #include "emu.h" #define MCFG_YM3526_IRQ_HANDLER(_devcb) \ - devcb = &ym3526_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ym3526_device::set_irq_handler(*device, DEVCB_##_devcb); class ym3526_device : public device_t, public device_sound_interface @@ -15,7 +15,7 @@ public: ym3526_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<ym3526_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym3526_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -46,7 +46,7 @@ private: sound_stream * m_stream; emu_timer * m_timer[2]; void * m_chip; - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; }; extern const device_type YM3526; diff --git a/src/emu/sound/3812intf.h b/src/emu/sound/3812intf.h index 2e7f5b23953..a724ac75384 100644 --- a/src/emu/sound/3812intf.h +++ b/src/emu/sound/3812intf.h @@ -6,7 +6,7 @@ #include "emu.h" #define MCFG_YM3812_IRQ_HANDLER(_devcb) \ - devcb = &ym3812_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ym3812_device::set_irq_handler(*device, DEVCB_##_devcb); class ym3812_device : public device_t, public device_sound_interface @@ -15,7 +15,7 @@ public: ym3812_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<ym3812_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym3812_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -45,7 +45,7 @@ private: sound_stream * m_stream; emu_timer * m_timer[2]; void * m_chip; - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; }; extern const device_type YM3812; diff --git a/src/emu/sound/8950intf.h b/src/emu/sound/8950intf.h index 1a61cec78ce..28ed7f5c2d0 100644 --- a/src/emu/sound/8950intf.h +++ b/src/emu/sound/8950intf.h @@ -6,19 +6,19 @@ #include "emu.h" #define MCFG_Y8950_IRQ_HANDLER(_devcb) \ - devcb = &y8950_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &y8950_device::set_irq_handler(*device, DEVCB_##_devcb); #define MCFG_Y8950_KEYBOARD_READ_HANDLER(_devcb) \ - devcb = &y8950_device::set_keyboard_read_handler(*device, DEVCB2_##_devcb); + devcb = &y8950_device::set_keyboard_read_handler(*device, DEVCB_##_devcb); #define MCFG_Y8950_KEYBOARD_WRITE_HANDLER(_devcb) \ - devcb = &y8950_device::set_keyboard_write_handler(*device, DEVCB2_##_devcb); + devcb = &y8950_device::set_keyboard_write_handler(*device, DEVCB_##_devcb); #define MCFG_Y8950_IO_READ_HANDLER(_devcb) \ - devcb = &y8950_device::set_io_read_handler(*device, DEVCB2_##_devcb); + devcb = &y8950_device::set_io_read_handler(*device, DEVCB_##_devcb); #define MCFG_Y8950_IO_WRITE_HANDLER(_devcb) \ - devcb = &y8950_device::set_io_write_handler(*device, DEVCB2_##_devcb); + devcb = &y8950_device::set_io_write_handler(*device, DEVCB_##_devcb); class y8950_device : public device_t, public device_sound_interface @@ -27,11 +27,11 @@ public: y8950_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<y8950_device &>(device).m_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_keyboard_read_handler(device_t &device, _Object object) { return downcast<y8950_device &>(device).m_keyboard_read_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_keyboard_write_handler(device_t &device, _Object object) { return downcast<y8950_device &>(device).m_keyboard_write_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_io_read_handler(device_t &device, _Object object) { return downcast<y8950_device &>(device).m_io_read_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_io_write_handler(device_t &device, _Object object) { return downcast<y8950_device &>(device).m_io_write_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<y8950_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_keyboard_read_handler(device_t &device, _Object object) { return downcast<y8950_device &>(device).m_keyboard_read_handler.set_callback(object); } + template<class _Object> static devcb_base &set_keyboard_write_handler(device_t &device, _Object object) { return downcast<y8950_device &>(device).m_keyboard_write_handler.set_callback(object); } + template<class _Object> static devcb_base &set_io_read_handler(device_t &device, _Object object) { return downcast<y8950_device &>(device).m_io_read_handler.set_callback(object); } + template<class _Object> static devcb_base &set_io_write_handler(device_t &device, _Object object) { return downcast<y8950_device &>(device).m_io_write_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -66,11 +66,11 @@ private: sound_stream * m_stream; emu_timer * m_timer[2]; void * m_chip; - devcb2_write_line m_irq_handler; - devcb2_read8 m_keyboard_read_handler; - devcb2_write8 m_keyboard_write_handler; - devcb2_read8 m_io_read_handler; - devcb2_write8 m_io_write_handler; + devcb_write_line m_irq_handler; + devcb_read8 m_keyboard_read_handler; + devcb_write8 m_keyboard_write_handler; + devcb_read8 m_io_read_handler; + devcb_write8 m_io_write_handler; }; extern const device_type Y8950; diff --git a/src/emu/sound/aica.h b/src/emu/sound/aica.h index 321bc5257d1..ec709756ec8 100644 --- a/src/emu/sound/aica.h +++ b/src/emu/sound/aica.h @@ -15,10 +15,10 @@ aica_device::set_roffset(*device, _offs); #define MCFG_AICA_IRQ_CB(_devcb) \ - devcb = &aica_device::set_irq_callback(*device, DEVCB2_##_devcb); + devcb = &aica_device::set_irq_callback(*device, DEVCB_##_devcb); #define MCFG_AICA_MAIN_IRQ_CB(_devcb) \ - devcb = &aica_device::set_main_irq_callback(*device, DEVCB2_##_devcb); + devcb = &aica_device::set_main_irq_callback(*device, DEVCB_##_devcb); enum AICA_STATE {AICA_ATTACK,AICA_DECAY1,AICA_DECAY2,AICA_RELEASE}; @@ -80,8 +80,8 @@ public: static void set_master(device_t &device) { downcast<aica_device &>(device).m_master = true; } static void set_roffset(device_t &device, int roffset) { downcast<aica_device &>(device).m_roffset = roffset; } - template<class _Object> static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast<aica_device &>(device).m_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_main_irq_callback(device_t &device, _Object object) { return downcast<aica_device &>(device).m_main_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<aica_device &>(device).m_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_main_irq_callback(device_t &device, _Object object) { return downcast<aica_device &>(device).m_main_irq_cb.set_callback(object); } // AICA register access DECLARE_READ16_MEMBER( read ); @@ -138,8 +138,8 @@ private: bool m_master; int m_roffset; /* offset in the region */ - devcb2_write_line m_irq_cb; - devcb2_write_line m_main_irq_cb; + devcb_write_line m_irq_cb; + devcb_write_line m_main_irq_cb; union { diff --git a/src/emu/sound/asc.h b/src/emu/sound/asc.h index 07d7722986f..652d035f990 100644 --- a/src/emu/sound/asc.h +++ b/src/emu/sound/asc.h @@ -51,7 +51,7 @@ enum #define MCFG_ASC_TYPE(_type) \ asc_device::static_set_type(*device, _type); #define MCFG_IRQ_FUNC(_irqf) \ - downcast<asc_device *>(device)->set_irqf(DEVCB2_##_irqf); + downcast<asc_device *>(device)->set_irqf(DEVCB_##_irqf); //************************************************************************** // TYPE DEFINITIONS @@ -74,7 +74,7 @@ public: write_irq.set_callback(wr); } - devcb2_write_line write_irq; + devcb_write_line write_irq; DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c index 627e227d8fd..513d528bcbe 100644 --- a/src/emu/sound/ay8910.c +++ b/src/emu/sound/ay8910.c @@ -733,7 +733,7 @@ void ay8910_device::device_start() m_streams = 1; } - // FIXME: this doesn't belong here, it should be an input pin exposed via devcb2 + // FIXME: this doesn't belong here, it should be an input pin exposed via devcb if (type() == YM2149 && (m_flags & YM2149_PIN26_LOW)) { master_clock /= 2; diff --git a/src/emu/sound/ay8910.h b/src/emu/sound/ay8910.h index 4f6240611d8..62c92f96e4b 100644 --- a/src/emu/sound/ay8910.h +++ b/src/emu/sound/ay8910.h @@ -75,16 +75,16 @@ YMZ294: 0 I/O port ay8910_device::set_resistors_load(*device, _res0, _res1, _res2); #define MCFG_AY8910_PORT_A_READ_CB(_devcb) \ - devcb = &ay8910_device::set_port_a_read_callback(*device, DEVCB2_##_devcb); + devcb = &ay8910_device::set_port_a_read_callback(*device, DEVCB_##_devcb); #define MCFG_AY8910_PORT_B_READ_CB(_devcb) \ - devcb = &ay8910_device::set_port_b_read_callback(*device, DEVCB2_##_devcb); + devcb = &ay8910_device::set_port_b_read_callback(*device, DEVCB_##_devcb); #define MCFG_AY8910_PORT_A_WRITE_CB(_devcb) \ - devcb = &ay8910_device::set_port_a_write_callback(*device, DEVCB2_##_devcb); + devcb = &ay8910_device::set_port_a_write_callback(*device, DEVCB_##_devcb); #define MCFG_AY8910_PORT_B_WRITE_CB(_devcb) \ - devcb = &ay8910_device::set_port_b_write_callback(*device, DEVCB2_##_devcb); + devcb = &ay8910_device::set_port_b_write_callback(*device, DEVCB_##_devcb); class ay8910_device : public device_t, @@ -105,10 +105,10 @@ public: // static configuration helpers static void set_flags(device_t &device, int flags) { downcast<ay8910_device &>(device).m_flags = flags; } static void set_resistors_load(device_t &device, int res_load0, int res_load1, int res_load2) { downcast<ay8910_device &>(device).m_res_load[0] = res_load0; downcast<ay8910_device &>(device).m_res_load[1] = res_load1; downcast<ay8910_device &>(device).m_res_load[2] = res_load2; } - template<class _Object> static devcb2_base &set_port_a_read_callback(device_t &device, _Object object) { return downcast<ay8910_device &>(device).m_port_a_read_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_port_b_read_callback(device_t &device, _Object object) { return downcast<ay8910_device &>(device).m_port_b_read_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_port_a_write_callback(device_t &device, _Object object) { return downcast<ay8910_device &>(device).m_port_a_write_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_port_b_write_callback(device_t &device, _Object object) { return downcast<ay8910_device &>(device).m_port_b_write_cb.set_callback(object); } + template<class _Object> static devcb_base &set_port_a_read_callback(device_t &device, _Object object) { return downcast<ay8910_device &>(device).m_port_a_read_cb.set_callback(object); } + template<class _Object> static devcb_base &set_port_b_read_callback(device_t &device, _Object object) { return downcast<ay8910_device &>(device).m_port_b_read_cb.set_callback(object); } + template<class _Object> static devcb_base &set_port_a_write_callback(device_t &device, _Object object) { return downcast<ay8910_device &>(device).m_port_a_write_cb.set_callback(object); } + template<class _Object> static devcb_base &set_port_b_write_callback(device_t &device, _Object object) { return downcast<ay8910_device &>(device).m_port_b_write_cb.set_callback(object); } DECLARE_READ8_MEMBER( data_r ); DECLARE_WRITE8_MEMBER( address_w ); @@ -182,10 +182,10 @@ private: INT32 m_vol3d_table[8*32*32*32]; int m_flags; /* Flags */ int m_res_load[3]; /* Load on channel in ohms */ - devcb2_read8 m_port_a_read_cb; - devcb2_read8 m_port_b_read_cb; - devcb2_write8 m_port_a_write_cb; - devcb2_write8 m_port_b_write_cb; + devcb_read8 m_port_a_read_cb; + devcb_read8 m_port_b_read_cb; + devcb_write8 m_port_a_write_cb; + devcb_write8 m_port_b_write_cb; }; extern const device_type AY8910; diff --git a/src/emu/sound/cdp1864.h b/src/emu/sound/cdp1864.h index 656edd9056e..c22322ef356 100644 --- a/src/emu/sound/cdp1864.h +++ b/src/emu/sound/cdp1864.h @@ -87,14 +87,14 @@ #define MCFG_CDP1864_ADD(_tag, _screen_tag, _clock, _inlace, _irq, _dma_out, _efx, _hsync, _rdata, _bdata, _gdata) \ MCFG_SOUND_ADD(_tag, CDP1864, _clock) \ MCFG_VIDEO_SET_SCREEN(_screen_tag) \ - downcast<cdp1864_device *>(device)->set_inlace_callback(DEVCB2_##_inlace); \ - downcast<cdp1864_device *>(device)->set_irq_callback(DEVCB2_##_irq); \ - downcast<cdp1864_device *>(device)->set_dma_out_callback(DEVCB2_##_dma_out); \ - downcast<cdp1864_device *>(device)->set_efx_callback(DEVCB2_##_efx); \ - downcast<cdp1864_device *>(device)->set_hsync_callback(DEVCB2_##_hsync); \ - downcast<cdp1864_device *>(device)->set_rdata_callback(DEVCB2_##_rdata); \ - downcast<cdp1864_device *>(device)->set_bdata_callback(DEVCB2_##_bdata); \ - downcast<cdp1864_device *>(device)->set_gdata_callback(DEVCB2_##_gdata); + downcast<cdp1864_device *>(device)->set_inlace_callback(DEVCB_##_inlace); \ + downcast<cdp1864_device *>(device)->set_irq_callback(DEVCB_##_irq); \ + downcast<cdp1864_device *>(device)->set_dma_out_callback(DEVCB_##_dma_out); \ + downcast<cdp1864_device *>(device)->set_efx_callback(DEVCB_##_efx); \ + downcast<cdp1864_device *>(device)->set_hsync_callback(DEVCB_##_hsync); \ + downcast<cdp1864_device *>(device)->set_rdata_callback(DEVCB_##_rdata); \ + downcast<cdp1864_device *>(device)->set_bdata_callback(DEVCB_##_bdata); \ + downcast<cdp1864_device *>(device)->set_gdata_callback(DEVCB_##_gdata); #define MCFG_CDP1864_CHROMINANCE(_r, _b, _g, _bkg) \ downcast<cdp1864_device *>(device)->set_chrominance_resistors(_r, _b, _g, _bkg); @@ -165,14 +165,14 @@ private: static const int bckgnd[]; - devcb2_read_line m_read_inlace; - devcb2_read_line m_read_rdata; - devcb2_read_line m_read_bdata; - devcb2_read_line m_read_gdata; - devcb2_write_line m_write_irq; - devcb2_write_line m_write_dma_out; - devcb2_write_line m_write_efx; - devcb2_write_line m_write_hsync; + devcb_read_line m_read_inlace; + devcb_read_line m_read_rdata; + devcb_read_line m_read_bdata; + devcb_read_line m_read_gdata; + devcb_write_line m_write_irq; + devcb_write_line m_write_dma_out; + devcb_write_line m_write_efx; + devcb_write_line m_write_hsync; bitmap_rgb32 m_bitmap; // bitmap sound_stream *m_stream; // sound output diff --git a/src/emu/sound/cdp1869.h b/src/emu/sound/cdp1869.h index 0c9b1ee1155..1dadd16cab2 100644 --- a/src/emu/sound/cdp1869.h +++ b/src/emu/sound/cdp1869.h @@ -160,10 +160,10 @@ #define CDP1869_PCB_READ_MEMBER(name) int name(UINT16 pma, UINT8 cma, UINT8 pmd) #define MCFG_CDP1869_PAL_NTSC_CALLBACK(_read) \ - devcb = &cdp1869_device::set_pal_ntsc_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1869_device::set_pal_ntsc_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1869_PRD_CALLBACK(_write) \ - devcb = &cdp1869_device::set_prd_wr_callback(*device, DEVCB2_##_write); + devcb = &cdp1869_device::set_prd_wr_callback(*device, DEVCB_##_write); #define MCFG_CDP1869_COLOR_CLOCK(_clk) \ cdp1869_device::static_set_color_clock(*device, _clk); @@ -196,8 +196,8 @@ public: // construction/destruction cdp1869_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_pal_ntsc_rd_callback(device_t &device, _Object object) { return downcast<cdp1869_device &>(device).m_read_pal_ntsc.set_callback(object); } - template<class _Object> static devcb2_base &set_prd_wr_callback(device_t &device, _Object object) { return downcast<cdp1869_device &>(device).m_write_prd.set_callback(object); } + template<class _Object> static devcb_base &set_pal_ntsc_rd_callback(device_t &device, _Object object) { return downcast<cdp1869_device &>(device).m_read_pal_ntsc.set_callback(object); } + template<class _Object> static devcb_base &set_prd_wr_callback(device_t &device, _Object object) { return downcast<cdp1869_device &>(device).m_write_prd.set_callback(object); } static void static_set_char_ram_read(device_t &device, cdp1869_char_ram_read_delegate callback) { downcast<cdp1869_device &>(device).m_in_char_ram_func = callback; } static void static_set_char_ram_write(device_t &device, cdp1869_char_ram_write_delegate callback) { downcast<cdp1869_device &>(device).m_out_char_ram_func = callback; } static void static_set_pcb_read(device_t &device, cdp1869_pcb_read_delegate callback) { downcast<cdp1869_device &>(device).m_in_pcb_func = callback; } @@ -256,8 +256,8 @@ protected: void draw_char(bitmap_rgb32 &bitmap, const rectangle &rect, int x, int y, UINT16 pma); private: - devcb2_read_line m_read_pal_ntsc; - devcb2_write_line m_write_prd; + devcb_read_line m_read_pal_ntsc; + devcb_write_line m_write_prd; cdp1869_pcb_read_delegate m_in_pcb_func; cdp1869_char_ram_read_delegate m_in_char_ram_func; cdp1869_char_ram_write_delegate m_out_char_ram_func; diff --git a/src/emu/sound/es5503.h b/src/emu/sound/es5503.h index 1d649713b1d..14bda5a6228 100644 --- a/src/emu/sound/es5503.h +++ b/src/emu/sound/es5503.h @@ -12,10 +12,10 @@ es5503_device::static_set_channels(*device, _channels); #define MCFG_ES5503_IRQ_FUNC(_write) \ - devcb = &es5503_device::static_set_irqf(*device, DEVCB2_##_write); + devcb = &es5503_device::static_set_irqf(*device, DEVCB_##_write); #define MCFG_ES5503_ADC_FUNC(_read) \ - devcb = &es5503_device::static_set_adcf(*device, DEVCB2_##_read); + devcb = &es5503_device::static_set_adcf(*device, DEVCB_##_read); // ======================> es5503_device @@ -29,8 +29,8 @@ public: static void static_set_channels(device_t &device, int channels); - template<class _Object> static devcb2_base &static_set_irqf(device_t &device, _Object object) { return downcast<es5503_device &>(device).m_irq_func.set_callback(object); } - template<class _Object> static devcb2_base &static_set_adcf(device_t &device, _Object object) { return downcast<es5503_device &>(device).m_adc_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_irqf(device_t &device, _Object object) { return downcast<es5503_device &>(device).m_irq_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_adcf(device_t &device, _Object object) { return downcast<es5503_device &>(device).m_adc_func.set_callback(object); } DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -53,8 +53,8 @@ protected: const address_space_config m_space_config; - devcb2_write_line m_irq_func; - devcb2_read8 m_adc_func; + devcb_write_line m_irq_func; + devcb_read8 m_adc_func; emu_timer *m_sync_timer; diff --git a/src/emu/sound/es5506.h b/src/emu/sound/es5506.h index fe6629f0ef1..dfb99ca17ae 100644 --- a/src/emu/sound/es5506.h +++ b/src/emu/sound/es5506.h @@ -30,10 +30,10 @@ es5506_device::set_channels(*device, _chan); #define MCFG_ES5506_IRQ_CB(_devcb) \ - devcb = &es5506_device::set_irq_callback(*device, DEVCB2_##_devcb); + devcb = &es5506_device::set_irq_callback(*device, DEVCB_##_devcb); #define MCFG_ES5506_READ_PORT_CB(_devcb) \ - devcb = &es5506_device::set_read_port_callback(*device, DEVCB2_##_devcb); + devcb = &es5506_device::set_read_port_callback(*device, DEVCB_##_devcb); #define MCFG_ES5505_REGION0(_region) \ @@ -46,10 +46,10 @@ es5505_device::set_channels(*device, _chan); #define MCFG_ES5505_IRQ_CB(_devcb) \ - devcb = &es5505_device::set_irq_callback(*device, DEVCB2_##_devcb); + devcb = &es5505_device::set_irq_callback(*device, DEVCB_##_devcb); #define MCFG_ES5505_READ_PORT_CB(_devcb) \ - devcb = &es5505_device::set_read_port_callback(*device, DEVCB2_##_devcb); + devcb = &es5505_device::set_read_port_callback(*device, DEVCB_##_devcb); /* struct describing a single playing voice */ @@ -123,8 +123,8 @@ public: static void set_region2(device_t &device, const char *region2) { downcast<es550x_device &>(device).m_region2 = region2; } static void set_region3(device_t &device, const char *region3) { downcast<es550x_device &>(device).m_region3 = region3; } static void set_channels(device_t &device, int channels) { downcast<es550x_device &>(device).m_channels = channels; } - template<class _Object> static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast<es550x_device &>(device).m_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_port_callback(device_t &device, _Object object) { return downcast<es550x_device &>(device).m_read_port_cb.set_callback(object); } + template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<es550x_device &>(device).m_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_port_callback(device_t &device, _Object object) { return downcast<es550x_device &>(device).m_read_port_cb.set_callback(object); } protected: @@ -170,8 +170,8 @@ protected: const char * m_region2; /* memory region where the sample ROM lives */ const char * m_region3; /* memory region where the sample ROM lives */ int m_channels; /* number of output channels: 1 .. 6 */ - devcb2_write_line m_irq_cb; /* irq callback */ - devcb2_read16 m_read_port_cb; /* input port read */ + devcb_write_line m_irq_cb; /* irq callback */ + devcb_read16 m_read_port_cb; /* input port read */ void update_irq_state(); void update_internal_irq_state(); diff --git a/src/emu/sound/ics2115.h b/src/emu/sound/ics2115.h index 6cc46098ad6..ae9b2d90423 100644 --- a/src/emu/sound/ics2115.h +++ b/src/emu/sound/ics2115.h @@ -14,7 +14,7 @@ MCFG_DEVICE_ADD(_tag, ICS2115, _clock) #define MCFG_ICS2115_IRQ_CB(_devcb) \ - devcb = &ics2115_device::set_irq_callback(*device, DEVCB2_##_devcb); + devcb = &ics2115_device::set_irq_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -92,7 +92,7 @@ public: // construction/destruction ics2115_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast<ics2115_device &>(device).m_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<ics2115_device &>(device).m_irq_cb.set_callback(object); } DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -115,7 +115,7 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); // internal state - devcb2_write_line m_irq_cb; + devcb_write_line m_irq_cb; UINT8 *m_rom; INT16 m_ulaw[256]; diff --git a/src/emu/sound/k007232.h b/src/emu/sound/k007232.h index 6da2790a24b..248ef858894 100644 --- a/src/emu/sound/k007232.h +++ b/src/emu/sound/k007232.h @@ -10,7 +10,7 @@ #define KDAC_A_PCM_MAX (2) /* Channels per chip */ #define MCFG_K007232_PORT_WRITE_HANDLER(_devcb) \ - devcb = &k007232_device::set_port_write_handler(*device, DEVCB2_##_devcb); + devcb = &k007232_device::set_port_write_handler(*device, DEVCB_##_devcb); class k007232_device : public device_t, @@ -20,7 +20,7 @@ public: k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k007232_device() {} - template<class _Object> static devcb2_base &set_port_write_handler(device_t &device, _Object object) { return downcast<k007232_device &>(device).m_port_write_handler.set_callback(object); } + template<class _Object> static devcb_base &set_port_write_handler(device_t &device, _Object object) { return downcast<k007232_device &>(device).m_port_write_handler.set_callback(object); } DECLARE_WRITE8_MEMBER( write ); DECLARE_READ8_MEMBER( read ); @@ -62,7 +62,7 @@ private: sound_stream * m_stream; UINT32 m_fncode[0x200]; - devcb2_write8 m_port_write_handler; + devcb_write8 m_port_write_handler; }; extern const device_type K007232; diff --git a/src/emu/sound/k054539.h b/src/emu/sound/k054539.h index 30369e4a7eb..042af6833a0 100644 --- a/src/emu/sound/k054539.h +++ b/src/emu/sound/k054539.h @@ -14,7 +14,7 @@ k054539_device::static_set_interface(*device, _interface); #define MCFG_K054539_TIMER_HANDLER(_devcb) \ - devcb = &k054539_device::set_timer_handler(*device, DEVCB2_##_devcb); + devcb = &k054539_device::set_timer_handler(*device, DEVCB_##_devcb); struct k054539_interface { @@ -50,7 +50,7 @@ public: // static configuration helpers static void static_set_interface(device_t &device, const k054539_interface &interface); - template<class _Object> static devcb2_base &set_timer_handler(device_t &device, _Object object) { return downcast<k054539_device &>(device).m_timer_handler.set_callback(object); } + template<class _Object> static devcb_base &set_timer_handler(device_t &device, _Object object) { return downcast<k054539_device &>(device).m_timer_handler.set_callback(object); } DECLARE_WRITE8_MEMBER(write); @@ -112,7 +112,7 @@ private: emu_timer *m_timer; UINT32 m_timer_state; - devcb2_write_line m_timer_handler; + devcb_write_line m_timer_handler; bool regupdate(); void keyon(int channel); diff --git a/src/emu/sound/k056800.h b/src/emu/sound/k056800.h index 121244e950b..f7b6194913a 100644 --- a/src/emu/sound/k056800.h +++ b/src/emu/sound/k056800.h @@ -15,7 +15,7 @@ #define MCFG_K056800_ADD(_tag, _clock) \ MCFG_DEVICE_ADD(_tag, K056800, _clock) #define MCFG_K056800_INT_HANDLER(_devcb) \ - devcb = &k056800_device::set_int_handler(*device, DEVCB2_##_devcb); + devcb = &k056800_device::set_int_handler(*device, DEVCB_##_devcb); @@ -30,7 +30,7 @@ public: k056800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_int_handler(device_t &device, _Object object) { return downcast<k056800_device &>(device).m_int_handler.set_callback(object); } + template<class _Object> static devcb_base &set_int_handler(device_t &device, _Object object) { return downcast<k056800_device &>(device).m_int_handler.set_callback(object); } DECLARE_READ8_MEMBER( host_r ); DECLARE_WRITE8_MEMBER( host_w ); @@ -49,7 +49,7 @@ private: UINT8 m_host_to_snd_regs[4]; UINT8 m_snd_to_host_regs[2]; - devcb2_write_line m_int_handler; + devcb_write_line m_int_handler; }; extern const device_type K056800; diff --git a/src/emu/sound/mos6560.h b/src/emu/sound/mos6560.h index 53de3ba8a0c..463411f357b 100644 --- a/src/emu/sound/mos6560.h +++ b/src/emu/sound/mos6560.h @@ -81,10 +81,10 @@ #define MCFG_MOS6560_POTX_CALLBACK(_read) \ - devcb = &mos6560_device::set_potx_rd_callback(*device, DEVCB2_##_read); + devcb = &mos6560_device::set_potx_rd_callback(*device, DEVCB_##_read); #define MCFG_MOS6560_POTY_CALLBACK(_read) \ - devcb = &mos6560_device::set_poty_rd_callback(*device, DEVCB2_##_read); + devcb = &mos6560_device::set_poty_rd_callback(*device, DEVCB_##_read); @@ -139,8 +139,8 @@ public: mos6560_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source); mos6560_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_potx_rd_callback(device_t &device, _Object object) { return downcast<mos6560_device &>(device).m_read_potx.set_callback(object); } - template<class _Object> static devcb2_base &set_poty_rd_callback(device_t &device, _Object object) { return downcast<mos6560_device &>(device).m_read_poty.set_callback(object); } + template<class _Object> static devcb_base &set_potx_rd_callback(device_t &device, _Object object) { return downcast<mos6560_device &>(device).m_read_potx.set_callback(object); } + template<class _Object> static devcb_base &set_poty_rd_callback(device_t &device, _Object object) { return downcast<mos6560_device &>(device).m_read_poty.set_callback(object); } virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; @@ -189,8 +189,8 @@ protected: const address_space_config m_videoram_space_config; const address_space_config m_colorram_space_config; - devcb2_read8 m_read_potx; - devcb2_read8 m_read_poty; + devcb_read8 m_read_potx; + devcb_read8 m_read_poty; UINT8 m_reg[16]; diff --git a/src/emu/sound/mos6581.h b/src/emu/sound/mos6581.h index 2e3cb4e9035..ff6598ec3f1 100644 --- a/src/emu/sound/mos6581.h +++ b/src/emu/sound/mos6581.h @@ -38,10 +38,10 @@ //************************************************************************** #define MCFG_MOS6581_POTX_CALLBACK(_read) \ - devcb = &mos6581_device::set_potx_rd_callback(*device, DEVCB2_##_read); + devcb = &mos6581_device::set_potx_rd_callback(*device, DEVCB_##_read); #define MCFG_MOS6581_POTY_CALLBACK(_read) \ - devcb = &mos6581_device::set_poty_rd_callback(*device, DEVCB2_##_read); + devcb = &mos6581_device::set_poty_rd_callback(*device, DEVCB_##_read); @@ -61,8 +61,8 @@ public: mos6581_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mos6581_device(); - template<class _Object> static devcb2_base &set_potx_rd_callback(device_t &device, _Object object) { return downcast<mos6581_device &>(device).m_read_potx.set_callback(object); } - template<class _Object> static devcb2_base &set_poty_rd_callback(device_t &device, _Object object) { return downcast<mos6581_device &>(device).m_read_poty.set_callback(object); } + template<class _Object> static devcb_base &set_potx_rd_callback(device_t &device, _Object object) { return downcast<mos6581_device &>(device).m_read_potx.set_callback(object); } + template<class _Object> static devcb_base &set_poty_rd_callback(device_t &device, _Object object) { return downcast<mos6581_device &>(device).m_read_poty.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -82,8 +82,8 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); private: - devcb2_read8 m_read_potx; - devcb2_read8 m_read_poty; + devcb_read8 m_read_potx; + devcb_read8 m_read_poty; sound_stream *m_stream; diff --git a/src/emu/sound/mos7360.h b/src/emu/sound/mos7360.h index 4693a97b2b3..b83c9850fc1 100644 --- a/src/emu/sound/mos7360.h +++ b/src/emu/sound/mos7360.h @@ -53,7 +53,7 @@ MCFG_DEVICE_ADD(_tag, MOS7360, _clock) \ MCFG_DEVICE_ADDRESS_MAP(AS_0, _videoram_map) \ MCFG_VIDEO_SET_SCREEN(_screen_tag) \ - downcast<mos7360_device *>(device)->set_callbacks(_cpu_tag, DEVCB2_##_irq, DEVCB2_##_k); + downcast<mos7360_device *>(device)->set_callbacks(_cpu_tag, DEVCB_##_irq, DEVCB_##_k); @@ -154,8 +154,8 @@ protected: const address_space_config m_videoram_space_config; - devcb2_write_line m_write_irq; - devcb2_read8 m_read_k; + devcb_write_line m_write_irq; + devcb_read8 m_read_k; const char *m_cpu_tag; cpu_device *m_cpu; diff --git a/src/emu/sound/msm5205.h b/src/emu/sound/msm5205.h index 2b11592e39b..2ccca75a468 100644 --- a/src/emu/sound/msm5205.h +++ b/src/emu/sound/msm5205.h @@ -27,14 +27,14 @@ msm5205_device::set_prescaler_selector(*device, _select); #define MCFG_MSM5205_VCLK_CB(_devcb) \ - devcb = &msm5205_device::set_vclk_callback(*device, DEVCB2_##_devcb); + devcb = &msm5205_device::set_vclk_callback(*device, DEVCB_##_devcb); #define MCFG_MSM6585_PRESCALER_SELECTOR(_select) \ msm6585_device::set_prescaler_selector(*device, _select); #define MCFG_MSM6585_VCLK_CB(_devcb) \ - devcb = &msm6585_device::set_vclk_callback(*device, DEVCB2_##_devcb); + devcb = &msm6585_device::set_vclk_callback(*device, DEVCB_##_devcb); class msm5205_device : public device_t, @@ -46,7 +46,7 @@ public: ~msm5205_device() {} static void set_prescaler_selector(device_t &device, int select) { downcast<msm5205_device &>(device).m_select = select; } - template<class _Object> static devcb2_base &set_vclk_callback(device_t &device, _Object object) { return downcast<msm5205_device &>(device).m_vclk_cb.set_callback(object); } + template<class _Object> static devcb_base &set_vclk_callback(device_t &device, _Object object) { return downcast<msm5205_device &>(device).m_vclk_cb.set_callback(object); } // reset signal should keep for 2cycle of VCLK void reset_w(int reset); @@ -87,7 +87,7 @@ protected: INT32 m_step; /* current ADPCM step */ int m_diff_lookup[49*16]; int m_select; - devcb2_write_line m_vclk_cb; + devcb_write_line m_vclk_cb; }; extern const device_type MSM5205; diff --git a/src/emu/sound/msm5232.h b/src/emu/sound/msm5232.h index febcca4f1f2..0fc1a08127b 100644 --- a/src/emu/sound/msm5232.h +++ b/src/emu/sound/msm5232.h @@ -8,7 +8,7 @@ msm5232_device::static_set_capacitors(*device, _a, _b, _c, _d, _e, _f, _g, _h); #define MCFG_MSM5232_GATE_HANDLER_CB(_devcb) \ - devcb = &msm5232_device::set_gate_handler_callback(*device, DEVCB2_##_devcb); + devcb = &msm5232_device::set_gate_handler_callback(*device, DEVCB_##_devcb); struct VOICE { UINT8 mode; @@ -47,7 +47,7 @@ public: ~msm5232_device() {} static void static_set_capacitors(device_t &device, double cap1, double cap2, double cap3, double cap4, double cap5, double cap6, double cap7, double cap8); - template<class _Object> static devcb2_base &set_gate_handler_callback(device_t &device, _Object object) { return downcast<msm5232_device &>(device).m_gate_handler_cb.set_callback(object); } + template<class _Object> static devcb_base &set_gate_handler_callback(device_t &device, _Object object) { return downcast<msm5232_device &>(device).m_gate_handler_cb.set_callback(object); } DECLARE_WRITE8_MEMBER( write ); void set_clock(int clock); @@ -92,7 +92,7 @@ protected: int m_rate; /* sample rate in Hz */ double m_external_capacity[8]; /* in Farads, eg 0.39e-6 = 0.36 uF (microFarads) */ - devcb2_write_line m_gate_handler_cb;/* callback called when the GATE output pin changes state */ + devcb_write_line m_gate_handler_cb;/* callback called when the GATE output pin changes state */ void init_tables(); void init_voice(int i); diff --git a/src/emu/sound/pokey.h b/src/emu/sound/pokey.h index 35e2567459e..e66bab4e465 100644 --- a/src/emu/sound/pokey.h +++ b/src/emu/sound/pokey.h @@ -67,37 +67,37 @@ //************************************************************************** #define MCFG_POKEY_POT0_R_CB(_devcb) \ - devcb = &pokey_device::set_pot0_r_callback(*device, DEVCB2_##_devcb); + devcb = &pokey_device::set_pot0_r_callback(*device, DEVCB_##_devcb); #define MCFG_POKEY_POT1_R_CB(_devcb) \ - devcb = &pokey_device::set_pot1_r_callback(*device, DEVCB2_##_devcb); + devcb = &pokey_device::set_pot1_r_callback(*device, DEVCB_##_devcb); #define MCFG_POKEY_POT2_R_CB(_devcb) \ - devcb = &pokey_device::set_pot2_r_callback(*device, DEVCB2_##_devcb); + devcb = &pokey_device::set_pot2_r_callback(*device, DEVCB_##_devcb); #define MCFG_POKEY_POT3_R_CB(_devcb) \ - devcb = &pokey_device::set_pot3_r_callback(*device, DEVCB2_##_devcb); + devcb = &pokey_device::set_pot3_r_callback(*device, DEVCB_##_devcb); #define MCFG_POKEY_POT4_R_CB(_devcb) \ - devcb = &pokey_device::set_pot4_r_callback(*device, DEVCB2_##_devcb); + devcb = &pokey_device::set_pot4_r_callback(*device, DEVCB_##_devcb); #define MCFG_POKEY_POT5_R_CB(_devcb) \ - devcb = &pokey_device::set_pot5_r_callback(*device, DEVCB2_##_devcb); + devcb = &pokey_device::set_pot5_r_callback(*device, DEVCB_##_devcb); #define MCFG_POKEY_POT6_R_CB(_devcb) \ - devcb = &pokey_device::set_pot6_r_callback(*device, DEVCB2_##_devcb); + devcb = &pokey_device::set_pot6_r_callback(*device, DEVCB_##_devcb); #define MCFG_POKEY_POT7_R_CB(_devcb) \ - devcb = &pokey_device::set_pot7_r_callback(*device, DEVCB2_##_devcb); + devcb = &pokey_device::set_pot7_r_callback(*device, DEVCB_##_devcb); #define MCFG_POKEY_ALLPOT_R_CB(_devcb) \ - devcb = &pokey_device::set_allpot_r_callback(*device, DEVCB2_##_devcb); + devcb = &pokey_device::set_allpot_r_callback(*device, DEVCB_##_devcb); #define MCFG_POKEY_SERIN_R_CB(_devcb) \ - devcb = &pokey_device::set_serin_r_callback(*device, DEVCB2_##_devcb); + devcb = &pokey_device::set_serin_r_callback(*device, DEVCB_##_devcb); #define MCFG_POKEY_SEROUT_W_CB(_devcb) \ - devcb = &pokey_device::set_serout_w_callback(*device, DEVCB2_##_devcb); + devcb = &pokey_device::set_serout_w_callback(*device, DEVCB_##_devcb); /* k543210 = k5 ... k0 returns bit0: kr1, bit1: kr2 */ /* all are, in contrast to actual hardware, ACTIVE_HIGH */ @@ -209,17 +209,17 @@ public: // construction/destruction pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_pot0_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot0_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_pot1_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot1_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_pot2_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot2_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_pot3_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot3_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_pot4_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot4_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_pot5_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot5_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_pot6_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot6_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_pot7_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot7_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_allpot_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_allpot_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_serin_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_serin_r_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_serout_w_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_serout_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_pot0_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot0_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_pot1_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot1_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_pot2_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot2_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_pot3_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot3_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_pot4_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot4_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_pot5_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot5_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_pot6_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot6_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_pot7_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot7_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_allpot_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_allpot_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_serin_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_serin_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_serout_w_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_serout_w_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -334,17 +334,17 @@ private: UINT32 m_p9; /* poly9 index */ UINT32 m_p17; /* poly17 index */ - devcb2_read8 m_pot0_r_cb; - devcb2_read8 m_pot1_r_cb; - devcb2_read8 m_pot2_r_cb; - devcb2_read8 m_pot3_r_cb; - devcb2_read8 m_pot4_r_cb; - devcb2_read8 m_pot5_r_cb; - devcb2_read8 m_pot6_r_cb; - devcb2_read8 m_pot7_r_cb; - devcb2_read8 m_allpot_r_cb; - devcb2_read8 m_serin_r_cb; - devcb2_write8 m_serout_w_cb; + devcb_read8 m_pot0_r_cb; + devcb_read8 m_pot1_r_cb; + devcb_read8 m_pot2_r_cb; + devcb_read8 m_pot3_r_cb; + devcb_read8 m_pot4_r_cb; + devcb_read8 m_pot5_r_cb; + devcb_read8 m_pot6_r_cb; + devcb_read8 m_pot7_r_cb; + devcb_read8 m_allpot_r_cb; + devcb_read8 m_serin_r_cb; + devcb_write8 m_serout_w_cb; UINT8 m_POTx[8]; /* POTx (R/D200-D207) */ UINT8 m_AUDCTL; /* AUDCTL (W/D208) */ diff --git a/src/emu/sound/qs1000.h b/src/emu/sound/qs1000.h index 6f8c1ac1977..3b5ce16ecae 100644 --- a/src/emu/sound/qs1000.h +++ b/src/emu/sound/qs1000.h @@ -22,25 +22,25 @@ qs1000_device::set_external_rom(*device, _bool); #define MCFG_QS1000_IN_P1_CB(_devcb) \ - devcb = &qs1000_device::set_in_p1_callback(*device, DEVCB2_##_devcb); + devcb = &qs1000_device::set_in_p1_callback(*device, DEVCB_##_devcb); #define MCFG_QS1000_IN_P2_CB(_devcb) \ - devcb = &qs1000_device::set_in_p2_callback(*device, DEVCB2_##_devcb); + devcb = &qs1000_device::set_in_p2_callback(*device, DEVCB_##_devcb); #define MCFG_QS1000_IN_P3_CB(_devcb) \ - devcb = &qs1000_device::set_in_p3_callback(*device, DEVCB2_##_devcb); + devcb = &qs1000_device::set_in_p3_callback(*device, DEVCB_##_devcb); #define MCFG_QS1000_OUT_P1_CB(_devcb) \ - devcb = &qs1000_device::set_out_p1_callback(*device, DEVCB2_##_devcb); + devcb = &qs1000_device::set_out_p1_callback(*device, DEVCB_##_devcb); #define MCFG_QS1000_OUT_P2_CB(_devcb) \ - devcb = &qs1000_device::set_out_p2_callback(*device, DEVCB2_##_devcb); + devcb = &qs1000_device::set_out_p2_callback(*device, DEVCB_##_devcb); #define MCFG_QS1000_OUT_P3_CB(_devcb) \ - devcb = &qs1000_device::set_out_p3_callback(*device, DEVCB2_##_devcb); + devcb = &qs1000_device::set_out_p3_callback(*device, DEVCB_##_devcb); /*#define MCFG_QS1000_SERIAL_W_CB(_devcb) \ - devcb = &qs1000_device::set_serial_w_callback(*device, DEVCB2_##_devcb);*/ + devcb = &qs1000_device::set_serial_w_callback(*device, DEVCB_##_devcb);*/ //************************************************************************** // TYPE DEFINITIONS @@ -60,13 +60,13 @@ public: qs1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_external_rom(device_t &device, bool external_rom) { downcast<qs1000_device &>(device).m_external_rom = external_rom; } - template<class _Object> static devcb2_base &set_in_p1_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_in_p1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_p2_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_in_p2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_p3_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_in_p3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_p1_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_out_p1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_p2_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_out_p2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_p3_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_out_p3_cb.set_callback(object); } - //template<class _Object> static devcb2_base &set_serial_w_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_serial_w_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_p1_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_in_p1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_p2_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_in_p2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_p3_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_in_p3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_p1_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_out_p1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_p2_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_out_p2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_p3_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_out_p3_cb.set_callback(object); } + //template<class _Object> static devcb_base &set_serial_w_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_serial_w_cb.set_callback(object); } // external void serial_in(UINT8 data); @@ -115,15 +115,15 @@ public: bool m_external_rom; // Callbacks - devcb2_read8 m_in_p1_cb; - devcb2_read8 m_in_p2_cb; - devcb2_read8 m_in_p3_cb; + devcb_read8 m_in_p1_cb; + devcb_read8 m_in_p2_cb; + devcb_read8 m_in_p3_cb; - devcb2_write8 m_out_p1_cb; - devcb2_write8 m_out_p2_cb; - devcb2_write8 m_out_p3_cb; + devcb_write8 m_out_p1_cb; + devcb_write8 m_out_p2_cb; + devcb_write8 m_out_p3_cb; - //devcb2_write8 m_serial_w_cb; + //devcb_write8 m_serial_w_cb; // Internal state const address_space_config m_space_config; diff --git a/src/emu/sound/scsp.h b/src/emu/sound/scsp.h index a074afa9a0e..8440f62b7a0 100644 --- a/src/emu/sound/scsp.h +++ b/src/emu/sound/scsp.h @@ -17,10 +17,10 @@ scsp_device::set_roffset(*device, _offs); #define MCFG_SCSP_IRQ_CB(_devcb) \ - devcb = &scsp_device::set_irq_callback(*device, DEVCB2_##_devcb); + devcb = &scsp_device::set_irq_callback(*device, DEVCB_##_devcb); #define MCFG_SCSP_MAIN_IRQ_CB(_devcb) \ - devcb = &scsp_device::set_main_irq_callback(*device, DEVCB2_##_devcb); + devcb = &scsp_device::set_main_irq_callback(*device, DEVCB_##_devcb); enum SCSP_STATE {SCSP_ATTACK,SCSP_DECAY1,SCSP_DECAY2,SCSP_RELEASE}; @@ -78,8 +78,8 @@ public: scsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_roffset(device_t &device, int roffset) { downcast<scsp_device &>(device).m_roffset = roffset; } - template<class _Object> static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast<scsp_device &>(device).m_irq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_main_irq_callback(device_t &device, _Object object) { return downcast<scsp_device &>(device).m_main_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<scsp_device &>(device).m_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_main_irq_callback(device_t &device, _Object object) { return downcast<scsp_device &>(device).m_main_irq_cb.set_callback(object); } // SCSP register access DECLARE_READ16_MEMBER( read ); @@ -100,8 +100,8 @@ protected: private: int m_roffset; /* offset in the region */ - devcb2_write8 m_irq_cb; /* irq callback */ - devcb2_write_line m_main_irq_cb; + devcb_write8 m_irq_cb; /* irq callback */ + devcb_write_line m_main_irq_cb; union { diff --git a/src/emu/sound/sn76496.h b/src/emu/sound/sn76496.h index 036ec955932..a5dd1af5b45 100644 --- a/src/emu/sound/sn76496.h +++ b/src/emu/sound/sn76496.h @@ -16,7 +16,7 @@ extern const device_type GAMEGEAR; extern const device_type SEGAPSG; #define MCFG_SN76496_READY_HANDLER(_devcb) \ - devcb = &sn76496_base_device::set_ready_handler(*device, DEVCB2_##_devcb); + devcb = &sn76496_base_device::set_ready_handler(*device, DEVCB_##_devcb); class sn76496_base_device : public device_t, public device_sound_interface { @@ -26,7 +26,7 @@ public: device_t *owner, UINT32 clock, const char *shortname, const char *source); // static configuration helpers - template<class _Object> static devcb2_base &set_ready_handler(device_t &device, _Object object) { return downcast<sn76496_base_device &>(device).m_ready_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ready_handler(device_t &device, _Object object) { return downcast<sn76496_base_device &>(device).m_ready_handler.set_callback(object); } DECLARE_WRITE8_MEMBER( stereo_w ); void write(UINT8 data); @@ -43,7 +43,7 @@ private: bool m_ready_state; - devcb2_write_line m_ready_handler; + devcb_write_line m_ready_handler; sound_stream* m_sound; diff --git a/src/emu/sound/sp0250.h b/src/emu/sound/sp0250.h index 93714c93f8c..6f1b9d6ab25 100644 --- a/src/emu/sound/sp0250.h +++ b/src/emu/sound/sp0250.h @@ -10,7 +10,7 @@ public: sp0250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~sp0250_device() {} - template<class _Object> static devcb2_base &set_drq_callback(device_t &device, _Object object) { return downcast<sp0250_device &>(device).m_drq.set_callback(object); } + template<class _Object> static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast<sp0250_device &>(device).m_drq.set_callback(object); } DECLARE_WRITE8_MEMBER( write ); UINT8 drq_r(); @@ -34,7 +34,7 @@ private: int m_voiced; UINT8 m_fifo[15]; int m_fifo_pos; - devcb2_write_line m_drq; + devcb_write_line m_drq; struct { @@ -49,7 +49,7 @@ private: extern const device_type SP0250; #define MCFG_SP0250_DRQ_CALLBACK(_write) \ - devcb = &sp0250_device::set_drq_callback(*device, DEVCB2_##_write); + devcb = &sp0250_device::set_drq_callback(*device, DEVCB_##_write); diff --git a/src/emu/sound/sp0256.h b/src/emu/sound/sp0256.h index 2f93af5836b..c5913bfab6d 100644 --- a/src/emu/sound/sp0256.h +++ b/src/emu/sound/sp0256.h @@ -50,10 +50,10 @@ #define __SP0256_H__ #define MCFG_SP0256_DATA_REQUEST_CB(_devcb) \ - devcb = &sp0256_device::set_data_request_callback(*device, DEVCB2_##_devcb); + devcb = &sp0256_device::set_data_request_callback(*device, DEVCB_##_devcb); #define MCFG_SP0256_STANDBY_CB(_devcb) \ - devcb = &sp0256_device::set_standby_callback(*device, DEVCB2_##_devcb); + devcb = &sp0256_device::set_standby_callback(*device, DEVCB_##_devcb); struct lpc12_t @@ -75,8 +75,8 @@ public: sp0256_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~sp0256_device() { } - template<class _Object> static devcb2_base &set_data_request_callback(device_t &device, _Object object) { return downcast<sp0256_device &>(device).m_drq_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_standby_callback(device_t &device, _Object object) { return downcast<sp0256_device &>(device).m_sby_cb.set_callback(object); } + template<class _Object> static devcb_base &set_data_request_callback(device_t &device, _Object object) { return downcast<sp0256_device &>(device).m_drq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_standby_callback(device_t &device, _Object object) { return downcast<sp0256_device &>(device).m_sby_cb.set_callback(object); } DECLARE_WRITE8_MEMBER(ald_w); DECLARE_READ_LINE_MEMBER(lrq_r); @@ -101,8 +101,8 @@ private: void micro(); sound_stream *m_stream; /* MAME core sound stream */ - devcb2_write_line m_drq_cb; /* Data request callback */ - devcb2_write_line m_sby_cb; /* Standby callback */ + devcb_write_line m_drq_cb; /* Data request callback */ + devcb_write_line m_sby_cb; /* Standby callback */ int m_sby_line; /* Standby line state */ int m_cur_len; /* Fullness of current sound buffer. */ diff --git a/src/emu/sound/spu.h b/src/emu/sound/spu.h index 7cd9fcd78e2..6dc4f2abad1 100644 --- a/src/emu/sound/spu.h +++ b/src/emu/sound/spu.h @@ -10,7 +10,7 @@ //************************************************************************** #define MCFG_SPU_IRQ_HANDLER(_devcb) \ - devcb = &spu_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &spu_device::set_irq_handler(*device, DEVCB_##_devcb); #define MCFG_SPU_ADD(_tag, _clock) \ MCFG_DEVICE_MODIFY( "maincpu" ) \ @@ -52,7 +52,7 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); // internal state - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; unsigned char *spu_ram; reverb *rev; @@ -223,7 +223,7 @@ public: spu_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<spu_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<spu_device &>(device).m_irq_handler.set_callback(object); } void dma_read( UINT32 *ram, UINT32 n_address, INT32 n_size ); void dma_write( UINT32 *ram, UINT32 n_address, INT32 n_size ); diff --git a/src/emu/sound/t6721a.h b/src/emu/sound/t6721a.h index 459d2c3f6c2..df50f630097 100644 --- a/src/emu/sound/t6721a.h +++ b/src/emu/sound/t6721a.h @@ -47,16 +47,16 @@ //************************************************************************** #define MCFG_T6721A_EOS_HANDLER(_eos) \ - downcast<t6721a_device *>(device)->set_eos_callback(DEVCB2_##_eos); + downcast<t6721a_device *>(device)->set_eos_callback(DEVCB_##_eos); #define MCFG_T6721A_PHI2_HANDLER(_phi2) \ - downcast<t6721a_device *>(device)->set_phi2_callback(DEVCB2_##_phi2); + downcast<t6721a_device *>(device)->set_phi2_callback(DEVCB_##_phi2); #define MCFG_T6721A_DTRD_HANDLER(_dtrd) \ - downcast<t6721a_device *>(device)->set_dtrd_callback(DEVCB2_##_dtrd); + downcast<t6721a_device *>(device)->set_dtrd_callback(DEVCB_##_dtrd); #define MCFG_T6721A_APD_HANDLER(_apd) \ - downcast<t6721a_device *>(device)->set_apd_callback(DEVCB2_##_apd); + downcast<t6721a_device *>(device)->set_apd_callback(DEVCB_##_apd); @@ -109,10 +109,10 @@ private: CMD_SAGN }; - devcb2_write_line m_write_eos; - devcb2_write_line m_write_phi2; - devcb2_write_line m_write_dtrd; - devcb2_write_line m_write_apd; + devcb_write_line m_write_eos; + devcb_write_line m_write_phi2; + devcb_write_line m_write_dtrd; + devcb_write_line m_write_apd; sound_stream *m_stream; }; diff --git a/src/emu/sound/tms5110.h b/src/emu/sound/tms5110.h index 3acaf27754f..e11e0534c79 100644 --- a/src/emu/sound/tms5110.h +++ b/src/emu/sound/tms5110.h @@ -24,19 +24,19 @@ /* usually 800000 for 10000 Hz sample rate. */ #define MCFG_TMS5110_M0_CB(_devcb) \ - devcb = &tms5110_device::set_m0_callback(*device, DEVCB2_##_devcb); + devcb = &tms5110_device::set_m0_callback(*device, DEVCB_##_devcb); #define MCFG_TMS5110_M1_CB(_devcb) \ - devcb = &tms5110_device::set_m1_callback(*device, DEVCB2_##_devcb); + devcb = &tms5110_device::set_m1_callback(*device, DEVCB_##_devcb); #define MCFG_TMS5110_ADDR_CB(_devcb) \ - devcb = &tms5110_device::set_addr_callback(*device, DEVCB2_##_devcb); + devcb = &tms5110_device::set_addr_callback(*device, DEVCB_##_devcb); #define MCFG_TMS5110_DATA_CB(_devcb) \ - devcb = &tms5110_device::set_data_callback(*device, DEVCB2_##_devcb); + devcb = &tms5110_device::set_data_callback(*device, DEVCB_##_devcb); #define MCFG_TMS5110_ROMCLK_CB(_devcb) \ - devcb = &tms5110_device::set_romclk_callback(*device, DEVCB2_##_devcb); + devcb = &tms5110_device::set_romclk_callback(*device, DEVCB_##_devcb); class tms5110_device : public device_t, @@ -46,11 +46,11 @@ public: tms5110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); tms5110_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_m0_callback(device_t &device, _Object object) { return downcast<tms5110_device &>(device).m_m0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_m1_callback(device_t &device, _Object object) { return downcast<tms5110_device &>(device).m_m1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_addr_callback(device_t &device, _Object object) { return downcast<tms5110_device &>(device).m_addr_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_data_callback(device_t &device, _Object object) { return downcast<tms5110_device &>(device).m_data_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_romclk_callback(device_t &device, _Object object) { return downcast<tms5110_device &>(device).m_romclk_cb.set_callback(object); } + template<class _Object> static devcb_base &set_m0_callback(device_t &device, _Object object) { return downcast<tms5110_device &>(device).m_m0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_m1_callback(device_t &device, _Object object) { return downcast<tms5110_device &>(device).m_m1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_addr_callback(device_t &device, _Object object) { return downcast<tms5110_device &>(device).m_addr_cb.set_callback(object); } + template<class _Object> static devcb_base &set_data_callback(device_t &device, _Object object) { return downcast<tms5110_device &>(device).m_data_cb.set_callback(object); } + template<class _Object> static devcb_base &set_romclk_callback(device_t &device, _Object object) { return downcast<tms5110_device &>(device).m_romclk_cb.set_callback(object); } DECLARE_WRITE8_MEMBER( ctl_w ); DECLARE_READ8_MEMBER( ctl_r ); @@ -117,14 +117,14 @@ private: UINT8 m_addr_bit; /* callbacks */ - devcb2_write_line m_m0_cb; // the M0 line - devcb2_write_line m_m1_cb; // the M1 line - devcb2_write8 m_addr_cb; // Write to ADD1,2,4,8 - 4 address bits - devcb2_read_line m_data_cb; // Read one bit from ADD8/Data - voice data + devcb_write_line m_m0_cb; // the M0 line + devcb_write_line m_m1_cb; // the M1 line + devcb_write8 m_addr_cb; // Write to ADD1,2,4,8 - 4 address bits + devcb_read_line m_data_cb; // Read one bit from ADD8/Data - voice data // On a real chip rom_clk is running all the time // Here, we only use it to properly emulate the protocol. // Do not rely on it to be a timed signal. - devcb2_write_line m_romclk_cb; // rom clock - Only used to drive the data lines + devcb_write_line m_romclk_cb; // rom clock - Only used to drive the data lines /* these contain data describing the current and previous voice frames */ UINT16 m_old_energy; @@ -257,8 +257,8 @@ public: static void set_ctl8_bit(device_t &device, UINT8 ctl8_bit) { downcast<tmsprom_device &>(device).m_ctl8_bit = ctl8_bit; } static void set_reset_bit(device_t &device, UINT8 reset_bit) { downcast<tmsprom_device &>(device).m_reset_bit = reset_bit; } static void set_stop_bit(device_t &device, UINT8 stop_bit) { downcast<tmsprom_device &>(device).m_stop_bit = stop_bit; } - template<class _Object> static devcb2_base &set_pdc_callback(device_t &device, _Object object) { return downcast<tmsprom_device &>(device).m_pdc_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_ctl_callback(device_t &device, _Object object) { return downcast<tmsprom_device &>(device).m_ctl_cb.set_callback(object); } + template<class _Object> static devcb_base &set_pdc_callback(device_t &device, _Object object) { return downcast<tmsprom_device &>(device).m_pdc_cb.set_callback(object); } + template<class _Object> static devcb_base &set_ctl_callback(device_t &device, _Object object) { return downcast<tmsprom_device &>(device).m_ctl_cb.set_callback(object); } DECLARE_WRITE_LINE_MEMBER( m0_w ); DECLARE_READ_LINE_MEMBER( data_r ); @@ -299,8 +299,8 @@ private: UINT8 m_ctl8_bit; /* bit # of ctl8 line */ UINT8 m_reset_bit; /* bit # of rom reset */ UINT8 m_stop_bit; /* bit # of stop */ - devcb2_write_line m_pdc_cb; /* tms pdc func */ - devcb2_write8 m_ctl_cb; /* tms ctl func */ + devcb_write_line m_pdc_cb; /* tms pdc func */ + devcb_write8 m_ctl_cb; /* tms ctl func */ emu_timer *m_romclk_timer; const UINT8 *m_rom; @@ -337,9 +337,9 @@ extern const device_type TMSPROM; tmsprom_device::set_stop_bit(*device, _bit); #define MCFG_TMSPROM_PDC_CB(_devcb) \ - devcb = &tmsprom_device::set_pdc_callback(*device, DEVCB2_##_devcb); + devcb = &tmsprom_device::set_pdc_callback(*device, DEVCB_##_devcb); #define MCFG_TMSPROM_CTL_CB(_devcb) \ - devcb = &tmsprom_device::set_ctl_callback(*device, DEVCB2_##_devcb); + devcb = &tmsprom_device::set_ctl_callback(*device, DEVCB_##_devcb); #endif /* __TMS5110_H__ */ diff --git a/src/emu/sound/tms5220.h b/src/emu/sound/tms5220.h index f11ade8f4c1..c73ddb71c89 100644 --- a/src/emu/sound/tms5220.h +++ b/src/emu/sound/tms5220.h @@ -17,11 +17,11 @@ /* IRQ callback function, active low, i.e. state=0 */ #define MCFG_TMS52XX_IRQ_HANDLER(_devcb) \ - devcb = &tms5220_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &tms5220_device::set_irq_handler(*device, DEVCB_##_devcb); /* Ready callback function, active low, i.e. state=0 */ #define MCFG_TMS52XX_READYQ_HANDLER(_devcb) \ - devcb = &tms5220_device::set_readyq_handler(*device, DEVCB2_##_devcb); + devcb = &tms5220_device::set_readyq_handler(*device, DEVCB_##_devcb); #define MCFG_TMS52XX_SPEECHROM(_tag) \ tms5220_device::set_speechrom_tag(*device, _tag); @@ -34,8 +34,8 @@ public: tms5220_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); // static configuration helpers - template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<tms5220_device &>(device).m_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_readyq_handler(device_t &device, _Object object) { return downcast<tms5220_device &>(device).m_readyq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<tms5220_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_readyq_handler(device_t &device, _Object object) { return downcast<tms5220_device &>(device).m_readyq_handler.set_callback(object); } static void set_speechrom_tag(device_t &device, const char *_tag) { downcast<tms5220_device &>(device).m_speechrom_tag = _tag; } /* Control lines - once written to will switch interface into @@ -197,8 +197,8 @@ private: emu_timer *m_timer_io_ready; /* callbacks */ - devcb2_write_line m_irq_handler; - devcb2_write_line m_readyq_handler; + devcb_write_line m_irq_handler; + devcb_write_line m_readyq_handler; const char *m_speechrom_tag; speechrom_device *m_speechrom; }; diff --git a/src/emu/sound/upd7759.c b/src/emu/sound/upd7759.c index bb55cbfbb23..72157e51f73 100644 --- a/src/emu/sound/upd7759.c +++ b/src/emu/sound/upd7759.c @@ -251,7 +251,7 @@ void upd7759_device::device_start() if (romsize >= 0x20000) m_rommask = 0x1ffff; else m_rommask = romsize - 1; - m_drqcallback.set_callback(DEVCB2_NULL); + m_drqcallback.set_callback(DEVCB_NULL); } /* assume /RESET and /START are both high */ @@ -324,7 +324,7 @@ void upd7756_device::device_start() if (romsize >= 0x20000) m_rommask = 0x1ffff; else m_rommask = romsize - 1; - m_drqcallback.set_callback(DEVCB2_NULL); + m_drqcallback.set_callback(DEVCB_NULL); } /* assume /RESET and /START are both high */ diff --git a/src/emu/sound/upd7759.h b/src/emu/sound/upd7759.h index a711df62a31..10d0df4a8f8 100644 --- a/src/emu/sound/upd7759.h +++ b/src/emu/sound/upd7759.h @@ -21,7 +21,7 @@ public: upd775x_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); ~upd775x_device() {} - template<class _Object> static devcb2_base &set_drq_callback(device_t &device, _Object object) { return downcast<upd775x_device &>(device).m_drqcallback.set_callback(object); } + template<class _Object> static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast<upd775x_device &>(device).m_drqcallback.set_callback(object); } void set_bank_base(offs_t base); @@ -81,7 +81,7 @@ protected: UINT32 m_romoffset; /* ROM offset to make save/restore easier */ UINT32 m_rommask; /* maximum address offset */ - devcb2_write_line m_drqcallback; + devcb_write_line m_drqcallback; void update_adpcm(int data); void advance_state(); @@ -123,9 +123,9 @@ extern const device_type UPD7759; extern const device_type UPD7756; #define MCFG_UPD7759_DRQ_CALLBACK(_write) \ - devcb = &upd7759_device::set_drq_callback(*device, DEVCB2_##_write); + devcb = &upd7759_device::set_drq_callback(*device, DEVCB_##_write); #define MCFG_UPD7756_DRQ_CALLBACK(_write) \ - devcb = &upd7756_device::set_drq_callback(*device, DEVCB2_##_write); + devcb = &upd7756_device::set_drq_callback(*device, DEVCB_##_write); #endif /* __UPD7759_H__ */ diff --git a/src/emu/sound/votrax.h b/src/emu/sound/votrax.h index 38a31ae4d58..152c1a51f99 100644 --- a/src/emu/sound/votrax.h +++ b/src/emu/sound/votrax.h @@ -21,7 +21,7 @@ //************************************************************************** #define MCFG_VOTRAX_SC01_REQUEST_CB(_devcb) \ - devcb = &votrax_sc01_device::set_request_callback(*device, DEVCB2_##_devcb); + devcb = &votrax_sc01_device::set_request_callback(*device, DEVCB_##_devcb); //************************************************************************** @@ -37,7 +37,7 @@ public: // construction/destruction votrax_sc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_request_callback(device_t &device, _Object object) { return downcast<votrax_sc01_device &>(device).m_request_cb.set_callback(object); } + template<class _Object> static devcb_base &set_request_callback(device_t &device, _Object object) { return downcast<votrax_sc01_device &>(device).m_request_cb.set_callback(object); } // writers DECLARE_WRITE8_MEMBER( write ); @@ -73,7 +73,7 @@ private: UINT8 m_phoneme; // 6-bit phoneme value // outputs - devcb2_write_line m_request_cb; // callback for request + devcb_write_line m_request_cb; // callback for request UINT8 m_request_state; // request as seen to the outside world UINT8 m_internal_request; // request managed by stream timing diff --git a/src/emu/sound/ymf271.h b/src/emu/sound/ymf271.h index 1408716f4b2..86a5bd75272 100644 --- a/src/emu/sound/ymf271.h +++ b/src/emu/sound/ymf271.h @@ -6,13 +6,13 @@ #include "emu.h" #define MCFG_YMF271_IRQ_HANDLER(_devcb) \ - devcb = &ymf271_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ymf271_device::set_irq_handler(*device, DEVCB_##_devcb); #define MCFG_YMF271_EXT_READ_HANDLER(_devcb) \ - devcb = &ymf271_device::set_ext_read_handler(*device, DEVCB2_##_devcb); + devcb = &ymf271_device::set_ext_read_handler(*device, DEVCB_##_devcb); #define MCFG_YMF271_EXT_WRITE_HANDLER(_devcb) \ - devcb = &ymf271_device::set_ext_write_handler(*device, DEVCB2_##_devcb); + devcb = &ymf271_device::set_ext_write_handler(*device, DEVCB_##_devcb); class ymf271_device : public device_t, public device_sound_interface @@ -21,9 +21,9 @@ public: ymf271_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<ymf271_device &>(device).m_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_ext_read_handler(device_t &device, _Object object) { return downcast<ymf271_device &>(device).m_ext_read_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_ext_write_handler(device_t &device, _Object object) { return downcast<ymf271_device &>(device).m_ext_write_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ymf271_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ext_read_handler(device_t &device, _Object object) { return downcast<ymf271_device &>(device).m_ext_read_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ext_write_handler(device_t &device, _Object object) { return downcast<ymf271_device &>(device).m_ext_write_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -153,9 +153,9 @@ private: sound_stream *m_stream; INT32 *m_mix_buffer; - devcb2_write_line m_irq_handler; - devcb2_read8 m_ext_read_handler; - devcb2_write8 m_ext_write_handler; + devcb_write_line m_irq_handler; + devcb_read8 m_ext_read_handler; + devcb_write8 m_ext_write_handler; }; extern const device_type YMF271; diff --git a/src/emu/sound/ymf278b.h b/src/emu/sound/ymf278b.h index 9e7a19ef737..6367627aea9 100644 --- a/src/emu/sound/ymf278b.h +++ b/src/emu/sound/ymf278b.h @@ -8,7 +8,7 @@ #define YMF278B_STD_CLOCK (33868800) /* standard clock for OPL4 */ #define MCFG_YMF278B_IRQ_HANDLER(_devcb) \ - devcb = &ymf278b_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ymf278b_device::set_irq_handler(*device, DEVCB_##_devcb); class ymf278b_device : public device_t, public device_sound_interface @@ -17,7 +17,7 @@ public: ymf278b_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<ymf278b_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ymf278b_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -126,7 +126,7 @@ private: sound_stream * m_stream; INT32 *m_mix_buffer; - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; }; extern const device_type YMF278B; diff --git a/src/emu/sound/ymz280b.h b/src/emu/sound/ymz280b.h index 6bfa8a4f81e..a67c0d8567b 100644 --- a/src/emu/sound/ymz280b.h +++ b/src/emu/sound/ymz280b.h @@ -17,13 +17,13 @@ #define MAKE_WAVS 0 #define MCFG_YMZ280B_IRQ_HANDLER(_devcb) \ - devcb = &ymz280b_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &ymz280b_device::set_irq_handler(*device, DEVCB_##_devcb); #define MCFG_YMZ280B_EXT_READ_HANDLER(_devcb) \ - devcb = &ymz280b_device::set_ext_read_handler(*device, DEVCB2_##_devcb); + devcb = &ymz280b_device::set_ext_read_handler(*device, DEVCB_##_devcb); #define MCFG_YMZ280B_EXT_WRITE_HANDLER(_devcb) \ - devcb = &ymz280b_device::set_ext_write_handler(*device, DEVCB2_##_devcb); + devcb = &ymz280b_device::set_ext_write_handler(*device, DEVCB_##_devcb); class ymz280b_device : public device_t, public device_sound_interface @@ -32,9 +32,9 @@ public: ymz280b_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<ymz280b_device &>(device).m_irq_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_ext_read_handler(device_t &device, _Object object) { return downcast<ymz280b_device &>(device).m_ext_read_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_ext_write_handler(device_t &device, _Object object) { return downcast<ymz280b_device &>(device).m_ext_write_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ymz280b_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ext_read_handler(device_t &device, _Object object) { return downcast<ymz280b_device &>(device).m_ext_read_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ext_write_handler(device_t &device, _Object object) { return downcast<ymz280b_device &>(device).m_ext_write_handler.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -113,9 +113,9 @@ private: UINT32 m_ext_mem_address_mid; UINT32 m_ext_mem_address; /* where the CPU can read the ROM */ - devcb2_write_line m_irq_handler; /* IRQ callback */ - devcb2_read8 m_ext_read_handler; /* external RAM read handler */ - devcb2_write8 m_ext_write_handler;/* external RAM write handler */ + devcb_write_line m_irq_handler; /* IRQ callback */ + devcb_read8 m_ext_read_handler; /* external RAM read handler */ + devcb_write8 m_ext_write_handler;/* external RAM write handler */ double m_master_clock; /* master clock frequency */ UINT8 *m_mem_base; /* pointer to the base of external memory */ diff --git a/src/emu/sound/zsg2.h b/src/emu/sound/zsg2.h index cf9450128a1..1bcad42ab3a 100644 --- a/src/emu/sound/zsg2.h +++ b/src/emu/sound/zsg2.h @@ -18,7 +18,7 @@ MCFG_DEVICE_REPLACE(_tag, ZSG2, _clock) #define MCFG_ZSG2_EXT_READ_HANDLER(_devcb) \ - devcb = &zsg2_device::set_ext_read_handler(*device, DEVCB2_##_devcb); + devcb = &zsg2_device::set_ext_read_handler(*device, DEVCB_##_devcb); // ======================> zsg2_device @@ -31,7 +31,7 @@ public: ~zsg2_device() { } // static configuration helpers - template<class _Object> static devcb2_base &set_ext_read_handler(device_t &device, _Object object) { return downcast<zsg2_device &>(device).m_ext_read_handler.set_callback(object); } + template<class _Object> static devcb_base &set_ext_read_handler(device_t &device, _Object object) { return downcast<zsg2_device &>(device).m_ext_read_handler.set_callback(object); } DECLARE_READ16_MEMBER(read); DECLARE_WRITE16_MEMBER(write); @@ -75,7 +75,7 @@ private: sound_stream *m_stream; - devcb2_read32 m_ext_read_handler; + devcb_read32 m_ext_read_handler; UINT32 read_memory(UINT32 offset); void chan_w(int ch, int reg, UINT16 data); diff --git a/src/emu/video/315_5124.h b/src/emu/video/315_5124.h index 5f6f38f4b53..18be2d087e7 100644 --- a/src/emu/video/315_5124.h +++ b/src/emu/video/315_5124.h @@ -62,8 +62,8 @@ public: sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source); static void set_signal_type(device_t &device, bool is_pal) { downcast<sega315_5124_device &>(device).m_is_pal = is_pal; } - template<class _Object> static devcb2_base &set_int_callback(device_t &device, _Object object) { return downcast<sega315_5124_device &>(device).m_int_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_pause_callback(device_t &device, _Object object) { return downcast<sega315_5124_device &>(device).m_pause_cb.set_callback(object); } + template<class _Object> static devcb_base &set_int_callback(device_t &device, _Object object) { return downcast<sega315_5124_device &>(device).m_int_cb.set_callback(object); } + template<class _Object> static devcb_base &set_pause_callback(device_t &device, _Object object) { return downcast<sega315_5124_device &>(device).m_pause_cb.set_callback(object); } DECLARE_READ8_MEMBER( vram_read ); DECLARE_WRITE8_MEMBER( vram_write ); @@ -152,8 +152,8 @@ protected: int *m_line_buffer; int m_current_palette[32]; bool m_is_pal; /* false = NTSC, true = PAL */ - devcb2_write_line m_int_cb; /* Interrupt callback function */ - devcb2_write_line m_pause_cb; /* Pause callback function */ + devcb_write_line m_int_cb; /* Interrupt callback function */ + devcb_write_line m_pause_cb; /* Pause callback function */ emu_timer *m_display_timer; emu_timer *m_check_hint_timer; emu_timer *m_check_vint_timer; @@ -211,10 +211,10 @@ protected: sega315_5124_device::set_signal_type(*device, _bool); #define MCFG_SEGA315_5124_INT_CB(_devcb) \ - devcb = &sega315_5124_device::set_int_callback(*device, DEVCB2_##_devcb); + devcb = &sega315_5124_device::set_int_callback(*device, DEVCB_##_devcb); #define MCFG_SEGA315_5124_PAUSE_CB(_devcb) \ - devcb = &sega315_5124_device::set_pause_callback(*device, DEVCB2_##_devcb); + devcb = &sega315_5124_device::set_pause_callback(*device, DEVCB_##_devcb); #define MCFG_SEGA315_5246_SET_SCREEN MCFG_VIDEO_SET_SCREEN @@ -223,10 +223,10 @@ protected: sega315_5246_device::set_signal_type(*device, _bool); #define MCFG_SEGA315_5246_INT_CB(_devcb) \ - devcb = &sega315_5246_device::set_int_callback(*device, DEVCB2_##_devcb); + devcb = &sega315_5246_device::set_int_callback(*device, DEVCB_##_devcb); #define MCFG_SEGA315_5246_PAUSE_CB(_devcb) \ - devcb = &sega315_5246_device::set_pause_callback(*device, DEVCB2_##_devcb); + devcb = &sega315_5246_device::set_pause_callback(*device, DEVCB_##_devcb); #define MCFG_SEGA315_5378_SET_SCREEN MCFG_VIDEO_SET_SCREEN @@ -235,10 +235,10 @@ protected: sega315_5378_device::set_signal_type(*device, _bool); #define MCFG_SEGA315_5378_INT_CB(_devcb) \ - devcb = &sega315_5378_device::set_int_callback(*device, DEVCB2_##_devcb); + devcb = &sega315_5378_device::set_int_callback(*device, DEVCB_##_devcb); #define MCFG_SEGA315_5378_PAUSE_CB(_devcb) \ - devcb = &sega315_5378_device::set_pause_callback(*device, DEVCB2_##_devcb); + devcb = &sega315_5378_device::set_pause_callback(*device, DEVCB_##_devcb); #endif /* __SEGA315_5124_H__ */ diff --git a/src/emu/video/315_5313.h b/src/emu/video/315_5313.h index 9292a339df6..d69b86ca076 100644 --- a/src/emu/video/315_5313.h +++ b/src/emu/video/315_5313.h @@ -148,19 +148,19 @@ sega315_5313_device::set_signal_type(*device, _bool); #define MCFG_SEGA315_5313_INT_CB(_devcb) \ - devcb = &sega315_5313_device::set_int_callback(*device, DEVCB2_##_devcb); + devcb = &sega315_5313_device::set_int_callback(*device, DEVCB_##_devcb); #define MCFG_SEGA315_5313_PAUSE_CB(_devcb) \ - devcb = &sega315_5313_device::set_pause_callback(*device, DEVCB2_##_devcb); + devcb = &sega315_5313_device::set_pause_callback(*device, DEVCB_##_devcb); #define MCFG_SEGA315_5313_SND_IRQ_CALLBACK(_write) \ - devcb = &sega315_5313_device::set_sndirqline_callback(*device, DEVCB2_##_write); + devcb = &sega315_5313_device::set_sndirqline_callback(*device, DEVCB_##_write); #define MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(_write) \ - devcb = &sega315_5313_device::set_lv6irqline_callback(*device, DEVCB2_##_write); + devcb = &sega315_5313_device::set_lv6irqline_callback(*device, DEVCB_##_write); #define MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(_write) \ - devcb = &sega315_5313_device::set_lv4irqline_callback(*device, DEVCB2_##_write); + devcb = &sega315_5313_device::set_lv4irqline_callback(*device, DEVCB_##_write); #define MCFG_SEGA315_5313_ALT_TIMING(_data) \ sega315_5313_device::set_alt_timing(*device, _data); @@ -192,9 +192,9 @@ class sega315_5313_device : public sega315_5124_device public: sega315_5313_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_sndirqline_callback(device_t &device, _Object object) { return downcast<sega315_5313_device &>(device).m_sndirqline_callback.set_callback(object); } - template<class _Object> static devcb2_base &set_lv6irqline_callback(device_t &device, _Object object) { return downcast<sega315_5313_device &>(device).m_lv6irqline_callback.set_callback(object); } - template<class _Object> static devcb2_base &set_lv4irqline_callback(device_t &device, _Object object) { return downcast<sega315_5313_device &>(device).m_lv4irqline_callback.set_callback(object); } + template<class _Object> static devcb_base &set_sndirqline_callback(device_t &device, _Object object) { return downcast<sega315_5313_device &>(device).m_sndirqline_callback.set_callback(object); } + template<class _Object> static devcb_base &set_lv6irqline_callback(device_t &device, _Object object) { return downcast<sega315_5313_device &>(device).m_lv6irqline_callback.set_callback(object); } + template<class _Object> static devcb_base &set_lv4irqline_callback(device_t &device, _Object object) { return downcast<sega315_5313_device &>(device).m_lv4irqline_callback.set_callback(object); } static void set_alt_timing(device_t &device, int use_alt_timing); static void set_palwrite_base(device_t &device, int palwrite_base); static void static_set_palette_tag(device_t &device, const char *tag); @@ -254,9 +254,9 @@ protected: virtual machine_config_constructor device_mconfig_additions() const; // called when we hit 240 and 241 (used to control the z80 irq line on genesis, or the main irq on c2) - devcb2_write_line m_sndirqline_callback; - devcb2_write_line m_lv6irqline_callback; - devcb2_write_line m_lv4irqline_callback; + devcb_write_line m_sndirqline_callback; + devcb_write_line m_lv6irqline_callback; + devcb_write_line m_lv4irqline_callback; md_32x_scanline_delegate m_32x_scanline_func; md_32x_interrupt_delegate m_32x_interrupt_func; diff --git a/src/emu/video/cdp1861.h b/src/emu/video/cdp1861.h index 086250e6835..25a654b1f9f 100644 --- a/src/emu/video/cdp1861.h +++ b/src/emu/video/cdp1861.h @@ -68,13 +68,13 @@ //************************************************************************** #define MCFG_CDP1861_IRQ_CALLBACK(_write) \ - devcb = &cdp1861_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &cdp1861_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_CDP1861_DMA_OUT_CALLBACK(_write) \ - devcb = &cdp1861_device::set_dma_out_wr_callback(*device, DEVCB2_##_write); + devcb = &cdp1861_device::set_dma_out_wr_callback(*device, DEVCB_##_write); #define MCFG_CDP1861_EFX_CALLBACK(_write) \ - devcb = &cdp1861_device::set_efx_wr_callback(*device, DEVCB2_##_write); + devcb = &cdp1861_device::set_efx_wr_callback(*device, DEVCB_##_write); #define MCFG_CDP1861_SCREEN_ADD(_cdptag, _tag, _clock) \ @@ -98,9 +98,9 @@ public: // construction/destruction cdp1861_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<cdp1861_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_out_wr_callback(device_t &device, _Object object) { return downcast<cdp1861_device &>(device).m_write_dma_out.set_callback(object); } - template<class _Object> static devcb2_base &set_efx_wr_callback(device_t &device, _Object object) { return downcast<cdp1861_device &>(device).m_write_efx.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<cdp1861_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_dma_out_wr_callback(device_t &device, _Object object) { return downcast<cdp1861_device &>(device).m_write_dma_out.set_callback(object); } + template<class _Object> static devcb_base &set_efx_wr_callback(device_t &device, _Object object) { return downcast<cdp1861_device &>(device).m_write_efx.set_callback(object); } DECLARE_WRITE8_MEMBER( dma_w ); DECLARE_WRITE_LINE_MEMBER( disp_on_w ); @@ -124,9 +124,9 @@ private: TIMER_DMA }; - devcb2_write_line m_write_irq; - devcb2_write_line m_write_dma_out; - devcb2_write_line m_write_efx; + devcb_write_line m_write_irq; + devcb_write_line m_write_dma_out; + devcb_write_line m_write_efx; int m_disp; // display enabled int m_dispon; // display on latch diff --git a/src/emu/video/cdp1862.h b/src/emu/video/cdp1862.h index 1735baf3f46..4ad3f173641 100644 --- a/src/emu/video/cdp1862.h +++ b/src/emu/video/cdp1862.h @@ -46,13 +46,13 @@ //************************************************************************** #define MCFG_CDP1861_RD_CALLBACK(_read) \ - devcb = &cdp1862_device::set_rd_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1862_device::set_rd_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1861_BD_CALLBACK(_read) \ - devcb = &cdp1862_device::set_bd_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1862_device::set_bd_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1861_GD_CALLBACK(_read) \ - devcb = &cdp1862_device::set_gd_rd_callback(*device, DEVCB2_##_read); + devcb = &cdp1862_device::set_gd_rd_callback(*device, DEVCB_##_read); #define MCFG_CDP1862_LUMINANCE(_r, _b, _g, _bkg) \ cdp1862_device::static_set_luminance(*device, _r, _b, _g, _bkg); @@ -75,9 +75,9 @@ public: // construction/destruction cdp1862_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_rd_rd_callback(device_t &device, _Object object) { return downcast<cdp1862_device &>(device).m_read_rd.set_callback(object); } - template<class _Object> static devcb2_base &set_bd_rd_callback(device_t &device, _Object object) { return downcast<cdp1862_device &>(device).m_read_bd.set_callback(object); } - template<class _Object> static devcb2_base &set_gd_rd_callback(device_t &device, _Object object) { return downcast<cdp1862_device &>(device).m_read_gd.set_callback(object); } + template<class _Object> static devcb_base &set_rd_rd_callback(device_t &device, _Object object) { return downcast<cdp1862_device &>(device).m_read_rd.set_callback(object); } + template<class _Object> static devcb_base &set_bd_rd_callback(device_t &device, _Object object) { return downcast<cdp1862_device &>(device).m_read_bd.set_callback(object); } + template<class _Object> static devcb_base &set_gd_rd_callback(device_t &device, _Object object) { return downcast<cdp1862_device &>(device).m_read_gd.set_callback(object); } static void static_set_luminance(device_t &device, double r, double b, double g, double bkg) { downcast<cdp1862_device &>(device).m_lum_r = r; downcast<cdp1862_device &>(device).m_lum_b = b; downcast<cdp1862_device &>(device).m_lum_g = g; downcast<cdp1862_device &>(device).m_lum_bkg = bkg; } static void static_set_chrominance(device_t &device, double r, double b, double g, double bkg) { downcast<cdp1862_device &>(device).m_chr_r = r; downcast<cdp1862_device &>(device).m_chr_b = b; downcast<cdp1862_device &>(device).m_chr_g = g; downcast<cdp1862_device &>(device).m_chr_bkg = bkg; } @@ -96,9 +96,9 @@ protected: private: inline void initialize_palette(); - devcb2_read_line m_read_rd; - devcb2_read_line m_read_bd; - devcb2_read_line m_read_gd; + devcb_read_line m_read_rd; + devcb_read_line m_read_bd; + devcb_read_line m_read_gd; bitmap_rgb32 m_bitmap; // bitmap diff --git a/src/emu/video/crt9007.h b/src/emu/video/crt9007.h index 8ca81f06890..8ae231f36a0 100644 --- a/src/emu/video/crt9007.h +++ b/src/emu/video/crt9007.h @@ -56,37 +56,37 @@ crt9007_t::static_set_character_width(*device, _value); #define MCFG_CRT9007_INT_CALLBACK(_write) \ - devcb = &crt9007_t::set_int_wr_callback(*device, DEVCB2_##_write); + devcb = &crt9007_t::set_int_wr_callback(*device, DEVCB_##_write); #define MCFG_CRT9007_DMAR_CALLBACK(_write) \ - devcb = &crt9007_t::set_dmar_wr_callback(*device, DEVCB2_##_write); + devcb = &crt9007_t::set_dmar_wr_callback(*device, DEVCB_##_write); #define MCFG_CRT9007_VS_CALLBACK(_write) \ - devcb = &crt9007_t::set_vs_wr_callback(*device, DEVCB2_##_write); + devcb = &crt9007_t::set_vs_wr_callback(*device, DEVCB_##_write); #define MCFG_CRT9007_HS_CALLBACK(_write) \ - devcb = &crt9007_t::set_hs_wr_callback(*device, DEVCB2_##_write); + devcb = &crt9007_t::set_hs_wr_callback(*device, DEVCB_##_write); #define MCFG_CRT9007_VLT_CALLBACK(_write) \ - devcb = &crt9007_t::set_vlt_wr_callback(*device, DEVCB2_##_write); + devcb = &crt9007_t::set_vlt_wr_callback(*device, DEVCB_##_write); #define MCFG_CRT9007_CURS_CALLBACK(_write) \ - devcb = &crt9007_t::set_curs_wr_callback(*device, DEVCB2_##_write); + devcb = &crt9007_t::set_curs_wr_callback(*device, DEVCB_##_write); #define MCFG_CRT9007_DRB_CALLBACK(_write) \ - devcb = &crt9007_t::set_drb_wr_callback(*device, DEVCB2_##_write); + devcb = &crt9007_t::set_drb_wr_callback(*device, DEVCB_##_write); #define MCFG_CRT9007_WBEN_CALLBACK(_write) \ - devcb = &crt9007_t::set_wben_wr_callback(*device, DEVCB2_##_write); + devcb = &crt9007_t::set_wben_wr_callback(*device, DEVCB_##_write); #define MCFG_CRT9007_CBLANK_CALLBACK(_write) \ - devcb = &crt9007_t::set_cblank_wr_callback(*device, DEVCB2_##_write); + devcb = &crt9007_t::set_cblank_wr_callback(*device, DEVCB_##_write); #define MCFG_CRT9007_SLG_CALLBACK(_write) \ - devcb = &crt9007_t::set_slg_wr_callback(*device, DEVCB2_##_write); + devcb = &crt9007_t::set_slg_wr_callback(*device, DEVCB_##_write); #define MCFG_CRT9007_SLD_CALLBACK(_write) \ - devcb = &crt9007_t::set_sld_wr_callback(*device, DEVCB2_##_write); + devcb = &crt9007_t::set_sld_wr_callback(*device, DEVCB_##_write); @@ -106,17 +106,17 @@ public: static void static_set_character_width(device_t &device, int value) { downcast<crt9007_t &>(device).m_hpixels_per_column = value; } - template<class _Object> static devcb2_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_int.set_callback(object); } - template<class _Object> static devcb2_base &set_dmar_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_dmar.set_callback(object); } - template<class _Object> static devcb2_base &set_vs_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_vs.set_callback(object); } - template<class _Object> static devcb2_base &set_hs_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_hs.set_callback(object); } - template<class _Object> static devcb2_base &set_vlt_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_vlt.set_callback(object); } - template<class _Object> static devcb2_base &set_curs_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_curs.set_callback(object); } - template<class _Object> static devcb2_base &set_drb_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_drb.set_callback(object); } - template<class _Object> static devcb2_base &set_wben_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_wben.set_callback(object); } - template<class _Object> static devcb2_base &set_cblank_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_cblank.set_callback(object); } - template<class _Object> static devcb2_base &set_slg_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_slg.set_callback(object); } - template<class _Object> static devcb2_base &set_sld_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_sld.set_callback(object); } + template<class _Object> static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_int.set_callback(object); } + template<class _Object> static devcb_base &set_dmar_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_dmar.set_callback(object); } + template<class _Object> static devcb_base &set_vs_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_vs.set_callback(object); } + template<class _Object> static devcb_base &set_hs_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_hs.set_callback(object); } + template<class _Object> static devcb_base &set_vlt_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_vlt.set_callback(object); } + template<class _Object> static devcb_base &set_curs_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_curs.set_callback(object); } + template<class _Object> static devcb_base &set_drb_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_drb.set_callback(object); } + template<class _Object> static devcb_base &set_wben_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_wben.set_callback(object); } + template<class _Object> static devcb_base &set_cblank_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_cblank.set_callback(object); } + template<class _Object> static devcb_base &set_slg_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_slg.set_callback(object); } + template<class _Object> static devcb_base &set_sld_wr_callback(device_t &device, _Object object) { return downcast<crt9007_t &>(device).m_write_sld.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -162,17 +162,17 @@ private: // address space configurations const address_space_config m_space_config; - devcb2_write_line m_write_int; - devcb2_write_line m_write_dmar; - devcb2_write_line m_write_hs; - devcb2_write_line m_write_vs; - devcb2_write_line m_write_vlt; - devcb2_write_line m_write_curs; - devcb2_write_line m_write_drb; - devcb2_write_line m_write_wben; - devcb2_write_line m_write_cblank; - devcb2_write_line m_write_slg; - devcb2_write_line m_write_sld; + devcb_write_line m_write_int; + devcb_write_line m_write_dmar; + devcb_write_line m_write_hs; + devcb_write_line m_write_vs; + devcb_write_line m_write_vlt; + devcb_write_line m_write_curs; + devcb_write_line m_write_drb; + devcb_write_line m_write_wben; + devcb_write_line m_write_cblank; + devcb_write_line m_write_slg; + devcb_write_line m_write_sld; // registers UINT8 m_reg[0x3d]; diff --git a/src/emu/video/crt9212.h b/src/emu/video/crt9212.h index 078429f4fd4..736c8bf91f7 100644 --- a/src/emu/video/crt9212.h +++ b/src/emu/video/crt9212.h @@ -51,13 +51,13 @@ const int CRT9212_RAM_SIZE = 135; crt9212_t::static_set_wen2(*device, 1); #define MCFG_CRT9212_DOUT_CALLBACK(_write) \ - devcb = &crt9212_t::set_dout_wr_callback(*device, DEVCB2_##_write); + devcb = &crt9212_t::set_dout_wr_callback(*device, DEVCB_##_write); #define MCFG_CRT9212_ROF_CALLBACK(_write) \ - devcb = &crt9212_t::set_rof_wr_callback(*device, DEVCB2_##_write); + devcb = &crt9212_t::set_rof_wr_callback(*device, DEVCB_##_write); #define MCFG_CRT9212_WOF_CALLBACK(_write) \ - devcb = &crt9212_t::set_wof_wr_callback(*device, DEVCB2_##_write); + devcb = &crt9212_t::set_wof_wr_callback(*device, DEVCB_##_write); @@ -75,9 +75,9 @@ public: static void static_set_wen2(device_t &device, int state) { downcast<crt9212_t &>(device).m_wen2 = state; } - template<class _Object> static devcb2_base &set_dout_wr_callback(device_t &device, _Object object) { return downcast<crt9212_t &>(device).m_write_dout.set_callback(object); } - template<class _Object> static devcb2_base &set_rof_wr_callback(device_t &device, _Object object) { return downcast<crt9212_t &>(device).m_write_rof.set_callback(object); } - template<class _Object> static devcb2_base &set_wof_wr_callback(device_t &device, _Object object) { return downcast<crt9212_t &>(device).m_write_wof.set_callback(object); } + template<class _Object> static devcb_base &set_dout_wr_callback(device_t &device, _Object object) { return downcast<crt9212_t &>(device).m_write_dout.set_callback(object); } + template<class _Object> static devcb_base &set_rof_wr_callback(device_t &device, _Object object) { return downcast<crt9212_t &>(device).m_write_rof.set_callback(object); } + template<class _Object> static devcb_base &set_wof_wr_callback(device_t &device, _Object object) { return downcast<crt9212_t &>(device).m_write_wof.set_callback(object); } DECLARE_WRITE8_MEMBER( write ) { m_data = data; } DECLARE_WRITE_LINE_MEMBER( clrcnt_w ); @@ -94,9 +94,9 @@ protected: virtual void device_start(); private: - devcb2_write8 m_write_dout; - devcb2_write_line m_write_rof; - devcb2_write_line m_write_wof; + devcb_write8 m_write_dout; + devcb_write_line m_write_rof; + devcb_write_line m_write_wof; // inputs UINT8 m_data; diff --git a/src/emu/video/crtc_ega.h b/src/emu/video/crtc_ega.h index fe88a37bfae..5356ee28f5f 100644 --- a/src/emu/video/crtc_ega.h +++ b/src/emu/video/crtc_ega.h @@ -41,16 +41,16 @@ typedef device_delegate<void (bitmap_ind16 &bitmap, const rectangle &cliprect)> crtc_ega_device::set_hpixels_per_column(*device, _pix); #define MCFG_CRTC_EGA_RES_OUT_DE_CB(_devcb) \ - devcb = &crtc_ega_device::set_res_out_de_callback(*device, DEVCB2_##_devcb); + devcb = &crtc_ega_device::set_res_out_de_callback(*device, DEVCB_##_devcb); #define MCFG_CRTC_EGA_RES_OUT_HSYNC_CB(_devcb) \ - devcb = &crtc_ega_device::set_res_out_hsync_callback(*device, DEVCB2_##_devcb); + devcb = &crtc_ega_device::set_res_out_hsync_callback(*device, DEVCB_##_devcb); #define MCFG_CRTC_EGA_RES_OUT_VSYNC_CB(_devcb) \ - devcb = &crtc_ega_device::set_res_out_vsync_callback(*device, DEVCB2_##_devcb); + devcb = &crtc_ega_device::set_res_out_vsync_callback(*device, DEVCB_##_devcb); #define MCFG_CRTC_EGA_RES_OUT_VBLANK_CB(_devcb) \ - devcb = &crtc_ega_device::set_res_out_vblank_callback(*device, DEVCB2_##_devcb); + devcb = &crtc_ega_device::set_res_out_vblank_callback(*device, DEVCB_##_devcb); class crtc_ega_device : public device_t, @@ -59,13 +59,13 @@ class crtc_ega_device : public device_t, public: crtc_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_res_out_de_callback(device_t &device, _Object object) + template<class _Object> static devcb_base &set_res_out_de_callback(device_t &device, _Object object) { return downcast<crtc_ega_device &>(device).m_res_out_de_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_res_out_hsync_callback(device_t &device, _Object object) + template<class _Object> static devcb_base &set_res_out_hsync_callback(device_t &device, _Object object) { return downcast<crtc_ega_device &>(device).m_res_out_hsync_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_res_out_vsync_callback(device_t &device, _Object object) + template<class _Object> static devcb_base &set_res_out_vsync_callback(device_t &device, _Object object) { return downcast<crtc_ega_device &>(device).m_res_out_vsync_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_res_out_vblank_callback(device_t &device, _Object object) + template<class _Object> static devcb_base &set_res_out_vblank_callback(device_t &device, _Object object) { return downcast<crtc_ega_device &>(device).m_res_out_vblank_cb.set_callback(object); } static void set_begin_update_callback(device_t &device, crtc_ega_begin_update_delegate callback) { downcast<crtc_ega_device &>(device).m_begin_update_cb = callback; } @@ -110,10 +110,10 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); private: - devcb2_write_line m_res_out_de_cb; - devcb2_write_line m_res_out_hsync_cb; - devcb2_write_line m_res_out_vsync_cb; - devcb2_write_line m_res_out_vblank_cb; + devcb_write_line m_res_out_de_cb; + devcb_write_line m_res_out_hsync_cb; + devcb_write_line m_res_out_vsync_cb; + devcb_write_line m_res_out_vblank_cb; /* if specified, this gets called before any pixel update, optionally return a pointer that will be passed to the diff --git a/src/emu/video/dl1416.h b/src/emu/video/dl1416.h index 80d0192e6f0..5b497efdd39 100644 --- a/src/emu/video/dl1416.h +++ b/src/emu/video/dl1416.h @@ -21,7 +21,7 @@ ***************************************************************************/ #define MCFG_DL1416_UPDATE_HANDLER(_devcb) \ - devcb = &dl1416_device::set_update_handler(*device, DEVCB2_##_devcb); + devcb = &dl1416_device::set_update_handler(*device, DEVCB_##_devcb); /*************************************************************************** @@ -35,7 +35,7 @@ public: dl1416_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); ~dl1416_device() {} - template<class _Object> static devcb2_base &set_update_handler(device_t &device, _Object object) { return downcast<dl1416_device &>(device).m_update.set_callback(object); } + template<class _Object> static devcb_base &set_update_handler(device_t &device, _Object object) { return downcast<dl1416_device &>(device).m_update.set_callback(object); } /* inputs */ DECLARE_WRITE_LINE_MEMBER( wr_w ); /* write enable */ @@ -53,7 +53,7 @@ private: int m_write_enable; int m_chip_enable; int m_cursor_enable; - devcb2_write16 m_update; + devcb_write16 m_update; UINT16 m_digit_ram[4]; // holds the digit code for each position UINT8 m_cursor_state[4]; // holds the cursor state for each position, 0=off, 1=on diff --git a/src/emu/video/dm9368.h b/src/emu/video/dm9368.h index d686d752dcb..ad413561f8b 100644 --- a/src/emu/video/dm9368.h +++ b/src/emu/video/dm9368.h @@ -34,7 +34,7 @@ //************************************************************************** #define MCFG_DM9368_RBO_CALLBACK(_write) \ - devcb = &dm9368_device::set_rbo_wr_callback(*device, DEVCB2_##_read); + devcb = &dm9368_device::set_rbo_wr_callback(*device, DEVCB_##_read); @@ -61,7 +61,7 @@ protected: virtual void device_start(); private: - devcb2_write_line m_write_rbo; + devcb_write_line m_write_rbo; int m_rbi; int m_rbo; diff --git a/src/emu/video/hd44352.h b/src/emu/video/hd44352.h index 195a74db1ed..b305e8ccfa9 100644 --- a/src/emu/video/hd44352.h +++ b/src/emu/video/hd44352.h @@ -13,7 +13,7 @@ #define MCFG_HD44352_ON_CB(_devcb) \ - devcb = &hd44352_device::set_on_callback(*device, DEVCB2_##_devcb); + devcb = &hd44352_device::set_on_callback(*device, DEVCB_##_devcb); //************************************************************************** @@ -29,7 +29,7 @@ public: // construction/destruction hd44352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_on_callback(device_t &device, _Object object) { return downcast<hd44352_device &>(device).m_on_cb.set_callback(object); } + template<class _Object> static devcb_base &set_on_callback(device_t &device, _Object object) { return downcast<hd44352_device &>(device).m_on_cb.set_callback(object); } // device interface UINT8 data_read(); @@ -72,7 +72,7 @@ private: UINT8 m_cursor_y; UINT8 m_cursor_lcd; - devcb2_write_line m_on_cb; // ON line callback + devcb_write_line m_on_cb; // ON line callback }; // device type definition diff --git a/src/emu/video/hd61830.h b/src/emu/video/hd61830.h index 24de36df2c9..6a152fd3110 100644 --- a/src/emu/video/hd61830.h +++ b/src/emu/video/hd61830.h @@ -23,7 +23,7 @@ //************************************************************************** #define MCFG_HD61830_RD_CALLBACK(_read) \ - devcb = &hd61830_device::set_rd_rd_callback(*device, DEVCB2_##_read); + devcb = &hd61830_device::set_rd_rd_callback(*device, DEVCB_##_read); @@ -41,7 +41,7 @@ public: // construction/destruction hd61830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_rd_rd_callback(device_t &device, _Object object) { return downcast<hd61830_device &>(device).m_read_rd.set_callback(object); } + template<class _Object> static devcb_base &set_rd_rd_callback(device_t &device, _Object object) { return downcast<hd61830_device &>(device).m_read_rd.set_callback(object); } DECLARE_READ8_MEMBER( status_r ); DECLARE_WRITE8_MEMBER( control_w ); @@ -89,7 +89,7 @@ private: void draw_char(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT16 ma, int x, int y, UINT8 md); void update_text(bitmap_ind16 &bitmap, const rectangle &cliprect); - devcb2_read8 m_read_rd; + devcb_read8 m_read_rd; emu_timer *m_busy_timer; //address_space *m_data; diff --git a/src/emu/video/huc6202.h b/src/emu/video/huc6202.h index 07a0317caeb..1f4b6d100fd 100644 --- a/src/emu/video/huc6202.h +++ b/src/emu/video/huc6202.h @@ -11,40 +11,40 @@ #define MCFG_HUC6202_NEXT_PIXEL_0_CB(_devcb) \ - devcb = &huc6202_device::set_next_pixel_0_callback(*device, DEVCB2_##_devcb); + devcb = &huc6202_device::set_next_pixel_0_callback(*device, DEVCB_##_devcb); #define MCFG_HUC6202_TIME_TIL_NEXT_EVENT_0_CB(_devcb) \ - devcb = &huc6202_device::set_time_til_next_event_0_callback(*device, DEVCB2_##_devcb); + devcb = &huc6202_device::set_time_til_next_event_0_callback(*device, DEVCB_##_devcb); #define MCFG_HUC6202_VSYNC_CHANGED_0_CB(_devcb) \ - devcb = &huc6202_device::set_vsync_changed_0_callback(*device, DEVCB2_##_devcb); + devcb = &huc6202_device::set_vsync_changed_0_callback(*device, DEVCB_##_devcb); #define MCFG_HUC6202_HSYNC_CHANGED_0_CB(_devcb) \ - devcb = &huc6202_device::set_hsync_changed_0_callback(*device, DEVCB2_##_devcb); + devcb = &huc6202_device::set_hsync_changed_0_callback(*device, DEVCB_##_devcb); #define MCFG_HUC6202_READ_0_CB(_devcb) \ - devcb = &huc6202_device::set_read_0_callback(*device, DEVCB2_##_devcb); + devcb = &huc6202_device::set_read_0_callback(*device, DEVCB_##_devcb); #define MCFG_HUC6202_WRITE_0_CB(_devcb) \ - devcb = &huc6202_device::set_write_0_callback(*device, DEVCB2_##_devcb); + devcb = &huc6202_device::set_write_0_callback(*device, DEVCB_##_devcb); #define MCFG_HUC6202_NEXT_PIXEL_1_CB(_devcb) \ - devcb = &huc6202_device::set_next_pixel_1_callback(*device, DEVCB2_##_devcb); + devcb = &huc6202_device::set_next_pixel_1_callback(*device, DEVCB_##_devcb); #define MCFG_HUC6202_TIME_TIL_NEXT_EVENT_1_CB(_devcb) \ - devcb = &huc6202_device::set_time_til_next_event_1_callback(*device, DEVCB2_##_devcb); + devcb = &huc6202_device::set_time_til_next_event_1_callback(*device, DEVCB_##_devcb); #define MCFG_HUC6202_VSYNC_CHANGED_1_CB(_devcb) \ - devcb = &huc6202_device::set_vsync_changed_1_callback(*device, DEVCB2_##_devcb); + devcb = &huc6202_device::set_vsync_changed_1_callback(*device, DEVCB_##_devcb); #define MCFG_HUC6202_HSYNC_CHANGED_1_CB(_devcb) \ - devcb = &huc6202_device::set_hsync_changed_1_callback(*device, DEVCB2_##_devcb); + devcb = &huc6202_device::set_hsync_changed_1_callback(*device, DEVCB_##_devcb); #define MCFG_HUC6202_READ_1_CB(_devcb) \ - devcb = &huc6202_device::set_read_1_callback(*device, DEVCB2_##_devcb); + devcb = &huc6202_device::set_read_1_callback(*device, DEVCB_##_devcb); #define MCFG_HUC6202_WRITE_1_CB(_devcb) \ - devcb = &huc6202_device::set_write_1_callback(*device, DEVCB2_##_devcb); + devcb = &huc6202_device::set_write_1_callback(*device, DEVCB_##_devcb); class huc6202_device : public device_t @@ -53,18 +53,18 @@ public: // construction/destruction huc6202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_next_pixel_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_next_pixel_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_time_til_next_event_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_time_til_next_event_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_vsync_changed_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_vsync_changed_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_hsync_changed_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_hsync_changed_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_read_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_write_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_write_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_next_pixel_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_next_pixel_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_time_til_next_event_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_time_til_next_event_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_vsync_changed_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_vsync_changed_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_hsync_changed_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_hsync_changed_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_read_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_write_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_write_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_next_pixel_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_next_pixel_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_time_til_next_event_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_time_til_next_event_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_vsync_changed_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_vsync_changed_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_hsync_changed_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_hsync_changed_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_read_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_write_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_write_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_next_pixel_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_next_pixel_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_time_til_next_event_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_time_til_next_event_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_vsync_changed_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_vsync_changed_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_hsync_changed_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_hsync_changed_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_read_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_write_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_write_1_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -83,29 +83,29 @@ protected: private: /* callbacks */ /* First gfx input device */ - devcb2_read16 m_next_pixel_0_cb; + devcb_read16 m_next_pixel_0_cb; /* TODO: Choose proper types */ /* Callback function to get time until next event */ - devcb2_read16 m_time_til_next_event_0_cb; + devcb_read16 m_time_til_next_event_0_cb; - devcb2_write_line m_vsync_changed_0_cb; - devcb2_write_line m_hsync_changed_0_cb; - devcb2_read8 m_read_0_cb; - devcb2_write8 m_write_0_cb; + devcb_write_line m_vsync_changed_0_cb; + devcb_write_line m_hsync_changed_0_cb; + devcb_read8 m_read_0_cb; + devcb_write8 m_write_0_cb; /* Second gfx input device */ - devcb2_read16 m_next_pixel_1_cb; + devcb_read16 m_next_pixel_1_cb; /* TODO: Choose proper types */ /* Callback function to get time until next event */ - devcb2_read16 m_time_til_next_event_1_cb; + devcb_read16 m_time_til_next_event_1_cb; - devcb2_write_line m_vsync_changed_1_cb; - devcb2_write_line m_hsync_changed_1_cb; - devcb2_read8 m_read_1_cb; - devcb2_write8 m_write_1_cb; + devcb_write_line m_vsync_changed_1_cb; + devcb_write_line m_hsync_changed_1_cb; + devcb_read8 m_read_1_cb; + devcb_write8 m_write_1_cb; struct { UINT8 prio_type; diff --git a/src/emu/video/huc6260.h b/src/emu/video/huc6260.h index 89932fea284..2214fefa052 100644 --- a/src/emu/video/huc6260.h +++ b/src/emu/video/huc6260.h @@ -19,16 +19,16 @@ #define MCFG_HUC6260_NEXT_PIXEL_DATA_CB(_devcb) \ - devcb = &huc6260_device::set_next_pixel_data_callback(*device, DEVCB2_##_devcb); + devcb = &huc6260_device::set_next_pixel_data_callback(*device, DEVCB_##_devcb); #define MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(_devcb) \ - devcb = &huc6260_device::set_time_til_next_event_callback(*device, DEVCB2_##_devcb); + devcb = &huc6260_device::set_time_til_next_event_callback(*device, DEVCB_##_devcb); #define MCFG_HUC6260_VSYNC_CHANGED_CB(_devcb) \ - devcb = &huc6260_device::set_vsync_changed_callback(*device, DEVCB2_##_devcb); + devcb = &huc6260_device::set_vsync_changed_callback(*device, DEVCB_##_devcb); #define MCFG_HUC6260_HSYNC_CHANGED_CB(_devcb) \ - devcb = &huc6260_device::set_hsync_changed_callback(*device, DEVCB2_##_devcb); + devcb = &huc6260_device::set_hsync_changed_callback(*device, DEVCB_##_devcb); class huc6260_device : public device_t, @@ -38,10 +38,10 @@ public: // construction/destruction huc6260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_next_pixel_data_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_next_pixel_data_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_time_til_next_event_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_time_til_next_event_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_vsync_changed_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_vsync_changed_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_hsync_changed_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_hsync_changed_cb.set_callback(object); } + template<class _Object> static devcb_base &set_next_pixel_data_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_next_pixel_data_cb.set_callback(object); } + template<class _Object> static devcb_base &set_time_til_next_event_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_time_til_next_event_cb.set_callback(object); } + template<class _Object> static devcb_base &set_vsync_changed_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_vsync_changed_cb.set_callback(object); } + template<class _Object> static devcb_base &set_hsync_changed_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_hsync_changed_cb.set_callback(object); } void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_READ8_MEMBER( read ); @@ -62,17 +62,17 @@ private: /* callbacks */ /* Callback function to retrieve pixel data */ - devcb2_read16 m_next_pixel_data_cb; + devcb_read16 m_next_pixel_data_cb; /* TODO: Choose proper types */ /* Callback function to get time until next event */ - devcb2_read16 m_time_til_next_event_cb; + devcb_read16 m_time_til_next_event_cb; /* Callback function which gets called when vsync changes */ - devcb2_write_line m_vsync_changed_cb; + devcb_write_line m_vsync_changed_cb; /* Callback function which gets called when hsync changes */ - devcb2_write_line m_hsync_changed_cb; + devcb_write_line m_hsync_changed_cb; UINT16 m_palette[512]; UINT16 m_address; diff --git a/src/emu/video/huc6270.h b/src/emu/video/huc6270.h index 99e370c5af5..5a06d21cb27 100644 --- a/src/emu/video/huc6270.h +++ b/src/emu/video/huc6270.h @@ -13,7 +13,7 @@ huc6270_device::set_vram_size(*device, _size); #define MCFG_HUC6270_IRQ_CHANGED_CB(_devcb) \ - devcb = &huc6270_device::set_irq_changed_callback(*device, DEVCB2_##_devcb); + devcb = &huc6270_device::set_irq_changed_callback(*device, DEVCB_##_devcb); class huc6270_device : public device_t { @@ -22,7 +22,7 @@ public: huc6270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_vram_size(device_t &device, UINT32 vram_size) { downcast<huc6270_device &>(device).m_vram_size = vram_size; } - template<class _Object> static devcb2_base &set_irq_changed_callback(device_t &device, _Object object) { return downcast<huc6270_device &>(device).m_irq_changed_cb.set_callback(object); } + template<class _Object> static devcb_base &set_irq_changed_callback(device_t &device, _Object object) { return downcast<huc6270_device &>(device).m_irq_changed_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -71,7 +71,7 @@ private: UINT32 m_vram_size; /* Callback for when the irq line may have changed (mandatory) */ - devcb2_write_line m_irq_changed_cb; + devcb_write_line m_irq_changed_cb; UINT8 m_register_index; diff --git a/src/emu/video/i8244.h b/src/emu/video/i8244.h index cc88fff8230..87d022623a7 100644 --- a/src/emu/video/i8244.h +++ b/src/emu/video/i8244.h @@ -24,9 +24,9 @@ MCFG_I8244_IRQ_CB(_irq_cb) \ MCFG_I8244_POSTPROCESS_CB(_postprocess_cb) #define MCFG_I8244_IRQ_CB(_devcb) \ - devcb = &i8244_device::set_irq_cb(*device, DEVCB2_##_devcb); + devcb = &i8244_device::set_irq_cb(*device, DEVCB_##_devcb); #define MCFG_I8244_POSTPROCESS_CB(_devcb) \ - devcb = &i8244_device::set_postprocess_cb(*device, DEVCB2_##_devcb); + devcb = &i8244_device::set_postprocess_cb(*device, DEVCB_##_devcb); #define MCFG_I8245_ADD(_tag, _clock, _screen_tag, _irq_cb, _postprocess_cb) \ MCFG_DEVICE_ADD(_tag, I8245, _clock) \ MCFG_VIDEO_SET_SCREEN(_screen_tag) \ @@ -83,8 +83,8 @@ public: // static configuration helpers static void set_screen_tag(device_t &device, const char *screen_tag) { downcast<i8244_device &>(device).m_screen_tag = screen_tag; } - template<class _Object> static devcb2_base &set_irq_cb(device_t &device, _Object object) { return downcast<i8244_device &>(device).m_irq_func.set_callback(object); } - template<class _Object> static devcb2_base &set_postprocess_cb(device_t &device, _Object object) { return downcast<i8244_device &>(device).m_postprocess_func.set_callback(object); } + template<class _Object> static devcb_base &set_irq_cb(device_t &device, _Object object) { return downcast<i8244_device &>(device).m_irq_func.set_callback(object); } + template<class _Object> static devcb_base &set_postprocess_cb(device_t &device, _Object object) { return downcast<i8244_device &>(device).m_postprocess_func.set_callback(object); } DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -127,8 +127,8 @@ protected: static const device_timer_id TIMER_HBLANK = 1; // callbacks - devcb2_write_line m_irq_func; - devcb2_write16 m_postprocess_func; + devcb_write_line m_irq_func; + devcb_write16 m_postprocess_func; bitmap_ind16 m_tmp_bitmap; emu_timer *m_line_timer; diff --git a/src/emu/video/i8275.h b/src/emu/video/i8275.h index 305252ca1ba..033b4846df0 100644 --- a/src/emu/video/i8275.h +++ b/src/emu/video/i8275.h @@ -55,16 +55,16 @@ i8275_device::static_set_display_callback(*device, i8275_draw_character_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); #define MCFG_I8275_DRQ_CALLBACK(_write) \ - devcb = &i8275_device::set_drq_wr_callback(*device, DEVCB2_##_write); + devcb = &i8275_device::set_drq_wr_callback(*device, DEVCB_##_write); #define MCFG_I8275_IRQ_CALLBACK(_write) \ - devcb = &i8275_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &i8275_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_I8275_HRTC_CALLBACK(_write) \ - devcb = &i8275_device::set_hrtc_wr_callback(*device, DEVCB2_##_write); + devcb = &i8275_device::set_hrtc_wr_callback(*device, DEVCB_##_write); #define MCFG_I8275_VRTC_CALLBACK(_write) \ - devcb = &i8275_device::set_vrtc_wr_callback(*device, DEVCB2_##_write); + devcb = &i8275_device::set_vrtc_wr_callback(*device, DEVCB_##_write); @@ -87,10 +87,10 @@ public: static void static_set_character_width(device_t &device, int value) { downcast<i8275_device &>(device).m_hpixels_per_column = value; } static void static_set_display_callback(device_t &device, i8275_draw_character_delegate callback) { downcast<i8275_device &>(device).m_display_cb = callback; } - template<class _Object> static devcb2_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<i8275_device &>(device).m_write_drq.set_callback(object); } - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i8275_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_hrtc_wr_callback(device_t &device, _Object object) { return downcast<i8275_device &>(device).m_write_hrtc.set_callback(object); } - template<class _Object> static devcb2_base &set_vrtc_wr_callback(device_t &device, _Object object) { return downcast<i8275_device &>(device).m_write_vrtc.set_callback(object); } + template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<i8275_device &>(device).m_write_drq.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i8275_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_hrtc_wr_callback(device_t &device, _Object object) { return downcast<i8275_device &>(device).m_write_hrtc.set_callback(object); } + template<class _Object> static devcb_base &set_vrtc_wr_callback(device_t &device, _Object object) { return downcast<i8275_device &>(device).m_write_vrtc.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -182,10 +182,10 @@ protected: static const int character_attribute[3][16]; - devcb2_write_line m_write_irq; - devcb2_write_line m_write_drq; - devcb2_write_line m_write_hrtc; - devcb2_write_line m_write_vrtc; + devcb_write_line m_write_irq; + devcb_write_line m_write_drq; + devcb_write_line m_write_hrtc; + devcb_write_line m_write_vrtc; i8275_draw_character_delegate m_display_cb; int m_hpixels_per_column; diff --git a/src/emu/video/mc6845.h b/src/emu/video/mc6845.h index 40e0ca47b57..702c9a6f6d6 100644 --- a/src/emu/video/mc6845.h +++ b/src/emu/video/mc6845.h @@ -50,16 +50,16 @@ mc6845_device::set_on_update_addr_change_callback(*device, mc6845_on_update_addr_changed_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); #define MCFG_MC6845_OUT_DE_CB(_write) \ - devcb = &mc6845_device::set_out_de_callback(*device, DEVCB2_##_write); + devcb = &mc6845_device::set_out_de_callback(*device, DEVCB_##_write); #define MCFG_MC6845_OUT_CUR_CB(_write) \ - devcb = &mc6845_device::set_out_cur_callback(*device, DEVCB2_##_write); + devcb = &mc6845_device::set_out_cur_callback(*device, DEVCB_##_write); #define MCFG_MC6845_OUT_HSYNC_CB(_write) \ - devcb = &mc6845_device::set_out_hsync_callback(*device, DEVCB2_##_write); + devcb = &mc6845_device::set_out_hsync_callback(*device, DEVCB_##_write); #define MCFG_MC6845_OUT_VSYNC_CB(_write) \ - devcb = &mc6845_device::set_out_vsync_callback(*device, DEVCB2_##_write); + devcb = &mc6845_device::set_out_vsync_callback(*device, DEVCB_##_write); /* callback definitions */ @@ -112,10 +112,10 @@ public: static void set_end_update_callback(device_t &device, mc6845_end_update_delegate callback) { downcast<mc6845_device &>(device).m_end_update_cb = callback; } static void set_on_update_addr_change_callback(device_t &device, mc6845_on_update_addr_changed_delegate callback) { downcast<mc6845_device &>(device).m_on_update_addr_changed_cb = callback; } - template<class _Object> static devcb2_base &set_out_de_callback(device_t &device, _Object object) { return downcast<mc6845_device &>(device).m_out_de_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_cur_callback(device_t &device, _Object object) { return downcast<mc6845_device &>(device).m_out_cur_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_hsync_callback(device_t &device, _Object object) { return downcast<mc6845_device &>(device).m_out_hsync_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_vsync_callback(device_t &device, _Object object) { return downcast<mc6845_device &>(device).m_out_vsync_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_de_callback(device_t &device, _Object object) { return downcast<mc6845_device &>(device).m_out_de_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_cur_callback(device_t &device, _Object object) { return downcast<mc6845_device &>(device).m_out_cur_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_hsync_callback(device_t &device, _Object object) { return downcast<mc6845_device &>(device).m_out_hsync_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_vsync_callback(device_t &device, _Object object) { return downcast<mc6845_device &>(device).m_out_vsync_cb.set_callback(object); } /* select one of the registers for reading or writing */ DECLARE_WRITE8_MEMBER( address_w ); @@ -302,16 +302,16 @@ protected: mc6845_on_update_addr_changed_delegate m_on_update_addr_changed_cb; /* if specified, this gets called for every change of the disply enable pin (pin 18) */ - devcb2_write_line m_out_de_cb; + devcb_write_line m_out_de_cb; /* if specified, this gets called for every change of the cursor pin (pin 19) */ - devcb2_write_line m_out_cur_cb; + devcb_write_line m_out_cur_cb; /* if specified, this gets called for every change of the HSYNC pin (pin 39) */ - devcb2_write_line m_out_hsync_cb; + devcb_write_line m_out_hsync_cb; /* if specified, this gets called for every change of the VSYNC pin (pin 40) */ - devcb2_write_line m_out_vsync_cb; + devcb_write_line m_out_vsync_cb; }; diff --git a/src/emu/video/mc6847.h b/src/emu/video/mc6847.h index 8feb39f0686..717b40637b0 100644 --- a/src/emu/video/mc6847.h +++ b/src/emu/video/mc6847.h @@ -43,16 +43,16 @@ MCFG_SCREEN_VBLANK_TIME(0) #define MCFG_MC6847_HSYNC_CALLBACK(_write) \ - devcb = &mc6847_friend_device::set_hsync_wr_callback(*device, DEVCB2_##_write); + devcb = &mc6847_friend_device::set_hsync_wr_callback(*device, DEVCB_##_write); #define MCFG_MC6847_FSYNC_CALLBACK(_write) \ - devcb = &mc6847_friend_device::set_fsync_wr_callback(*device, DEVCB2_##_write); + devcb = &mc6847_friend_device::set_fsync_wr_callback(*device, DEVCB_##_write); #define MCFG_MC6847_CHARROM_CALLBACK(_class, _method) \ mc6847_friend_device::set_get_char_rom(*device, mc6847_get_char_rom_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); #define MCFG_MC6847_INPUT_CALLBACK(_read) \ - devcb = &mc6847_base_device::set_input_callback(*device, DEVCB2_##_read); + devcb = &mc6847_base_device::set_input_callback(*device, DEVCB_##_read); #define MCFG_MC6847_FIXED_MODE(_mode) \ mc6847_base_device::set_get_fixed_mode(*device, _mode); @@ -82,8 +82,8 @@ public: bool hs_r(void) { return m_horizontal_sync; } bool fs_r(void) { return m_field_sync; } - template<class _Object> static devcb2_base &set_hsync_wr_callback(device_t &device, _Object object) { return downcast<mc6847_friend_device &>(device).m_write_hsync.set_callback(object); } - template<class _Object> static devcb2_base &set_fsync_wr_callback(device_t &device, _Object object) { return downcast<mc6847_friend_device &>(device).m_write_fsync.set_callback(object); } + template<class _Object> static devcb_base &set_hsync_wr_callback(device_t &device, _Object object) { return downcast<mc6847_friend_device &>(device).m_write_hsync.set_callback(object); } + template<class _Object> static devcb_base &set_fsync_wr_callback(device_t &device, _Object object) { return downcast<mc6847_friend_device &>(device).m_write_fsync.set_callback(object); } static void set_get_char_rom(device_t &device, mc6847_get_char_rom_delegate callback) { downcast<mc6847_friend_device &>(device).m_charrom_cb = callback; } @@ -267,8 +267,8 @@ protected: }; // callbacks - devcb2_write_line m_write_hsync; - devcb2_write_line m_write_fsync; + devcb_write_line m_write_hsync; + devcb_write_line m_write_fsync; /* if specified, this reads the external char rom off of the driver state */ // moved here from mc6847_base_device so to be useable in GIME @@ -517,7 +517,7 @@ public: // optional information overrides virtual const rom_entry *device_rom_region() const; - template<class _Object> static devcb2_base &set_input_callback(device_t &device, _Object object) { return downcast<mc6847_base_device &>(device).m_input_cb.set_callback(object); } + template<class _Object> static devcb_base &set_input_callback(device_t &device, _Object object) { return downcast<mc6847_base_device &>(device).m_input_cb.set_callback(object); } static void set_get_fixed_mode(device_t &device, UINT8 mode) { downcast<mc6847_base_device &>(device).m_fixed_mode = mode; } static void set_black_and_white(device_t &device, bool bw) { downcast<mc6847_base_device &>(device).m_black_and_white = bw; } @@ -575,7 +575,7 @@ private: // callbacks /* if specified, this gets called whenever reading a byte (offs_t ~0 specifies DA* entering the tristate mode) */ - devcb2_read8 m_input_cb; + devcb_read8 m_input_cb; /* if true, this is black and white */ bool m_black_and_white; diff --git a/src/emu/video/mos6566.h b/src/emu/video/mos6566.h index fea6c0465f3..f63669b0d6c 100644 --- a/src/emu/video/mos6566.h +++ b/src/emu/video/mos6566.h @@ -95,16 +95,16 @@ mos6566_device::static_set_cpu_tag(*device, "^"_tag); #define MCFG_MOS6566_IRQ_CALLBACK(_write) \ - devcb = &mos6566_device::set_irq_wr_callback(*device, DEVCB2_##_write); + devcb = &mos6566_device::set_irq_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS6566_BA_CALLBACK(_write) \ - devcb = &mos6566_device::set_ba_wr_callback(*device, DEVCB2_##_write); + devcb = &mos6566_device::set_ba_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS6566_AEC_CALLBACK(_write) \ - devcb = &mos6566_device::set_aec_wr_callback(*device, DEVCB2_##_write); + devcb = &mos6566_device::set_aec_wr_callback(*device, DEVCB_##_write); #define MCFG_MOS8564_K_CALLBACK(_write) \ - devcb = &mos6566_device::set_k_wr_callback(*device, DEVCB2_##_write); + devcb = &mos6566_device::set_k_wr_callback(*device, DEVCB_##_write); @@ -216,10 +216,10 @@ public: mos6566_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<mos6566_device &>(device).m_cpu.set_tag(tag); } - template<class _Object> static devcb2_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<mos6566_device &>(device).m_write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_ba_wr_callback(device_t &device, _Object object) { return downcast<mos6566_device &>(device).m_write_ba.set_callback(object); } - template<class _Object> static devcb2_base &set_aec_wr_callback(device_t &device, _Object object) { return downcast<mos6566_device &>(device).m_write_aec.set_callback(object); } - template<class _Object> static devcb2_base &set_k_wr_callback(device_t &device, _Object object) { return downcast<mos6566_device &>(device).m_write_k.set_callback(object); } + template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<mos6566_device &>(device).m_write_irq.set_callback(object); } + template<class _Object> static devcb_base &set_ba_wr_callback(device_t &device, _Object object) { return downcast<mos6566_device &>(device).m_write_ba.set_callback(object); } + template<class _Object> static devcb_base &set_aec_wr_callback(device_t &device, _Object object) { return downcast<mos6566_device &>(device).m_write_aec.set_callback(object); } + template<class _Object> static devcb_base &set_k_wr_callback(device_t &device, _Object object) { return downcast<mos6566_device &>(device).m_write_k.set_callback(object); } virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; @@ -288,10 +288,10 @@ protected: void draw_graphics(); void draw_sprites(); - devcb2_write_line m_write_irq; - devcb2_write_line m_write_ba; - devcb2_write_line m_write_aec; - devcb2_write8 m_write_k; + devcb_write_line m_write_irq; + devcb_write_line m_write_ba; + devcb_write_line m_write_aec; + devcb_write8 m_write_k; required_device<cpu_device> m_cpu; diff --git a/src/emu/video/psx.h b/src/emu/video/psx.h index 05d49ea4e2c..65fdc8f5a0f 100644 --- a/src/emu/video/psx.h +++ b/src/emu/video/psx.h @@ -15,7 +15,7 @@ #include "emu.h" #define MCFG_PSX_GPU_VBLANK_HANDLER(_devcb) \ - devcb = &psxgpu_device::set_vblank_handler(*device, DEVCB2_##_devcb); + devcb = &psxgpu_device::set_vblank_handler(*device, DEVCB_##_devcb); #define MCFG_PSXGPU_ADD( cputag, tag, type, _vramSize, clock ) \ MCFG_DEVICE_MODIFY( cputag ) \ @@ -193,7 +193,7 @@ public: virtual machine_config_constructor device_mconfig_additions() const; // static configuration helpers - template<class _Object> static devcb2_base &set_vblank_handler(device_t &device, _Object object) { return downcast<psxgpu_device &>(device).m_vblank_handler.set_callback(object); } + template<class _Object> static devcb_base &set_vblank_handler(device_t &device, _Object object) { return downcast<psxgpu_device &>(device).m_vblank_handler.set_callback(object); } UINT32 update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE32_MEMBER( write ); @@ -301,7 +301,7 @@ private: UINT16 p_n_r1[ 0x10000 ]; UINT16 p_n_b1g1[ 0x10000 ]; - devcb2_write_line m_vblank_handler; + devcb_write_line m_vblank_handler; #if defined(DEBUG_VIEWER) && DEBUG_VIEWER required_device<screen_device> m_screen; diff --git a/src/emu/video/saa5050.h b/src/emu/video/saa5050.h index b550ce64299..bf0d460ed2f 100644 --- a/src/emu/video/saa5050.h +++ b/src/emu/video/saa5050.h @@ -40,7 +40,7 @@ //************************************************************************** #define MCFG_SAA5050_D_CALLBACK(_read) \ - devcb = &saa5050_device::set_d_rd_callback(*device, DEVCB2_##_read); + devcb = &saa5050_device::set_d_rd_callback(*device, DEVCB_##_read); #define MCFG_SAA5050_SCREEN_SIZE(_cols, _rows, _size) \ @@ -63,7 +63,7 @@ public: static void static_set_screen_size(device_t &device, int cols, int rows, int size) { downcast<saa5050_device &>(device).m_cols = cols; downcast<saa5050_device &>(device).m_rows = rows; downcast<saa5050_device &>(device).m_size = size; } - template<class _Object> static devcb2_base &set_d_rd_callback(device_t &device, _Object object) { return downcast<saa5050_device &>(device).m_read_d.set_callback(object); } + template<class _Object> static devcb_base &set_d_rd_callback(device_t &device, _Object object) { return downcast<saa5050_device &>(device).m_read_d.set_callback(object); } // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -127,7 +127,7 @@ private: required_memory_region m_char_rom; - devcb2_read8 m_read_d; + devcb_read8 m_read_d; UINT8 m_code; UINT8 m_last_code; diff --git a/src/emu/video/snes_ppu.h b/src/emu/video/snes_ppu.h index b16e12a16d2..80c95444573 100644 --- a/src/emu/video/snes_ppu.h +++ b/src/emu/video/snes_ppu.h @@ -71,7 +71,7 @@ public: snes_ppu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers - template<class _Object> static devcb2_base &static_set_open_bus_callback(device_t &device, _Object object) { return downcast<snes_ppu_device &>(device).m_openbus_cb.set_callback(object); } + template<class _Object> static devcb_base &static_set_open_bus_callback(device_t &device, _Object object) { return downcast<snes_ppu_device &>(device).m_openbus_cb.set_callback(object); } UINT8 m_regs[0x40]; @@ -274,7 +274,7 @@ protected: virtual void device_reset() {}; private: - devcb2_read16 m_openbus_cb; + devcb_read16 m_openbus_cb; }; @@ -287,6 +287,6 @@ extern const device_type SNES_PPU; ***************************************************************************/ #define MCFG_SNES_PPU_OPENBUS_CB(_read) \ - devcb = &snes_ppu_device::static_set_open_bus_callback(*device, DEVCB2_##_read); + devcb = &snes_ppu_device::static_set_open_bus_callback(*device, DEVCB_##_read); #endif diff --git a/src/emu/video/tms34061.h b/src/emu/video/tms34061.h index 402a9e9de98..030fdf38cfe 100644 --- a/src/emu/video/tms34061.h +++ b/src/emu/video/tms34061.h @@ -19,7 +19,7 @@ tms34061_device::set_vram_size(*device, _size); #define MCFG_TMS34061_INTERRUPT_CB(_devcb) \ - devcb = &tms34061_device::set_interrupt_callback(*device, DEVCB2_##_devcb); + devcb = &tms34061_device::set_interrupt_callback(*device, DEVCB_##_devcb); /* register constants */ @@ -70,7 +70,7 @@ public: static void set_rowshift(device_t &device, UINT8 rowshift) { downcast<tms34061_device &>(device).m_rowshift = rowshift; } static void set_vram_size(device_t &device, UINT32 vramsize) { downcast<tms34061_device &>(device).m_vramsize = vramsize; } - template<class _Object> static devcb2_base &set_interrupt_callback(device_t &device, _Object object) { return downcast<tms34061_device &>(device).m_interrupt_cb.set_callback(object); } + template<class _Object> static devcb_base &set_interrupt_callback(device_t &device, _Object object) { return downcast<tms34061_device &>(device).m_interrupt_cb.set_callback(object); } /* reads/writes to the 34061 */ UINT8 read(address_space &space, int col, int row, int func); @@ -93,7 +93,7 @@ protected: private: UINT8 m_rowshift; /* VRAM address is (row << rowshift) | col */ UINT32 m_vramsize; /* size of video RAM */ - devcb2_write_line m_interrupt_cb; /* interrupt gen callback */ + devcb_write_line m_interrupt_cb; /* interrupt gen callback */ UINT16 m_regs[TMS34061_REGCOUNT]; UINT16 m_xmask; diff --git a/src/emu/video/tms9927.h b/src/emu/video/tms9927.h index 071c0fbff23..a4ddae6833d 100644 --- a/src/emu/video/tms9927.h +++ b/src/emu/video/tms9927.h @@ -12,7 +12,7 @@ #define MCFG_TMS9927_VSYN_CALLBACK(_write) \ - devcb = &tms9927_device::set_vsyn_wr_callback(*device, DEVCB2_##_write); + devcb = &tms9927_device::set_vsyn_wr_callback(*device, DEVCB_##_write); #define MCFG_TMS9927_CHAR_WIDTH(_pixels) \ tms9927_device::set_char_width(*device, _pixels); @@ -29,7 +29,7 @@ public: tms9927_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); ~tms9927_device() {} - template<class _Object> static devcb2_base &set_vsyn_wr_callback(device_t &device, _Object object) { return downcast<tms9927_device &>(device).m_write_vsyn.set_callback(object); } + template<class _Object> static devcb_base &set_vsyn_wr_callback(device_t &device, _Object object) { return downcast<tms9927_device &>(device).m_write_vsyn.set_callback(object); } static void set_char_width(device_t &device, int pixels) { downcast<tms9927_device &>(device).m_hpixels_per_column = pixels; } static void set_region_tag(device_t &device, const char *tag) { downcast<tms9927_device &>(device).m_selfload_region = tag; } @@ -58,7 +58,7 @@ private: void recompute_parameters(int postload); void generic_access(address_space &space, offs_t offset); - devcb2_write_line m_write_vsyn; + devcb_write_line m_write_vsyn; int m_hpixels_per_column; /* number of pixels per video memory address */ const char *m_selfload_region; /* name of the region with self-load data */ diff --git a/src/emu/video/tms9928a.h b/src/emu/video/tms9928a.h index c8ab0cac6b4..19ba5a69226 100644 --- a/src/emu/video/tms9928a.h +++ b/src/emu/video/tms9928a.h @@ -45,7 +45,7 @@ tms9928a_device::set_vram_size(*device, _size); #define MCFG_TMS9928A_OUT_INT_LINE_CB(_devcb) \ - devcb = &tms9928a_device::set_out_int_line_callback(*device, DEVCB2_##_devcb); + devcb = &tms9928a_device::set_out_int_line_callback(*device, DEVCB_##_devcb); #define MCFG_TMS9928A_SET_SCREEN MCFG_VIDEO_SET_SCREEN @@ -84,7 +84,7 @@ public: tms9928a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, const char *shortname, const char *source); static void set_vram_size(device_t &device, int vram_size) { downcast<tms9928a_device &>(device).m_vram_size = vram_size; } - template<class _Object> static devcb2_base &set_out_int_line_callback(device_t &device, _Object object) { return downcast<tms9928a_device &>(device).m_out_int_line_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_int_line_callback(device_t &device, _Object object) { return downcast<tms9928a_device &>(device).m_out_int_line_cb.set_callback(object); } DECLARE_READ8_MEMBER( vram_read ); DECLARE_WRITE8_MEMBER( vram_write ); @@ -117,7 +117,7 @@ private: static const device_timer_id TIMER_LINE = 0; int m_vram_size; /* 4K, 8K, or 16K. This should be replaced by fetching data from an address space? */ - devcb2_write_line m_out_int_line_cb; /* Callback is called whenever the state of the INT output changes */ + devcb_write_line m_out_int_line_cb; /* Callback is called whenever the state of the INT output changes */ /* TMS9928A internal settings */ UINT8 m_ReadAhead; diff --git a/src/emu/video/upd3301.h b/src/emu/video/upd3301.h index 81ab1026383..ec3910deaed 100644 --- a/src/emu/video/upd3301.h +++ b/src/emu/video/upd3301.h @@ -55,16 +55,16 @@ upd3301_device::static_set_display_callback(*device, upd3301_draw_character_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); #define MCFG_UPD3301_DRQ_CALLBACK(_write) \ - devcb = &upd3301_device::set_drq_wr_callback(*device, DEVCB2_##_write); + devcb = &upd3301_device::set_drq_wr_callback(*device, DEVCB_##_write); #define MCFG_UPD3301_INT_CALLBACK(_write) \ - devcb = &upd3301_device::set_int_wr_callback(*device, DEVCB2_##_write); + devcb = &upd3301_device::set_int_wr_callback(*device, DEVCB_##_write); #define MCFG_UPD3301_HRTC_CALLBACK(_write) \ - devcb = &upd3301_device::set_hrtc_wr_callback(*device, DEVCB2_##_write); + devcb = &upd3301_device::set_hrtc_wr_callback(*device, DEVCB_##_write); #define MCFG_UPD3301_VRTC_CALLBACK(_write) \ - devcb = &upd3301_device::set_vrtc_wr_callback(*device, DEVCB2_##_write); + devcb = &upd3301_device::set_vrtc_wr_callback(*device, DEVCB_##_write); @@ -87,10 +87,10 @@ public: static void static_set_character_width(device_t &device, int value) { downcast<upd3301_device &>(device).m_width = value; } static void static_set_display_callback(device_t &device, upd3301_draw_character_delegate callback) { downcast<upd3301_device &>(device).m_display_cb = callback; } - template<class _Object> static devcb2_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<upd3301_device &>(device).m_write_drq.set_callback(object); } - template<class _Object> static devcb2_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<upd3301_device &>(device).m_write_int.set_callback(object); } - template<class _Object> static devcb2_base &set_hrtc_wr_callback(device_t &device, _Object object) { return downcast<upd3301_device &>(device).m_write_hrtc.set_callback(object); } - template<class _Object> static devcb2_base &set_vrtc_wr_callback(device_t &device, _Object object) { return downcast<upd3301_device &>(device).m_write_vrtc.set_callback(object); } + template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<upd3301_device &>(device).m_write_drq.set_callback(object); } + template<class _Object> static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<upd3301_device &>(device).m_write_int.set_callback(object); } + template<class _Object> static devcb_base &set_hrtc_wr_callback(device_t &device, _Object object) { return downcast<upd3301_device &>(device).m_write_hrtc.set_callback(object); } + template<class _Object> static devcb_base &set_vrtc_wr_callback(device_t &device, _Object object) { return downcast<upd3301_device &>(device).m_write_vrtc.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -126,10 +126,10 @@ private: void draw_scanline(); - devcb2_write_line m_write_int; - devcb2_write_line m_write_drq; - devcb2_write_line m_write_hrtc; - devcb2_write_line m_write_vrtc; + devcb_write_line m_write_int; + devcb_write_line m_write_drq; + devcb_write_line m_write_hrtc; + devcb_write_line m_write_vrtc; upd3301_draw_character_delegate m_display_cb; int m_width; diff --git a/src/emu/video/upd7220.h b/src/emu/video/upd7220.h index adeadaef495..2aa681f1218 100644 --- a/src/emu/video/upd7220.h +++ b/src/emu/video/upd7220.h @@ -54,16 +54,16 @@ upd7220_device::static_set_draw_text_callback(*device, upd7220_draw_text_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); #define MCFG_UPD7220_DRQ_CALLBACK(_write) \ - devcb = &upd7220_device::set_drq_wr_callback(*device, DEVCB2_##_write); + devcb = &upd7220_device::set_drq_wr_callback(*device, DEVCB_##_write); #define MCFG_UPD7220_HSYNC_CALLBACK(_write) \ - devcb = &upd7220_device::set_hsync_wr_callback(*device, DEVCB2_##_write); + devcb = &upd7220_device::set_hsync_wr_callback(*device, DEVCB_##_write); #define MCFG_UPD7220_VSYNC_CALLBACK(_write) \ - devcb = &upd7220_device::set_vsync_wr_callback(*device, DEVCB2_##_write); + devcb = &upd7220_device::set_vsync_wr_callback(*device, DEVCB_##_write); #define MCFG_UPD7220_BLANK_CALLBACK(_write) \ - devcb = &upd7220_device::set_blank_wr_callback(*device, DEVCB2_##_write); + devcb = &upd7220_device::set_blank_wr_callback(*device, DEVCB_##_write); @@ -88,10 +88,10 @@ public: static void static_set_display_pixels_callback(device_t &device, upd7220_display_pixels_delegate callback) { downcast<upd7220_device &>(device).m_display_cb = callback; } static void static_set_draw_text_callback(device_t &device, upd7220_draw_text_delegate callback) { downcast<upd7220_device &>(device).m_draw_text_cb = callback; } - template<class _Object> static devcb2_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<upd7220_device &>(device).m_write_drq.set_callback(object); } - template<class _Object> static devcb2_base &set_hsync_wr_callback(device_t &device, _Object object) { return downcast<upd7220_device &>(device).m_write_hsync.set_callback(object); } - template<class _Object> static devcb2_base &set_vsync_wr_callback(device_t &device, _Object object) { return downcast<upd7220_device &>(device).m_write_vsync.set_callback(object); } - template<class _Object> static devcb2_base &set_blank_wr_callback(device_t &device, _Object object) { return downcast<upd7220_device &>(device).m_write_blank.set_callback(object); } + template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<upd7220_device &>(device).m_write_drq.set_callback(object); } + template<class _Object> static devcb_base &set_hsync_wr_callback(device_t &device, _Object object) { return downcast<upd7220_device &>(device).m_write_hsync.set_callback(object); } + template<class _Object> static devcb_base &set_vsync_wr_callback(device_t &device, _Object object) { return downcast<upd7220_device &>(device).m_write_vsync.set_callback(object); } + template<class _Object> static devcb_base &set_blank_wr_callback(device_t &device, _Object object) { return downcast<upd7220_device &>(device).m_write_blank.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -156,10 +156,10 @@ private: upd7220_display_pixels_delegate m_display_cb; upd7220_draw_text_delegate m_draw_text_cb; - devcb2_write_line m_write_drq; - devcb2_write_line m_write_hsync; - devcb2_write_line m_write_vsync; - devcb2_write_line m_write_blank; + devcb_write_line m_write_drq; + devcb_write_line m_write_hsync; + devcb_write_line m_write_vsync; + devcb_write_line m_write_blank; UINT16 m_mask; // mask register UINT8 m_pitch; // number of word addresses in display memory in the horizontal direction diff --git a/src/emu/video/v9938.h b/src/emu/video/v9938.h index 665a8900c48..ff9fef48bb4 100644 --- a/src/emu/video/v9938.h +++ b/src/emu/video/v9938.h @@ -25,7 +25,7 @@ v9938_device::static_set_vram_size(*device, _vramsize); #define MCFG_V99X8_INTERRUPT_CALLBACK(_irq) \ - downcast<v99x8_device *>(device)->set_interrupt_callback(DEVCB2_##_irq); + downcast<v99x8_device *>(device)->set_interrupt_callback(DEVCB_##_irq); // init functions @@ -191,7 +191,7 @@ private: // interrupt UINT8 m_int_state; - devcb2_write_line m_int_callback; + devcb_write_line m_int_callback; int m_scanline; // blinking int m_blink, m_blink_count; diff --git a/src/emu/video/vic4567.h b/src/emu/video/vic4567.h index b4ce9f79dd1..1c0c27df27d 100644 --- a/src/emu/video/vic4567.h +++ b/src/emu/video/vic4567.h @@ -127,14 +127,14 @@ public: static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<vic3_device &>(device).m_cpu.set_tag(tag); } static void set_vic3_type(device_t &device, vic3_type type) { downcast<vic3_device &>(device).m_type = type; } - template<class _Object> static devcb2_base &set_dma_read_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_dma_read_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_dma_read_color_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_dma_read_color_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_interrupt_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_interrupt_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_port_changed_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_port_changed_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_lightpen_button_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_lightpen_button_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_lightpen_x_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_lightpen_x_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_lightpen_y_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_lightpen_y_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_c64_mem_r_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_c64_mem_r_cb.set_callback(object); } + template<class _Object> static devcb_base &set_dma_read_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_dma_read_cb.set_callback(object); } + template<class _Object> static devcb_base &set_dma_read_color_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_dma_read_color_cb.set_callback(object); } + template<class _Object> static devcb_base &set_interrupt_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_interrupt_cb.set_callback(object); } + template<class _Object> static devcb_base &set_port_changed_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_port_changed_cb.set_callback(object); } + template<class _Object> static devcb_base &set_lightpen_button_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_lightpen_button_cb.set_callback(object); } + template<class _Object> static devcb_base &set_lightpen_x_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_lightpen_x_cb.set_callback(object); } + template<class _Object> static devcb_base &set_lightpen_y_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_lightpen_y_cb.set_callback(object); } + template<class _Object> static devcb_base &set_c64_mem_r_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_c64_mem_r_cb.set_callback(object); } DECLARE_WRITE8_MEMBER(port_w); DECLARE_WRITE8_MEMBER(palette_w); @@ -208,22 +208,22 @@ private: vic3_sprite m_sprites[8]; /* DMA */ - devcb2_read8 m_dma_read_cb; - devcb2_read8 m_dma_read_color_cb; + devcb_read8 m_dma_read_cb; + devcb_read8 m_dma_read_color_cb; /* IRQ */ - devcb2_write_line m_interrupt_cb; + devcb_write_line m_interrupt_cb; /* Port Changed */ - devcb2_write8 m_port_changed_cb; + devcb_write8 m_port_changed_cb; /* lightpen */ - devcb2_read8 m_lightpen_button_cb; - devcb2_read8 m_lightpen_x_cb; - devcb2_read8 m_lightpen_y_cb; + devcb_read8 m_lightpen_button_cb; + devcb_read8 m_lightpen_x_cb; + devcb_read8 m_lightpen_y_cb; /* C64 memory access */ - devcb2_read8 m_c64_mem_r_cb; + devcb_read8 m_c64_mem_r_cb; /* palette - vic3 specific items (the ones above are used for VIC II as well) */ UINT8 m_palette_red[0x100]; @@ -244,28 +244,28 @@ extern const device_type VIC3; vic3_device::set_vic3_type(*device, _type); #define MCFG_VIC3_DMA_READ_CB(_devcb) \ - devcb = &vic3_device::set_dma_read_callback(*device, DEVCB2_##_devcb); + devcb = &vic3_device::set_dma_read_callback(*device, DEVCB_##_devcb); #define MCFG_VIC3_DMA_READ_COLOR_CB(_devcb) \ - devcb = &vic3_device::set_dma_read_color_callback(*device, DEVCB2_##_devcb); + devcb = &vic3_device::set_dma_read_color_callback(*device, DEVCB_##_devcb); #define MCFG_VIC3_INTERRUPT_CB(_devcb) \ - devcb = &vic3_device::set_interrupt_callback(*device, DEVCB2_##_devcb); + devcb = &vic3_device::set_interrupt_callback(*device, DEVCB_##_devcb); #define MCFG_VIC3_PORT_CHANGED_CB(_devcb) \ - devcb = &vic3_device::set_port_changed_callback(*device, DEVCB2_##_devcb); + devcb = &vic3_device::set_port_changed_callback(*device, DEVCB_##_devcb); #define MCFG_VIC3_LIGHTPEN_BUTTON_CB(_devcb) \ - devcb = &vic3_device::set_lightpen_button_callback(*device, DEVCB2_##_devcb); + devcb = &vic3_device::set_lightpen_button_callback(*device, DEVCB_##_devcb); #define MCFG_VIC3_LIGHTPEN_X_CB(_devcb) \ - devcb = &vic3_device::set_lightpen_x_callback(*device, DEVCB2_##_devcb); + devcb = &vic3_device::set_lightpen_x_callback(*device, DEVCB_##_devcb); #define MCFG_VIC3_LIGHTPEN_Y_CB(_devcb) \ - devcb = &vic3_device::set_lightpen_y_callback(*device, DEVCB2_##_devcb); + devcb = &vic3_device::set_lightpen_y_callback(*device, DEVCB_##_devcb); #define MCFG_VIC3_C64_MEM_R_CB(_devcb) \ - devcb = &vic3_device::set_c64_mem_r_callback(*device, DEVCB2_##_devcb); + devcb = &vic3_device::set_c64_mem_r_callback(*device, DEVCB_##_devcb); #endif /* __VIC4567_H__ */ diff --git a/src/emu/video/voodoo.h b/src/emu/video/voodoo.h index 32a9d097c42..70234ab4148 100644 --- a/src/emu/video/voodoo.h +++ b/src/emu/video/voodoo.h @@ -51,10 +51,10 @@ enum voodoo_device::static_set_cpu_tag(*device, _tag); #define MCFG_VOODOO_VBLANK_CB(_devcb) \ - devcb = &voodoo_device::static_set_vblank_callback(*device, DEVCB2_##_devcb); + devcb = &voodoo_device::static_set_vblank_callback(*device, DEVCB_##_devcb); #define MCFG_VOODOO_STALL_CB(_devcb) \ - devcb = &voodoo_device::static_set_stall_callback(*device, DEVCB2_##_devcb); + devcb = &voodoo_device::static_set_stall_callback(*device, DEVCB_##_devcb); /*************************************************************************** @@ -79,8 +79,8 @@ public: static void static_set_tmumem(device_t &device, int value1, int value2) { downcast<voodoo_device &>(device).m_tmumem0 = value1; downcast<voodoo_device &>(device).m_tmumem1 = value2; } static void static_set_screen_tag(device_t &device, const char *tag) { downcast<voodoo_device &>(device).m_screen = tag; } static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<voodoo_device &>(device).m_cputag = tag; } - template<class _Object> static devcb2_base &static_set_vblank_callback(device_t &device, _Object object) { return downcast<voodoo_device &>(device).m_vblank.set_callback(object); } - template<class _Object> static devcb2_base &static_set_stall_callback(device_t &device, _Object object) { return downcast<voodoo_device &>(device).m_stall.set_callback(object); } + template<class _Object> static devcb_base &static_set_vblank_callback(device_t &device, _Object object) { return downcast<voodoo_device &>(device).m_vblank.set_callback(object); } + template<class _Object> static devcb_base &static_set_stall_callback(device_t &device, _Object object) { return downcast<voodoo_device &>(device).m_stall.set_callback(object); } DECLARE_READ32_MEMBER( voodoo_r ); DECLARE_WRITE32_MEMBER( voodoo_w ); @@ -94,8 +94,8 @@ public: UINT8 m_tmumem1; const char * m_screen; const char * m_cputag; - devcb2_write_line m_vblank; - devcb2_write_line m_stall; + devcb_write_line m_vblank; + devcb_write_line m_stall; protected: // device-level overrides diff --git a/src/mame/audio/atarijsa.h b/src/mame/audio/atarijsa.h index 85a66cbab1c..e1866d1c75c 100644 --- a/src/mame/audio/atarijsa.h +++ b/src/mame/audio/atarijsa.h @@ -38,22 +38,22 @@ extern const device_type ATARI_JSA_IIIS; #define MCFG_ATARI_JSA_I_ADD(_tag, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_JSA_I, 0) \ - devcb = &atari_jsa_i_device::static_set_main_int_cb(*device, DEVCB2_##_intcb); + devcb = &atari_jsa_i_device::static_set_main_int_cb(*device, DEVCB_##_intcb); #define MCFG_ATARI_JSA_II_ADD(_tag, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_JSA_II, 0) \ - devcb = &atari_jsa_ii_device::static_set_main_int_cb(*device, DEVCB2_##_intcb); + devcb = &atari_jsa_ii_device::static_set_main_int_cb(*device, DEVCB_##_intcb); #define MCFG_ATARI_JSA_III_ADD(_tag, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_JSA_III, 0) \ - devcb = &atari_jsa_iii_device::static_set_main_int_cb(*device, DEVCB2_##_intcb); + devcb = &atari_jsa_iii_device::static_set_main_int_cb(*device, DEVCB_##_intcb); #define MCFG_ATARI_JSA_IIIS_ADD(_tag, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_JSA_IIIS, 0) \ - devcb = &atari_jsa_iiis_device::static_set_main_int_cb(*device, DEVCB2_##_intcb); + devcb = &atari_jsa_iiis_device::static_set_main_int_cb(*device, DEVCB_##_intcb); #define MCFG_ATARI_JSA_TEST_PORT(_port, _bitnum) \ - devcb = &atari_jsa_base_device::static_set_test_read_cb(*device, DEVCB2_IOPORT(_port)); \ + devcb = &atari_jsa_base_device::static_set_test_read_cb(*device, DEVCB_IOPORT(_port)); \ MCFG_DEVCB_RSHIFT(_bitnum); @@ -84,8 +84,8 @@ protected: public: // static configuration - template<class _Object> static devcb2_base &static_set_test_read_cb(device_t &device, _Object object) { return downcast<atari_jsa_base_device &>(device).m_test_read_cb.set_callback(object); } - template<class _Object> static devcb2_base &static_set_main_int_cb(device_t &device, _Object object) { return downcast<atari_jsa_base_device &>(device).m_main_int_cb.set_callback(object); } + template<class _Object> static devcb_base &static_set_test_read_cb(device_t &device, _Object object) { return downcast<atari_jsa_base_device &>(device).m_test_read_cb.set_callback(object); } + template<class _Object> static devcb_base &static_set_main_int_cb(device_t &device, _Object object) { return downcast<atari_jsa_base_device &>(device).m_main_int_cb.set_callback(object); } // getters m6502_device &soundcpu() const { return *m_jsacpu; } @@ -121,8 +121,8 @@ protected: required_memory_bank m_cpu_bank; // configuration state - devcb2_read_line m_test_read_cb; - devcb2_write_line m_main_int_cb; + devcb_read_line m_test_read_cb; + devcb_write_line m_main_int_cb; // internal state double m_ym2151_volume; diff --git a/src/mame/audio/cage.h b/src/mame/audio/cage.h index aa075967f0e..f1db2dd3e26 100644 --- a/src/mame/audio/cage.h +++ b/src/mame/audio/cage.h @@ -15,7 +15,7 @@ #define CAGE_IRQ_REASON_BUFFER_EMPTY (2) #define MCFG_ATARI_CAGE_IRQ_CALLBACK(_write) \ - devcb = &atari_cage_device::set_irqhandler_callback(*device, DEVCB2_##_write); + devcb = &atari_cage_device::set_irqhandler_callback(*device, DEVCB_##_write); #define MCFG_ATARI_CAGE_SPEEDUP(_speedup) \ atari_cage_device::static_set_speedup(*device, _speedup); @@ -28,7 +28,7 @@ public: atari_cage_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); static void static_set_speedup(device_t &device, offs_t speedup) { downcast<atari_cage_device &>(device).m_speedup = speedup; } - template<class _Object> static devcb2_base &set_irqhandler_callback(device_t &device, _Object object) { return downcast<atari_cage_device &>(device).m_irqhandler.set_callback(object); } + template<class _Object> static devcb_base &set_irqhandler_callback(device_t &device, _Object object) { return downcast<atari_cage_device &>(device).m_irqhandler.set_callback(object); } // optional information overrides virtual machine_config_constructor device_mconfig_additions() const; @@ -67,7 +67,7 @@ private: UINT8 m_cpu_to_cage_ready; UINT8 m_cage_to_cpu_ready; - devcb2_write8 m_irqhandler; + devcb_write8 m_irqhandler; attotime m_serial_period_per_word; diff --git a/src/mame/audio/namco52.h b/src/mame/audio/namco52.h index 949c62de1e2..b38061618e7 100644 --- a/src/mame/audio/namco52.h +++ b/src/mame/audio/namco52.h @@ -19,10 +19,10 @@ namco_52xx_device::set_extclock(*device, _clock); #define MCFG_NAMCO_52XX_ROMREAD_CB(_devcb) \ - devcb = &namco_52xx_device::set_romread_callback(*device, DEVCB2_##_devcb); + devcb = &namco_52xx_device::set_romread_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_52XX_SI_CB(_devcb) \ - devcb = &namco_52xx_device::set_si_callback(*device, DEVCB2_##_devcb); + devcb = &namco_52xx_device::set_si_callback(*device, DEVCB_##_devcb); class namco_52xx_device : public device_t @@ -33,8 +33,8 @@ public: static void set_discrete(device_t &device, const char *tag) { downcast<namco_52xx_device &>(device).m_discrete.set_tag(tag); } static void set_basenote(device_t &device, int node) { downcast<namco_52xx_device &>(device).m_basenode = node; } static void set_extclock(device_t &device, attoseconds_t clk) { downcast<namco_52xx_device &>(device).m_extclock = clk; } - template<class _Object> static devcb2_base &set_romread_callback(device_t &device, _Object object) { return downcast<namco_52xx_device &>(device).m_romread.set_callback(object); } - template<class _Object> static devcb2_base &set_si_callback(device_t &device, _Object object) { return downcast<namco_52xx_device &>(device).m_si.set_callback(object); } + template<class _Object> static devcb_base &set_romread_callback(device_t &device, _Object object) { return downcast<namco_52xx_device &>(device).m_romread.set_callback(object); } + template<class _Object> static devcb_base &set_si_callback(device_t &device, _Object object) { return downcast<namco_52xx_device &>(device).m_si.set_callback(object); } DECLARE_WRITE8_MEMBER(write); @@ -63,8 +63,8 @@ private: int m_basenode; attoseconds_t m_extclock; - devcb2_read8 m_romread; - devcb2_read8 m_si; + devcb_read8 m_romread; + devcb_read8 m_si; UINT8 m_latched_cmd; UINT32 m_address; diff --git a/src/mame/audio/segam1audio.h b/src/mame/audio/segam1audio.h index 023d6e07e6f..1146324c62e 100644 --- a/src/mame/audio/segam1audio.h +++ b/src/mame/audio/segam1audio.h @@ -54,7 +54,7 @@ private: int m_to_68k[8]; int m_fifo_rptr; int m_fifo_wptr; - devcb2_write_line m_main_irq_cb; + devcb_write_line m_main_irq_cb; }; diff --git a/src/mame/audio/wpcsnd.h b/src/mame/audio/wpcsnd.h index d1150ea6d59..6b502b908da 100644 --- a/src/mame/audio/wpcsnd.h +++ b/src/mame/audio/wpcsnd.h @@ -18,7 +18,7 @@ wpcsnd_device::static_set_gfxregion(*device, _region); #define MCFG_WPC_SOUND_REPLY_CALLBACK(_reply) \ - downcast<wpcsnd_device *>(device)->set_reply_callback(DEVCB2_##_reply); + downcast<wpcsnd_device *>(device)->set_reply_callback(DEVCB_##_reply); class wpcsnd_device : public device_t { @@ -65,7 +65,7 @@ private: bool m_reply_available; // callback - devcb2_write_line m_reply_cb; + devcb_write_line m_reply_cb; }; diff --git a/src/mame/drivers/de_2.c b/src/mame/drivers/de_2.c index 9886a757b98..98ba6d52292 100644 --- a/src/mame/drivers/de_2.c +++ b/src/mame/drivers/de_2.c @@ -86,7 +86,7 @@ public: DECLARE_READ8_MEMBER(sound_latch_r); DECLARE_WRITE8_MEMBER(sample_bank_w); - // devcb2 callbacks + // devcb callbacks DECLARE_READ8_MEMBER(display_r); DECLARE_WRITE8_MEMBER(display_w); DECLARE_WRITE8_MEMBER(type2alpha3_display_w); diff --git a/src/mame/drivers/de_3.c b/src/mame/drivers/de_3.c index 439f93f723d..2766505a35e 100644 --- a/src/mame/drivers/de_3.c +++ b/src/mame/drivers/de_3.c @@ -73,7 +73,7 @@ public: required_device<decobsmt_device> m_decobsmt; bool m_nmi_enable; - // devcb2 callbacks + // devcb callbacks DECLARE_READ8_MEMBER(display_r); DECLARE_WRITE8_MEMBER(display_w); DECLARE_WRITE8_MEMBER(lamps_w); diff --git a/src/mame/drivers/de_3b.c b/src/mame/drivers/de_3b.c index 888de9877e8..b042f3e87bf 100644 --- a/src/mame/drivers/de_3b.c +++ b/src/mame/drivers/de_3b.c @@ -34,7 +34,7 @@ public: DECLARE_READ8_MEMBER(pia2c_pb_r); DECLARE_WRITE8_MEMBER(pia2c_pb_w); - // devcb2 callbacks + // devcb callbacks DECLARE_READ8_MEMBER(display_r); DECLARE_WRITE8_MEMBER(display_w); DECLARE_WRITE8_MEMBER(lamps_w); diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 8260ef82b9a..994dea8335d 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -1703,7 +1703,7 @@ ADDRESS_MAP_END MCFG_DEVICE_ADD(_tag, PUZZLET_IO, 0) #define MCFG_PUZZLET_IO_DATA_CALLBACK(_devcb) \ - devcb = &puzzlet_io_device::set_data_cb(*device, DEVCB2_##_devcb); + devcb = &puzzlet_io_device::set_data_cb(*device, DEVCB_##_devcb); class puzzlet_io_device : public device_t { public: @@ -1712,14 +1712,14 @@ public: DECLARE_WRITE_LINE_MEMBER( ce_w ); DECLARE_WRITE_LINE_MEMBER( clk_w ); - template<class _Object> static devcb2_base &set_data_cb(device_t &device, _Object object) { return downcast<puzzlet_io_device &>(device).data_cb.set_callback(object); } + template<class _Object> static devcb_base &set_data_cb(device_t &device, _Object object) { return downcast<puzzlet_io_device &>(device).data_cb.set_callback(object); } protected: virtual void device_start(); virtual void device_reset(); private: - devcb2_write_line data_cb; + devcb_write_line data_cb; required_ioport port; int ce, clk; int cur_bit; diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index 34be79073f5..a8058235300 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -1578,7 +1578,7 @@ static MACHINE_CONFIG_START( coh700, namcos12_state ) MCFG_DEVICE_MODIFY("sub:sci1") MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":namco_settings", namco_settings_device, data_w)) - MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb2_line_dispatch_device<2>, in_w)) + MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb_line_dispatch_device<2>, in_w)) MCFG_AT28C16_ADD("at28c16", NULL) diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index a04183a6040..e20163ff6a4 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -3361,7 +3361,7 @@ static MACHINE_CONFIG_START( gorgon, namcos23_state ) MCFG_DEVICE_MODIFY("subcpu:sci1") MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":namco_settings", namco_settings_device, data_w)) - MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb2_line_dispatch_device<2>, in_w)) + MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb_line_dispatch_device<2>, in_w)) MCFG_NVRAM_ADD_0FILL("nvram") @@ -3429,7 +3429,7 @@ static MACHINE_CONFIG_START( s23, namcos23_state ) MCFG_DEVICE_MODIFY("subcpu:sci1") MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":namco_settings", namco_settings_device, data_w)) - MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb2_line_dispatch_device<2>, in_w)) + MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb_line_dispatch_device<2>, in_w)) MCFG_NVRAM_ADD_0FILL("nvram") @@ -3508,7 +3508,7 @@ static MACHINE_CONFIG_START( ss23, namcos23_state ) MCFG_DEVICE_MODIFY("subcpu:sci1") MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":namco_settings", namco_settings_device, data_w)) - MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb2_line_dispatch_device<2>, in_w)) + MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb_line_dispatch_device<2>, in_w)) MCFG_NVRAM_ADD_0FILL("nvram") diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 67b23b1236b..207071e163d 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -515,7 +515,7 @@ ADDRESS_MAP_END MCFG_DEVICE_ADD( _tag, FUNCUBE_TOUCHSCREEN, _clock ) #define MCFG_FUNCUBE_TOUCHSCREEN_TX_CALLBACK(_devcb) \ - devcb = &funcube_touchscreen_device::set_tx_cb(*device, DEVCB2_##_devcb); + devcb = &funcube_touchscreen_device::set_tx_cb(*device, DEVCB_##_devcb); class funcube_touchscreen_device : public device_t, public device_serial_interface @@ -524,7 +524,7 @@ public: funcube_touchscreen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const; - template<class _Object> static devcb2_base &set_tx_cb(device_t &device, _Object object) { return downcast<funcube_touchscreen_device &>(device).m_tx_cb.set_callback(object); } + template<class _Object> static devcb_base &set_tx_cb(device_t &device, _Object object) { return downcast<funcube_touchscreen_device &>(device).m_tx_cb.set_callback(object); } protected: virtual void device_start(); @@ -535,7 +535,7 @@ protected: virtual void tra_callback(); private: - devcb2_write_line m_tx_cb; + devcb_write_line m_tx_cb; required_ioport m_x; required_ioport m_y; required_ioport m_btn; diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index e7a8b1191c6..5031e24c15a 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -37,14 +37,14 @@ #define MCFG_ATARI_SOUND_COMM_ADD(_tag, _soundcpu, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_SOUND_COMM, 0) \ atari_sound_comm_device::static_set_sound_cpu(*device, _soundcpu); \ - devcb = &atari_sound_comm_device::static_set_main_int_cb(*device, DEVCB2_##_intcb); + devcb = &atari_sound_comm_device::static_set_main_int_cb(*device, DEVCB_##_intcb); #define MCFG_ATARI_VAD_ADD(_tag, _screen, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_VAD, 0) \ MCFG_VIDEO_SET_SCREEN(_screen) \ - devcb = &atari_vad_device::static_set_scanline_int_cb(*device, DEVCB2_##_intcb); + devcb = &atari_vad_device::static_set_scanline_int_cb(*device, DEVCB_##_intcb); #define MCFG_ATARI_VAD_PLAYFIELD(_class, _gfxtag, _getinfo) \ { astring fulltag(device->tag(), ":playfield"); device_t *device; \ @@ -114,7 +114,7 @@ public: // static configuration helpers static void static_set_sound_cpu(device_t &device, const char *cputag); - template<class _Object> static devcb2_base &static_set_main_int_cb(device_t &device, _Object object) { return downcast<atari_sound_comm_device &>(device).m_main_int_cb.set_callback(object); } + template<class _Object> static devcb_base &static_set_main_int_cb(device_t &device, _Object object) { return downcast<atari_sound_comm_device &>(device).m_main_int_cb.set_callback(object); } // getters DECLARE_READ_LINE_MEMBER(main_to_sound_ready) { return m_main_to_sound_ready ? ASSERT_LINE : CLEAR_LINE; } @@ -159,7 +159,7 @@ private: // configuration state const char * m_sound_cpu_tag; - devcb2_write_line m_main_int_cb; + devcb_write_line m_main_int_cb; // internal state m6502_device * m_sound_cpu; @@ -186,7 +186,7 @@ public: atari_vad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &static_set_scanline_int_cb(device_t &device, _Object object) { return downcast<atari_vad_device &>(device).m_scanline_int_cb.set_callback(object); } + template<class _Object> static devcb_base &static_set_scanline_int_cb(device_t &device, _Object object) { return downcast<atari_vad_device &>(device).m_scanline_int_cb.set_callback(object); } // getters tilemap_device *alpha() const { return m_alpha_tilemap; } @@ -228,7 +228,7 @@ private: void eof_update(emu_timer &timer); // configuration state - devcb2_write_line m_scanline_int_cb; + devcb_write_line m_scanline_int_cb; // internal state optional_device<tilemap_device> m_alpha_tilemap; diff --git a/src/mame/machine/decopincpu.h b/src/mame/machine/decopincpu.h index 6c215f88dd6..6cf3508fc2d 100644 --- a/src/mame/machine/decopincpu.h +++ b/src/mame/machine/decopincpu.h @@ -29,24 +29,24 @@ decocpu_type1_device::static_set_cpuregion(*device, _region); #define MCFG_DECOCPU_DISPLAY(_disp_r, _disp_w) \ - downcast<decocpu_type1_device *>(device)->set_display_read_callback(DEVCB2_##_disp_r); \ - downcast<decocpu_type1_device *>(device)->set_display_write_callback(DEVCB2_##_disp_w); + downcast<decocpu_type1_device *>(device)->set_display_read_callback(DEVCB_##_disp_r); \ + downcast<decocpu_type1_device *>(device)->set_display_write_callback(DEVCB_##_disp_w); #define MCFG_DECOCPU_DMDSTATUS(_dmdstat_r) \ - downcast<decocpu_type1_device *>(device)->set_dmdstatus_read_callback(DEVCB2_##_dmdstat_r); + downcast<decocpu_type1_device *>(device)->set_dmdstatus_read_callback(DEVCB_##_dmdstat_r); #define MCFG_DECOCPU_SOUNDLATCH(_soundlatch_w) \ - downcast<decocpu_type1_device *>(device)->set_soundlatch_write_callback(DEVCB2_##_soundlatch_w); + downcast<decocpu_type1_device *>(device)->set_soundlatch_write_callback(DEVCB_##_soundlatch_w); #define MCFG_DECOCPU_SWITCH(_switch_r, _switch_w) \ - downcast<decocpu_type1_device *>(device)->set_switch_read_callback(DEVCB2_##_switch_r); \ - downcast<decocpu_type1_device *>(device)->set_switch_write_callback(DEVCB2_##_switch_w); + downcast<decocpu_type1_device *>(device)->set_switch_read_callback(DEVCB_##_switch_r); \ + downcast<decocpu_type1_device *>(device)->set_switch_write_callback(DEVCB_##_switch_w); #define MCFG_DECOCPU_LAMP(_lamp_w) \ - downcast<decocpu_type1_device *>(device)->set_lamp_write_callback(DEVCB2_##_lamp_w); + downcast<decocpu_type1_device *>(device)->set_lamp_write_callback(DEVCB_##_lamp_w); #define MCFG_DECOCPU_SOLENOIDS(_sol_w) \ - downcast<decocpu_type1_device *>(device)->set_solenoid_write_callback(DEVCB2_##_sol_w); + downcast<decocpu_type1_device *>(device)->set_solenoid_write_callback(DEVCB_##_sol_w); // 6808 CPU's input clock is 4MHz @@ -119,14 +119,14 @@ private: bool m_ca2; // callbacks - devcb2_read8 m_read_display; - devcb2_write8 m_write_display; - devcb2_read8 m_read_dmdstatus; - devcb2_write8 m_write_soundlatch; - devcb2_read8 m_read_switch; - devcb2_write8 m_write_switch; - devcb2_write8 m_write_lamp; - devcb2_write8 m_write_solenoid; + devcb_read8 m_read_display; + devcb_write8 m_write_display; + devcb_read8 m_read_dmdstatus; + devcb_write8 m_write_soundlatch; + devcb_read8 m_read_switch; + devcb_write8 m_write_switch; + devcb_write8 m_write_lamp; + devcb_write8 m_write_solenoid; }; class decocpu_type2_device : public decocpu_type1_device diff --git a/src/mame/machine/gaelco3d.h b/src/mame/machine/gaelco3d.h index 14269cf6942..0c9b5a4f894 100644 --- a/src/mame/machine/gaelco3d.h +++ b/src/mame/machine/gaelco3d.h @@ -13,7 +13,7 @@ ***************************************************************************/ #define MCFG_GAELCO_SERIAL_IRQ_HANDLER(_devcb) \ - devcb = &gaelco_serial_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &gaelco_serial_device::set_irq_handler(*device, DEVCB_##_devcb); /* external status bits */ #define GAELCOSER_STATUS_READY 0x01 @@ -65,7 +65,7 @@ public: gaelco_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~gaelco_serial_device() {} - template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<gaelco_serial_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<gaelco_serial_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ8_MEMBER( status_r); DECLARE_WRITE8_MEMBER( data_w); @@ -94,7 +94,7 @@ protected: private: // internal state - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; UINT8 m_status; int m_last_in_msg_cnt; diff --git a/src/mame/machine/k573cass.h b/src/mame/machine/k573cass.h index 9d86ab41f19..3dc431111f3 100644 --- a/src/mame/machine/k573cass.h +++ b/src/mame/machine/k573cass.h @@ -95,28 +95,28 @@ extern const device_type KONAMI573_CASSETTE_Y; #define MCFG_KONAMI573_CASSETTE_Y_D0_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d0_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d0_handler(*device, DEVCB_##_devcb); #define MCFG_KONAMI573_CASSETTE_Y_D1_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d1_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d1_handler(*device, DEVCB_##_devcb); #define MCFG_KONAMI573_CASSETTE_Y_D2_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d2_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d2_handler(*device, DEVCB_##_devcb); #define MCFG_KONAMI573_CASSETTE_Y_D3_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d3_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d3_handler(*device, DEVCB_##_devcb); #define MCFG_KONAMI573_CASSETTE_Y_D4_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d4_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d4_handler(*device, DEVCB_##_devcb); #define MCFG_KONAMI573_CASSETTE_Y_D5_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d5_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d5_handler(*device, DEVCB_##_devcb); #define MCFG_KONAMI573_CASSETTE_Y_D6_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d6_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d6_handler(*device, DEVCB_##_devcb); #define MCFG_KONAMI573_CASSETTE_Y_D7_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d7_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d7_handler(*device, DEVCB_##_devcb); class konami573_cassette_y_device: public device_t, public konami573_cassette_interface, @@ -127,14 +127,14 @@ public: konami573_cassette_y_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); // static configuration helpers - template<class _Object> static devcb2_base &set_d0_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d0_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d1_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d1_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d2_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d3_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d3_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d4_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d4_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d5_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d5_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d6_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d6_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d7_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d7_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d0_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d0_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d1_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d1_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d2_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d3_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d3_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d4_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d4_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d5_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d5_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d6_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d6_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d7_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d7_handler.set_callback(object); } virtual DECLARE_READ_LINE_MEMBER(read_line_secflash_sda); virtual DECLARE_WRITE_LINE_MEMBER(write_line_d0); @@ -152,14 +152,14 @@ protected: private: required_device<x76f100_device> m_x76f100; - devcb2_write_line m_d0_handler; - devcb2_write_line m_d1_handler; - devcb2_write_line m_d2_handler; - devcb2_write_line m_d3_handler; - devcb2_write_line m_d4_handler; - devcb2_write_line m_d5_handler; - devcb2_write_line m_d6_handler; - devcb2_write_line m_d7_handler; + devcb_write_line m_d0_handler; + devcb_write_line m_d1_handler; + devcb_write_line m_d2_handler; + devcb_write_line m_d3_handler; + devcb_write_line m_d4_handler; + devcb_write_line m_d5_handler; + devcb_write_line m_d6_handler; + devcb_write_line m_d7_handler; }; diff --git a/src/mame/machine/k573dio.h b/src/mame/machine/k573dio.h index 88bbfc05b51..c215ee7c429 100644 --- a/src/mame/machine/k573dio.h +++ b/src/mame/machine/k573dio.h @@ -10,7 +10,7 @@ MCFG_DEVICE_ADD(_tag, KONAMI_573_DIGITAL_IO_BOARD, _clock) #define MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( _output_cb ) \ - downcast<k573dio_device *>(device)->set_output_cb(DEVCB2_##_output_cb); + downcast<k573dio_device *>(device)->set_output_cb(DEVCB_##_output_cb); class k573dio_device : public device_t { @@ -69,7 +69,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); private: - devcb2_write8 output_cb; + devcb_write8 output_cb; UINT16 *ram; UINT32 ram_adr; diff --git a/src/mame/machine/midikbd.h b/src/mame/machine/midikbd.h index 74d6af03378..9198e5e983e 100644 --- a/src/mame/machine/midikbd.h +++ b/src/mame/machine/midikbd.h @@ -5,7 +5,7 @@ #define MCFG_MIDI_KBD_ADD(_tag, _devcb, _clock) \ MCFG_DEVICE_ADD(_tag, MIDI_KBD, _clock) \ - devcb = &midi_keyboard_device::static_set_tx_callback(*device, DEVCB2_##_devcb); + devcb = &midi_keyboard_device::static_set_tx_callback(*device, DEVCB_##_devcb); class midi_keyboard_device : public device_t, public device_serial_interface @@ -14,7 +14,7 @@ public: midi_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ioport_constructor device_input_ports() const; - template<class _Object> static devcb2_base &static_set_tx_callback(device_t &device, _Object object) { return downcast<midi_keyboard_device &>(device).m_out_tx_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_tx_callback(device_t &device, _Object object) { return downcast<midi_keyboard_device &>(device).m_out_tx_func.set_callback(object); } protected: void device_start(); @@ -25,7 +25,7 @@ protected: private: void push_tx(UINT8 data) { ++m_head %= 16; m_buffer[m_head] = data; } - devcb2_write_line m_out_tx_func; + devcb_write_line m_out_tx_func; emu_timer *m_keyboard_timer; required_ioport m_keyboard; UINT32 m_keyboard_state; diff --git a/src/mame/machine/midwayic.h b/src/mame/machine/midwayic.h index 0b7a363b754..e300e7f473f 100644 --- a/src/mame/machine/midwayic.h +++ b/src/mame/machine/midwayic.h @@ -124,7 +124,7 @@ public: static void static_set_shuffle(device_t &device, UINT8 shuffle) { downcast<midway_ioasic_device &>(device).m_shuffle_type = shuffle; } static void static_set_shuffle_default(device_t &device, UINT8 shuffle) { downcast<midway_ioasic_device &>(device).m_shuffle_default = shuffle; } static void static_set_auto_ack(device_t &device, UINT8 auto_ack) { downcast<midway_ioasic_device &>(device).m_auto_ack = auto_ack; } - template<class _Object> static devcb2_base &set_irqhandler_callback(device_t &device, _Object object) { return downcast<midway_ioasic_device &>(device).m_irq_callback.set_callback(object); } + template<class _Object> static devcb_base &set_irqhandler_callback(device_t &device, _Object object) { return downcast<midway_ioasic_device &>(device).m_irq_callback.set_callback(object); } void set_shuffle_state(int state); void fifo_w(UINT16 data); @@ -163,7 +163,7 @@ private: UINT8 m_shuffle_default; UINT8 m_shuffle_active; const UINT8 * m_shuffle_map; - devcb2_write8 m_irq_callback; + devcb_write8 m_irq_callback; UINT8 m_irq_state; UINT16 m_sound_irq_state; UINT8 m_auto_ack; @@ -194,7 +194,7 @@ extern const device_type MIDWAY_IOASIC; midway_ioasic_device::static_set_shuffle_default(*device, _shuffle); #define MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(_write) \ - devcb = &midway_ioasic_device::set_irqhandler_callback(*device, DEVCB2_##_write); + devcb = &midway_ioasic_device::set_irqhandler_callback(*device, DEVCB_##_write); #define MCFG_MIDWAY_IOASIC_AUTO_ACK(_ack) \ midway_ioasic_device::static_set_auto_ack(*device, _ack); diff --git a/src/mame/machine/namco06.h b/src/mame/machine/namco06.h index 4a539566483..bf1af3aea16 100644 --- a/src/mame/machine/namco06.h +++ b/src/mame/machine/namco06.h @@ -21,42 +21,42 @@ struct namco_06xx_config namco_06xx_device::set_maincpu(*device, "^" _tag); #define MCFG_NAMCO_06XX_READ_0_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_READ_1_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_READ_2_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_READ_3_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_READ_REQUEST_0_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_request_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_request_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_READ_REQUEST_1_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_request_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_request_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_READ_REQUEST_2_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_request_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_request_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_READ_REQUEST_3_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_request_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_request_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_WRITE_0_CB(_devcb) \ - devcb = &namco_06xx_device::set_write_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_write_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_WRITE_1_CB(_devcb) \ - devcb = &namco_06xx_device::set_write_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_write_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_WRITE_2_CB(_devcb) \ - devcb = &namco_06xx_device::set_write_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_write_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_WRITE_3_CB(_devcb) \ - devcb = &namco_06xx_device::set_write_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_write_3_callback(*device, DEVCB_##_devcb); /* device get info callback */ @@ -67,21 +67,21 @@ public: static void set_maincpu(device_t &device, const char *tag) { downcast<namco_06xx_device &>(device).m_nmicpu.set_tag(tag); } - template<class _Object> static devcb2_base &set_read_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_0.set_callback(object); } - template<class _Object> static devcb2_base &set_read_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_1.set_callback(object); } - template<class _Object> static devcb2_base &set_read_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_2.set_callback(object); } - template<class _Object> static devcb2_base &set_read_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_3.set_callback(object); } + template<class _Object> static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_0.set_callback(object); } + template<class _Object> static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_1.set_callback(object); } + template<class _Object> static devcb_base &set_read_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_2.set_callback(object); } + template<class _Object> static devcb_base &set_read_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_3.set_callback(object); } - template<class _Object> static devcb2_base &set_read_request_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_0.set_callback(object); } - template<class _Object> static devcb2_base &set_read_request_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_1.set_callback(object); } - template<class _Object> static devcb2_base &set_read_request_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_2.set_callback(object); } - template<class _Object> static devcb2_base &set_read_request_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_3.set_callback(object); } + template<class _Object> static devcb_base &set_read_request_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_0.set_callback(object); } + template<class _Object> static devcb_base &set_read_request_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_1.set_callback(object); } + template<class _Object> static devcb_base &set_read_request_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_2.set_callback(object); } + template<class _Object> static devcb_base &set_read_request_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_3.set_callback(object); } - template<class _Object> static devcb2_base &set_write_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_0.set_callback(object); } - template<class _Object> static devcb2_base &set_write_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_1.set_callback(object); } - template<class _Object> static devcb2_base &set_write_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_2.set_callback(object); } - template<class _Object> static devcb2_base &set_write_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_3.set_callback(object); } + template<class _Object> static devcb_base &set_write_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_0.set_callback(object); } + template<class _Object> static devcb_base &set_write_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_1.set_callback(object); } + template<class _Object> static devcb_base &set_write_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_2.set_callback(object); } + template<class _Object> static devcb_base &set_write_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_3.set_callback(object); } DECLARE_READ8_MEMBER( data_r ); DECLARE_WRITE8_MEMBER( data_w ); @@ -102,20 +102,20 @@ private: required_device<cpu_device> m_nmicpu; - devcb2_read8 m_read_0; - devcb2_read8 m_read_1; - devcb2_read8 m_read_2; - devcb2_read8 m_read_3; + devcb_read8 m_read_0; + devcb_read8 m_read_1; + devcb_read8 m_read_2; + devcb_read8 m_read_3; - devcb2_write_line m_readreq_0; - devcb2_write_line m_readreq_1; - devcb2_write_line m_readreq_2; - devcb2_write_line m_readreq_3; + devcb_write_line m_readreq_0; + devcb_write_line m_readreq_1; + devcb_write_line m_readreq_2; + devcb_write_line m_readreq_3; - devcb2_write8 m_write_0; - devcb2_write8 m_write_1; - devcb2_write8 m_write_2; - devcb2_write8 m_write_3; + devcb_write8 m_write_0; + devcb_write8 m_write_1; + devcb_write8 m_write_2; + devcb_write8 m_write_3; }; extern const device_type NAMCO_06XX; diff --git a/src/mame/machine/namco51.h b/src/mame/machine/namco51.h index 4b5cabe0468..f4fc6cd170e 100644 --- a/src/mame/machine/namco51.h +++ b/src/mame/machine/namco51.h @@ -10,35 +10,35 @@ MCFG_DEVICE_ADD(_tag, NAMCO_51XX, _clock) #define MCFG_NAMCO_51XX_INPUT_0_CB(_devcb) \ - devcb = &namco_51xx_device::set_input_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_51xx_device::set_input_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_51XX_INPUT_1_CB(_devcb) \ - devcb = &namco_51xx_device::set_input_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_51xx_device::set_input_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_51XX_INPUT_2_CB(_devcb) \ - devcb = &namco_51xx_device::set_input_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco_51xx_device::set_input_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_51XX_INPUT_3_CB(_devcb) \ - devcb = &namco_51xx_device::set_input_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco_51xx_device::set_input_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_51XX_OUTPUT_0_CB(_devcb) \ - devcb = &namco_51xx_device::set_output_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_51xx_device::set_output_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_51XX_OUTPUT_1_CB(_devcb) \ - devcb = &namco_51xx_device::set_output_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_51xx_device::set_output_1_callback(*device, DEVCB_##_devcb); class namco_51xx_device : public device_t { public: namco_51xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_0.set_callback(object); } - template<class _Object> static devcb2_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_1.set_callback(object); } - template<class _Object> static devcb2_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_2.set_callback(object); } - template<class _Object> static devcb2_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_3.set_callback(object); } + template<class _Object> static devcb_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_0.set_callback(object); } + template<class _Object> static devcb_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_1.set_callback(object); } + template<class _Object> static devcb_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_2.set_callback(object); } + template<class _Object> static devcb_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_3.set_callback(object); } - template<class _Object> static devcb2_base &set_output_0_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_out_0.set_callback(object); } - template<class _Object> static devcb2_base &set_output_1_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_out_1.set_callback(object); } + template<class _Object> static devcb_base &set_output_0_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_out_0.set_callback(object); } + template<class _Object> static devcb_base &set_output_1_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_out_1.set_callback(object); } DECLARE_WRITE8_MEMBER( write ); DECLARE_READ8_MEMBER( read ); @@ -52,12 +52,12 @@ protected: private: // internal state required_device<mb88_cpu_device> m_cpu; - devcb2_read8 m_in_0; - devcb2_read8 m_in_1; - devcb2_read8 m_in_2; - devcb2_read8 m_in_3; - devcb2_write8 m_out_0; - devcb2_write8 m_out_1; + devcb_read8 m_in_0; + devcb_read8 m_in_1; + devcb_read8 m_in_2; + devcb_read8 m_in_3; + devcb_write8 m_out_0; + devcb_write8 m_out_1; INT32 m_lastcoins; INT32 m_lastbuttons; diff --git a/src/mame/machine/namco53.h b/src/mame/machine/namco53.h index 03a1324ef9a..2bbf95a6ccd 100644 --- a/src/mame/machine/namco53.h +++ b/src/mame/machine/namco53.h @@ -9,22 +9,22 @@ MCFG_DEVICE_ADD(_tag, NAMCO_53XX, _clock) #define MCFG_NAMCO_53XX_K_CB(_devcb) \ - devcb = &namco_53xx_device::set_k_port_callback(*device, DEVCB2_##_devcb); + devcb = &namco_53xx_device::set_k_port_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_53XX_INPUT_0_CB(_devcb) \ - devcb = &namco_53xx_device::set_input_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_53xx_device::set_input_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_53XX_INPUT_1_CB(_devcb) \ - devcb = &namco_53xx_device::set_input_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_53xx_device::set_input_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_53XX_INPUT_2_CB(_devcb) \ - devcb = &namco_53xx_device::set_input_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco_53xx_device::set_input_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_53XX_INPUT_3_CB(_devcb) \ - devcb = &namco_53xx_device::set_input_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco_53xx_device::set_input_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_53XX_P_CB(_devcb) \ - devcb = &namco_53xx_device::set_p_port_callback(*device, DEVCB2_##_devcb); + devcb = &namco_53xx_device::set_p_port_callback(*device, DEVCB_##_devcb); class namco_53xx_device : public device_t @@ -32,13 +32,13 @@ class namco_53xx_device : public device_t public: namco_53xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_0.set_callback(object); } - template<class _Object> static devcb2_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_1.set_callback(object); } - template<class _Object> static devcb2_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_2.set_callback(object); } - template<class _Object> static devcb2_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_3.set_callback(object); } + template<class _Object> static devcb_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_0.set_callback(object); } + template<class _Object> static devcb_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_1.set_callback(object); } + template<class _Object> static devcb_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_2.set_callback(object); } + template<class _Object> static devcb_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_3.set_callback(object); } - template<class _Object> static devcb2_base &set_k_port_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_k.set_callback(object); } - template<class _Object> static devcb2_base &set_p_port_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_p.set_callback(object); } + template<class _Object> static devcb_base &set_k_port_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_k.set_callback(object); } + template<class _Object> static devcb_base &set_p_port_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_p.set_callback(object); } DECLARE_READ8_MEMBER( K_r ); DECLARE_READ8_MEMBER( Rx_r ); @@ -59,12 +59,12 @@ private: // internal state required_device<mb88_cpu_device> m_cpu; UINT8 m_portO; - devcb2_read8 m_k; - devcb2_read8 m_in_0; - devcb2_read8 m_in_1; - devcb2_read8 m_in_2; - devcb2_read8 m_in_3; - devcb2_write8 m_p; + devcb_read8 m_k; + devcb_read8 m_in_0; + devcb_read8 m_in_1; + devcb_read8 m_in_2; + devcb_read8 m_in_3; + devcb_write8 m_p; }; diff --git a/src/mame/machine/namco62.h b/src/mame/machine/namco62.h index e6ff411b2cc..212fa9fb085 100644 --- a/src/mame/machine/namco62.h +++ b/src/mame/machine/namco62.h @@ -7,22 +7,22 @@ MCFG_DEVICE_ADD(_tag, NAMCO_62XX, _clock) #define MCFG_NAMCO_62XX_INPUT_0_CB(_devcb) \ - devcb = &namco_62xx_device::set_input_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_62xx_device::set_input_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_62XX_INPUT_1_CB(_devcb) \ - devcb = &namco_62xx_device::set_input_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_62xx_device::set_input_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_62XX_INPUT_2_CB(_devcb) \ - devcb = &namco_62xx_device::set_input_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco_62xx_device::set_input_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_62XX_INPUT_3_CB(_devcb) \ - devcb = &namco_62xx_device::set_input_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco_62xx_device::set_input_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_62XX_OUTPUT_0_CB(_devcb) \ - devcb = &namco_62xx_device::set_output_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_62xx_device::set_output_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_62XX_OUTPUT_1_CB(_devcb) \ - devcb = &namco_62xx_device::set_output_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_62xx_device::set_output_1_callback(*device, DEVCB_##_devcb); class namco_62xx_device : public device_t @@ -30,13 +30,13 @@ class namco_62xx_device : public device_t public: namco_62xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_0.set_callback(object); } - template<class _Object> static devcb2_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_1.set_callback(object); } - template<class _Object> static devcb2_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_2.set_callback(object); } - template<class _Object> static devcb2_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_3.set_callback(object); } + template<class _Object> static devcb_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_0.set_callback(object); } + template<class _Object> static devcb_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_1.set_callback(object); } + template<class _Object> static devcb_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_2.set_callback(object); } + template<class _Object> static devcb_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_3.set_callback(object); } - template<class _Object> static devcb2_base &set_output_0_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_out_0.set_callback(object); } - template<class _Object> static devcb2_base &set_output_1_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_out_1.set_callback(object); } + template<class _Object> static devcb_base &set_output_0_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_out_0.set_callback(object); } + template<class _Object> static devcb_base &set_output_1_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_out_1.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -50,12 +50,12 @@ protected: private: // internal state required_device<mb88_cpu_device> m_cpu; - devcb2_read8 m_in_0; - devcb2_read8 m_in_1; - devcb2_read8 m_in_2; - devcb2_read8 m_in_3; - devcb2_write8 m_out_0; - devcb2_write8 m_out_1; + devcb_read8 m_in_0; + devcb_read8 m_in_1; + devcb_read8 m_in_2; + devcb_read8 m_in_3; + devcb_write8 m_out_0; + devcb_write8 m_out_1; }; extern const device_type NAMCO_62XX; diff --git a/src/mame/machine/namcoio.h b/src/mame/machine/namcoio.h index 1e05b758ea4..7c2b4e14249 100644 --- a/src/mame/machine/namcoio.h +++ b/src/mame/machine/namcoio.h @@ -11,12 +11,12 @@ class namcoio_device : public device_t public: namcoio_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); - template<class _Object> static devcb2_base &set_in_0_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_1_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_2_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_3_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_0_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_out_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_1_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_out_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_0_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_1_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_2_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_3_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_0_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_out_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_1_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_out_1_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); @@ -41,12 +41,12 @@ protected: // internal state UINT8 m_ram[16]; - devcb2_read8 m_in_0_cb; - devcb2_read8 m_in_1_cb; - devcb2_read8 m_in_2_cb; - devcb2_read8 m_in_3_cb; - devcb2_write8 m_out_0_cb; - devcb2_write8 m_out_1_cb; + devcb_read8 m_in_0_cb; + devcb_read8 m_in_1_cb; + devcb_read8 m_in_2_cb; + devcb_read8 m_in_3_cb; + devcb_write8 m_out_0_cb; + devcb_write8 m_out_1_cb; int m_reset; INT32 m_lastcoins, m_lastbuttons; @@ -97,59 +97,59 @@ extern const device_type NAMCO59XX; ***************************************************************************/ #define MCFG_NAMCO56XX_IN_0_CB(_devcb) \ - devcb = &namco56xx_device::set_in_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco56xx_device::set_in_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO56XX_IN_1_CB(_devcb) \ - devcb = &namco56xx_device::set_in_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco56xx_device::set_in_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO56XX_IN_2_CB(_devcb) \ - devcb = &namco56xx_device::set_in_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco56xx_device::set_in_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO56XX_IN_3_CB(_devcb) \ - devcb = &namco56xx_device::set_in_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco56xx_device::set_in_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO56XX_OUT_0_CB(_devcb) \ - devcb = &namco56xx_device::set_out_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco56xx_device::set_out_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO56XX_OUT_1_CB(_devcb) \ - devcb = &namco56xx_device::set_out_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco56xx_device::set_out_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO58XX_IN_0_CB(_devcb) \ - devcb = &namco58xx_device::set_in_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco58xx_device::set_in_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO58XX_IN_1_CB(_devcb) \ - devcb = &namco58xx_device::set_in_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco58xx_device::set_in_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO58XX_IN_2_CB(_devcb) \ - devcb = &namco58xx_device::set_in_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco58xx_device::set_in_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO58XX_IN_3_CB(_devcb) \ - devcb = &namco58xx_device::set_in_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco58xx_device::set_in_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO58XX_OUT_0_CB(_devcb) \ - devcb = &namco58xx_device::set_out_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco58xx_device::set_out_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO58XX_OUT_1_CB(_devcb) \ - devcb = &namco58xx_device::set_out_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco58xx_device::set_out_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO59XX_IN_0_CB(_devcb) \ - devcb = &namco59xx_device::set_in_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco59xx_device::set_in_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO59XX_IN_1_CB(_devcb) \ - devcb = &namco59xx_device::set_in_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco59xx_device::set_in_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO59XX_IN_2_CB(_devcb) \ - devcb = &namco59xx_device::set_in_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco59xx_device::set_in_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO59XX_IN_3_CB(_devcb) \ - devcb = &namco59xx_device::set_in_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco59xx_device::set_in_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO59XX_OUT_0_CB(_devcb) \ - devcb = &namco59xx_device::set_out_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco59xx_device::set_out_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO59XX_OUT_1_CB(_devcb) \ - devcb = &namco59xx_device::set_out_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco59xx_device::set_out_1_callback(*device, DEVCB_##_devcb); #endif /* __NAMCOIO_H__ */ diff --git a/src/mame/machine/naomig1.h b/src/mame/machine/naomig1.h index 90fc0ed7440..6aac02c5d2f 100644 --- a/src/mame/machine/naomig1.h +++ b/src/mame/machine/naomig1.h @@ -5,7 +5,7 @@ #define MCFG_NAOMI_G1_ADD(_tag, type, _irq_cb) \ MCFG_DEVICE_ADD(_tag, type, 0) \ - downcast<naomi_g1_device *>(device)->set_irq_cb(DEVCB2_ ## _irq_cb); + downcast<naomi_g1_device *>(device)->set_irq_cb(DEVCB_ ## _irq_cb); class naomi_g1_device : public device_t { @@ -62,7 +62,7 @@ private: UINT32 gdstar, gdlen, gddir, gden, gdst; emu_timer *timer; - devcb2_write8 irq_cb; + devcb_write8 irq_cb; dma_cb _dma_cb; void dma(void *dma_ptr, UINT32 main_adr, UINT32 size, bool to_mainram); diff --git a/src/mame/machine/tait8741.h b/src/mame/machine/tait8741.h index 27953fb4966..5fc07eb2122 100644 --- a/src/mame/machine/tait8741.h +++ b/src/mame/machine/tait8741.h @@ -15,10 +15,10 @@ MCFG_DEVICE_ADD(_tag, TAITO8741_4PACK, 0) #define MCFG_TAITO8741_PORT_HANDLERS(_devcb0, _devcb1, _devcb2, _devcb3) \ - devcb = &taito8741_4pack_device::set_port_handler_0_callback(*device, DEVCB2_##_devcb0); \ - devcb = &taito8741_4pack_device::set_port_handler_1_callback(*device, DEVCB2_##_devcb1); \ - devcb = &taito8741_4pack_device::set_port_handler_2_callback(*device, DEVCB2_##_devcb2); \ - devcb = &taito8741_4pack_device::set_port_handler_3_callback(*device, DEVCB2_##_devcb3); + devcb = &taito8741_4pack_device::set_port_handler_0_callback(*device, DEVCB_##_devcb0); \ + devcb = &taito8741_4pack_device::set_port_handler_1_callback(*device, DEVCB_##_devcb1); \ + devcb = &taito8741_4pack_device::set_port_handler_2_callback(*device, DEVCB_##_devcb2); \ + devcb = &taito8741_4pack_device::set_port_handler_3_callback(*device, DEVCB_##_devcb3); #define MCFG_TAITO8741_MODES(_mode0, _mode1, _mode2, _mode3) \ taito8741_4pack_device::static_set_mode(*device, 0, _mode0); \ @@ -58,10 +58,10 @@ public: taito8741_4pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~taito8741_4pack_device() {} - template<class _Object> static devcb2_base &set_port_handler_0_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_0_r.set_callback(object); } - template<class _Object> static devcb2_base &set_port_handler_1_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_1_r.set_callback(object); } - template<class _Object> static devcb2_base &set_port_handler_2_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_2_r.set_callback(object); } - template<class _Object> static devcb2_base &set_port_handler_3_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_3_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_0_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_0_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_1_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_1_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_2_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_2_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_3_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_3_r.set_callback(object); } static void static_set_mode(device_t &device, int num, UINT8 mode) { downcast<taito8741_4pack_device &>(device).m_taito8741[num].mode = mode; } static void static_set_connect(device_t &device, int num, int conn) { downcast<taito8741_4pack_device &>(device).m_taito8741[num].connect = conn; } @@ -98,10 +98,10 @@ private: // internal state I8741 m_taito8741[4]; - devcb2_read8 m_port_handler_0_r; - devcb2_read8 m_port_handler_1_r; - devcb2_read8 m_port_handler_2_r; - devcb2_read8 m_port_handler_3_r; + devcb_read8 m_port_handler_0_r; + devcb_read8 m_port_handler_1_r; + devcb_read8 m_port_handler_2_r; + devcb_read8 m_port_handler_3_r; }; @@ -116,10 +116,10 @@ extern const device_type TAITO8741_4PACK; MCFG_DEVICE_ADD(_tag, JOSVOLLY8741_4PACK, 0) #define MCFG_JOSVOLLY8741_PORT_HANDLERS(_devcb0, _devcb1, _devcb2, _devcb3) \ - devcb = &josvolly8741_4pack_device::set_port_handler_0_callback(*device, DEVCB2_##_devcb0); \ - devcb = &josvolly8741_4pack_device::set_port_handler_1_callback(*device, DEVCB2_##_devcb1); \ - devcb = &josvolly8741_4pack_device::set_port_handler_2_callback(*device, DEVCB2_##_devcb2); \ - devcb = &josvolly8741_4pack_device::set_port_handler_3_callback(*device, DEVCB2_##_devcb3); + devcb = &josvolly8741_4pack_device::set_port_handler_0_callback(*device, DEVCB_##_devcb0); \ + devcb = &josvolly8741_4pack_device::set_port_handler_1_callback(*device, DEVCB_##_devcb1); \ + devcb = &josvolly8741_4pack_device::set_port_handler_2_callback(*device, DEVCB_##_devcb2); \ + devcb = &josvolly8741_4pack_device::set_port_handler_3_callback(*device, DEVCB_##_devcb3); #define MCFG_JOSVOLLY8741_CONNECT(_con0, _con1, _con2, _con3) \ josvolly8741_4pack_device::static_set_connect(*device, 0, _con0); \ @@ -144,10 +144,10 @@ public: josvolly8741_4pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~josvolly8741_4pack_device() {} - template<class _Object> static devcb2_base &set_port_handler_0_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_0_r.set_callback(object); } - template<class _Object> static devcb2_base &set_port_handler_1_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_1_r.set_callback(object); } - template<class _Object> static devcb2_base &set_port_handler_2_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_2_r.set_callback(object); } - template<class _Object> static devcb2_base &set_port_handler_3_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_3_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_0_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_0_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_1_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_1_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_2_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_2_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_3_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_3_r.set_callback(object); } static void static_set_connect(device_t &device, int num, int conn) { downcast<josvolly8741_4pack_device &>(device).m_i8741[num].connect = conn; } @@ -174,10 +174,10 @@ private: JV8741 m_i8741[4]; int m_nmi_enable; - devcb2_read8 m_port_handler_0_r; - devcb2_read8 m_port_handler_1_r; - devcb2_read8 m_port_handler_2_r; - devcb2_read8 m_port_handler_3_r; + devcb_read8 m_port_handler_0_r; + devcb_read8 m_port_handler_1_r; + devcb_read8 m_port_handler_2_r; + devcb_read8 m_port_handler_3_r; }; diff --git a/src/mame/machine/taitoio.h b/src/mame/machine/taitoio.h index 1a5204c8d69..9e60fc48bd8 100644 --- a/src/mame/machine/taitoio.h +++ b/src/mame/machine/taitoio.h @@ -16,11 +16,11 @@ public: tc0220ioc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0220ioc_device() {} - template<class _Object> static devcb2_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_7_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_7_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -39,11 +39,11 @@ private: UINT8 m_regs[8]; UINT8 m_port; - devcb2_read8 m_read_0_cb; - devcb2_read8 m_read_1_cb; - devcb2_read8 m_read_2_cb; - devcb2_read8 m_read_3_cb; - devcb2_read8 m_read_7_cb; + devcb_read8 m_read_0_cb; + devcb_read8 m_read_1_cb; + devcb_read8 m_read_2_cb; + devcb_read8 m_read_3_cb; + devcb_read8 m_read_7_cb; }; extern const device_type TC0220IOC; @@ -54,11 +54,11 @@ public: tc0510nio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0510nio_device() {} - template<class _Object> static devcb2_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_7_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_7_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -76,11 +76,11 @@ private: // internal state UINT8 m_regs[8]; - devcb2_read8 m_read_0_cb; - devcb2_read8 m_read_1_cb; - devcb2_read8 m_read_2_cb; - devcb2_read8 m_read_3_cb; - devcb2_read8 m_read_7_cb; + devcb_read8 m_read_0_cb; + devcb_read8 m_read_1_cb; + devcb_read8 m_read_2_cb; + devcb_read8 m_read_3_cb; + devcb_read8 m_read_7_cb; }; extern const device_type TC0510NIO; @@ -91,11 +91,11 @@ public: tc0640fio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0640fio_device() {} - template<class _Object> static devcb2_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_7_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_7_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); @@ -114,11 +114,11 @@ protected: // internal state UINT8 m_regs[8]; - devcb2_read8 m_read_0_cb; - devcb2_read8 m_read_1_cb; - devcb2_read8 m_read_2_cb; - devcb2_read8 m_read_3_cb; - devcb2_read8 m_read_7_cb; + devcb_read8 m_read_0_cb; + devcb_read8 m_read_1_cb; + devcb_read8 m_read_2_cb; + devcb_read8 m_read_3_cb; + devcb_read8 m_read_7_cb; }; extern const device_type TC0640FIO; @@ -129,51 +129,51 @@ extern const device_type TC0640FIO; ***************************************************************************/ #define MCFG_TC0220IOC_READ_0_CB(_devcb) \ - devcb = &tc0220ioc_device::set_read_0_callback(*device, DEVCB2_##_devcb); + devcb = &tc0220ioc_device::set_read_0_callback(*device, DEVCB_##_devcb); #define MCFG_TC0220IOC_READ_1_CB(_devcb) \ - devcb = &tc0220ioc_device::set_read_1_callback(*device, DEVCB2_##_devcb); + devcb = &tc0220ioc_device::set_read_1_callback(*device, DEVCB_##_devcb); #define MCFG_TC0220IOC_READ_2_CB(_devcb) \ - devcb = &tc0220ioc_device::set_read_2_callback(*device, DEVCB2_##_devcb); + devcb = &tc0220ioc_device::set_read_2_callback(*device, DEVCB_##_devcb); #define MCFG_TC0220IOC_READ_3_CB(_devcb) \ - devcb = &tc0220ioc_device::set_read_3_callback(*device, DEVCB2_##_devcb); + devcb = &tc0220ioc_device::set_read_3_callback(*device, DEVCB_##_devcb); #define MCFG_TC0220IOC_READ_7_CB(_devcb) \ - devcb = &tc0220ioc_device::set_read_7_callback(*device, DEVCB2_##_devcb); + devcb = &tc0220ioc_device::set_read_7_callback(*device, DEVCB_##_devcb); #define MCFG_TC0510NIO_READ_0_CB(_devcb) \ - devcb = &tc0510nio_device::set_read_0_callback(*device, DEVCB2_##_devcb); + devcb = &tc0510nio_device::set_read_0_callback(*device, DEVCB_##_devcb); #define MCFG_TC0510NIO_READ_1_CB(_devcb) \ - devcb = &tc0510nio_device::set_read_1_callback(*device, DEVCB2_##_devcb); + devcb = &tc0510nio_device::set_read_1_callback(*device, DEVCB_##_devcb); #define MCFG_TC0510NIO_READ_2_CB(_devcb) \ - devcb = &tc0510nio_device::set_read_2_callback(*device, DEVCB2_##_devcb); + devcb = &tc0510nio_device::set_read_2_callback(*device, DEVCB_##_devcb); #define MCFG_TC0510NIO_READ_3_CB(_devcb) \ - devcb = &tc0510nio_device::set_read_3_callback(*device, DEVCB2_##_devcb); + devcb = &tc0510nio_device::set_read_3_callback(*device, DEVCB_##_devcb); #define MCFG_TC0510NIO_READ_7_CB(_devcb) \ - devcb = &tc0510nio_device::set_read_7_callback(*device, DEVCB2_##_devcb); + devcb = &tc0510nio_device::set_read_7_callback(*device, DEVCB_##_devcb); #define MCFG_TC0640FIO_READ_0_CB(_devcb) \ - devcb = &tc0640fio_device::set_read_0_callback(*device, DEVCB2_##_devcb); + devcb = &tc0640fio_device::set_read_0_callback(*device, DEVCB_##_devcb); #define MCFG_TC0640FIO_READ_1_CB(_devcb) \ - devcb = &tc0640fio_device::set_read_1_callback(*device, DEVCB2_##_devcb); + devcb = &tc0640fio_device::set_read_1_callback(*device, DEVCB_##_devcb); #define MCFG_TC0640FIO_READ_2_CB(_devcb) \ - devcb = &tc0640fio_device::set_read_2_callback(*device, DEVCB2_##_devcb); + devcb = &tc0640fio_device::set_read_2_callback(*device, DEVCB_##_devcb); #define MCFG_TC0640FIO_READ_3_CB(_devcb) \ - devcb = &tc0640fio_device::set_read_3_callback(*device, DEVCB2_##_devcb); + devcb = &tc0640fio_device::set_read_3_callback(*device, DEVCB_##_devcb); #define MCFG_TC0640FIO_READ_7_CB(_devcb) \ - devcb = &tc0640fio_device::set_read_7_callback(*device, DEVCB2_##_devcb); + devcb = &tc0640fio_device::set_read_7_callback(*device, DEVCB_##_devcb); #endif /* __TAITOIO_H__ */ diff --git a/src/mame/machine/wpc.h b/src/mame/machine/wpc.h index 0d7547412df..5594082ff74 100644 --- a/src/mame/machine/wpc.h +++ b/src/mame/machine/wpc.h @@ -75,27 +75,27 @@ MCFG_DEVICE_ADD(_tag, WPCASIC, 0); #define MCFG_WPC_IRQ_ACKNOWLEDGE(_irq) \ - downcast<wpc_device *>(device)->set_irq_callback(DEVCB2_##_irq); + downcast<wpc_device *>(device)->set_irq_callback(DEVCB_##_irq); #define MCFG_WPC_FIRQ_ACKNOWLEDGE(_firq) \ - downcast<wpc_device *>(device)->set_firq_callback(DEVCB2_##_firq); + downcast<wpc_device *>(device)->set_firq_callback(DEVCB_##_firq); #define MCFG_WPC_SOUND_DATA(_sounddata_r,_sounddata_w) \ - downcast<wpc_device *>(device)->set_sound_data_read(DEVCB2_##_sounddata_r); \ - downcast<wpc_device *>(device)->set_sound_data_write(DEVCB2_##_sounddata_w); + downcast<wpc_device *>(device)->set_sound_data_read(DEVCB_##_sounddata_r); \ + downcast<wpc_device *>(device)->set_sound_data_write(DEVCB_##_sounddata_w); #define MCFG_WPC_SOUND_CTRL(_soundctrl_r,_soundctrl_w) \ - downcast<wpc_device *>(device)->set_sound_ctrl_read(DEVCB2_##_soundctrl_r); \ - downcast<wpc_device *>(device)->set_sound_ctrl_write(DEVCB2_##_soundctrl_w); + downcast<wpc_device *>(device)->set_sound_ctrl_read(DEVCB_##_soundctrl_r); \ + downcast<wpc_device *>(device)->set_sound_ctrl_write(DEVCB_##_soundctrl_w); #define MCFG_WPC_SOUND_S11C(_sounds11_w) \ - downcast<wpc_device *>(device)->set_sound_s11_write(DEVCB2_##_sounds11_w); + downcast<wpc_device *>(device)->set_sound_s11_write(DEVCB_##_sounds11_w); #define MCFG_WPC_ROMBANK(_bank_w) \ - downcast<wpc_device *>(device)->set_bank_write(DEVCB2_##_bank_w); + downcast<wpc_device *>(device)->set_bank_write(DEVCB_##_bank_w); #define MCFG_WPC_DMDBANK(_dmdbank_w) \ - downcast<wpc_device *>(device)->set_dmdbank_write(DEVCB2_##_dmdbank_w); + downcast<wpc_device *>(device)->set_dmdbank_write(DEVCB_##_dmdbank_w); class wpc_device : public device_t { @@ -151,15 +151,15 @@ private: UINT8 m_dmd_irqline; emu_timer* m_zc_timer; - devcb2_write_line m_irq_cb; - devcb2_write_line m_firq_cb; - devcb2_read8 m_sounddata_r; - devcb2_write8 m_sounddata_w; - devcb2_read8 m_soundctrl_r; - devcb2_write8 m_soundctrl_w; - devcb2_write8 m_sounds11_w; - devcb2_write8 m_bank_w; - devcb2_write8 m_dmdbank_w; + devcb_write_line m_irq_cb; + devcb_write_line m_firq_cb; + devcb_read8 m_sounddata_r; + devcb_write8 m_sounddata_w; + devcb_read8 m_soundctrl_r; + devcb_write8 m_soundctrl_w; + devcb_write8 m_sounds11_w; + devcb_write8 m_bank_w; + devcb_write8 m_dmdbank_w; }; extern const device_type WPCASIC; diff --git a/src/mame/machine/zndip.h b/src/mame/machine/zndip.h index e6cc2f01708..1c7b364fb07 100644 --- a/src/mame/machine/zndip.h +++ b/src/mame/machine/zndip.h @@ -10,14 +10,14 @@ extern const device_type ZNDIP; #define MCFG_ZNDIP_DATA_HANDLER(_devcb) \ - devcb = &zndip_device::set_data_handler(*device, DEVCB2_##_devcb); + devcb = &zndip_device::set_data_handler(*device, DEVCB_##_devcb); class zndip_device : public psxsiodev_device { public: zndip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_data_handler(device_t &device, _Object object) { return downcast<zndip_device &>(device).m_data_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data_handler(device_t &device, _Object object) { return downcast<zndip_device &>(device).m_data_handler.set_callback(object); } void select(int select); @@ -28,7 +28,7 @@ protected: private: virtual void data_in( int data, int mask ); - devcb2_read8 m_data_handler; + devcb_read8 m_data_handler; int m_select; UINT8 m_bit; diff --git a/src/mame/video/bfm_dm01.h b/src/mame/video/bfm_dm01.h index dd6ace9f1fb..df68264a556 100644 --- a/src/mame/video/bfm_dm01.h +++ b/src/mame/video/bfm_dm01.h @@ -9,7 +9,7 @@ #define DM_BYTESPERROW 9 #define MCFG_BF_DM01_BUSY_CB(_devcb) \ - devcb = &bfmdm01_device::set_busy_callback(*device, DEVCB2_##_devcb); + devcb = &bfmdm01_device::set_busy_callback(*device, DEVCB_##_devcb); class bfmdm01_device : public device_t { @@ -17,7 +17,7 @@ public: bfmdm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~bfmdm01_device() {} - template<class _Object> static devcb2_base &set_busy_callback(device_t &device, _Object object) { return downcast<bfmdm01_device &>(device).m_busy_cb.set_callback(object); } + template<class _Object> static devcb_base &set_busy_callback(device_t &device, _Object object) { return downcast<bfmdm01_device &>(device).m_busy_cb.set_callback(object); } DECLARE_READ8_MEMBER( control_r ); DECLARE_WRITE8_MEMBER( control_w ); @@ -47,7 +47,7 @@ private: UINT8 m_scanline[DM_BYTESPERROW]; UINT8 m_comdata; - devcb2_write_line m_busy_cb; + devcb_write_line m_busy_cb; int read_data(void); }; diff --git a/src/mame/video/powervr2.h b/src/mame/video/powervr2.h index bc8b0e2ae14..bb0c1f60d55 100644 --- a/src/mame/video/powervr2.h +++ b/src/mame/video/powervr2.h @@ -3,7 +3,7 @@ #define MCFG_POWERVR2_ADD(_tag, _irq_cb) \ MCFG_DEVICE_ADD(_tag, POWERVR2, 0) \ - downcast<powervr2_device *>(device)->set_irq_cb(DEVCB2_ ## _irq_cb); + downcast<powervr2_device *>(device)->set_irq_cb(DEVCB_ ## _irq_cb); class powervr2_device : public device_t, public device_video_interface @@ -282,7 +282,7 @@ protected: virtual void device_reset(); private: - devcb2_write8 irq_cb; + devcb_write8 irq_cb; // Core registers UINT32 softreset; diff --git a/src/mame/video/scn2674.h b/src/mame/video/scn2674.h index 2a846e2ce76..eb50750e979 100644 --- a/src/mame/video/scn2674.h +++ b/src/mame/video/scn2674.h @@ -5,7 +5,7 @@ #define MCFG_SCN2674_VIDEO_ADD(_tag, _clock, _irq) \ MCFG_DEVICE_ADD(_tag, SCN2674_VIDEO, _clock) \ - downcast<scn2674_device *>(device)->set_callbacks(DEVCB2_##_irq); + downcast<scn2674_device *>(device)->set_callbacks(DEVCB_##_irq); #define MCFG_SCN2674_GFXDECODE(_gfxtag) \ scn2674_device::static_set_gfxdecode_tag(*device, "^" _gfxtag); @@ -51,7 +51,7 @@ protected: virtual void device_start(); virtual void device_reset(); - devcb2_write_line m_interrupt_callback; + devcb_write_line m_interrupt_callback; UINT8 m_scn2674_IR_pointer; UINT8 m_scn2674_screen1_l; diff --git a/src/mame/video/seibu_crtc.h b/src/mame/video/seibu_crtc.h index eeac3b6d3d3..abfe7d3dae1 100644 --- a/src/mame/video/seibu_crtc.h +++ b/src/mame/video/seibu_crtc.h @@ -15,10 +15,10 @@ //************************************************************************** #define MCFG_SEIBU_CRTC_LAYER_EN_CB(_devcb) \ - devcb = &seibu_crtc_device::set_layer_en_callback(*device, DEVCB2_##_devcb); + devcb = &seibu_crtc_device::set_layer_en_callback(*device, DEVCB_##_devcb); #define MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(_devcb) \ - devcb = &seibu_crtc_device::set_layer_scroll_callback(*device, DEVCB2_##_devcb); + devcb = &seibu_crtc_device::set_layer_scroll_callback(*device, DEVCB_##_devcb); //************************************************************************** @@ -35,8 +35,8 @@ public: // construction/destruction seibu_crtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_layer_en_callback(device_t &device, _Object object) { return downcast<seibu_crtc_device &>(device).m_layer_en_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_layer_scroll_callback(device_t &device, _Object object) { return downcast<seibu_crtc_device &>(device).m_layer_scroll_cb.set_callback(object); } + template<class _Object> static devcb_base &set_layer_en_callback(device_t &device, _Object object) { return downcast<seibu_crtc_device &>(device).m_layer_en_cb.set_callback(object); } + template<class _Object> static devcb_base &set_layer_scroll_callback(device_t &device, _Object object) { return downcast<seibu_crtc_device &>(device).m_layer_scroll_cb.set_callback(object); } // I/O operations DECLARE_WRITE16_MEMBER( write ); @@ -56,8 +56,8 @@ protected: virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; private: - devcb2_write16 m_layer_en_cb; - devcb2_write16 m_layer_scroll_cb; + devcb_write16 m_layer_en_cb; + devcb_write16 m_layer_scroll_cb; const address_space_config m_space_config; inline UINT16 read_word(offs_t address); inline void write_word(offs_t address, UINT16 data); diff --git a/src/mame/video/tia.h b/src/mame/video/tia.h index cc544299e62..cc321f5bd7a 100644 --- a/src/mame/video/tia.h +++ b/src/mame/video/tia.h @@ -29,13 +29,13 @@ struct player_gfx { //************************************************************************** #define MCFG_TIA_READ_INPUT_PORT_CB(_devcb) \ - devcb = &tia_video_device::set_read_input_port_callback(*device, DEVCB2_##_devcb); + devcb = &tia_video_device::set_read_input_port_callback(*device, DEVCB_##_devcb); #define MCFG_TIA_DATABUS_CONTENTS_CB(_devcb) \ - devcb = &tia_video_device::set_databus_contents_callback(*device, DEVCB2_##_devcb); + devcb = &tia_video_device::set_databus_contents_callback(*device, DEVCB_##_devcb); #define MCFG_TIA_VSYNC_CB(_devcb) \ - devcb = &tia_video_device::set_vsync_callback(*device, DEVCB2_##_devcb); + devcb = &tia_video_device::set_vsync_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -50,9 +50,9 @@ class tia_video_device : public device_t, public: UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - template<class _Object> static devcb2_base &set_read_input_port_callback(device_t &device, _Object object) { return downcast<tia_video_device &>(device).m_read_input_port_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_databus_contents_callback(device_t &device, _Object object) { return downcast<tia_video_device &>(device).m_databus_contents_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_vsync_callback(device_t &device, _Object object) { return downcast<tia_video_device &>(device).m_vsync_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_input_port_callback(device_t &device, _Object object) { return downcast<tia_video_device &>(device).m_read_input_port_cb.set_callback(object); } + template<class _Object> static devcb_base &set_databus_contents_callback(device_t &device, _Object object) { return downcast<tia_video_device &>(device).m_databus_contents_cb.set_callback(object); } + template<class _Object> static devcb_base &set_vsync_callback(device_t &device, _Object object) { return downcast<tia_video_device &>(device).m_vsync_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -108,9 +108,9 @@ protected: private: - devcb2_read16 m_read_input_port_cb; - devcb2_read8 m_databus_contents_cb; - devcb2_write16 m_vsync_cb; + devcb_read16 m_read_input_port_cb; + devcb_read8 m_databus_contents_cb; + devcb_write16 m_vsync_cb; struct player_gfx p0gfx; struct player_gfx p1gfx; 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; |