diff options
author | 2019-03-26 11:13:37 +1100 | |
---|---|---|
committer | 2019-03-26 11:13:37 +1100 | |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /src/devices/bus/c64/easyflash.cpp | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (diff) |
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and
c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at
598cd5227223c3b04ca31f0dbc1981256d9ea3ff.
Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline. When things like this happen, it wastes
everyone's time. I really don't need this in a week when real work⢠is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
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 abdd891572f..38cdf9739c6 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(address_space &space, 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(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(space, addr); + data = m_flash_roml->read(addr); } else if (!romh) { offs_t addr = (m_bank << 13) | (offset & 0x1fff); - data = m_flash_romh->read(space, addr); + data = m_flash_romh->read(addr); } else if (!io2) { @@ -139,17 +139,17 @@ uint8_t c64_easyflash_cartridge_device::c64_cd_r(address_space &space, offs_t of // c64_cd_w - cartridge data write //------------------------------------------------- -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) +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) { if (!roml) { offs_t addr = (m_bank << 13) | (offset & 0x1fff); - m_flash_roml->write(space, addr, data); + m_flash_roml->write(addr, data); } else if (!romh) { offs_t addr = (m_bank << 13) | (offset & 0x1fff); - m_flash_romh->write(space, addr, data); + m_flash_romh->write(addr, data); } else if (!io1) { |