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/bus/cgenie | |
parent | 25472091b626bd01ef47f11389a4b2ebe0fc0008 (diff) |
destaticify initializations (nw) (#3289)
* destaticify initializations (nw)
* fix this->set_screen (nw)
Diffstat (limited to 'src/devices/bus/cgenie')
-rw-r--r-- | src/devices/bus/cgenie/expansion/expansion.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/devices/bus/cgenie/expansion/expansion.h b/src/devices/bus/cgenie/expansion/expansion.h index 6c752efb331..cc7a6b04828 100644 --- a/src/devices/bus/cgenie/expansion/expansion.h +++ b/src/devices/bus/cgenie/expansion/expansion.h @@ -50,13 +50,13 @@ MCFG_DEVICE_SLOT_INTERFACE(cg_exp_slot_carts, nullptr, false) #define MCFG_CG_EXP_SLOT_INT_HANDLER(_devcb) \ - devcb = &cg_exp_slot_device::set_int_handler(*device, DEVCB_##_devcb); + devcb = &downcast<cg_exp_slot_device &>(*device).set_int_handler(DEVCB_##_devcb); #define MCFG_CG_EXP_SLOT_NMI_HANDLER(_devcb) \ - devcb = &cg_exp_slot_device::set_nmi_handler(*device, DEVCB_##_devcb); + devcb = &downcast<cg_exp_slot_device &>(*device).set_nmi_handler(DEVCB_##_devcb); #define MCFG_CG_EXP_SLOT_RESET_HANDLER(_devcb) \ - devcb = &cg_exp_slot_device::set_reset_handler(*device, DEVCB_##_devcb); + devcb = &downcast<cg_exp_slot_device &>(*device).set_reset_handler(DEVCB_##_devcb); //************************************************************************** @@ -76,14 +76,9 @@ public: void set_io_space(address_space *io); // callbacks - template <class Object> static devcb_base &set_int_handler(device_t &device, Object &&cb) - { return downcast<cg_exp_slot_device &>(device).m_int_handler.set_callback(std::forward<Object>(cb)); } - - template <class Object> static devcb_base &set_nmi_handler(device_t &device, Object &&cb) - { return downcast<cg_exp_slot_device &>(device).m_nmi_handler.set_callback(std::forward<Object>(cb)); } - - template <class Object> static devcb_base &set_reset_handler(device_t &device, Object &&cb) - { return downcast<cg_exp_slot_device &>(device).m_reset_handler.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_int_handler(Object &&cb) { return m_int_handler.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_nmi_handler(Object &&cb) { return m_nmi_handler.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_reset_handler(Object &&cb) { return m_reset_handler.set_callback(std::forward<Object>(cb)); } // called from cart device DECLARE_WRITE_LINE_MEMBER( int_w ) { m_int_handler(state); } |