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/vic20/fe3.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/vic20/fe3.cpp')
-rw-r--r-- | src/devices/bus/vic20/fe3.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/devices/bus/vic20/fe3.cpp b/src/devices/bus/vic20/fe3.cpp index f008bec3cb8..57b7df49e91 100644 --- a/src/devices/bus/vic20/fe3.cpp +++ b/src/devices/bus/vic20/fe3.cpp @@ -140,7 +140,7 @@ void vic20_final_expansion_3_device::device_reset() // vic20_cd_r - cartridge data read //------------------------------------------------- -uint8_t vic20_final_expansion_3_device::vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +uint8_t vic20_final_expansion_3_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { switch (m_reg1 & REG1_MODE_MASK) { @@ -148,7 +148,7 @@ uint8_t vic20_final_expansion_3_device::vic20_cd_r(offs_t offset, uint8_t data, // read from ROM if (!blk5) { - data = m_flash_rom->read(get_address(0, 3, offset)); + data = m_flash_rom->read(space, get_address(0, 3, offset)); m_lockbit = 1; } @@ -170,19 +170,19 @@ uint8_t vic20_final_expansion_3_device::vic20_cd_r(offs_t offset, uint8_t data, // read from ROM if (!blk1 && !BLK1_HIDDEN) { - data = m_flash_rom->read(get_address(REG1_BANK, 0, offset)); + data = m_flash_rom->read(space, get_address(REG1_BANK, 0, offset)); } if (!blk2 && !BLK2_HIDDEN) { - data = m_flash_rom->read(get_address(REG1_BANK, 1, offset)); + data = m_flash_rom->read(space, get_address(REG1_BANK, 1, offset)); } if (!blk3 && !BLK3_HIDDEN) { - data = m_flash_rom->read(get_address(REG1_BANK, 2, offset)); + data = m_flash_rom->read(space, get_address(REG1_BANK, 2, offset)); } if (!blk5 && !BLK5_HIDDEN) { - data = m_flash_rom->read(get_address(REG1_BANK, 3, offset)); + data = m_flash_rom->read(space, get_address(REG1_BANK, 3, offset)); } // read from registers @@ -298,19 +298,19 @@ uint8_t vic20_final_expansion_3_device::vic20_cd_r(offs_t offset, uint8_t data, // read from ROM bank 0 or RAM bank 1 if (!blk1 && !BLK1_HIDDEN) { - data = (m_reg1 & REG1_BLK1) ? m_flash_rom->read(get_address(0, 0, offset)) : m_ram[get_address(1, 0, offset)]; + data = (m_reg1 & REG1_BLK1) ? m_flash_rom->read(space, get_address(0, 0, offset)) : m_ram[get_address(1, 0, offset)]; } if (!blk2 && !BLK2_HIDDEN) { - data = (m_reg1 & REG1_BLK2) ? m_flash_rom->read(get_address(0, 1, offset)) : m_ram[get_address(1, 1, offset)]; + data = (m_reg1 & REG1_BLK2) ? m_flash_rom->read(space, get_address(0, 1, offset)) : m_ram[get_address(1, 1, offset)]; } if (!blk3 && !BLK3_HIDDEN) { - data = (m_reg1 & REG1_BLK3) ? m_flash_rom->read(get_address(0, 2, offset)) : m_ram[get_address(1, 2, offset)]; + data = (m_reg1 & REG1_BLK3) ? m_flash_rom->read(space, get_address(0, 2, offset)) : m_ram[get_address(1, 2, offset)]; } if (!blk5 && !BLK5_HIDDEN) { - data = (m_reg1 & REG1_BLK5) ? m_flash_rom->read(get_address(0, 3, offset)) : m_ram[get_address(1, 3, offset)]; + data = (m_reg1 & REG1_BLK5) ? m_flash_rom->read(space, get_address(0, 3, offset)) : m_ram[get_address(1, 3, offset)]; } // read from registers @@ -330,19 +330,19 @@ uint8_t vic20_final_expansion_3_device::vic20_cd_r(offs_t offset, uint8_t data, // read from ROM if (!blk1 && !BLK1_HIDDEN) { - data = m_flash_rom->read(get_address(REG1_BANK, 0, offset)); + data = m_flash_rom->read(space, get_address(REG1_BANK, 0, offset)); } if (!blk2 && !BLK2_HIDDEN) { - data = m_flash_rom->read(get_address(REG1_BANK, 1, offset)); + data = m_flash_rom->read(space, get_address(REG1_BANK, 1, offset)); } if (!blk3 && !BLK3_HIDDEN) { - data = m_flash_rom->read(get_address(REG1_BANK, 2, offset)); + data = m_flash_rom->read(space, get_address(REG1_BANK, 2, offset)); } if (!blk5 && !BLK5_HIDDEN) { - data = m_flash_rom->read(get_address(REG1_BANK, 3, offset)); + data = m_flash_rom->read(space, get_address(REG1_BANK, 3, offset)); } // read from registers @@ -361,7 +361,7 @@ uint8_t vic20_final_expansion_3_device::vic20_cd_r(offs_t offset, uint8_t data, // vic20_cd_w - cartridge data write //------------------------------------------------- -void vic20_final_expansion_3_device::vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +void vic20_final_expansion_3_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { switch (m_reg1 & REG1_MODE_MASK) { @@ -551,19 +551,19 @@ void vic20_final_expansion_3_device::vic20_cd_w(offs_t offset, uint8_t data, int // write to ROM if (!blk1 && !BLK1_HIDDEN) { - m_flash_rom->write(get_address(REG1_BANK, 0, offset), data); + m_flash_rom->write(space, get_address(REG1_BANK, 0, offset), data); } if (!blk2 && !BLK2_HIDDEN) { - m_flash_rom->write(get_address(REG1_BANK, 1, offset), data); + m_flash_rom->write(space, get_address(REG1_BANK, 1, offset), data); } if (!blk3 && !BLK3_HIDDEN) { - m_flash_rom->write(get_address(REG1_BANK, 2, offset), data); + m_flash_rom->write(space, get_address(REG1_BANK, 2, offset), data); } if (!blk5 && !BLK5_HIDDEN) { - m_flash_rom->write(get_address(REG1_BANK, 3, offset), data); + m_flash_rom->write(space, get_address(REG1_BANK, 3, offset), data); } // write to registers |