diff options
Diffstat (limited to 'src/devices/machine/mos6529.h')
-rw-r--r-- | src/devices/machine/mos6529.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/devices/machine/mos6529.h b/src/devices/machine/mos6529.h index 75d10082ab1..ca0a4525d1b 100644 --- a/src/devices/machine/mos6529.h +++ b/src/devices/machine/mos6529.h @@ -32,28 +32,28 @@ //************************************************************************** #define MCFG_MOS6529_P0_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p0_handler(*device, DEVCB_##_devcb); + devcb = &downcast<mos6529_device &>(*device).set_p0_handler(DEVCB_##_devcb); #define MCFG_MOS6529_P1_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p1_handler(*device, DEVCB_##_devcb); + devcb = &downcast<mos6529_device &>(*device).set_p1_handler(DEVCB_##_devcb); #define MCFG_MOS6529_P2_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p2_handler(*device, DEVCB_##_devcb); + devcb = &downcast<mos6529_device &>(*device).set_p2_handler(DEVCB_##_devcb); #define MCFG_MOS6529_P3_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p3_handler(*device, DEVCB_##_devcb); + devcb = &downcast<mos6529_device &>(*device).set_p3_handler(DEVCB_##_devcb); #define MCFG_MOS6529_P4_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p4_handler(*device, DEVCB_##_devcb); + devcb = &downcast<mos6529_device &>(*device).set_p4_handler(DEVCB_##_devcb); #define MCFG_MOS6529_P5_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p5_handler(*device, DEVCB_##_devcb); + devcb = &downcast<mos6529_device &>(*device).set_p5_handler(DEVCB_##_devcb); #define MCFG_MOS6529_P6_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p6_handler(*device, DEVCB_##_devcb); + devcb = &downcast<mos6529_device &>(*device).set_p6_handler(DEVCB_##_devcb); #define MCFG_MOS6529_P7_HANDLER(_devcb) \ - devcb = &mos6529_device::set_p7_handler(*device, DEVCB_##_devcb); + devcb = &downcast<mos6529_device &>(*device).set_p7_handler(DEVCB_##_devcb); //************************************************************************** @@ -68,14 +68,14 @@ public: // construction/destruction mos6529_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <class Object> static devcb_base &set_p0_handler(device_t &device, Object &&cb) { return downcast<mos6529_device &>(device).m_p0_handler.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_p1_handler(device_t &device, Object &&cb) { return downcast<mos6529_device &>(device).m_p1_handler.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_p2_handler(device_t &device, Object &&cb) { return downcast<mos6529_device &>(device).m_p2_handler.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_p3_handler(device_t &device, Object &&cb) { return downcast<mos6529_device &>(device).m_p3_handler.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_p4_handler(device_t &device, Object &&cb) { return downcast<mos6529_device &>(device).m_p4_handler.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_p5_handler(device_t &device, Object &&cb) { return downcast<mos6529_device &>(device).m_p5_handler.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_p6_handler(device_t &device, Object &&cb) { return downcast<mos6529_device &>(device).m_p6_handler.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_p7_handler(device_t &device, Object &&cb) { return downcast<mos6529_device &>(device).m_p7_handler.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_p0_handler(Object &&cb) { return m_p0_handler.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_p1_handler(Object &&cb) { return m_p1_handler.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_p2_handler(Object &&cb) { return m_p2_handler.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_p3_handler(Object &&cb) { return m_p3_handler.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_p4_handler(Object &&cb) { return m_p4_handler.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_p5_handler(Object &&cb) { return m_p5_handler.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_p6_handler(Object &&cb) { return m_p6_handler.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_p7_handler(Object &&cb) { return m_p7_handler.set_callback(std::forward<Object>(cb)); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); |