diff options
author | Aaron Giles <aaron@aarongiles.com> | 2010-06-30 03:46:21 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2010-06-30 03:46:21 +0000 |
commit | 733b797a3dae6c89b11c9b3f3eaad68995f6ef09 (patch) | |
tree | 6fa31dcfd68bd9c4a34dd8f2c139d63c00d3e33e /src/emu/timer.c | |
parent | 2c549dad23fd5b5e8dc48e5a9c8f7790d17e697d (diff) |
Split mame.c into mame.c and machine.c, the latter containing the
running_machine definition and implementation.
Moved global machine-level operations and accessors into methods on the
running_machine class. For the most part, this doesn't affect drivers
except for a few occasional bits:
mame_get_phase() == machine->phase()
add_reset_callback() == machine->add_notifier(MACHINE_NOTIFY_RESET, ...)
add_exit_callback() == machine->add_notifier(MACHINE_NOTIFY_EXIT, ...)
mame_get_base_datetime() == machine->base_datetime()
mame_get_current_datetime() == machine->current_datetime()
Cleaned up the region_info class, removing most global region accessors
except for memory_region() and memory_region_length(). Again, this doesn't
generally affect drivers.
Diffstat (limited to 'src/emu/timer.c')
-rw-r--r-- | src/emu/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/timer.c b/src/emu/timer.c index 21b2999cc00..0faebed1468 100644 --- a/src/emu/timer.c +++ b/src/emu/timer.c @@ -123,7 +123,7 @@ INLINE attotime get_current_time(running_machine *machine) /* if we're executing as a particular CPU, use its local time as a base */ /* otherwise, return the global base time */ - device_execute_interface *execdevice = machine->scheduler.currently_executing(); + device_execute_interface *execdevice = machine->scheduler().currently_executing(); return (execdevice != NULL) ? execdevice->local_time() : global->exec.basetime; } @@ -704,7 +704,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 == global->activelist) - which->machine->scheduler.abort_timeslice(); + which->machine->scheduler().abort_timeslice(); } |