diff options
Diffstat (limited to 'src/emu/machine/ins8154.h')
-rw-r--r-- | src/emu/machine/ins8154.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/emu/machine/ins8154.h b/src/emu/machine/ins8154.h index 238685582f7..3b272b70a9e 100644 --- a/src/emu/machine/ins8154.h +++ b/src/emu/machine/ins8154.h @@ -45,19 +45,19 @@ ***************************************************************************/ #define MCFG_INS8154_IN_A_CB(_devcb) \ - devcb = &ins8154_device::set_in_a_callback(*device, DEVCB2_##_devcb); + devcb = &ins8154_device::set_in_a_callback(*device, DEVCB_##_devcb); #define MCFG_INS8154_OUT_A_CB(_devcb) \ - devcb = &ins8154_device::set_out_a_callback(*device, DEVCB2_##_devcb); + devcb = &ins8154_device::set_out_a_callback(*device, DEVCB_##_devcb); #define MCFG_INS8154_IN_B_CB(_devcb) \ - devcb = &ins8154_device::set_in_b_callback(*device, DEVCB2_##_devcb); + devcb = &ins8154_device::set_in_b_callback(*device, DEVCB_##_devcb); #define MCFG_INS8154_OUT_B_CB(_devcb) \ - devcb = &ins8154_device::set_out_b_callback(*device, DEVCB2_##_devcb); + devcb = &ins8154_device::set_out_b_callback(*device, DEVCB_##_devcb); #define MCFG_INS8154_OUT_IRQ_CB(_devcb) \ - devcb = &ins8154_device::set_out_irq_callback(*device, DEVCB2_##_devcb); //currently unused + devcb = &ins8154_device::set_out_irq_callback(*device, DEVCB_##_devcb); //currently unused /*************************************************************************** TYPE DEFINITIONS @@ -71,11 +71,11 @@ public: // construction/destruction ins8154_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_in_a_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_in_a_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_a_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_out_a_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_b_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_in_b_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_b_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_out_b_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_out_irq_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_a_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_in_a_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_a_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_out_a_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_b_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_in_b_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_b_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_out_b_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_out_irq_cb.set_callback(object); } DECLARE_READ8_MEMBER( ins8154_r ); DECLARE_WRITE8_MEMBER( ins8154_w ); @@ -93,11 +93,11 @@ protected: private: /* i/o lines */ - devcb2_read8 m_in_a_cb; - devcb2_write8 m_out_a_cb; - devcb2_read8 m_in_b_cb; - devcb2_write8 m_out_b_cb; - devcb2_write_line m_out_irq_cb; + devcb_read8 m_in_a_cb; + devcb_write8 m_out_a_cb; + devcb_read8 m_in_b_cb; + devcb_write8 m_out_b_cb; + devcb_write_line m_out_irq_cb; /* registers */ UINT8 m_in_a; /* Input Latch Port A */ |