diff options
Diffstat (limited to 'src/devices/machine/mc6846.h')
-rw-r--r-- | src/devices/machine/mc6846.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/devices/machine/mc6846.h b/src/devices/machine/mc6846.h index e35d08f7af8..676db3129f9 100644 --- a/src/devices/machine/mc6846.h +++ b/src/devices/machine/mc6846.h @@ -15,22 +15,22 @@ #define MCFG_MC6846_OUT_PORT_CB(_devcb) \ - devcb = &mc6846_device::set_out_port_callback(*device, DEVCB_##_devcb); + devcb = &downcast<mc6846_device &>(*device).set_out_port_callback(DEVCB_##_devcb); #define MCFG_MC6846_OUT_CP1_CB(_devcb) \ - devcb = &mc6846_device::set_out_cp1_callback(*device, DEVCB_##_devcb); + devcb = &downcast<mc6846_device &>(*device).set_out_cp1_callback(DEVCB_##_devcb); #define MCFG_MC6846_OUT_CP2_CB(_devcb) \ - devcb = &mc6846_device::set_out_cp2_callback(*device, DEVCB_##_devcb); + devcb = &downcast<mc6846_device &>(*device).set_out_cp2_callback(DEVCB_##_devcb); #define MCFG_MC6846_IN_PORT_CB(_devcb) \ - devcb = &mc6846_device::set_in_port_callback(*device, DEVCB_##_devcb); + devcb = &downcast<mc6846_device &>(*device).set_in_port_callback(DEVCB_##_devcb); #define MCFG_MC6846_OUT_CTO_CB(_devcb) \ - devcb = &mc6846_device::set_out_cto_callback(*device, DEVCB_##_devcb); + devcb = &downcast<mc6846_device &>(*device).set_out_cto_callback(DEVCB_##_devcb); #define MCFG_MC6846_IRQ_CB(_devcb) \ - devcb = &mc6846_device::set_irq_callback(*device, DEVCB_##_devcb); + devcb = &downcast<mc6846_device &>(*device).set_irq_callback(DEVCB_##_devcb); class mc6846_device : public device_t @@ -38,12 +38,12 @@ class mc6846_device : public device_t public: mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <class Object> static devcb_base &set_out_port_callback(device_t &device, Object &&cb) { return downcast<mc6846_device &>(device).m_out_port_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_out_cp1_callback(device_t &device, Object &&cb) { return downcast<mc6846_device &>(device).m_out_cp1_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_out_cp2_callback(device_t &device, Object &&cb) { return downcast<mc6846_device &>(device).m_out_cp2_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_in_port_callback(device_t &device, Object &&cb) { return downcast<mc6846_device &>(device).m_in_port_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_out_cto_callback(device_t &device, Object &&cb) { return downcast<mc6846_device &>(device).m_out_cto_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_irq_callback(device_t &device, Object &&cb) { return downcast<mc6846_device &>(device).m_irq_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_port_callback(Object &&cb) { return m_out_port_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_cp1_callback(Object &&cb) { return m_out_cp1_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_cp2_callback(Object &&cb) { return m_out_cp2_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_in_port_callback(Object &&cb) { return m_in_port_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_cto_callback(Object &&cb) { return m_out_cto_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_irq_callback(Object &&cb) { return m_irq_cb.set_callback(std::forward<Object>(cb)); } /* interface to CPU via address/data bus*/ DECLARE_READ8_MEMBER(read); |