summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/pci-ide.cpp
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2018-02-01 10:04:01 +0100
committer Olivier Galibert <galibert@pobox.com>2018-02-12 10:04:52 +0100
commitc5219643162cb7d2a8688425a09008d28c8e2437 (patch)
treef2775ca3b1770ab0d3fb568f0bdd6d9212c68bf6 /src/devices/machine/pci-ide.cpp
parent09b6ce46873b38de9030a3c0378ff327f17af881 (diff)
API change: Memory maps are now methods of the owner class [O. Galibert]
Also, a lot more freedom happened, that's going to be more visible soon.
Diffstat (limited to 'src/devices/machine/pci-ide.cpp')
-rw-r--r--src/devices/machine/pci-ide.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/machine/pci-ide.cpp b/src/devices/machine/pci-ide.cpp
index 636ce015cd0..4e542850b2f 100644
--- a/src/devices/machine/pci-ide.cpp
+++ b/src/devices/machine/pci-ide.cpp
@@ -16,8 +16,8 @@ ide_pci_device::ide_pci_device(const machine_config &mconfig, const char *tag, d
{
}
-DEVICE_ADDRESS_MAP_START(config_map, 32, ide_pci_device)
- AM_INHERIT_FROM(pci_device::config_map)
+ADDRESS_MAP_START(ide_pci_device::config_map)
+ AM_IMPORT_FROM(pci_device::config_map)
AM_RANGE(0x08, 0x0b) AM_WRITE8(prog_if_w, 0x0000ff00)
AM_RANGE(0x10, 0x1f) AM_READWRITE(address_base_r, address_base_w)
AM_RANGE(0x2c, 0x2f) AM_WRITE(subsystem_id_w);
@@ -26,23 +26,23 @@ DEVICE_ADDRESS_MAP_START(config_map, 32, ide_pci_device)
AM_RANGE(0x78, 0x7f) AM_DEVREADWRITE("ide2", bus_master_ide_controller_device, bmdma_r, bmdma_w) // PCI646
ADDRESS_MAP_END
-DEVICE_ADDRESS_MAP_START(chan1_data_command_map, 32, ide_pci_device)
+ADDRESS_MAP_START(ide_pci_device::chan1_data_command_map)
AM_RANGE(0x0, 0x7) AM_DEVREADWRITE("ide", bus_master_ide_controller_device, read_cs0, write_cs0)
ADDRESS_MAP_END
-DEVICE_ADDRESS_MAP_START(chan1_control_map, 32, ide_pci_device)
+ADDRESS_MAP_START(ide_pci_device::chan1_control_map)
AM_RANGE(0x0, 0x3) AM_READWRITE(ide_read_cs1, ide_write_cs1)
ADDRESS_MAP_END
-DEVICE_ADDRESS_MAP_START(chan2_data_command_map, 32, ide_pci_device)
+ADDRESS_MAP_START(ide_pci_device::chan2_data_command_map)
AM_RANGE(0x0, 0x7) AM_DEVREADWRITE("ide2", bus_master_ide_controller_device, read_cs0, write_cs0)
ADDRESS_MAP_END
-DEVICE_ADDRESS_MAP_START(chan2_control_map, 32, ide_pci_device)
+ADDRESS_MAP_START(ide_pci_device::chan2_control_map)
AM_RANGE(0x0, 0x3) AM_READWRITE(ide2_read_cs1, ide2_write_cs1)
ADDRESS_MAP_END
-DEVICE_ADDRESS_MAP_START(bus_master_map, 32, ide_pci_device)
+ADDRESS_MAP_START(ide_pci_device::bus_master_map)
AM_RANGE(0x0, 0x7) AM_DEVREADWRITE("ide", bus_master_ide_controller_device, bmdma_r, bmdma_w)
AM_RANGE(0x8, 0xf) AM_DEVREADWRITE("ide2", bus_master_ide_controller_device, bmdma_r, bmdma_w)
ADDRESS_MAP_END