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/machine/msm6242.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/machine/msm6242.c')
-rw-r--r-- | src/emu/machine/msm6242.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/machine/msm6242.c b/src/emu/machine/msm6242.c index 2f84a309729..754a38f5566 100644 --- a/src/emu/machine/msm6242.c +++ b/src/emu/machine/msm6242.c @@ -33,7 +33,7 @@ typedef struct _msm6242_t msm6242_t; struct _msm6242_t { UINT8 reg[3]; - mame_system_time hold_time; + system_time hold_time; }; @@ -49,7 +49,7 @@ INLINE msm6242_t *get_safe_token(running_device *device) READ8_DEVICE_HANDLER( msm6242_r ) { - mame_system_time curtime, *systime = &curtime; + system_time curtime, *systime = &curtime; msm6242_t *msm6242 = get_safe_token(device); if (msm6242->reg[0] & 1) /* if HOLD is set, use the hold time */ @@ -58,7 +58,7 @@ READ8_DEVICE_HANDLER( msm6242_r ) } else /* otherwise, use the current time */ { - mame_get_current_datetime(device->machine, &curtime); + device->machine->current_datetime(curtime); } switch(offset) @@ -120,7 +120,7 @@ WRITE8_DEVICE_HANDLER( msm6242_w ) if (data & 1) /* was Hold set? */ { - mame_get_current_datetime(device->machine, &msm6242->hold_time); + device->machine->current_datetime(msm6242->hold_time); } return; @@ -157,7 +157,7 @@ static DEVICE_START( msm6242 ) msm6242->reg[0] = 0; msm6242->reg[1] = 0; msm6242->reg[2] = 0; - memset(&msm6242->hold_time, 0, sizeof(mame_system_time)); + memset(&msm6242->hold_time, 0, sizeof(system_time)); } |