diff options
author | wilbertpol <wilbertpol@users.noreply.github.com> | 2018-03-03 18:18:08 +0100 |
---|---|---|
committer | Vas Crabb <cuavas@users.noreply.github.com> | 2018-03-04 04:18:08 +1100 |
commit | 3b923d59ccb8d2d8e386392518450006f8e644fe (patch) | |
tree | 73c48568e76d69edbde9f96a3f57d173dd05a747 /src/devices/machine/tms9901.h | |
parent | 25472091b626bd01ef47f11389a4b2ebe0fc0008 (diff) |
destaticify initializations (nw) (#3289)
* destaticify initializations (nw)
* fix this->set_screen (nw)
Diffstat (limited to 'src/devices/machine/tms9901.h')
-rw-r--r-- | src/devices/machine/tms9901.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/devices/machine/tms9901.h b/src/devices/machine/tms9901.h index f83e8ad6e22..51807b56bec 100644 --- a/src/devices/machine/tms9901.h +++ b/src/devices/machine/tms9901.h @@ -63,9 +63,9 @@ public: DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); - template <class Object> static devcb_base &static_set_readblock_callback(device_t &device, Object &&cb) { return downcast<tms9901_device &>(device).m_read_block.set_callback(std::forward<Object>(cb)); } - template <unsigned N, class Object> static devcb_base &static_set_p_callback(device_t &device, Object &&cb) { return downcast<tms9901_device &>(device).m_write_p[N].set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &static_set_intlevel_callback(device_t &device, Object &&cb) { return downcast<tms9901_device &>(device).m_interrupt.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_readblock_callback(Object &&cb) { return m_read_block.set_callback(std::forward<Object>(cb)); } + template <unsigned N, class Object> devcb_base &set_p_callback(Object &&cb) { return m_write_p[N].set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_intlevel_callback(Object &&cb) { return m_interrupt.set_callback(std::forward<Object>(cb)); } private: static constexpr device_timer_id DECREMENTER = 0; @@ -139,57 +139,57 @@ private: ***************************************************************************/ #define MCFG_TMS9901_READBLOCK_HANDLER( _read ) \ - devcb = &tms9901_device::static_set_readblock_callback( *device, DEVCB_##_read ); + devcb = &downcast<tms9901_device &>(*device).set_readblock_callback(DEVCB_##_read); #define MCFG_TMS9901_P0_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<0>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<0>(DEVCB_##_write); #define MCFG_TMS9901_P1_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<1>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<1>(DEVCB_##_write); #define MCFG_TMS9901_P2_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<2>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<2>(DEVCB_##_write); #define MCFG_TMS9901_P3_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<3>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<3>(DEVCB_##_write); #define MCFG_TMS9901_P4_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<4>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<4>(DEVCB_##_write); #define MCFG_TMS9901_P5_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<5>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<5>(DEVCB_##_write); #define MCFG_TMS9901_P6_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<6>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<6>(DEVCB_##_write); #define MCFG_TMS9901_P7_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<7>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<7>(DEVCB_##_write); #define MCFG_TMS9901_P8_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<8>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<8>(DEVCB_##_write); #define MCFG_TMS9901_P9_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<9>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<9>(DEVCB_##_write); #define MCFG_TMS9901_P10_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<10>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<10>(DEVCB_##_write); #define MCFG_TMS9901_P11_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<11>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<11>(DEVCB_##_write); #define MCFG_TMS9901_P12_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<12>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<12>(DEVCB_##_write); #define MCFG_TMS9901_P13_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<13>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<13>(DEVCB_##_write); #define MCFG_TMS9901_P14_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<14>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<14>(DEVCB_##_write); #define MCFG_TMS9901_P15_HANDLER( _write ) \ - devcb = &tms9901_device::static_set_p_callback<15>( *device, DEVCB_##_write ); + devcb = &downcast<tms9901_device &>(*device).set_p_callback<15>(DEVCB_##_write); #define MCFG_TMS9901_INTLEVEL_HANDLER( _intlevel ) \ - devcb = &tms9901_device::static_set_intlevel_callback( *device, DEVCB_##_intlevel ); + devcb = &downcast<tms9901_device &>(*device).set_intlevel_callback(DEVCB_##_intlevel); #endif // MAME_MACHINE_TMS9901_H |