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/scmp | |
parent | 25472091b626bd01ef47f11389a4b2ebe0fc0008 (diff) |
destaticify initializations (nw) (#3289)
* destaticify initializations (nw)
* fix this->set_screen (nw)
Diffstat (limited to 'src/devices/cpu/scmp')
-rw-r--r-- | src/devices/cpu/scmp/scmp.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/devices/cpu/scmp/scmp.h b/src/devices/cpu/scmp/scmp.h index 1ca7c699af5..c77068d40b8 100644 --- a/src/devices/cpu/scmp/scmp.h +++ b/src/devices/cpu/scmp/scmp.h @@ -7,12 +7,12 @@ #define MCFG_SCMP_CONFIG(_flag_out_devcb, _sout_devcb, _sin_devcb, _sensea_devcb, _senseb_devcb, _halt_devcb) \ - scmp_device::set_flag_out_cb(*device, DEVCB_##_flag_out_devcb); \ - scmp_device::set_sout_cb(*device, DEVCB_##_sout_devcb); \ - scmp_device::set_sin_cb(*device, DEVCB_##_sin_devcb); \ - scmp_device::set_sensea_cb(*device, DEVCB_##_sensea_devcb); \ - scmp_device::set_senseb_cb(*device, DEVCB_##_senseb_devcb); \ - scmp_device::set_halt_cb(*device, DEVCB_##_halt_devcb); + downcast<scmp_device &>(*device).set_flag_out_cb(DEVCB_##_flag_out_devcb); \ + downcast<scmp_device &>(*device).set_sout_cb(DEVCB_##_sout_devcb); \ + downcast<scmp_device &>(*device).set_sin_cb(DEVCB_##_sin_devcb); \ + downcast<scmp_device &>(*device).set_sensea_cb( DEVCB_##_sensea_devcb); \ + downcast<scmp_device &>(*device).set_senseb_cb(DEVCB_##_senseb_devcb); \ + downcast<scmp_device &>(*device).set_halt_cb(DEVCB_##_halt_devcb); class scmp_device : public cpu_device @@ -21,13 +21,13 @@ public: // construction/destruction scmp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // static configuration helpers - template <class Object> static devcb_base &set_flag_out_cb(device_t &device, Object &&cb) { return downcast<scmp_device &>(device).m_flag_out_func.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_sout_cb(device_t &device, Object &&cb) { return downcast<scmp_device &>(device).m_sout_func.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_sin_cb(device_t &device, Object &&cb) { return downcast<scmp_device &>(device).m_sin_func.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_sensea_cb(device_t &device, Object &&cb) { return downcast<scmp_device &>(device).m_sensea_func.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_senseb_cb(device_t &device, Object &&cb) { return downcast<scmp_device &>(device).m_senseb_func.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_halt_cb(device_t &device, Object &&cb) { return downcast<scmp_device &>(device).m_halt_func.set_callback(std::forward<Object>(cb)); } + // configuration helpers + template <class Object> devcb_base &set_flag_out_cb(Object &&cb) { return m_flag_out_func.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_sout_cb(Object &&cb) { return m_sout_func.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_sin_cb(Object &&cb) { return m_sin_func.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_sensea_cb(Object &&cb) { return m_sensea_func.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_senseb_cb(Object &&cb) { return m_senseb_func.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_halt_cb(Object &&cb) { return m_halt_func.set_callback(std::forward<Object>(cb)); } protected: enum |