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/74123.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/74123.c')
-rw-r--r-- | src/emu/machine/74123.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/emu/machine/74123.c b/src/emu/machine/74123.c index 5b90d9610c4..1ce5a435b9b 100644 --- a/src/emu/machine/74123.c +++ b/src/emu/machine/74123.c @@ -173,8 +173,8 @@ attotime ttl74123_device::compute_duration() int ttl74123_device::timer_running() { - return (timer_timeleft(m_timer) > attotime::zero) && - (timer_timeleft(m_timer) != attotime::never); + return (m_timer->remaining() > attotime::zero) && + (m_timer->remaining() != attotime::never); } @@ -239,9 +239,9 @@ void ttl74123_device::start_pulse() /* retriggering, but not if we are called to quickly */ attotime delay_time = attotime(0, ATTOSECONDS_PER_SECOND * m_config.m_cap * 220); - if(timer_timeelapsed(m_timer) >= delay_time) + if(m_timer->elapsed() >= delay_time) { - timer_adjust_oneshot(m_timer, duration, 0); + m_timer->adjust(duration); if (LOG) logerror("74123 %s: Retriggering pulse. Duration: %f\n", tag(), duration.as_double()); } @@ -253,7 +253,7 @@ void ttl74123_device::start_pulse() else { /* starting */ - timer_adjust_oneshot(m_timer, duration, 0); + m_timer->adjust(duration); set_output(); @@ -325,7 +325,7 @@ void ttl74123_device::clear_w(UINT8 data) } else if (!data) /* clear the output */ { - timer_adjust_oneshot(m_timer, attotime::zero, 0); + m_timer->adjust(attotime::zero); if (LOG) logerror("74123 #%s: Cleared\n", tag() ); } |