summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/imagedev/bitbngr.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/imagedev/bitbngr.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/imagedev/bitbngr.c')
-rw-r--r--src/emu/imagedev/bitbngr.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/emu/imagedev/bitbngr.c b/src/emu/imagedev/bitbngr.c
index 1df8b0866f1..591a38d1032 100644
--- a/src/emu/imagedev/bitbngr.c
+++ b/src/emu/imagedev/bitbngr.c
@@ -386,7 +386,7 @@ static TIMER_CALLBACK(bitbanger_output_timer)
else
logerror("Bitbanger: Output framing error.\n" );
- timer_reset(bi->bitbanger_output_timer, attotime::never);
+ bi->bitbanger_output_timer->reset();
}
}
@@ -410,7 +410,7 @@ static TIMER_CALLBACK(bitbanger_input_timer)
{
/* no more data, wait and try again */
bi->idle_delay = min(bi->idle_delay + attotime::from_msec(100), attotime::from_seconds(1));
- timer_adjust_oneshot(bi->bitbanger_input_timer, bi->idle_delay, 0);
+ bi->bitbanger_input_timer->adjust(bi->idle_delay);
if( bi->mode == BITBANGER_MODEM )
@@ -423,7 +423,7 @@ static TIMER_CALLBACK(bitbanger_input_timer)
else
{
bi->idle_delay = bi->current_baud;
- timer_adjust_periodic(bi->bitbanger_input_timer, bi->idle_delay, 0, bi->idle_delay);
+ bi->bitbanger_input_timer->adjust(bi->idle_delay, 0, bi->idle_delay);
}
}
@@ -450,7 +450,7 @@ void bitbanger_output(device_t *device, int value)
bi->build_byte = 0;
one_point_five_baud = bi->current_baud + bi->current_baud / 2;
- timer_adjust_periodic(bi->bitbanger_output_timer, one_point_five_baud, 0, bi->current_baud);
+ bi->bitbanger_output_timer->adjust(one_point_five_baud, 0, bi->current_baud);
}
//fprintf(stderr,"%s, %d\n", device->machine->time().as_string(9), value);
@@ -468,8 +468,8 @@ static DEVICE_IMAGE_LOAD( bitbanger )
bitbanger_token *bi;
bi = get_token(device);
- timer_enable(bi->bitbanger_input_timer, TRUE);
- timer_adjust_periodic(bi->bitbanger_input_timer, attotime::zero, 0, attotime::from_seconds(1));
+ bi->bitbanger_input_timer->enable(true);
+ bi->bitbanger_input_timer->adjust(attotime::zero, 0, attotime::from_seconds(1));
/* we don't need to do anything special */
return IMAGE_INIT_PASS;
@@ -486,7 +486,7 @@ static DEVICE_IMAGE_UNLOAD( bitbanger )
bitbanger_token *bi;
bi = get_token(device);
- timer_enable(bi->bitbanger_input_timer, FALSE);
+ bi->bitbanger_input_timer->enable(false);
}