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/sunsoft.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/sunsoft.cpp')
-rw-r--r-- | src/devices/bus/nes/sunsoft.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp index f62fa24e67d..be90e36e535 100644 --- a/src/devices/bus/nes/sunsoft.cpp +++ b/src/devices/bus/nes/sunsoft.cpp @@ -209,7 +209,7 @@ void nes_sunsoft_fme7_device::pcb_reset() -------------------------------------------------*/ -WRITE8_MEMBER(nes_sunsoft_1_device::write_m) +void nes_sunsoft_1_device::write_m(offs_t offset, uint8_t data) { LOG_MMC(("Sunsoft 1 write_m, offset: %04x, data: %02x\n", offset, data)); @@ -235,7 +235,7 @@ WRITE8_MEMBER(nes_sunsoft_1_device::write_m) // there are two 'variants' depending on hardwired or mapper ctrl mirroring -WRITE8_MEMBER(nes_sunsoft_2_device::write_h) +void nes_sunsoft_2_device::write_h(offs_t offset, uint8_t data) { uint8_t helper = (data & 0x07) | ((data & 0x80) ? 0x08 : 0x00); LOG_MMC(("Sunsoft 2 write_h, offset: %04x, data: %02x\n", offset, data)); @@ -282,7 +282,7 @@ void nes_sunsoft_3_device::device_timer(emu_timer &timer, device_timer_id id, in } } -WRITE8_MEMBER(nes_sunsoft_3_device::write_h) +void nes_sunsoft_3_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("Sunsoft 3 write_h, offset %04x, data: %02x\n", offset, data)); @@ -384,7 +384,7 @@ void nes_sunsoft_4_device::sun4_mirror( int mirror, int mirr0, int mirr1 ) } } -WRITE8_MEMBER(nes_sunsoft_4_device::sun4_write) +void nes_sunsoft_4_device::sun4_write(offs_t offset, uint8_t data) { LOG_MMC(("Sunsoft 4 write_h, offset %04x, data: %02x\n", offset, data)); @@ -424,7 +424,7 @@ WRITE8_MEMBER(nes_sunsoft_4_device::sun4_write) } } -WRITE8_MEMBER(nes_sunsoft_4_device::write_m) +void nes_sunsoft_4_device::write_m(offs_t offset, uint8_t data) { LOG_MMC(("Sunsoft 4 write_m, offset: %04x, data: %02x\n", offset, data)); @@ -434,7 +434,7 @@ WRITE8_MEMBER(nes_sunsoft_4_device::write_m) m_prgram[offset & (m_prgram.size() - 1)] = data; } -READ8_MEMBER(nes_sunsoft_4_device::read_m) +uint8_t nes_sunsoft_4_device::read_m(offs_t offset) { LOG_MMC(("Sunsoft 4 read_m, offset: %04x\n", offset)); @@ -443,7 +443,7 @@ READ8_MEMBER(nes_sunsoft_4_device::read_m) if (!m_prgram.empty() && m_wram_enable) return m_prgram[offset & (m_prgram.size() - 1)]; - return m_open_bus; // open bus + return get_open_bus(); // open bus } /*------------------------------------------------- @@ -475,7 +475,7 @@ void nes_sunsoft_fme7_device::device_timer(emu_timer &timer, device_timer_id id, } } -WRITE8_MEMBER(nes_sunsoft_fme7_device::fme7_write) +void nes_sunsoft_fme7_device::fme7_write(offs_t offset, uint8_t data) { LOG_MMC(("fme7_write, offset %04x, data: %02x\n", offset, data)); @@ -533,7 +533,7 @@ WRITE8_MEMBER(nes_sunsoft_fme7_device::fme7_write) } } -WRITE8_MEMBER(nes_sunsoft_fme7_device::write_m) +void nes_sunsoft_fme7_device::write_m(offs_t offset, uint8_t data) { uint8_t bank = m_wram_bank & 0x3f; LOG_MMC(("Sunsoft FME7 write_m, offset: %04x, data: %02x\n", offset, data)); @@ -549,7 +549,7 @@ WRITE8_MEMBER(nes_sunsoft_fme7_device::write_m) } } -READ8_MEMBER(nes_sunsoft_fme7_device::read_m) +uint8_t nes_sunsoft_fme7_device::read_m(offs_t offset) { uint8_t bank = m_wram_bank & 0x3f; LOG_MMC(("Sunsoft FME7 read_m, offset: %04x\n", offset)); @@ -564,7 +564,7 @@ READ8_MEMBER(nes_sunsoft_fme7_device::read_m) return m_prgram[((bank * 0x2000) + offset) & (m_prgram.size() - 1)]; } - return m_open_bus; // open bus + return get_open_bus(); // open bus } @@ -578,20 +578,20 @@ READ8_MEMBER(nes_sunsoft_fme7_device::read_m) -------------------------------------------------*/ -WRITE8_MEMBER(nes_sunsoft_5_device::write_h) +void nes_sunsoft_5_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("sunsoft 5 write_h, offset %04x, data: %02x\n", offset, data)); switch (offset & 0x6000) { case 0x4000: - m_ym2149->address_w(space, 0, data & 0x0f); + m_ym2149->address_w(data & 0x0f); break; case 0x6000: - m_ym2149->data_w(space, 0, data); + m_ym2149->data_w(data); break; default: - fme7_write(space, offset, data, mem_mask); + fme7_write(offset, data); break; } } |