summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/alg.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/mame/drivers/alg.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/mame/drivers/alg.c')
-rw-r--r--src/mame/drivers/alg.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index 9a00e6eba76..e97430c1e06 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -131,7 +131,7 @@ static TIMER_CALLBACK( response_timer )
/* if there's more to come, set another timer */
if (laserdisc_line_r(state->laserdisc, LASERDISC_LINE_DATA_AVAIL) == ASSERT_LINE)
- timer_adjust_oneshot(state->serial_timer, amiga_get_serial_char_period(machine), 0);
+ state->serial_timer->adjust(amiga_get_serial_char_period(machine));
else
state->serial_timer_active = FALSE;
}
@@ -144,7 +144,7 @@ static void vsync_callback(running_machine *machine)
/* if we have data available, set a timer to read it */
if (!state->serial_timer_active && laserdisc_line_r(state->laserdisc, LASERDISC_LINE_DATA_AVAIL) == ASSERT_LINE)
{
- timer_adjust_oneshot(state->serial_timer, amiga_get_serial_char_period(machine), 0);
+ state->serial_timer->adjust(amiga_get_serial_char_period(machine));
state->serial_timer_active = TRUE;
}
}
@@ -160,7 +160,7 @@ static void serial_w(running_machine *machine, UINT16 data)
/* if we have data available, set a timer to read it */
if (!state->serial_timer_active && laserdisc_line_r(state->laserdisc, LASERDISC_LINE_DATA_AVAIL) == ASSERT_LINE)
{
- timer_adjust_oneshot(state->serial_timer, amiga_get_serial_char_period(machine), 0);
+ state->serial_timer->adjust(amiga_get_serial_char_period(machine));
state->serial_timer_active = TRUE;
}
}
@@ -245,7 +245,7 @@ static READ8_DEVICE_HANDLER( alg_cia_0_porta_r )
static READ8_DEVICE_HANDLER( alg_cia_0_portb_r )
{
- logerror("%s:alg_cia_0_portb_r\n", cpuexec_describe_context(device->machine));
+ logerror("%s:alg_cia_0_portb_r\n", device->machine->describe_context());
return 0xff;
}
@@ -253,20 +253,20 @@ static READ8_DEVICE_HANDLER( alg_cia_0_portb_r )
static WRITE8_DEVICE_HANDLER( alg_cia_0_portb_w )
{
/* parallel port */
- logerror("%s:alg_cia_0_portb_w(%02x)\n", cpuexec_describe_context(device->machine), data);
+ logerror("%s:alg_cia_0_portb_w(%02x)\n", device->machine->describe_context(), data);
}
static READ8_DEVICE_HANDLER( alg_cia_1_porta_r )
{
- logerror("%s:alg_cia_1_porta_r\n", cpuexec_describe_context(device->machine));
+ logerror("%s:alg_cia_1_porta_r\n", device->machine->describe_context());
return 0xff;
}
static WRITE8_DEVICE_HANDLER( alg_cia_1_porta_w )
{
- logerror("%s:alg_cia_1_porta_w(%02x)\n", cpuexec_describe_context(device->machine), data);
+ logerror("%s:alg_cia_1_porta_w(%02x)\n", device->machine->describe_context(), data);
}