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/magic_formel.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/c64/magic_formel.cpp')
-rw-r--r-- | src/devices/bus/c64/magic_formel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp index 9ebadc5320b..7575320b765 100644 --- a/src/devices/bus/c64/magic_formel.cpp +++ b/src/devices/bus/c64/magic_formel.cpp @@ -206,7 +206,7 @@ void c64_magic_formel_cartridge_device::device_reset() // c64_cd_r - cartridge data read //------------------------------------------------- -uint8_t c64_magic_formel_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_magic_formel_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 (!romh) { @@ -227,7 +227,7 @@ uint8_t c64_magic_formel_cartridge_device::c64_cd_r(offs_t offset, uint8_t data, // c64_cd_w - cartridge data write //------------------------------------------------- -void c64_magic_formel_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_magic_formel_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 (!io1 && !m_ram_oe) { @@ -239,7 +239,7 @@ void c64_magic_formel_cartridge_device::c64_cd_w(offs_t offset, uint8_t data, in offs_t addr = (offset >> 6) & 0x03; uint8_t new_data = (BIT(data, 1) << 7) | (offset & 0x3f); - m_pia->write(addr, new_data); + m_pia->write(space, addr, new_data); } else if (offset == 0x0001) { |