diff options
author | 2018-01-18 19:41:45 +0100 | |
---|---|---|
committer | 2018-01-31 22:03:00 +0100 | |
commit | 127cd08d4d8a7ebbd5e0cbe8239fa17c8dc9b20e (patch) | |
tree | ee4db1c2bfd942142669ab820a39f8417d0a0d9d /src/devices/machine/sis85c496.cpp | |
parent | 86d25d4d8dae418ef39b132e9f80cc9f781b96e1 (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/sis85c496.cpp')
-rw-r--r-- | src/devices/machine/sis85c496.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/devices/machine/sis85c496.cpp b/src/devices/machine/sis85c496.cpp index 2a1032a9161..7fad963a04f 100644 --- a/src/devices/machine/sis85c496.cpp +++ b/src/devices/machine/sis85c496.cpp @@ -20,17 +20,17 @@ DEFINE_DEVICE_TYPE(SIS85C496, sis85c496_host_device, "sis85c496", "SiS 85C496/497 chipset") DEVICE_ADDRESS_MAP_START(config_map, 32, sis85c496_host_device) + AM_INHERIT_FROM(pci_host_device::config_map) AM_RANGE(0x40, 0x43) AM_READWRITE8(dram_config_r, dram_config_w, 0x000000ff) AM_RANGE(0x44, 0x47) AM_READWRITE16(shadow_config_r, shadow_config_w, 0x0000ffff) AM_RANGE(0x58, 0x5b) AM_READWRITE8(smram_ctrl_r, smram_ctrl_w, 0x00ff0000) AM_RANGE(0xc8, 0xcb) AM_READWRITE(mailbox_r, mailbox_w) AM_RANGE(0xd0, 0xd3) AM_READWRITE8(bios_config_r, bios_config_w, 0x000000ff) AM_RANGE(0xd0, 0xd3) AM_READWRITE8(isa_decoder_r, isa_decoder_w, 0x0000ff00) - - AM_INHERIT_FROM(pci_host_device::config_map) ADDRESS_MAP_END DEVICE_ADDRESS_MAP_START(internal_io_map, 32, sis85c496_host_device) + AM_INHERIT_FROM(pci_host_device::io_configuration_access_map) AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8("dma8237_1", am9517a_device, read, write, 0xffffffff) AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8("pic8259_master", pic8259_device, read, write, 0xffffffff) AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8("pit8254", pit8254_device, read, write, 0xffffffff) @@ -41,8 +41,6 @@ DEVICE_ADDRESS_MAP_START(internal_io_map, 32, sis85c496_host_device) AM_RANGE(0x00a0, 0x00bf) AM_DEVREADWRITE8("pic8259_slave", pic8259_device, read, write, 0xffffffff) AM_RANGE(0x00c0, 0x00df) AM_READWRITE8(at_dma8237_2_r, at_dma8237_2_w, 0xffffffff); AM_RANGE(0x00e0, 0x00ef) AM_NOP - - AM_INHERIT_FROM(pci_host_device::io_configuration_access_map) ADDRESS_MAP_END MACHINE_CONFIG_START(sis85c496_host_device::device_add_mconfig) |