diff options
Diffstat (limited to 'src/mame/machine/namco53.h')
-rw-r--r-- | src/mame/machine/namco53.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/machine/namco53.h b/src/mame/machine/namco53.h index f6c3c66aef2..7b8852bc738 100644 --- a/src/mame/machine/namco53.h +++ b/src/mame/machine/namco53.h @@ -11,22 +11,22 @@ MCFG_DEVICE_ADD(_tag, NAMCO_53XX, _clock) #define MCFG_NAMCO_53XX_K_CB(_devcb) \ - devcb = &namco_53xx_device::set_k_port_callback(*device, DEVCB_##_devcb); + devcb = &downcast<namco_53xx_device &>(*device).set_k_port_callback(DEVCB_##_devcb); #define MCFG_NAMCO_53XX_INPUT_0_CB(_devcb) \ - devcb = &namco_53xx_device::set_input_callback<0>(*device, DEVCB_##_devcb); + devcb = &downcast<namco_53xx_device &>(*device).set_input_callback<0>(DEVCB_##_devcb); #define MCFG_NAMCO_53XX_INPUT_1_CB(_devcb) \ - devcb = &namco_53xx_device::set_input_callback<1>(*device, DEVCB_##_devcb); + devcb = &downcast<namco_53xx_device &>(*device).set_input_callback<1>(DEVCB_##_devcb); #define MCFG_NAMCO_53XX_INPUT_2_CB(_devcb) \ - devcb = &namco_53xx_device::set_input_callback<2>(*device, DEVCB_##_devcb); + devcb = &downcast<namco_53xx_device &>(*device).set_input_callback<2>(DEVCB_##_devcb); #define MCFG_NAMCO_53XX_INPUT_3_CB(_devcb) \ - devcb = &namco_53xx_device::set_input_callback<3>(*device, DEVCB_##_devcb); + devcb = &downcast<namco_53xx_device &>(*device).set_input_callback<3>(DEVCB_##_devcb); #define MCFG_NAMCO_53XX_P_CB(_devcb) \ - devcb = &namco_53xx_device::set_p_port_callback(*device, DEVCB_##_devcb); + devcb = &downcast<namco_53xx_device &>(*device).set_p_port_callback(DEVCB_##_devcb); class namco_53xx_device : public device_t @@ -34,10 +34,10 @@ class namco_53xx_device : public device_t public: namco_53xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <unsigned N, class Object> static devcb_base &set_input_callback(device_t &device, Object &&cb) { return downcast<namco_53xx_device &>(device).m_in[N].set_callback(std::forward<Object>(cb)); } + template <unsigned N, class Object> devcb_base &set_input_callback(Object &&cb) { return m_in[N].set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_k_port_callback(device_t &device, Object &&cb) { return downcast<namco_53xx_device &>(device).m_k.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_p_port_callback(device_t &device, Object &&cb) { return downcast<namco_53xx_device &>(device).m_p.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_k_port_callback(Object &&cb) { return m_k.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_p_port_callback(Object &&cb) { return m_p.set_callback(std::forward<Object>(cb)); } DECLARE_READ8_MEMBER( K_r ); DECLARE_READ8_MEMBER( R0_r ); |