diff options
Diffstat (limited to 'src/devices/cpu/s2650/s2650.h')
-rw-r--r-- | src/devices/cpu/s2650/s2650.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/cpu/s2650/s2650.h b/src/devices/cpu/s2650/s2650.h index e329831690c..4d8da0cde0c 100644 --- a/src/devices/cpu/s2650/s2650.h +++ b/src/devices/cpu/s2650/s2650.h @@ -28,13 +28,13 @@ DECLARE_DEVICE_TYPE(S2650, s2650_device) #define MCFG_S2650_SENSE_INPUT(_devcb) \ - devcb = &s2650_device::set_sense_handler(*device, DEVCB_##_devcb); + devcb = &downcast<s2650_device &>(*device).set_sense_handler(DEVCB_##_devcb); #define MCFG_S2650_FLAG_OUTPUT(_devcb) \ - devcb = &s2650_device::set_flag_handler(*device, DEVCB_##_devcb); + devcb = &downcast<s2650_device &>(*device).set_flag_handler(DEVCB_##_devcb); #define MCFG_S2650_INTACK_HANDLER(_devcb) \ - devcb = &s2650_device::set_intack_handler(*device, DEVCB_##_devcb); + devcb = &downcast<s2650_device &>(*device).set_intack_handler(DEVCB_##_devcb); class s2650_device : public cpu_device, public s2650_disassembler::config { @@ -42,10 +42,10 @@ public: // construction/destruction s2650_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // static configuration helpers - template <class Object> static devcb_base &set_sense_handler(device_t &device, Object &&cb) { return downcast<s2650_device &>(device).m_sense_handler.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_flag_handler(device_t &device, Object &&cb) { return downcast<s2650_device &>(device).m_flag_handler.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_intack_handler(device_t &device, Object &&cb) { return downcast<s2650_device &>(device).m_intack_handler.set_callback(std::forward<Object>(cb)); } + // configuration helpers + template <class Object> devcb_base &set_sense_handler(Object &&cb) { return m_sense_handler.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_flag_handler(Object &&cb) { return m_flag_handler.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_intack_handler(Object &&cb) { return m_intack_handler.set_callback(std::forward<Object>(cb)); } protected: // device-level overrides |