diff options
author | 2018-03-03 18:18:08 +0100 | |
---|---|---|
committer | 2018-03-04 04:18:08 +1100 | |
commit | 3b923d59ccb8d2d8e386392518450006f8e644fe (patch) | |
tree | 73c48568e76d69edbde9f96a3f57d173dd05a747 /src/devices/machine/6525tpi.h | |
parent | 25472091b626bd01ef47f11389a4b2ebe0fc0008 (diff) |
destaticify initializations (nw) (#3289)
* destaticify initializations (nw)
* fix this->set_screen (nw)
Diffstat (limited to 'src/devices/machine/6525tpi.h')
-rw-r--r-- | src/devices/machine/6525tpi.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/devices/machine/6525tpi.h b/src/devices/machine/6525tpi.h index 1164e3b31d5..a844de2ac0f 100644 --- a/src/devices/machine/6525tpi.h +++ b/src/devices/machine/6525tpi.h @@ -43,15 +43,15 @@ class tpi6525_device : public device_t public: tpi6525_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <class Object> static devcb_base &set_out_irq_callback(device_t &device, Object &&cb) { return downcast<tpi6525_device &>(device).m_out_irq_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_in_pa_callback(device_t &device, Object &&cb) { return downcast<tpi6525_device &>(device).m_in_pa_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_out_pa_callback(device_t &device, Object &&cb) { return downcast<tpi6525_device &>(device).m_out_pa_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_in_pb_callback(device_t &device, Object &&cb) { return downcast<tpi6525_device &>(device).m_in_pb_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_out_pb_callback(device_t &device, Object &&cb) { return downcast<tpi6525_device &>(device).m_out_pb_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_in_pc_callback(device_t &device, Object &&cb) { return downcast<tpi6525_device &>(device).m_in_pc_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_out_pc_callback(device_t &device, Object &&cb) { return downcast<tpi6525_device &>(device).m_out_pc_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_out_ca_callback(device_t &device, Object &&cb) { return downcast<tpi6525_device &>(device).m_out_ca_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_out_cb_callback(device_t &device, Object &&cb) { return downcast<tpi6525_device &>(device).m_out_cb_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_irq_callback(Object &&cb) { return m_out_irq_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_in_pa_callback(Object &&cb) { return m_in_pa_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_pa_callback(Object &&cb) { return m_out_pa_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_in_pb_callback(Object &&cb) { return m_in_pb_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_pb_callback(Object &&cb) { return m_out_pb_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_in_pc_callback(Object &&cb) { return m_in_pc_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_pc_callback(Object &&cb) { return m_out_pc_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_ca_callback(Object &&cb) { return m_out_ca_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_cb_callback(Object &&cb) { return m_out_cb_cb.set_callback(std::forward<Object>(cb)); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -125,31 +125,31 @@ DECLARE_DEVICE_TYPE(TPI6525, tpi6525_device) #define MCFG_TPI6525_OUT_IRQ_CB(_devcb) \ - devcb = &tpi6525_device::set_out_irq_callback(*device, DEVCB_##_devcb); + devcb = &downcast<tpi6525_device &>(*device).set_out_irq_callback(DEVCB_##_devcb); #define MCFG_TPI6525_IN_PA_CB(_devcb) \ - devcb = &tpi6525_device::set_in_pa_callback(*device, DEVCB_##_devcb); + devcb = &downcast<tpi6525_device &>(*device).set_in_pa_callback(DEVCB_##_devcb); #define MCFG_TPI6525_OUT_PA_CB(_devcb) \ - devcb = &tpi6525_device::set_out_pa_callback(*device, DEVCB_##_devcb); + devcb = &downcast<tpi6525_device &>(*device).set_out_pa_callback(DEVCB_##_devcb); #define MCFG_TPI6525_IN_PB_CB(_devcb) \ - devcb = &tpi6525_device::set_in_pb_callback(*device, DEVCB_##_devcb); + devcb = &downcast<tpi6525_device &>(*device).set_in_pb_callback(DEVCB_##_devcb); #define MCFG_TPI6525_OUT_PB_CB(_devcb) \ - devcb = &tpi6525_device::set_out_pb_callback(*device, DEVCB_##_devcb); + devcb = &downcast<tpi6525_device &>(*device).set_out_pb_callback(DEVCB_##_devcb); #define MCFG_TPI6525_IN_PC_CB(_devcb) \ - devcb = &tpi6525_device::set_in_pc_callback(*device, DEVCB_##_devcb); + devcb = &downcast<tpi6525_device &>(*device).set_in_pc_callback(DEVCB_##_devcb); #define MCFG_TPI6525_OUT_PC_CB(_devcb) \ - devcb = &tpi6525_device::set_out_pc_callback(*device, DEVCB_##_devcb); + devcb = &downcast<tpi6525_device &>(*device).set_out_pc_callback(DEVCB_##_devcb); #define MCFG_TPI6525_OUT_CA_CB(_devcb) \ - devcb = &tpi6525_device::set_out_ca_callback(*device, DEVCB_##_devcb); + devcb = &downcast<tpi6525_device &>(*device).set_out_ca_callback(DEVCB_##_devcb); #define MCFG_TPI6525_OUT_CB_CB(_devcb) \ - devcb = &tpi6525_device::set_out_cb_callback(*device, DEVCB_##_devcb); + devcb = &downcast<tpi6525_device &>(*device).set_out_cb_callback(DEVCB_##_devcb); #endif // MAME_MACHINE_6525TPI_H |