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/easyflash.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/c64/easyflash.cpp')
-rw-r--r-- | src/devices/bus/c64/easyflash.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/bus/c64/easyflash.cpp b/src/devices/bus/c64/easyflash.cpp index 38cdf9739c6..abdd891572f 100644 --- a/src/devices/bus/c64/easyflash.cpp +++ b/src/devices/bus/c64/easyflash.cpp @@ -114,17 +114,17 @@ void c64_easyflash_cartridge_device::device_reset() // c64_cd_r - cartridge data read //------------------------------------------------- -uint8_t c64_easyflash_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_easyflash_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) { offs_t addr = (m_bank << 13) | (offset & 0x1fff); - data = m_flash_roml->read(addr); + data = m_flash_roml->read(space, addr); } else if (!romh) { offs_t addr = (m_bank << 13) | (offset & 0x1fff); - data = m_flash_romh->read(addr); + data = m_flash_romh->read(space, addr); } else if (!io2) { @@ -139,17 +139,17 @@ uint8_t c64_easyflash_cartridge_device::c64_cd_r(offs_t offset, uint8_t data, in // c64_cd_w - cartridge data write //------------------------------------------------- -void c64_easyflash_cartridge_device::c64_cd_w(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) +void c64_easyflash_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) { if (!roml) { offs_t addr = (m_bank << 13) | (offset & 0x1fff); - m_flash_roml->write(addr, data); + m_flash_roml->write(space, addr, data); } else if (!romh) { offs_t addr = (m_bank << 13) | (offset & 0x1fff); - m_flash_romh->write(addr, data); + m_flash_romh->write(space, addr, data); } else if (!io1) { |