diff options
Diffstat (limited to 'src/mame/machine/taitosjsec.h')
-rw-r--r-- | src/mame/machine/taitosjsec.h | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/mame/machine/taitosjsec.h b/src/mame/machine/taitosjsec.h index 98132067428..48ccfe57a1b 100644 --- a/src/mame/machine/taitosjsec.h +++ b/src/mame/machine/taitosjsec.h @@ -11,15 +11,15 @@ DECLARE_DEVICE_TYPE(TAITO_SJ_SECURITY_MCU, taito_sj_security_mcu_device) #define MCFG_TAITO_SJ_SECURITY_MCU_INT_MODE(mode) \ - taito_sj_security_mcu_device::set_int_mode(*device, taito_sj_security_mcu_device::int_mode::mode); + downcast<taito_sj_security_mcu_device &>(*device).set_int_mode(taito_sj_security_mcu_device::int_mode::mode); #define MCFG_TAITO_SJ_SECURITY_MCU_68READ_CB(cb) \ - devcb = &taito_sj_security_mcu_device::set_68read_cb(*device, DEVCB_##cb); + devcb = &downcast<taito_sj_security_mcu_device &>(*device).set_68read_cb(DEVCB_##cb); #define MCFG_TAITO_SJ_SECURITY_MCU_68WRITE_CB(cb) \ - devcb = &taito_sj_security_mcu_device::set_68write_cb(*device, DEVCB_##cb); + devcb = &downcast<taito_sj_security_mcu_device &>(*device).set_68write_cb(DEVCB_##cb); #define MCFG_TAITO_SJ_SECURITY_MCU_68INTRQ_CB(cb) \ - devcb = &taito_sj_security_mcu_device::set_68intrq_cb(*device, DEVCB_##cb); + devcb = &downcast<taito_sj_security_mcu_device &>(*device).set_68intrq_cb(DEVCB_##cb); #define MCFG_TAITO_SJ_SECURITY_MCU_BUSRQ_CB(cb) \ - devcb = &taito_sj_security_mcu_device::set_busrq_cb(*device, DEVCB_##cb); + devcb = &downcast<taito_sj_security_mcu_device &>(*device).set_busrq_cb(DEVCB_##cb); class taito_sj_security_mcu_device : public device_t { @@ -31,16 +31,11 @@ public: WRITE }; - static void set_int_mode(device_t &device, int_mode mode) - { downcast<taito_sj_security_mcu_device &>(device).m_int_mode = mode; } - template <typename Obj> static devcb_base &set_68read_cb(device_t &device, Obj &&cb) - { return downcast<taito_sj_security_mcu_device &>(device).m_68read_cb.set_callback(std::forward<Obj>(cb)); } - template <typename Obj> static devcb_base &set_68write_cb(device_t &device, Obj &&cb) - { return downcast<taito_sj_security_mcu_device &>(device).m_68write_cb.set_callback(std::forward<Obj>(cb)); } - template <typename Obj> static devcb_base &set_68intrq_cb(device_t &device, Obj &&cb) - { return downcast<taito_sj_security_mcu_device &>(device).m_68intrq_cb.set_callback(std::forward<Obj>(cb)); } - template <typename Obj> static devcb_base &set_busrq_cb(device_t &device, Obj &&cb) - { return downcast<taito_sj_security_mcu_device &>(device).m_busrq_cb.set_callback(std::forward<Obj>(cb)); } + void set_int_mode(int_mode mode) { m_int_mode = mode; } + template <typename Obj> devcb_base &set_68read_cb(Obj &&cb) { return m_68read_cb.set_callback(std::forward<Obj>(cb)); } + template <typename Obj> devcb_base &set_68write_cb(Obj &&cb) { return m_68write_cb.set_callback(std::forward<Obj>(cb)); } + template <typename Obj> devcb_base &set_68intrq_cb(Obj &&cb) { return m_68intrq_cb.set_callback(std::forward<Obj>(cb)); } + template <typename Obj> devcb_base &set_busrq_cb(Obj &&cb) { return m_busrq_cb.set_callback(std::forward<Obj>(cb)); } taito_sj_security_mcu_device( machine_config const &mconfig, |