summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine/6840ptm.c
diff options
context:
space:
mode:
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
commitfeb6e77be3a63acc32b224d961becdfab1ae449c (patch)
tree55649d80e357ee0b31ae529c1f53be5989414fde /src/emu/machine/6840ptm.c
parentffeaa72e573f16d56df740adc8d8609061e8ae59 (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/6840ptm.c')
-rw-r--r--src/emu/machine/6840ptm.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c
index 26c1ec2c621..132597e36fe 100644
--- a/src/emu/machine/6840ptm.c
+++ b/src/emu/machine/6840ptm.c
@@ -138,7 +138,7 @@ void ptm6840_device::device_start()
for (int i = 0; i < 3; i++)
{
- timer_enable(m_timer[i], FALSE);
+ m_timer[i]->enable(false);
}
devcb_resolve_write_line(&m_irq_func, &m_config.m_irq_func, this);
@@ -299,7 +299,7 @@ void ptm6840_device::subtract_from_counter(int counter, int count)
duration *= m_t3_divisor;
}
- timer_adjust_oneshot(m_timer[counter], duration, 0);
+ m_timer[counter]->adjust(duration);
}
}
@@ -390,7 +390,7 @@ UINT16 ptm6840_device::compute_counter( int counter )
PLOG(("MC6840 #%s: %d external clock freq %f \n", tag(), counter, clock));
}
/* See how many are left */
- int remaining = (timer_timeleft(m_timer[counter]) * clock).as_double();
+ int remaining = (m_timer[counter]->remaining() * clock).as_double();
/* Adjust the count for dual byte mode */
if (m_control_reg[counter] & 0x04)
@@ -468,15 +468,15 @@ void ptm6840_device::reload_count(int idx)
if (!m_external_clock[idx])
{
m_enabled[idx] = 0;
- timer_enable(m_timer[idx],FALSE);
+ m_timer[idx]->enable(false);
}
}
else
#endif
{
m_enabled[idx] = 1;
- timer_adjust_oneshot(m_timer[idx], duration, 0);
- timer_enable(m_timer[idx], TRUE);
+ m_timer[idx]->adjust(duration);
+ m_timer[idx]->enable(true);
}
}
@@ -500,7 +500,7 @@ READ8_DEVICE_HANDLER_TRAMPOLINE(ptm6840, ptm6840_read)
case PTM_6840_STATUS:
{
- PLOG(("%s: MC6840 #%s: Status read = %04X\n", cpuexec_describe_context(&m_machine), tag(), m_status_reg));
+ PLOG(("%s: MC6840 #%s: Status read = %04X\n", m_machine.describe_context(), tag(), m_status_reg));
m_status_read_since_int |= m_status_reg & 0x07;
val = m_status_reg;
break;
@@ -522,7 +522,7 @@ READ8_DEVICE_HANDLER_TRAMPOLINE(ptm6840, ptm6840_read)
m_lsb_buffer = result & 0xff;
- PLOG(("%s: MC6840 #%s: Counter %d read = %04X\n", cpuexec_describe_context(&m_machine), tag(), idx, result >> 8));
+ PLOG(("%s: MC6840 #%s: Counter %d read = %04X\n", m_machine.describe_context(), tag(), idx, result >> 8));
val = result >> 8;
break;
}
@@ -582,7 +582,7 @@ WRITE8_DEVICE_HANDLER_TRAMPOLINE(ptm6840, ptm6840_write)
PLOG(("MC6840 #%s : Timer reset\n", tag()));
for (int i = 0; i < 3; i++)
{
- timer_enable(m_timer[i], FALSE);
+ m_timer[i]->enable(false);
m_enabled[i] = 0;
}
}
@@ -633,7 +633,7 @@ WRITE8_DEVICE_HANDLER_TRAMPOLINE(ptm6840, ptm6840_write)
reload_count(idx);
}
- PLOG(("%s:MC6840 #%s: Counter %d latch = %04X\n", cpuexec_describe_context(&m_machine), tag(), idx, m_latch[idx]));
+ PLOG(("%s:MC6840 #%s: Counter %d latch = %04X\n", m_machine.describe_context(), tag(), idx, m_latch[idx]));
break;
}
}
@@ -813,7 +813,7 @@ void ptm6840_device::ptm6840_set_ext_clock(int counter, double clock)
if (!m_external_clock[counter])
{
m_enabled[counter] = 0;
- timer_enable(m_timer[counter], FALSE);
+ m_timer[counter]->enable(false);
}
}
else
@@ -841,8 +841,8 @@ void ptm6840_device::ptm6840_set_ext_clock(int counter, double clock)
}
m_enabled[counter] = 1;
- timer_adjust_oneshot(m_timer[counter], duration, 0);
- timer_enable(m_timer[counter], TRUE);
+ m_timer[counter]->adjust(duration);
+ m_timer[counter]->enable(true);
}
}