summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/upd65031.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/upd65031.h')
-rw-r--r--src/mame/machine/upd65031.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mame/machine/upd65031.h b/src/mame/machine/upd65031.h
index c588922898f..f5c8e0e7cc0 100644
--- a/src/mame/machine/upd65031.h
+++ b/src/mame/machine/upd65031.h
@@ -18,22 +18,22 @@
//**************************************************************************
#define MCFG_UPD65031_KB_CALLBACK(_read) \
- devcb = &upd65031_device::set_kb_rd_callback(*device, DEVCB_##_read);
+ devcb = &downcast<upd65031_device &>(*device).set_kb_rd_callback(DEVCB_##_read);
#define MCFG_UPD65031_INT_CALLBACK(_write) \
- devcb = &upd65031_device::set_int_wr_callback(*device, DEVCB_##_write);
+ devcb = &downcast<upd65031_device &>(*device).set_int_wr_callback(DEVCB_##_write);
#define MCFG_UPD65031_NMI_CALLBACK(_write) \
- devcb = &upd65031_device::set_nmi_wr_callback(*device, DEVCB_##_write);
+ devcb = &downcast<upd65031_device &>(*device).set_nmi_wr_callback(DEVCB_##_write);
#define MCFG_UPD65031_SPKR_CALLBACK(_write) \
- devcb = &upd65031_device::set_spkr_wr_callback(*device, DEVCB_##_write);
+ devcb = &downcast<upd65031_device &>(*device).set_spkr_wr_callback(DEVCB_##_write);
#define MCFG_UPD65031_SCR_UPDATE_CB(_class, _method) \
- upd65031_device::set_screen_update_callback(*device, upd65031_screen_update_delegate(&_class::_method, #_class "::" #_method, this));
+ downcast<upd65031_device &>(*device).set_screen_update_callback(upd65031_screen_update_delegate(&_class::_method, #_class "::" #_method, this));
#define MCFG_UPD65031_MEM_UPDATE_CB(_class, _method) \
- upd65031_device::set_memory_update_callback(*device, upd65031_memory_update_delegate(&_class::_method, #_class "::" #_method, this));
+ downcast<upd65031_device &>(*device).set_memory_update_callback(upd65031_memory_update_delegate(&_class::_method, #_class "::" #_method, this));
//**************************************************************************
@@ -55,13 +55,13 @@ public:
// construction/destruction
upd65031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_kb_rd_callback(device_t &device, _Object object) { return downcast<upd65031_device &>(device).m_read_kb.set_callback(object); }
- template<class _Object> static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<upd65031_device &>(device).m_write_int.set_callback(object); }
- template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<upd65031_device &>(device).m_write_nmi.set_callback(object); }
- template<class _Object> static devcb_base &set_spkr_wr_callback(device_t &device, _Object object) { return downcast<upd65031_device &>(device).m_write_spkr.set_callback(object); }
+ template<class _Object> devcb_base &set_kb_rd_callback(_Object object) { return m_read_kb.set_callback(object); }
+ template<class _Object> devcb_base &set_int_wr_callback(_Object object) { return m_write_int.set_callback(object); }
+ template<class _Object> devcb_base &set_nmi_wr_callback(_Object object) { return m_write_nmi.set_callback(object); }
+ template<class _Object> devcb_base &set_spkr_wr_callback(_Object object) { return m_write_spkr.set_callback(object); }
- static void set_screen_update_callback(device_t &device, upd65031_screen_update_delegate callback) { downcast<upd65031_device &>(device).m_screen_update_cb = callback; }
- static void set_memory_update_callback(device_t &device, upd65031_memory_update_delegate callback) { downcast<upd65031_device &>(device).m_out_mem_cb = callback; }
+ void set_screen_update_callback(upd65031_screen_update_delegate callback) { m_screen_update_cb = callback; }
+ void set_memory_update_callback(upd65031_memory_update_delegate callback) { m_out_mem_cb = callback; }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );