summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/timer.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-11-10 07:42:09 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-11-10 07:42:09 +0000
commit92f305310513e310dcca7f5b1c3fe7ec2b197775 (patch)
tree26a4873c3e46ad13db9d1a92de2be5179754d95b /src/emu/timer.c
parent7c2bd582be58669e84d3bfd2c927401641a7fa80 (diff)
Major cpuintrf changes:
* added a set of cpu_* calls which accept a CPU device object; these are now the preferred means of manipulating a CPU * removed the cpunum_* calls; added an array of cpu[] to the running_machine object; converted all existing cpunum_* calls to cpu_* calls, pulling the CPU device object from the new array in the running_machine * removed the activecpu_* calls; added an activecpu member to the running_machine object; converted all existing activecpu_* calls to cpu_* calls, pulling the active CPU device object from the running_machine * changed cpuintrf_push_context() to cpu_push_context(), taking a CPU object pointer; changed cpuintrf_pop_context() to cpu_pop_context(); eventually these will go away * many other similar changes moving toward a model where all CPU references are done by the CPU object and not by index
Diffstat (limited to 'src/emu/timer.c')
-rw-r--r--src/emu/timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/timer.c b/src/emu/timer.c
index d4fb794cde6..c5f400ec9c1 100644
--- a/src/emu/timer.c
+++ b/src/emu/timer.c
@@ -147,7 +147,7 @@ INLINE attotime get_current_time(void)
return callback_timer_expire_time;
/* if we're executing as a particular CPU, use its local time as a base */
- activecpu = cpu_getactivecpu();
+ activecpu = cpunum_get_active();
if (activecpu >= 0)
return cpunum_get_localtime(activecpu);
@@ -734,7 +734,7 @@ void timer_adjust_periodic(emu_timer *which, attotime start_delay, INT32 param,
/* if this was inserted as the head, abort the current timeslice and resync */
LOG(("timer_adjust_oneshot %s.%s:%d to expire @ %s\n", which->file, which->func, which->line, attotime_string(which->expire, 9)));
- if (which == timer_head && cpu_getexecutingcpu() >= 0)
+ if (which == timer_head && cpunum_get_executing() >= 0)
activecpu_abort_timeslice();
}