From 3b923d59ccb8d2d8e386392518450006f8e644fe Mon Sep 17 00:00:00 2001 From: wilbertpol Date: Sat, 3 Mar 2018 18:18:08 +0100 Subject: destaticify initializations (nw) (#3289) * destaticify initializations (nw) * fix this->set_screen (nw) --- src/devices/machine/1mb5.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/devices/machine/1mb5.h') diff --git a/src/devices/machine/1mb5.h b/src/devices/machine/1mb5.h index 3350e4a968c..9c7c76eab3e 100644 --- a/src/devices/machine/1mb5.h +++ b/src/devices/machine/1mb5.h @@ -14,16 +14,16 @@ #pragma once #define MCFG_1MB5_IRL_HANDLER(_devcb) \ - devcb = &hp_1mb5_device::set_irl_handler(*device , DEVCB_##_devcb); + devcb = &downcast(*device).set_irl_handler(DEVCB_##_devcb); #define MCFG_1MB5_HALT_HANDLER(_devcb) \ - devcb = &hp_1mb5_device::set_halt_handler(*device , DEVCB_##_devcb); + devcb = &downcast(*device).set_halt_handler(DEVCB_##_devcb); #define MCFG_1MB5_RESET_HANDLER(_devcb) \ - devcb = &hp_1mb5_device::set_reset_handler(*device , DEVCB_##_devcb); + devcb = &downcast(*device).set_reset_handler(DEVCB_##_devcb); #define MCFG_1MB5_INT_HANDLER(_devcb) \ - devcb = &hp_1mb5_device::set_int_handler(*device , DEVCB_##_devcb); + devcb = &downcast(*device).set_int_handler(DEVCB_##_devcb); class hp_1mb5_device : public device_t { @@ -32,10 +32,10 @@ public: hp_1mb5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // static configuration helpers - template static devcb_base &set_irl_handler(device_t &device, Object &&cb) { return downcast(device).m_irl_handler.set_callback(std::forward(cb)); } - template static devcb_base &set_halt_handler(device_t &device, Object &&cb) { return downcast(device).m_halt_handler.set_callback(std::forward(cb)); } - template static devcb_base &set_reset_handler(device_t &device, Object &&cb) { return downcast(device).m_reset_handler.set_callback(std::forward(cb)); } - template static devcb_base &set_int_handler(device_t &device, Object &&cb) { return downcast(device).m_int_handler.set_callback(std::forward(cb)); } + template devcb_base &set_irl_handler(Object &&cb) { return m_irl_handler.set_callback(std::forward(cb)); } + template devcb_base &set_halt_handler(Object &&cb) { return m_halt_handler.set_callback(std::forward(cb)); } + template devcb_base &set_reset_handler(Object &&cb) { return m_reset_handler.set_callback(std::forward(cb)); } + template devcb_base &set_int_handler(Object &&cb) { return m_int_handler.set_callback(std::forward(cb)); } // CPU access DECLARE_READ8_MEMBER(cpu_r); -- cgit v1.2.3-70-g09d2