diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/nes/rexsoft.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/nes/rexsoft.cpp')
-rw-r--r-- | src/devices/bus/nes/rexsoft.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/bus/nes/rexsoft.cpp b/src/devices/bus/nes/rexsoft.cpp index c10b88afe01..3d868a0c970 100644 --- a/src/devices/bus/nes/rexsoft.cpp +++ b/src/devices/bus/nes/rexsoft.cpp @@ -112,7 +112,7 @@ void nes_rex_sl1632_device::pcb_reset() -------------------------------------------------*/ -void nes_rex_dbz5_device::write_l(offs_t offset, uint8_t data) +WRITE8_MEMBER(nes_rex_dbz5_device::write_l) { LOG_MMC(("rex_dbz write_l, offset: %04x, data: %02x\n", offset, data)); @@ -121,7 +121,7 @@ void nes_rex_dbz5_device::write_l(offs_t offset, uint8_t data) } /* we would need to use this read handler in 0x6000-0x7fff as well */ -uint8_t nes_rex_dbz5_device::read_l(offs_t offset) +READ8_MEMBER(nes_rex_dbz5_device::read_l) { LOG_MMC(("rex_dbz read_l, offset: %04x\n", offset)); return 0x01; @@ -208,7 +208,7 @@ void nes_rex_sl1632_device::set_chr(uint8_t chr, int chr_base, int chr_mask) chr1_x(chr_page ^ 7, chr_base2[7] | (bank[7] & chr_mask), chr); } -void nes_rex_sl1632_device::write_h(offs_t offset, uint8_t data) +WRITE8_MEMBER(nes_rex_sl1632_device::write_h) { uint8_t helper1, helper2; LOG_MMC(("rex_sl1632 write_h, offset: %04x, data: %02x\n", offset, data)); @@ -232,7 +232,7 @@ void nes_rex_sl1632_device::write_h(offs_t offset, uint8_t data) break; default: - txrom_write(offset, data); + txrom_write(space, offset, data, mem_mask); break; } } |