diff options
Diffstat (limited to 'src/devices/video/upd3301.h')
-rw-r--r-- | src/devices/video/upd3301.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/devices/video/upd3301.h b/src/devices/video/upd3301.h index 40deb120e05..554df8189b5 100644 --- a/src/devices/video/upd3301.h +++ b/src/devices/video/upd3301.h @@ -47,19 +47,19 @@ downcast<upd3301_device &>(*device).set_character_width(_value); #define MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(_class, _method) \ - downcast<upd3301_device &>(*device).set_display_callback(upd3301_device::draw_character_delegate(&_class::_method, #_class "::" #_method, this)); + downcast<upd3301_device &>(*device).set_display_callback(&_class::_method, #_class "::" #_method, this); #define MCFG_UPD3301_DRQ_CALLBACK(_write) \ - devcb = &downcast<upd3301_device &>(*device).set_drq_wr_callback(DEVCB_##_write); + downcast<upd3301_device &>(*device).set_drq_wr_callback(DEVCB_##_write); #define MCFG_UPD3301_INT_CALLBACK(_write) \ - devcb = &downcast<upd3301_device &>(*device).set_int_wr_callback(DEVCB_##_write); + downcast<upd3301_device &>(*device).set_int_wr_callback(DEVCB_##_write); #define MCFG_UPD3301_HRTC_CALLBACK(_write) \ - devcb = &downcast<upd3301_device &>(*device).set_hrtc_wr_callback(DEVCB_##_write); + downcast<upd3301_device &>(*device).set_hrtc_wr_callback(DEVCB_##_write); #define MCFG_UPD3301_VRTC_CALLBACK(_write) \ - devcb = &downcast<upd3301_device &>(*device).set_vrtc_wr_callback(DEVCB_##_write); + downcast<upd3301_device &>(*device).set_vrtc_wr_callback(DEVCB_##_write); @@ -80,12 +80,16 @@ public: upd3301_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); void set_character_width(int value) { m_width = value; } - template <typename Object> void set_display_callback(Object &&cb) { m_display_cb = std::forward<Object>(cb); } + template <typename... T> void set_display_callback(T &&... args) { m_display_cb = draw_character_delegate(std::forward<T>(args)...); } template <class Object> devcb_base &set_drq_wr_callback(Object &&cb) { return m_write_drq.set_callback(std::forward<Object>(cb)); } template <class Object> devcb_base &set_int_wr_callback(Object &&cb) { return m_write_int.set_callback(std::forward<Object>(cb)); } template <class Object> devcb_base &set_hrtc_wr_callback(Object &&cb) { return m_write_hrtc.set_callback(std::forward<Object>(cb)); } template <class Object> devcb_base &set_vrtc_wr_callback(Object &&cb) { return m_write_vrtc.set_callback(std::forward<Object>(cb)); } + auto drq_wr_callback() { return m_write_drq.bind(); } + auto int_wr_callback() { return m_write_int.bind(); } + auto hrtc_wr_callback() { return m_write_hrtc.bind(); } + auto vrtc_wr_callback() { return m_write_vrtc.bind(); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); |