diff options
Diffstat (limited to 'src/devices/bus/nes/nxrom.cpp')
-rw-r--r-- | src/devices/bus/nes/nxrom.cpp | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/src/devices/bus/nes/nxrom.cpp b/src/devices/bus/nes/nxrom.cpp index e78fd6d1527..352b7534250 100644 --- a/src/devices/bus/nes/nxrom.cpp +++ b/src/devices/bus/nes/nxrom.cpp @@ -145,9 +145,6 @@ void nes_nrom_device::common_start() save_item(NAME(m_nt_src)); save_item(NAME(m_nt_orig)); save_item(NAME(m_nt_writable)); - - // open bus - save_item(NAME(m_open_bus)); } void nes_nrom_device::pcb_reset() @@ -291,23 +288,23 @@ void nes_un1rom_device::pcb_reset() -------------------------------------------------*/ -READ8_MEMBER(nes_nrom368_device::read_l) +uint8_t nes_nrom368_device::read_l(offs_t offset) { LOG_MMC(("nrom368 read_l, offset: %04x\n", offset)); offset += 0x100; if (offset >= 0x800) return m_prg[offset - 0x800]; else - return m_open_bus; + return get_open_bus(); } -READ8_MEMBER(nes_nrom368_device::read_m) +uint8_t nes_nrom368_device::read_m(offs_t offset) { LOG_MMC(("nrom368 read_m, offset: %04x\n", offset)); return m_prg[0x1800 + (offset & 0x1fff)]; } -READ8_MEMBER(nes_nrom368_device::read_h) +uint8_t nes_nrom368_device::read_h(offs_t offset) { LOG_MMC(("nrom368 read_h, offset: %04x\n", offset)); return m_prg[0x3800 + (offset & 0x7fff)]; @@ -334,7 +331,7 @@ READ8_MEMBER(nes_nrom368_device::read_h) -------------------------------------------------*/ -WRITE8_MEMBER(nes_axrom_device::write_h) +void nes_axrom_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("axrom write_h, offset: %04x, data: %02x\n", offset, data)); @@ -355,7 +352,7 @@ WRITE8_MEMBER(nes_axrom_device::write_h) -------------------------------------------------*/ -WRITE8_MEMBER(nes_bxrom_device::write_h) +void nes_bxrom_device::write_h(offs_t offset, uint8_t data) { /* This portion of the mapper is nearly identical to Mapper 7, except no one-screen mirroring */ /* Deadly Towers is really a BxROM game - the demo screens look wrong using mapper 7. */ @@ -391,7 +388,7 @@ WRITE8_MEMBER(nes_bxrom_device::write_h) -------------------------------------------------*/ -WRITE8_MEMBER(nes_cnrom_device::write_h) +void nes_cnrom_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("cxrom write_h, offset: %04x, data: %02x\n", offset, data)); @@ -412,7 +409,7 @@ WRITE8_MEMBER(nes_cnrom_device::write_h) chr8(data, CHRROM); } -READ8_MEMBER(nes_cnrom_device::chr_r) +uint8_t nes_cnrom_device::chr_r(offs_t offset) { int bank = offset >> 10; @@ -421,7 +418,7 @@ READ8_MEMBER(nes_cnrom_device::chr_r) // give actual VROM content or open bus values. // For most boards, chr_open_bus remains always zero. if (m_chr_open_bus) - return m_open_bus; + return get_open_bus(); return m_chr_access[bank][offset & 0x3ff]; } @@ -441,7 +438,7 @@ READ8_MEMBER(nes_cnrom_device::chr_r) -------------------------------------------------*/ -WRITE8_MEMBER(nes_cprom_device::write_h) +void nes_cprom_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("cprom write_h, offset: %04x, data: %02x\n", offset, data)); @@ -462,7 +459,7 @@ WRITE8_MEMBER(nes_cprom_device::write_h) -------------------------------------------------*/ -WRITE8_MEMBER(nes_gxrom_device::write_h) +void nes_gxrom_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("gxrom write_h, offset %04x, data: %02x\n", offset, data)); @@ -488,7 +485,7 @@ WRITE8_MEMBER(nes_gxrom_device::write_h) -------------------------------------------------*/ -WRITE8_MEMBER(nes_uxrom_device::write_h) +void nes_uxrom_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("uxrom write_h, offset: %04x, data: %02x\n", offset, data)); @@ -514,7 +511,7 @@ WRITE8_MEMBER(nes_uxrom_device::write_h) -------------------------------------------------*/ -WRITE8_MEMBER(nes_uxrom_cc_device::write_h) +void nes_uxrom_cc_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("uxrom_cc write_h, offset: %04x, data: %02x\n", offset, data)); @@ -535,7 +532,7 @@ WRITE8_MEMBER(nes_uxrom_cc_device::write_h) -------------------------------------------------*/ -WRITE8_MEMBER(nes_un1rom_device::write_h) +void nes_un1rom_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("un1rom write_h, offset: %04x, data: %02x\n", offset, data)); @@ -558,7 +555,7 @@ WRITE8_MEMBER(nes_un1rom_device::write_h) -------------------------------------------------*/ -WRITE8_MEMBER(nes_nochr_device::chr_w) +void nes_nochr_device::chr_w(offs_t offset, uint8_t data) { int mirr = get_mirroring(); if (mirr == PPU_MIRROR_HIGH) @@ -569,7 +566,7 @@ WRITE8_MEMBER(nes_nochr_device::chr_w) m_ciram[offset & 0x7ff] = data; // not sure here, since there is no software to test... } -READ8_MEMBER(nes_nochr_device::chr_r) +uint8_t nes_nochr_device::chr_r(offs_t offset) { int mirr = get_mirroring(); if (mirr == PPU_MIRROR_HIGH) |