diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/c64/16kb.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/c64/16kb.cpp')
-rw-r--r-- | src/devices/bus/c64/16kb.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/devices/bus/c64/16kb.cpp b/src/devices/bus/c64/16kb.cpp index 4b497f88591..4b23cb663f7 100644 --- a/src/devices/bus/c64/16kb.cpp +++ b/src/devices/bus/c64/16kb.cpp @@ -22,12 +22,13 @@ DEFINE_DEVICE_TYPE(C64_16KB, c64_16kb_cartridge_device, "c64_16kb", "C64 16KB EP // device_add_mconfig - add device configuration //------------------------------------------------- -void c64_16kb_cartridge_device::device_add_mconfig(machine_config &config) -{ - GENERIC_CARTSLOT(config, m_low, generic_linear_slot, nullptr, "rom,bin,80"); +MACHINE_CONFIG_START(c64_16kb_cartridge_device::device_add_mconfig) + MCFG_GENERIC_CARTSLOT_ADD("roml", generic_linear_slot, nullptr) + MCFG_GENERIC_EXTENSIONS("rom,bin,80") - GENERIC_CARTSLOT(config, m_high, generic_linear_slot, nullptr, "rom,bin,a0,e0"); -} + MCFG_GENERIC_CARTSLOT_ADD("romh", generic_linear_slot, nullptr) + MCFG_GENERIC_EXTENSIONS("rom,bin,a0,e0") +MACHINE_CONFIG_END //------------------------------------------------- @@ -98,15 +99,15 @@ void c64_16kb_cartridge_device::device_reset() // c64_cd_r - cartridge data read //------------------------------------------------- -uint8_t c64_16kb_cartridge_device::c64_cd_r(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) +uint8_t c64_16kb_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) { if (!roml) { - data = m_low->read_rom(offset & 0x1fff); + data = m_low->read_rom(space, offset & 0x1fff); } else if (!romh) { - data = m_high->read_rom(offset & 0x1fff); + data = m_high->read_rom(space, offset & 0x1fff); } return data; |