summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine/idectrl.h
diff options
context:
space:
mode:
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
commite738b79785852050ce8b83e369a7fc4dd46a071b (patch)
tree1ac39e9f40790b375c57fea4e5d56ca8d132babc /src/emu/machine/idectrl.h
parent3f87f47a2ecdccb9d9627d0d52b76f262becb949 (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/machine/idectrl.h')
-rw-r--r--src/emu/machine/idectrl.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/emu/machine/idectrl.h b/src/emu/machine/idectrl.h
index b67a5875f66..efe778cdb39 100644
--- a/src/emu/machine/idectrl.h
+++ b/src/emu/machine/idectrl.h
@@ -24,7 +24,7 @@
typedef struct _ide_config ide_config;
struct _ide_config
{
- void (*interrupt)(const device_config *device, int state);
+ void (*interrupt)(running_device *device, int state);
const char *master; /* name of master region (defaults to device tag) */
const char *slave; /* name of slave region (defaults to NULL) */
const char *bmcpu; /* name of bus master CPU */
@@ -55,18 +55,18 @@ struct _ide_config
FUNCTION PROTOTYPES
***************************************************************************/
-UINT8 *ide_get_features(const device_config *device);
+UINT8 *ide_get_features(running_device *device);
-void ide_set_master_password(const device_config *device, const UINT8 *password);
-void ide_set_user_password(const device_config *device, const UINT8 *password);
+void ide_set_master_password(running_device *device, const UINT8 *password);
+void ide_set_user_password(running_device *device, const UINT8 *password);
-void ide_set_gnet_readlock(const device_config *device, const UINT8 onoff);
+void ide_set_gnet_readlock(running_device *device, const UINT8 onoff);
-int ide_bus_r(const device_config *config, int select, int offset);
-void ide_bus_w(const device_config *config, int select, int offset, int data);
+int ide_bus_r(running_device *config, int select, int offset);
+void ide_bus_w(running_device *config, int select, int offset, int data);
-UINT32 ide_controller_r(const device_config *config, int reg, int size);
-void ide_controller_w(const device_config *config, int reg, int size, UINT32 data);
+UINT32 ide_controller_r(running_device *config, int reg, int size);
+void ide_controller_w(running_device *config, int reg, int size, UINT32 data);
READ32_DEVICE_HANDLER( ide_controller32_r );
WRITE32_DEVICE_HANDLER( ide_controller32_w );