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/cpu/apexc | |
parent | 25472091b626bd01ef47f11389a4b2ebe0fc0008 (diff) |
destaticify initializations (nw) (#3289)
* destaticify initializations (nw)
* fix this->set_screen (nw)
Diffstat (limited to 'src/devices/cpu/apexc')
-rw-r--r-- | src/devices/cpu/apexc/apexc.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/devices/cpu/apexc/apexc.h b/src/devices/cpu/apexc/apexc.h index 46b45e7bc2c..daa42e8ddd8 100644 --- a/src/devices/cpu/apexc/apexc.h +++ b/src/devices/cpu/apexc/apexc.h @@ -7,10 +7,10 @@ #pragma once #define MCFG_APEXC_TAPE_READ_CB(_devcb) \ - devcb = &apexc_cpu_device::set_tape_read_cb(*device, DEVCB_##_devcb); + devcb = &downcast<apexc_cpu_device &>(*device).set_tape_read_cb(DEVCB_##_devcb); #define MCFG_APEXC_TAPE_PUNCH_CB(_devcb) \ - devcb = &apexc_cpu_device::set_tape_punch_cb(*device, DEVCB_##_devcb); + devcb = &downcast<apexc_cpu_device &>(*device).set_tape_punch_cb(DEVCB_##_devcb); enum { @@ -28,17 +28,9 @@ public: // construction/destruction apexc_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // static configuration - template<class Object> - static devcb_base &set_tape_read_cb(device_t &device, Object &&object) - { - return downcast<apexc_cpu_device &>(device).m_tape_read_cb.set_callback(std::forward<Object>(object)); - } - template<class Object> - static devcb_base &set_tape_punch_cb(device_t &device, Object &&object) - { - return downcast<apexc_cpu_device &>(device).m_tape_punch_cb.set_callback(std::forward<Object>(object)); - } + // configuration + template<class Object> devcb_base &set_tape_read_cb(Object &&object) { return m_tape_read_cb.set_callback(std::forward<Object>(object)); } + template<class Object> devcb_base &set_tape_punch_cb(Object &&object) { return m_tape_punch_cb.set_callback(std::forward<Object>(object)); } protected: // device-level overrides |