diff options
author | 2010-01-18 09:34:43 +0000 | |
---|---|---|
committer | 2010-01-18 09:34:43 +0000 | |
commit | e738b79785852050ce8b83e369a7fc4dd46a071b (patch) | |
tree | 1ac39e9f40790b375c57fea4e5d56ca8d132babc /src/emu/cpu/i86/i286.c | |
parent | 3f87f47a2ecdccb9d9627d0d52b76f262becb949 (diff) |
Correct a long-standing design flaw: device configuration state
is now separate from runtime device state. I have larger plans
for devices, so there is some temporary scaffolding to hold
everything together, but this first step does separate things
out.
There is a new class 'running_device' which represents the
state of a live device. A list of these running_devices sits
in machine->devicelist and is created when a running_machine
is instantiated.
To access the configuration state, use device->baseconfig()
which returns a reference to the configuration.
The list of running_devices in machine->devicelist has a 1:1
correspondance with the list of device configurations in
machine->config->devicelist, and most navigation options work
equally on either (scanning by class, type, etc.)
For the most part, drivers will now deal with running_device
objects instead of const device_config objects. In fact, in
order to do this patch, I did the following global search &
replace:
const device_config -> running_device
device->static_config -> device->baseconfig().static_config
device->inline_config -> device->baseconfig().inline_config
and then fixed up the compiler errors that fell out.
Some specifics:
Removed device_get_info_* functions and replaced them with
methods called get_config_*.
Added methods for get_runtime_* to access runtime state from
the running_device.
DEVICE_GET_INFO callbacks are only passed a device_config *.
This means they have no access to the token or runtime state
at all. For most cases this is fine.
Added new DEVICE_GET_RUNTIME_INFO callback that is passed
the running_device for accessing data that is live at runtime.
In the future this will go away to make room for a cleaner
mechanism.
Cleaned up the handoff of memory regions from the memory
subsystem to the devices.
Diffstat (limited to 'src/emu/cpu/i86/i286.c')
-rw-r--r-- | src/emu/cpu/i86/i286.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/cpu/i86/i286.c b/src/emu/cpu/i86/i286.c index 30756a28094..1bc0634b6fc 100644 --- a/src/emu/cpu/i86/i286.c +++ b/src/emu/cpu/i86/i286.c @@ -58,7 +58,7 @@ struct _i80286_state UINT8 rights; } ldtr, tr; cpu_irq_callback irq_callback; - const device_config *device; + running_device *device; const address_space *program; const address_space *io; INT32 AuxVal, OverVal, SignVal, ZeroVal, CarryVal, DirVal; /* 0 or non-0 valued flags */ @@ -81,7 +81,7 @@ struct _i80286_state UINT16 eo; /* HJB 12/13/98 effective offset of the address (before segment is added) */ }; -INLINE i80286_state *get_safe_token(const device_config *device) +INLINE i80286_state *get_safe_token(running_device *device) { assert(device != NULL); assert(device->token != NULL); @@ -298,8 +298,8 @@ static CPU_INIT( i80286 ) cpustate->io = device->space(AS_IO); /* If a reset parameter is given, take it as pointer to an address mask */ - if( device->static_config ) - cpustate->amask = *(unsigned*)device->static_config; + if( device->baseconfig().static_config ) + cpustate->amask = *(unsigned*)device->baseconfig().static_config; else cpustate->amask = 0x00ffff; |