diff options
Diffstat (limited to 'src/devices/machine/s3c44b0.h')
-rw-r--r-- | src/devices/machine/s3c44b0.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/devices/machine/s3c44b0.h b/src/devices/machine/s3c44b0.h index 08c4282ad52..00523b56a2b 100644 --- a/src/devices/machine/s3c44b0.h +++ b/src/devices/machine/s3c44b0.h @@ -116,13 +116,13 @@ class s3c44b0_device : public device_t public: s3c44b0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <class Object> static devcb_base &set_gpio_port_r_callback(device_t &device, Object &&cb) { return downcast<s3c44b0_device &>(device).m_port_r_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_gpio_port_w_callback(device_t &device, Object &&cb) { return downcast<s3c44b0_device &>(device).m_port_w_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_i2c_scl_w_callback(device_t &device, Object &&cb) { return downcast<s3c44b0_device &>(device).m_scl_w_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_i2c_sda_r_callback(device_t &device, Object &&cb) { return downcast<s3c44b0_device &>(device).m_sda_r_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_i2c_sda_w_callback(device_t &device, Object &&cb) { return downcast<s3c44b0_device &>(device).m_sda_w_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_adc_data_r_callback(device_t &device, Object &&cb) { return downcast<s3c44b0_device &>(device).m_data_r_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_i2s_data_w_callback(device_t &device, Object &&cb) { return downcast<s3c44b0_device &>(device).m_data_w_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_gpio_port_r_callback(Object &&cb) { return m_port_r_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_gpio_port_w_callback(Object &&cb) { return m_port_w_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_i2c_scl_w_callback(Object &&cb) { return m_scl_w_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_i2c_sda_r_callback(Object &&cb) { return m_sda_r_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_i2c_sda_w_callback(Object &&cb) { return m_sda_w_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_adc_data_r_callback(Object &&cb) { return m_data_r_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_i2s_data_w_callback(Object &&cb) { return m_data_w_cb.set_callback(std::forward<Object>(cb)); } DECLARE_READ32_MEMBER(lcd_r); DECLARE_READ32_MEMBER(clkpow_r); @@ -605,25 +605,25 @@ DECLARE_DEVICE_TYPE(S3C44B0, s3c44b0_device) #define MCFG_S3C44B0_GPIO_PORT_R_CB(cb) \ - devcb = &s3c44b0_device::set_gpio_port_r_callback(*device, DEVCB_##cb); + devcb = &downcast<s3c44b0_device &>(*device).set_gpio_port_r_callback(DEVCB_##cb); #define MCFG_S3C44B0_GPIO_PORT_W_CB(cb) \ - devcb = &s3c44b0_device::set_gpio_port_w_callback(*device, DEVCB_##cb); + devcb = &downcast<s3c44b0_device &>(*device).set_gpio_port_w_callback(DEVCB_##cb); #define MCFG_S3C44B0_I2C_SCL_W_CB(cb) \ - devcb = &s3c44b0_device::set_i2c_scl_w_callback(*device, DEVCB_##cb); + devcb = &downcast<s3c44b0_device &>(*device).set_i2c_scl_w_callback(DEVCB_##cb); #define MCFG_S3C44B0_I2C_SDA_R_CB(cb) \ - devcb = &s3c44b0_device::set_i2c_sda_r_callback(*device, DEVCB_##cb); + devcb = &downcast<s3c44b0_device &>(*device).set_i2c_sda_r_callback(DEVCB_##cb); #define MCFG_S3C44B0_I2C_SDA_W_CB(cb) \ - devcb = &s3c44b0_device::set_i2c_sda_w_callback(*device, DEVCB_##cb); + devcb = &downcast<s3c44b0_device &>(*device).set_i2c_sda_w_callback(DEVCB_##cb); #define MCFG_S3C44B0_ADC_DATA_R_CB(cb) \ - devcb = &s3c44b0_device::set_adc_data_r_callback(*device, DEVCB_##cb); + devcb = &downcast<s3c44b0_device &>(*device).set_adc_data_r_callback(DEVCB_##cb); #define MCFG_S3C44B0_I2S_DATA_W_CB(cb) \ - devcb = &s3c44b0_device::set_i2s_data_w_callback(*device, DEVCB_##cb); + devcb = &downcast<s3c44b0_device &>(*device).set_i2s_data_w_callback(DEVCB_##cb); #endif // MAME_MACHINE_S3C44B0_H |