diff options
Diffstat (limited to 'src/emu/timer.h')
-rw-r--r-- | src/emu/timer.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/emu/timer.h b/src/emu/timer.h index c117c48084c..184131ca89c 100644 --- a/src/emu/timer.h +++ b/src/emu/timer.h @@ -14,8 +14,8 @@ #error Dont include this file directly; include emu.h instead. #endif -#ifndef __TIMER_H__ -#define __TIMER_H__ +#ifndef MAME_EMU_TIMER_H +#define MAME_EMU_TIMER_H @@ -24,7 +24,7 @@ //************************************************************************** // macros for a timer callback functions -#define TIMER_DEVICE_CALLBACK_MEMBER(name) void name(timer_device &timer, void *ptr, int32_t param) +#define TIMER_DEVICE_CALLBACK_MEMBER(name) void name(timer_device &timer, void *ptr, s32 param) //************************************************************************** // TIMER DEVICE CONFIGURATION MACROS @@ -73,7 +73,7 @@ class emu_timer; class timer_device; // a timer callbacks look like this -typedef device_delegate<void (timer_device &, void *, int32_t)> timer_device_expired_delegate; +typedef device_delegate<void (timer_device &, void *, s32)> timer_device_expired_delegate; // ======================> timer_device @@ -81,7 +81,7 @@ class timer_device : public device_t { public: // construction/destruction - timer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + timer_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); // inline configuration helpers static void static_configure_generic(device_t &device, timer_device_expired_delegate callback); @@ -104,7 +104,7 @@ public: // adjustments void reset() { adjust(attotime::never, 0, attotime::never); } - void adjust(const attotime &duration, int32_t param = 0, const attotime &period = attotime::never) const { assert(m_type == TIMER_TYPE_GENERIC); m_timer->adjust(duration, param, period); } + void adjust(const attotime &duration, s32 param = 0, const attotime &period = attotime::never) const { assert(m_type == TIMER_TYPE_GENERIC); m_timer->adjust(duration, param, period); } // timing information attotime time_elapsed() const { return m_timer->elapsed(); } @@ -135,13 +135,13 @@ private: // periodic timers only attotime m_start_delay; // delay before the timer fires for the first time attotime m_period; // period of repeated timer firings - int32_t m_param; // the integer parameter passed to the timer callback + s32 m_param; // the integer parameter passed to the timer callback // scanline timers only const char * m_screen_tag; // the tag of the screen this timer tracks screen_device * m_screen; // pointer to the screen device - uint32_t m_first_vpos; // the first vertical scanline position the timer fires on - uint32_t m_increment; // the number of scanlines between firings + u32 m_first_vpos; // the first vertical scanline position the timer fires on + u32 m_increment; // the number of scanlines between firings // internal state emu_timer * m_timer; // the backing timer @@ -157,4 +157,4 @@ private: extern const device_type TIMER; -#endif /* __TIMER_H__ */ +#endif /* MAME_EMU_TIMER_H */ |