diff options
Diffstat (limited to 'src/devices/cpu/melps4/melps4.h')
-rw-r--r-- | src/devices/cpu/melps4/melps4.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/devices/cpu/melps4/melps4.h b/src/devices/cpu/melps4/melps4.h index c268d74e508..ae11114aecf 100644 --- a/src/devices/cpu/melps4/melps4.h +++ b/src/devices/cpu/melps4/melps4.h @@ -16,37 +16,37 @@ // K input or A/D input port, up to 16 pins #define MCFG_MELPS4_READ_K_CB(_devcb) \ - devcb = &melps4_cpu_device::set_read_k_callback(*device, DEVCB_##_devcb); + devcb = &downcast<melps4_cpu_device &>(*device).set_read_k_callback(DEVCB_##_devcb); // D discrete I/O port, up to 16 pins - offset 0-15 for bit, 16 for all pins clear #define MCFG_MELPS4_READ_D_CB(_devcb) \ - devcb = &melps4_cpu_device::set_read_d_callback(*device, DEVCB_##_devcb); + devcb = &downcast<melps4_cpu_device &>(*device).set_read_d_callback(DEVCB_##_devcb); #define MCFG_MELPS4_WRITE_D_CB(_devcb) \ - devcb = &melps4_cpu_device::set_write_d_callback(*device, DEVCB_##_devcb); + devcb = &downcast<melps4_cpu_device &>(*device).set_write_d_callback(DEVCB_##_devcb); // 8-bit S generic I/O port #define MCFG_MELPS4_READ_S_CB(_devcb) \ - devcb = &melps4_cpu_device::set_read_s_callback(*device, DEVCB_##_devcb); + devcb = &downcast<melps4_cpu_device &>(*device).set_read_s_callback(DEVCB_##_devcb); #define MCFG_MELPS4_WRITE_S_CB(_devcb) \ - devcb = &melps4_cpu_device::set_write_s_callback(*device, DEVCB_##_devcb); + devcb = &downcast<melps4_cpu_device &>(*device).set_write_s_callback(DEVCB_##_devcb); // 4-bit F generic I/O port #define MCFG_MELPS4_READ_F_CB(_devcb) \ - devcb = &melps4_cpu_device::set_read_f_callback(*device, DEVCB_##_devcb); + devcb = &downcast<melps4_cpu_device &>(*device).set_read_f_callback(DEVCB_##_devcb); #define MCFG_MELPS4_WRITE_F_CB(_devcb) \ - devcb = &melps4_cpu_device::set_write_f_callback(*device, DEVCB_##_devcb); + devcb = &downcast<melps4_cpu_device &>(*device).set_write_f_callback(DEVCB_##_devcb); // 4-bit G generic output port #define MCFG_MELPS4_WRITE_G_CB(_devcb) \ - devcb = &melps4_cpu_device::set_write_g_callback(*device, DEVCB_##_devcb); + devcb = &downcast<melps4_cpu_device &>(*device).set_write_g_callback(DEVCB_##_devcb); // 1-bit U generic output port #define MCFG_MELPS4_WRITE_U_CB(_devcb) \ - devcb = &melps4_cpu_device::set_write_u_callback(*device, DEVCB_##_devcb); + devcb = &downcast<melps4_cpu_device &>(*device).set_write_u_callback(DEVCB_##_devcb); // T timer I/O pin (use execute_set_input for reads) #define MCFG_MELPS4_WRITE_T_CB(_devcb) \ - devcb = &melps4_cpu_device::set_write_t_callback(*device, DEVCB_##_devcb); + devcb = &downcast<melps4_cpu_device &>(*device).set_write_t_callback(DEVCB_##_devcb); #define MELPS4_PORTD_CLR 16 @@ -100,18 +100,18 @@ enum class melps4_cpu_device : public cpu_device { public: - // static configuration helpers - template <class Object> static devcb_base &set_read_k_callback(device_t &device, Object &&cb) { return downcast<melps4_cpu_device &>(device).m_read_k.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_read_d_callback(device_t &device, Object &&cb) { return downcast<melps4_cpu_device &>(device).m_read_d.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_read_s_callback(device_t &device, Object &&cb) { return downcast<melps4_cpu_device &>(device).m_read_s.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_read_f_callback(device_t &device, Object &&cb) { return downcast<melps4_cpu_device &>(device).m_read_f.set_callback(std::forward<Object>(cb)); } - - template <class Object> static devcb_base &set_write_d_callback(device_t &device, Object &&cb) { return downcast<melps4_cpu_device &>(device).m_write_d.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_write_s_callback(device_t &device, Object &&cb) { return downcast<melps4_cpu_device &>(device).m_write_s.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_write_f_callback(device_t &device, Object &&cb) { return downcast<melps4_cpu_device &>(device).m_write_f.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_write_g_callback(device_t &device, Object &&cb) { return downcast<melps4_cpu_device &>(device).m_write_g.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_write_u_callback(device_t &device, Object &&cb) { return downcast<melps4_cpu_device &>(device).m_write_u.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_write_t_callback(device_t &device, Object &&cb) { return downcast<melps4_cpu_device &>(device).m_write_t.set_callback(std::forward<Object>(cb)); } + // configuration helpers + template <class Object> devcb_base &set_read_k_callback(Object &&cb) { return m_read_k.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_read_d_callback(Object &&cb) { return m_read_d.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_read_s_callback(Object &&cb) { return m_read_s.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_read_f_callback(Object &&cb) { return m_read_f.set_callback(std::forward<Object>(cb)); } + + template <class Object> devcb_base &set_write_d_callback(Object &&cb) { return m_write_d.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_write_s_callback(Object &&cb) { return m_write_s.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_write_f_callback(Object &&cb) { return m_write_f.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_write_g_callback(Object &&cb) { return m_write_g.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_write_u_callback(Object &&cb) { return m_write_u.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_write_t_callback(Object &&cb) { return m_write_t.set_callback(std::forward<Object>(cb)); } protected: // construction/destruction |