diff options
Diffstat (limited to 'src/devices/bus/nes/mmc3.cpp')
-rw-r--r-- | src/devices/bus/nes/mmc3.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/devices/bus/nes/mmc3.cpp b/src/devices/bus/nes/mmc3.cpp index f8497dbd42d..d6f7f37dc4a 100644 --- a/src/devices/bus/nes/mmc3.cpp +++ b/src/devices/bus/nes/mmc3.cpp @@ -244,7 +244,7 @@ void nes_txrom_device::set_chr( uint8_t chr, int chr_base, int chr_mask ) chr_cb(chr_page ^ 7, chr_base | (m_mmc_vrom_bank[5] & chr_mask), chr); } -WRITE8_MEMBER(nes_txrom_device::txrom_write) +void nes_txrom_device::txrom_write(offs_t offset, uint8_t data) { uint8_t mmc_helper, cmd; @@ -313,7 +313,7 @@ WRITE8_MEMBER(nes_txrom_device::txrom_write) } } -WRITE8_MEMBER(nes_txrom_device::write_m) +void nes_txrom_device::write_m(offs_t offset, uint8_t data) { LOG_MMC(("txrom write_m, offset: %04x, data: %02x\n", offset, data)); @@ -326,7 +326,7 @@ WRITE8_MEMBER(nes_txrom_device::write_m) } } -READ8_MEMBER(nes_txrom_device::read_m) +uint8_t nes_txrom_device::read_m(offs_t offset) { LOG_MMC(("txrom read_m, offset: %04x\n", offset)); @@ -338,7 +338,7 @@ READ8_MEMBER(nes_txrom_device::read_m) return m_prgram[offset & (m_prgram.size() - 1)]; } - return m_open_bus; // open bus + return get_open_bus(); // open bus } @@ -350,7 +350,7 @@ READ8_MEMBER(nes_txrom_device::read_m) -------------------------------------------------*/ -WRITE8_MEMBER(nes_hkrom_device::write_m) +void nes_hkrom_device::write_m(offs_t offset, uint8_t data) { uint8_t write_hi, write_lo; LOG_MMC(("hkrom write_m, offset: %04x, data: %02x\n", offset, data)); @@ -369,15 +369,15 @@ WRITE8_MEMBER(nes_hkrom_device::write_m) m_mmc6_ram[offset & 0x3ff] = data; } -READ8_MEMBER(nes_hkrom_device::read_m) +uint8_t nes_hkrom_device::read_m(offs_t offset) { LOG_MMC(("hkrom read_m, offset: %04x\n", offset)); if (offset < 0x1000) - return m_open_bus; // open bus + return get_open_bus(); // open bus if (!(m_mmc6_reg & 0xa0)) - return m_open_bus; // open bus + return get_open_bus(); // open bus if (BIT(offset, 9) && BIT(m_mmc6_reg, 7)) // access to upper half of 1k when upper read is enabled return m_mmc6_ram[offset & 0x3ff]; @@ -389,7 +389,7 @@ READ8_MEMBER(nes_hkrom_device::read_m) return 0x00; } -WRITE8_MEMBER(nes_hkrom_device::write_h) +void nes_hkrom_device::write_h(offs_t offset, uint8_t data) { uint8_t mmc6_helper; LOG_MMC(("hkrom write_h, offset: %04x, data: %02x\n", offset, data)); @@ -423,7 +423,7 @@ WRITE8_MEMBER(nes_hkrom_device::write_h) break; default: - txrom_write(space, offset, data, mem_mask); + txrom_write(offset, data); break; } } @@ -465,7 +465,7 @@ void nes_txsrom_device::chr_cb( int start, int bank, int source ) chr1_x(start, bank, source); } -WRITE8_MEMBER(nes_txsrom_device::write_h) +void nes_txsrom_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("txsrom write_h, offset: %04x, data: %02x\n", offset, data)); @@ -475,7 +475,7 @@ WRITE8_MEMBER(nes_txsrom_device::write_h) break; default: - txrom_write(space, offset, data, mem_mask); + txrom_write(offset, data); break; } } @@ -524,7 +524,7 @@ void nes_tqrom_device::set_chr( uint8_t chr, int chr_base, int chr_mask ) -------------------------------------------------*/ -WRITE8_MEMBER(nes_qj_device::write_m) +void nes_qj_device::write_m(offs_t offset, uint8_t data) { LOG_MMC(("qj write_m, offset: %04x, data: %02x\n", offset, data)); @@ -546,7 +546,7 @@ WRITE8_MEMBER(nes_qj_device::write_m) -------------------------------------------------*/ -WRITE8_MEMBER(nes_zz_device::write_m) +void nes_zz_device::write_m(offs_t offset, uint8_t data) { uint8_t mmc_helper = data & 0x07; LOG_MMC(("zz write_m, offset: %04x, data: %02x\n", offset, data)); |