From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- src/devices/bus/snes/bsx.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/devices/bus/snes/bsx.cpp') diff --git a/src/devices/bus/snes/bsx.cpp b/src/devices/bus/snes/bsx.cpp index 6aacaa3ed2c..1f6efc1af6c 100644 --- a/src/devices/bus/snes/bsx.cpp +++ b/src/devices/bus/snes/bsx.cpp @@ -283,13 +283,13 @@ void sns_rom_bsx_device::access_update() } } -uint8_t sns_rom_bsx_device::read_l(offs_t offset) +READ8_MEMBER(sns_rom_bsx_device::read_l) { if (offset < 0x200000 && access_00_1f) { // 0x00-0x1f:0x8000-0xffff -> CART if (m_slot->m_cart && m_slot->m_cart->get_rom_size()) - return m_slot->m_cart->read_l(offset); + return m_slot->m_cart->read_l(space, offset); } if (offset >= 0x200000 && offset < 0x400000) { @@ -334,13 +334,13 @@ uint8_t sns_rom_bsx_device::read_l(offs_t offset) } -uint8_t sns_rom_bsx_device::read_h(offs_t offset) +READ8_MEMBER(sns_rom_bsx_device::read_h) { if (offset < 0x200000 && access_80_9f) { // 0x80-0x9f:0x8000-0xffff -> CART if (m_slot->m_cart && m_slot->m_cart->get_rom_size()) - return m_slot->m_cart->read_l(offset); + return m_slot->m_cart->read_l(space, offset); } // if not in any of the cases above... @@ -358,7 +358,7 @@ uint8_t sns_rom_bsx_device::read_h(offs_t offset) //return 0x00; } -void sns_rom_bsx_device::write_l(offs_t offset, uint8_t data) +WRITE8_MEMBER(sns_rom_bsx_device::write_l) { if (offset < 0x200000 && access_00_1f) { @@ -400,7 +400,7 @@ void sns_rom_bsx_device::write_l(offs_t offset, uint8_t data) } -void sns_rom_bsx_device::write_h(offs_t offset, uint8_t data) +WRITE8_MEMBER(sns_rom_bsx_device::write_h) { if (offset < 0x200000 && access_80_9f) { @@ -416,7 +416,7 @@ void sns_rom_bsx_device::write_h(offs_t offset, uint8_t data) } -uint8_t sns_rom_bsx_device::chip_read(offs_t offset) +READ8_MEMBER(sns_rom_bsx_device::chip_read) { if ((offset & 0xffff) >= 0x2188 && (offset & 0xffff) < 0x21a0) return m_base_unit->read(offset & 0xffff); @@ -435,7 +435,7 @@ uint8_t sns_rom_bsx_device::chip_read(offs_t offset) return 0x00; } -void sns_rom_bsx_device::chip_write(offs_t offset, uint8_t data) +WRITE8_MEMBER(sns_rom_bsx_device::chip_write) { if ((offset & 0xffff) >= 0x2188 && (offset & 0xffff) < 0x21a0) m_base_unit->write(offset & 0xffff, data); @@ -457,7 +457,7 @@ void sns_rom_bsx_device::chip_write(offs_t offset, uint8_t data) // LoROM cart w/BS-X slot -uint8_t sns_rom_bsxlo_device::read_l(offs_t offset) +READ8_MEMBER(sns_rom_bsxlo_device::read_l) { if (offset < 0x400000) { @@ -469,7 +469,7 @@ uint8_t sns_rom_bsxlo_device::read_l(offs_t offset) return 0x00; } -uint8_t sns_rom_bsxlo_device::read_h(offs_t offset) +READ8_MEMBER(sns_rom_bsxlo_device::read_h) { if (offset < 0x400000) { @@ -481,7 +481,7 @@ uint8_t sns_rom_bsxlo_device::read_h(offs_t offset) else if (offset < 0x700000) { if (m_slot->m_cart && m_slot->m_cart->get_rom_size()) - return m_slot->m_cart->read_h(offset); + return m_slot->m_cart->read_h(space, offset); } // RAM [70-7f] return 0x00; @@ -490,12 +490,12 @@ uint8_t sns_rom_bsxlo_device::read_h(offs_t offset) // HiROM cart w/BS-X slot -uint8_t sns_rom_bsxhi_device::read_l(offs_t offset) +READ8_MEMBER(sns_rom_bsxhi_device::read_l) { - return read_h(offset); + return read_h(space, offset); } -uint8_t sns_rom_bsxhi_device::read_h(offs_t offset) +READ8_MEMBER(sns_rom_bsxhi_device::read_h) { if (offset < 0x200000 && (offset & 0xffff) >= 0x8000) { @@ -505,7 +505,7 @@ uint8_t sns_rom_bsxhi_device::read_h(offs_t offset) if (offset >= 0x200000 && offset < 0x400000) { if (m_slot->m_cart && m_slot->m_cart->get_rom_size() && (offset & 0xffff) >= 0x8000) - return m_slot->m_cart->read_h(offset); + return m_slot->m_cart->read_h(space, offset); } if (offset >= 0x400000 && offset < 0x600000) { @@ -516,7 +516,7 @@ uint8_t sns_rom_bsxhi_device::read_h(offs_t offset) if (offset >= 0x600000) { if (m_slot->m_cart && m_slot->m_cart->get_rom_size()) - return m_slot->m_cart->read_h(offset); + return m_slot->m_cart->read_h(space, offset); } return 0xff; } @@ -530,18 +530,18 @@ uint8_t sns_rom_bsxhi_device::read_h(offs_t offset) // Hence, we use low read handler for ROM access in the 0x8000-0xffff range (i.e. mempack mapped as LoROM) and // hi read handler for ROM access in the 0x0000-0xffff range (i.e. mempack mapped as HiROM)... -uint8_t sns_rom_bsmempak_device::read_l(offs_t offset) +READ8_MEMBER(sns_rom_bsmempak_device::read_l) { int bank = offset / 0x10000; return m_rom[rom_bank_map[bank] * 0x8000 + (offset & 0x7fff)]; } -uint8_t sns_rom_bsmempak_device::read_h(offs_t offset) +READ8_MEMBER(sns_rom_bsmempak_device::read_h) { int bank = offset / 0x8000; return m_rom[rom_bank_map[bank] * 0x8000 + (offset & 0x7fff)]; } -void sns_rom_bsmempak_device::write_l(offs_t offset, uint8_t data) +WRITE8_MEMBER(sns_rom_bsmempak_device::write_l) { } -- cgit v1.2.3