diff options
author | 2019-03-26 11:13:37 +1100 | |
---|---|---|
committer | 2019-03-26 11:13:37 +1100 | |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /src/devices/bus/nes/jy.cpp | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (diff) |
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and
c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at
598cd5227223c3b04ca31f0dbc1981256d9ea3ff.
Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline. When things like this happen, it wastes
everyone's time. I really don't need this in a week when real work⢠is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
Diffstat (limited to 'src/devices/bus/nes/jy.cpp')
-rw-r--r-- | src/devices/bus/nes/jy.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/devices/bus/nes/jy.cpp b/src/devices/bus/nes/jy.cpp index 33c1e6e6cac..8a54624cd5a 100644 --- a/src/devices/bus/nes/jy.cpp +++ b/src/devices/bus/nes/jy.cpp @@ -144,14 +144,14 @@ void nes_jy_typea_device::pcb_reset() -------------------------------------------------*/ -READ8_MEMBER(nes_jy_typea_device::nt_r) +uint8_t nes_jy_typea_device::nt_r(offs_t offset) { int page = ((offset & 0xc00) >> 10); irq_clock(0, 2); return m_nt_access[page][offset & 0x3ff]; } -READ8_MEMBER(nes_jy_typea_device::chr_r) +uint8_t nes_jy_typea_device::chr_r(offs_t offset) { int bank = offset >> 10; irq_clock(0, 2); @@ -241,7 +241,7 @@ void nes_jy_typea_device::scanline_irq(int scanline, int vblank, int blanked) // 0x5000-0x5fff : sort of protection? -READ8_MEMBER(nes_jy_typea_device::read_l) +uint8_t nes_jy_typea_device::read_l(offs_t offset) { LOG_MMC(("JY Company write_m, offset: %04x\n", offset)); offset += 0x100; @@ -249,7 +249,7 @@ READ8_MEMBER(nes_jy_typea_device::read_l) if (offset >= 0x1000 && offset < 0x1800) { // bit6/bit7 DSW read - return m_open_bus & 0x3f; + return get_open_bus() & 0x3f; } if (offset >= 0x1800) @@ -262,10 +262,10 @@ READ8_MEMBER(nes_jy_typea_device::read_l) return m_latch; } - return m_open_bus; // open bus + return get_open_bus(); // open bus } -WRITE8_MEMBER(nes_jy_typea_device::write_l) +void nes_jy_typea_device::write_l(offs_t offset, uint8_t data) { LOG_MMC(("JY Company write_m, offset: %04x, data: %02x\n", offset, data)); offset += 0x100; @@ -282,14 +282,14 @@ WRITE8_MEMBER(nes_jy_typea_device::write_l) } // 0x6000-0x7fff : WRAM or open bus -READ8_MEMBER(nes_jy_typea_device::read_m) +uint8_t nes_jy_typea_device::read_m(offs_t offset) { LOG_MMC(("JY Company write_m, offset: %04x\n", offset)); if (m_reg[0] & 0x80) return m_prg[(m_bank_6000 & m_prg_mask) * 0x2000 + (offset & 0x1fff)]; - return m_open_bus; // open bus + return get_open_bus(); // open bus } @@ -425,7 +425,7 @@ void nes_jy_typea_device::update_banks(int reg) } -WRITE8_MEMBER(nes_jy_typea_device::write_h) +void nes_jy_typea_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("JY Company write_m, offset: %04x, data: %02x\n", offset, data)); @@ -569,7 +569,7 @@ void nes_jy_typec_device::update_mirror_typec() update_mirror_typea(); } -READ8_MEMBER(nes_jy_typec_device::chr_r) +uint8_t nes_jy_typec_device::chr_r(offs_t offset) { int bank = offset >> 10; |