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/cpu/pps4/pps4.h | |
parent | 25472091b626bd01ef47f11389a4b2ebe0fc0008 (diff) |
destaticify initializations (nw) (#3289)
* destaticify initializations (nw)
* fix this->set_screen (nw)
Diffstat (limited to 'src/devices/cpu/pps4/pps4.h')
-rw-r--r-- | src/devices/cpu/pps4/pps4.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/cpu/pps4/pps4.h b/src/devices/cpu/pps4/pps4.h index fcf1d790756..de0bca60b1c 100644 --- a/src/devices/cpu/pps4/pps4.h +++ b/src/devices/cpu/pps4/pps4.h @@ -29,13 +29,13 @@ enum //************************************************************************** #define MCFG_PPS4_DISCRETE_INPUT_A_CB(_devcb) \ - devcb = &pps4_device::set_dia_cb(*device, DEVCB_##_devcb); + devcb = &downcast<pps4_device &>(*device).set_dia_cb(DEVCB_##_devcb); #define MCFG_PPS4_DISCRETE_INPUT_B_CB(_devcb) \ - devcb = &pps4_device::set_dib_cb(*device, DEVCB_##_devcb); + devcb = &downcast<pps4_device &>(*device).set_dib_cb(DEVCB_##_devcb); #define MCFG_PPS4_DISCRETE_OUTPUT_CB(_devcb) \ - devcb = &pps4_device::set_do_cb(*device, DEVCB_##_devcb); + devcb = &downcast<pps4_device &>(*device).set_do_cb(DEVCB_##_devcb); //************************************************************************** // DEVICE TYPE DEFINITIONS @@ -54,10 +54,10 @@ public: // construction/destruction pps4_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); - // static configuration helpers - template <class Object> static devcb_base &set_dia_cb(device_t &device, Object &&cb) { return downcast<pps4_device &>(device).m_dia_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_dib_cb(device_t &device, Object &&cb) { return downcast<pps4_device &>(device).m_dib_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_do_cb(device_t &device, Object &&cb) { return downcast<pps4_device &>(device).m_do_cb.set_callback(std::forward<Object>(cb)); } + // configuration helpers + template <class Object> devcb_base &set_dia_cb(Object &&cb) { return m_dia_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_dib_cb(Object &&cb) { return m_dib_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_do_cb(Object &&cb) { return m_do_cb.set_callback(std::forward<Object>(cb)); } DECLARE_READ16_MEMBER(address_bus_r); |