diff options
Diffstat (limited to 'src/devices/bus/nes/waixing.cpp')
-rw-r--r-- | src/devices/bus/nes/waixing.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/devices/bus/nes/waixing.cpp b/src/devices/bus/nes/waixing.cpp index 791779f0a76..3706d64b26e 100644 --- a/src/devices/bus/nes/waixing.cpp +++ b/src/devices/bus/nes/waixing.cpp @@ -433,7 +433,7 @@ void nes_waixing_a1_device::chr_cb(int start, int bank, int source) chr1_x(start, bank, chr_src); } -WRITE8_MEMBER(nes_waixing_a_device::waixing_write) +void nes_waixing_a_device::waixing_write(offs_t offset, uint8_t data) { LOG_MMC(("waixing_write, offset: %04x, data: %02x\n", offset, data)); @@ -447,12 +447,12 @@ WRITE8_MEMBER(nes_waixing_a_device::waixing_write) break; default: - txrom_write(space, offset, data, mem_mask); + txrom_write(offset, data); break; } } -READ8_MEMBER(nes_waixing_a_device::read_l) +uint8_t nes_waixing_a_device::read_l(offs_t offset) { LOG_MMC(("waixing read_l, offset: %04x\n", offset)); offset += 0x100; @@ -462,7 +462,7 @@ READ8_MEMBER(nes_waixing_a_device::read_l) return 0xff; } -WRITE8_MEMBER(nes_waixing_a_device::write_l) +void nes_waixing_a_device::write_l(offs_t offset, uint8_t data) { LOG_MMC(("waixing write_l, offset: %04x, data: %02x\n", offset, data)); offset += 0x100; @@ -597,7 +597,7 @@ void nes_waixing_f_device::set_prg( int prg_base, int prg_mask ) prg_cb(3, m_mmc_prg_bank[3]); } -WRITE8_MEMBER(nes_waixing_f_device::write_h) +void nes_waixing_f_device::write_h(offs_t offset, uint8_t data) { uint8_t cmd; LOG_MMC(("waixing_f write_h, offset: %04x, data: %02x\n", offset, data)); @@ -628,7 +628,7 @@ WRITE8_MEMBER(nes_waixing_f_device::write_h) break; default: - waixing_write(space, offset, data, mem_mask); + waixing_write(offset, data); break; } } @@ -668,7 +668,7 @@ void nes_waixing_g_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_waixing_g_device::write_h) +void nes_waixing_g_device::write_h(offs_t offset, uint8_t data) { uint8_t cmd; LOG_MMC(("waixing_g write_h, offset: %04x, data: %02x\n", offset, data)); @@ -699,7 +699,7 @@ WRITE8_MEMBER(nes_waixing_g_device::write_h) break; default: - waixing_write(space, offset, data, mem_mask); + waixing_write(offset, data); break; } } @@ -731,7 +731,7 @@ void nes_waixing_h_device::chr_cb(int start, int bank, int source) chr1_x(start, bank, source); } -WRITE8_MEMBER(nes_waixing_h_device::write_h) +void nes_waixing_h_device::write_h(offs_t offset, uint8_t data) { uint8_t cmd; LOG_MMC(("waixing_h write_h, offset: %04x, data: %02x\n", offset, data)); @@ -767,12 +767,12 @@ WRITE8_MEMBER(nes_waixing_h_device::write_h) break; default: - txrom_write(space, offset, data, mem_mask); + txrom_write(offset, data); break; } } -WRITE8_MEMBER(nes_waixing_h1_device::write_h) +void nes_waixing_h1_device::write_h(offs_t offset, uint8_t data) { uint8_t cmd; LOG_MMC(("waixing_h1 write_h, offset: %04x, data: %02x\n", offset, data)); @@ -805,7 +805,7 @@ WRITE8_MEMBER(nes_waixing_h1_device::write_h) break; default: - txrom_write(space, offset, data, mem_mask); + txrom_write(offset, data); break; } } @@ -832,7 +832,7 @@ void nes_waixing_j_device::set_prg( int prg_base, int prg_mask ) prg_cb(3, m_reg[3]); } -WRITE8_MEMBER(nes_waixing_j_device::write_h) +void nes_waixing_j_device::write_h(offs_t offset, uint8_t data) { uint8_t cmd; LOG_MMC(("waixing_f write_h, offset: %04x, data: %02x\n", offset, data)); @@ -862,7 +862,7 @@ WRITE8_MEMBER(nes_waixing_j_device::write_h) // break; default: - waixing_write(space, offset, data, mem_mask); + waixing_write(offset, data); break; } } @@ -887,7 +887,7 @@ void nes_waixing_sh2_device::chr_cb(int start, int bank, int source) chr4_4(m_reg[1], m_reg[1] ? CHRRAM : CHRROM); } -READ8_MEMBER(nes_waixing_sh2_device::chr_r) +uint8_t nes_waixing_sh2_device::chr_r(offs_t offset) { int bank = offset >> 10; uint8_t val = m_chr_access[bank][offset & 0x3ff]; // this would be usual return value @@ -940,7 +940,7 @@ void nes_waixing_sec_device::chr_cb(int start, int bank, int source) chr1_x(start, bank, source); } -WRITE8_MEMBER(nes_waixing_sec_device::write_l) +void nes_waixing_sec_device::write_l(offs_t offset, uint8_t data) { LOG_MMC(("waixing_sec write_l, offset: %04x, data: %02x\n", offset, data)); offset += 0x100; @@ -979,7 +979,7 @@ void nes_waixing_sgz_device::hblank_irq(int scanline, int vblank, int blanked) } } -WRITE8_MEMBER(nes_waixing_sgz_device::write_h) +void nes_waixing_sgz_device::write_h(offs_t offset, uint8_t data) { uint8_t helper, bank; LOG_MMC(("waixing_sgz write_h, offset: %04x, data: %02x\n", offset, data)); @@ -1047,7 +1047,7 @@ WRITE8_MEMBER(nes_waixing_sgz_device::write_h) -------------------------------------------------*/ -WRITE8_MEMBER(nes_waixing_sgzlz_device::write_l) +void nes_waixing_sgzlz_device::write_l(offs_t offset, uint8_t data) { LOG_MMC(("waixing_sgzlz write_l, offset: %04x, data: %02x\n", offset, data)); if (offset >= 0x700 && offset <= 0xEFF) @@ -1112,7 +1112,7 @@ WRITE8_MEMBER(nes_waixing_sgzlz_device::write_l) -------------------------------------------------*/ -WRITE8_MEMBER(nes_waixing_ffv_device::write_l) +void nes_waixing_ffv_device::write_l(offs_t offset, uint8_t data) { uint8_t helper; LOG_MMC(("waixing_ffv write_l, offset: %04x, data: %02x\n", offset, data)); @@ -1161,7 +1161,7 @@ WRITE8_MEMBER(nes_waixing_ffv_device::write_l) -------------------------------------------------*/ -WRITE8_MEMBER(nes_waixing_wxzs_device::write_h) +void nes_waixing_wxzs_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("waixing_zs write_h, offset: %04x, data: %02x\n", offset, data)); @@ -1191,7 +1191,7 @@ WRITE8_MEMBER(nes_waixing_wxzs_device::write_h) -------------------------------------------------*/ -WRITE8_MEMBER(nes_waixing_dq8_device::write_h) +void nes_waixing_dq8_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("waixing_dq8 write_h, offset: %04x, data: %02x\n", offset, data)); @@ -1212,7 +1212,7 @@ WRITE8_MEMBER(nes_waixing_dq8_device::write_h) -------------------------------------------------*/ -WRITE8_MEMBER(nes_waixing_wxzs2_device::write_h) +void nes_waixing_wxzs2_device::write_h(offs_t offset, uint8_t data) { uint8_t flip = (data & 0x80) >> 7; uint8_t helper = (data & 0x7f) << 1; @@ -1265,7 +1265,7 @@ WRITE8_MEMBER(nes_waixing_wxzs2_device::write_h) -------------------------------------------------*/ -WRITE8_MEMBER(nes_waixing_fs304_device::write_l) +void nes_waixing_fs304_device::write_l(offs_t offset, uint8_t data) { LOG_MMC(("fs304 write_l, offset: %04x, data: %02x\n", offset, data)); int bank; |