diff options
author | Aaron Giles <aaron@aarongiles.com> | 2010-01-18 09:34:43 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2010-01-18 09:34:43 +0000 |
commit | e738b79785852050ce8b83e369a7fc4dd46a071b (patch) | |
tree | 1ac39e9f40790b375c57fea4e5d56ca8d132babc /src/mame/audio/vicdual.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 '')
-rw-r--r-- | src/mame/audio/vicdual.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mame/audio/vicdual.c b/src/mame/audio/vicdual.c index 8cdcfb0712c..e44fe4cedb3 100644 --- a/src/mame/audio/vicdual.c +++ b/src/mame/audio/vicdual.c @@ -132,7 +132,7 @@ MACHINE_DRIVER_END static TIMER_CALLBACK( frogs_croak_callback ) { - const device_config *samples = devtag_get_device(machine, "samples"); + running_device *samples = devtag_get_device(machine, "samples"); sample_stop(samples, 2); } @@ -145,8 +145,8 @@ MACHINE_START( frogs_audio ) WRITE8_HANDLER( frogs_audio_w ) { - const device_config *samples = devtag_get_device(space->machine, "samples"); - const device_config *discrete = devtag_get_device(space->machine, "discrete"); + running_device *samples = devtag_get_device(space->machine, "samples"); + running_device *discrete = devtag_get_device(space->machine, "discrete"); static int last_croak = 0; static int last_buzzz = 0; int new_croak = data & 0x08; @@ -462,7 +462,7 @@ MACHINE_DRIVER_END WRITE8_HANDLER( headon_audio_w ) { - const device_config *discrete = devtag_get_device(space->machine, "discrete"); + running_device *discrete = devtag_get_device(space->machine, "discrete"); if (discrete == NULL) return; discrete_sound_w(discrete, HEADON_HISPEED_PC_EN, data & 0x01); @@ -477,7 +477,7 @@ WRITE8_HANDLER( headon_audio_w ) WRITE8_HANDLER( invho2_audio_w ) { - const device_config *discrete = devtag_get_device(space->machine, "discrete"); + running_device *discrete = devtag_get_device(space->machine, "discrete"); if (discrete == NULL) return; discrete_sound_w(discrete, HEADON_HISPEED_PC_EN, data & 0x10); |