diff options
author | Aaron Giles <aaron@aarongiles.com> | 2011-02-06 21:23:00 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2011-02-06 21:23:00 +0000 |
commit | feb6e77be3a63acc32b224d961becdfab1ae449c (patch) | |
tree | 55649d80e357ee0b31ae529c1f53be5989414fde /src/emu/timer.c | |
parent | ffeaa72e573f16d56df740adc8d8609061e8ae59 (diff) |
As promised, the bulk update of timer calls:
timer_adjust_oneshot(t,...) => t->adjust(...)
timer_adjust_periodic(t,...) => t->adjust(...)
timer_reset(t,...) => t->reset(...)
timer_enable(t,...) => t->enable(...)
timer_enabled(t) => t->enabled()
timer_get_param(t) => t->param()
timer_get_ptr(t) => t->ptr()
timer_set_param(t,...) => t->set_param(...)
timer_set_ptr(t) => t->set_ptr(...)
timer_timeelapsed(t) => t->elapsed()
timer_timeleft(t) => t->remaining()
timer_starttime(t) => t->start()
timer_firetime(t) => t->expire()
Also remove some stray legacy cpuexec* macros that were
lurking in schedule.h):
cpuexec_describe_context(m) => m->describe_context()
cpuexec_boost_interleave(m,...) => m->scheduler().boot_interleave(...)
cpuexec_trigger(m,...) => m->scheduler().trigger(...)
cpuexec_triggertime(m,...) => m->scheduler().trigger(...)
Specific regex'es used:
timer_adjust_oneshot( *)\(( *)([^,;]+), *
\3->adjust\1\(\2
timer_adjust_periodic( *)\(( *)([^,;]+), *
\3->adjust\1\(\2
(->adjust.*), *0( *)\)
\1\2\)
timer_reset( *)\(( *)([^,;]+), *
\3->reset\1\(\2
(->reset *\(.*)attotime::never
\1
timer_enable( *)\(( *)([^,;]+), *
\3->enable\1\(\2
timer_enabled( *)\(( *)([^,;)]+)\)
\3->enabled\1\(\2\)
timer_get_param( *)\(( *)([^,;)]+)\)
\3->param\1\(\2\)
timer_get_ptr( *)\(( *)([^,;)]+)\)
\3->ptr\1\(\2\)
timer_timeelapsed( *)\(( *)([^,;)]+)\)
\3->elapsed\1\(\2\)
timer_timeleft( *)\(( *)([^,;)]+)\)
\3->remaining\1\(\2\)
timer_starttime( *)\(( *)([^,;)]+)\)
\3->start\1\(\2\)
timer_firetime( *)\(( *)([^,;)]+)\)
\3->expire\1\(\2\)
timer_set_param( *)\(( *)([^,;]+), *
\3->set_param\1\(\2
timer_set_ptr( *)\(( *)([^,;]+), *
\3->set_ptr\1\(\2
cpuexec_describe_context( *)\(( *)([^,;)]+)\)
\3->describe_context\1\(\2\)
\&m_machine->describe_context
m_machine.describe_context
cpuexec_boost_interleave( *)\(( *)([^,;]+), *
\3->scheduler().boost_interleave\1\(\2
cpuexec_trigger( *)\(( *)([^,;]+), *
\3->scheduler().trigger\1\(\2
cpuexec_triggertime( *)\(( *)([^,;]+), *
\3->scheduler().trigger\1\(\2
Diffstat (limited to 'src/emu/timer.c')
-rw-r--r-- | src/emu/timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/timer.c b/src/emu/timer.c index 05f959ee95a..1d0e3af8525 100644 --- a/src/emu/timer.c +++ b/src/emu/timer.c @@ -314,7 +314,7 @@ void timer_device::device_reset() start_delay = m_config.m_start_delay; // allocate and start the backing timer - timer_adjust_periodic(m_timer, start_delay, m_config.m_param, period); + m_timer->adjust(start_delay, m_config.m_param, period); } break; } @@ -325,7 +325,7 @@ void timer_device::device_reset() // set the timer to to fire immediately m_first_time = true; - timer_adjust_oneshot(m_timer, attotime::zero, m_config.m_param); + m_timer->adjust(attotime::zero, m_config.m_param); break; } } @@ -370,7 +370,7 @@ void timer_device::device_timer(emu_timer &timer, device_timer_id id, int param, m_first_time = false; // adjust the timer - timer_adjust_oneshot(m_timer, m_screen->time_until_pos(next_vpos), 0); + m_timer->adjust(m_screen->time_until_pos(next_vpos)); break; } } |