diff options
author | 2011-02-06 21:23:00 +0000 | |
---|---|---|
committer | 2011-02-06 21:23:00 +0000 | |
commit | feb6e77be3a63acc32b224d961becdfab1ae449c (patch) | |
tree | 55649d80e357ee0b31ae529c1f53be5989414fde /src/emu/machine/pit8253.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/machine/pit8253.c')
-rw-r--r-- | src/emu/machine/pit8253.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/machine/pit8253.c b/src/emu/machine/pit8253.c index ab854eb38ff..050cd38eea0 100644 --- a/src/emu/machine/pit8253.c +++ b/src/emu/machine/pit8253.c @@ -608,13 +608,13 @@ static void simulate2(device_t *device, struct pit8253_timer *timer, INT64 elaps timer->cycles_to_output = cycles_to_output; if (cycles_to_output == CYCLES_NEVER || timer->clockin == 0) { - timer_adjust_oneshot(timer->updatetimer, attotime::never, timer->index); + timer->updatetimer->adjust(attotime::never, timer->index); } else { attotime next_fire_time = timer->last_updated + cycles_to_output * attotime::from_hz( timer->clockin ); - timer_adjust_oneshot(timer->updatetimer, next_fire_time - device->machine->time(), timer->index ); + timer->updatetimer->adjust(next_fire_time - device->machine->time(), timer->index ); } LOG2(("pit8253: simulate2(): simulating %d cycles for %d in mode %d, bcd = %d, phase = %d, gate = %d, output %d, value = 0x%04x, cycles_to_output = %04x\n", @@ -645,7 +645,7 @@ static void simulate(device_t *device, struct pit8253_timer *timer, INT64 elapse simulate2(device, timer, elapsed_cycles); else if ( timer->clockin ) - timer_adjust_oneshot(timer->updatetimer, attotime::from_hz( timer->clockin ), timer->index ); + timer->updatetimer->adjust(attotime::from_hz( timer->clockin ), timer->index ); } @@ -1082,7 +1082,7 @@ static void common_start( device_t *device, int device_type ) { /* initialize timer */ timer->clockin = pit8253->config->timer[timerno].clockin; timer->updatetimer = device->machine->scheduler().timer_alloc(FUNC(update_timer_cb), (void *)device); - timer_adjust_oneshot(timer->updatetimer, attotime::never, timerno); + timer->updatetimer->adjust(attotime::never, timerno); /* resolve callbacks */ devcb_resolve_read_line(&timer->in_gate_func, &pit8253->config->timer[timerno].in_gate_func, device); |