diff options
author | 2014-03-19 14:46:10 +0000 | |
---|---|---|
committer | 2014-03-19 14:46:10 +0000 | |
commit | 3c81060f84e205128d128e67d828c9eb65fc5d3a (patch) | |
tree | b1d04bc80b5265d65b896fe59ea0ce96b6c47f80 /src/mess/machine/pc1512kb.h | |
parent | 5e0ddf29582970783c3d25dfabef090280170eec (diff) |
(MESS) Cleaned up devcb2. (nw)
Diffstat (limited to 'src/mess/machine/pc1512kb.h')
-rw-r--r-- | src/mess/machine/pc1512kb.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mess/machine/pc1512kb.h b/src/mess/machine/pc1512kb.h index 6451e407a29..cd5e79c4240 100644 --- a/src/mess/machine/pc1512kb.h +++ b/src/mess/machine/pc1512kb.h @@ -32,10 +32,11 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_PC1512_KEYBOARD_ADD(_clock, _data) \ - MCFG_DEVICE_ADD(PC1512_KEYBOARD_TAG, PC1512_KEYBOARD, 0) \ - downcast<pc1512_keyboard_device *>(device)->set_clock_callback(DEVCB2_##_clock); \ - downcast<pc1512_keyboard_device *>(device)->set_data_callback(DEVCB2_##_data); +#define MCFG_PC1512_KEYBOARD_CLOCK_CALLBACK(_write) \ + devcb = &pc1512_keyboard_device::set_clock_wr_callback(*device, DEVCB2_##_write); + +#define MCFG_PC1512_KEYBOARD_DATA_CALLBACK(_write) \ + devcb = &pc1512_keyboard_device::set_data_wr_callback(*device, DEVCB2_##_write); @@ -51,8 +52,8 @@ public: // construction/destruction pc1512_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _clock> void set_clock_callback(_clock clock) { m_write_clock.set_callback(clock); } - template<class _data> void set_data_callback(_data data) { m_write_data.set_callback(data); } + template<class _Object> static devcb2_base &set_clock_wr_callback(device_t &device, _Object object) { return downcast<pc1512_keyboard_device &>(device).m_write_clock.set_callback(object); } + template<class _Object> static devcb2_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<pc1512_keyboard_device &>(device).m_write_data.set_callback(object); } // optional information overrides virtual const rom_entry *device_rom_region() const; |