diff options
Diffstat (limited to 'src/emu/diexec.h')
-rw-r--r-- | src/emu/diexec.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/emu/diexec.h b/src/emu/diexec.h index 3a5cc0405f9..4fd379b5dae 100644 --- a/src/emu/diexec.h +++ b/src/emu/diexec.h @@ -71,12 +71,13 @@ enum // MACROS //************************************************************************** +#define TIMER_CALLBACK(name) void name(running_machine &machine, void *ptr, int param) +#define TIMER_CALLBACK_MEMBER(name) void name(void *ptr, INT32 param) + // IRQ callback to be called by device implementations when an IRQ is actually taken -#define IRQ_CALLBACK(func) int func(device_t *device, int irqline) #define IRQ_CALLBACK_MEMBER(func) int func(device_t &device, int irqline) // interrupt generator callback called as a VBLANK or periodic interrupt -#define INTERRUPT_GEN(func) void func(device_t *device) #define INTERRUPT_GEN_MEMBER(func) void func(device_t &device) @@ -246,8 +247,7 @@ protected: int m_qindex; // index within the queue private: - static void static_empty_event_queue(running_machine &machine, void *ptr, int param); - void empty_event_queue(); + TIMER_CALLBACK_MEMBER(empty_event_queue); }; // scheduler @@ -292,12 +292,11 @@ protected: private: // callbacks - static void static_timed_trigger_callback(running_machine &machine, void *ptr, int param); + TIMER_CALLBACK_MEMBER(timed_trigger_callback); void on_vblank(screen_device &screen, bool vblank_state); - static void static_trigger_periodic_interrupt(running_machine &machine, void *ptr, int param); - void trigger_periodic_interrupt(); + TIMER_CALLBACK_MEMBER(trigger_periodic_interrupt); void suspend_resume_changed(); attoseconds_t minimum_quantum() const; |