diff options
author | 2014-05-14 06:46:50 +0000 | |
---|---|---|
committer | 2014-05-14 06:46:50 +0000 | |
commit | 546fbff34966f4f5f62930dd73c064df90d4e51e (patch) | |
tree | a2e859303874d5ee6cda105c465983e5223d5675 /src/emu/bus | |
parent | c5a60146edfc6d9bf8ff7f398b0c3fa17b94b1e3 (diff) |
devcv2 -> devcb (nw)
Diffstat (limited to 'src/emu/bus')
50 files changed, 716 insertions, 716 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; |