summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/pci-ide.cpp
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2018-01-18 19:41:45 +0100
committer Olivier Galibert <galibert@pobox.com>2018-01-31 22:03:00 +0100
commit127cd08d4d8a7ebbd5e0cbe8239fa17c8dc9b20e (patch)
treeee4db1c2bfd942142669ab820a39f8417d0a0d9d /src/devices/machine/pci-ide.cpp
parent86d25d4d8dae418ef39b132e9f80cc9f781b96e1 (diff)
API change: Memory maps are now "last entry wins" [O. Galibert]
This allows for the much more natural "import another map and patch it" structure, or "cover a whole region then punch holes in it". Our previous first-entry-wins rule was always a surprise to newcomers, and oldcomers too.
Diffstat (limited to 'src/devices/machine/pci-ide.cpp')
-rw-r--r--src/devices/machine/pci-ide.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/machine/pci-ide.cpp b/src/devices/machine/pci-ide.cpp
index deaa2c1b944..636ce015cd0 100644
--- a/src/devices/machine/pci-ide.cpp
+++ b/src/devices/machine/pci-ide.cpp
@@ -17,13 +17,13 @@ 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)
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);
AM_RANGE(0x40, 0x5f) AM_READWRITE(pcictrl_r, pcictrl_w)
AM_RANGE(0x70, 0x77) AM_DEVREADWRITE("ide", bus_master_ide_controller_device, bmdma_r, bmdma_w) // PCI646
AM_RANGE(0x78, 0x7f) AM_DEVREADWRITE("ide2", bus_master_ide_controller_device, bmdma_r, bmdma_w) // PCI646
- AM_INHERIT_FROM(pci_device::config_map)
ADDRESS_MAP_END
DEVICE_ADDRESS_MAP_START(chan1_data_command_map, 32, ide_pci_device)