diff options
Diffstat (limited to 'src/emu/diexec.h')
-rw-r--r-- | src/emu/diexec.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/diexec.h b/src/emu/diexec.h index 597f3186174..dd3c5c54727 100644 --- a/src/emu/diexec.h +++ b/src/emu/diexec.h @@ -86,7 +86,7 @@ enum #define MCFG_DEVICE_VBLANK_INT_DEVICE(_tag, _devtag, _class, _func) \ dynamic_cast<device_execute_interface &>(*device).set_vblank_int(device_interrupt_delegate(&_class::_func, #_class "::" #_func, _devtag, (_class *)nullptr), _tag); #define MCFG_DEVICE_VBLANK_INT_REMOVE() \ - dynamic_cast<device_execute_interface &>(*device).set_vblank_int(device_interrupt_delegate(), finder_base::DUMMY_TAG); + dynamic_cast<device_execute_interface &>(*device).set_vblank_int(device_interrupt_delegate(), nullptr); #define MCFG_DEVICE_PERIODIC_INT_DRIVER(_class, _func, _rate) \ dynamic_cast<device_execute_interface &>(*device).set_periodic_int(device_interrupt_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)nullptr), attotime::from_hz(_rate)); #define MCFG_DEVICE_PERIODIC_INT_DEVICE(_devtag, _class, _func, _rate) \ @@ -140,10 +140,10 @@ public: // inline configuration helpers void set_disable() { m_disabled = true; } - template <typename Object, typename T> void set_vblank_int(Object &&cb, T &&tag, int rate = 0) + template <typename Object> void set_vblank_int(Object &&cb, const char *tag, int rate = 0) { m_vblank_interrupt = std::forward<Object>(cb); - m_vblank_interrupt_screen.set_tag(std::forward<T>(tag)); + m_vblank_interrupt_screen = tag; } template <typename Object> void set_periodic_int(Object &&cb, const attotime &rate) { @@ -290,7 +290,7 @@ private: // configuration bool m_disabled; // disabled from executing? device_interrupt_delegate m_vblank_interrupt; // for interrupts tied to VBLANK - optional_device<screen_device> m_vblank_interrupt_screen; // the screen that causes the VBLANK interrupt + const char * m_vblank_interrupt_screen; // the screen that causes the VBLANK interrupt device_interrupt_delegate m_timed_interrupt; // for interrupts not tied to VBLANK attotime m_timed_interrupt_period; // period for periodic interrupts |