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/txc.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/nes/txc.cpp')
-rw-r--r-- | src/devices/bus/nes/txc.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/devices/bus/nes/txc.cpp b/src/devices/bus/nes/txc.cpp index 4149c6262a3..f3ab8efc5f9 100644 --- a/src/devices/bus/nes/txc.cpp +++ b/src/devices/bus/nes/txc.cpp @@ -139,7 +139,7 @@ void nes_txc_commandos_device::pcb_reset() -------------------------------------------------*/ -void nes_txc_22211_device::write_l(offs_t offset, uint8_t data) +WRITE8_MEMBER(nes_txc_22211_device::write_l) { LOG_MMC(("TXC 22111 write_l, offset: %04x, data: %02x\n", offset, data)); @@ -147,7 +147,7 @@ void nes_txc_22211_device::write_l(offs_t offset, uint8_t data) m_reg[offset & 0x03] = data; } -uint8_t nes_txc_22211_device::read_l(offs_t offset) +READ8_MEMBER(nes_txc_22211_device::read_l) { LOG_MMC(("TXC 22111 read_l, offset: %04x\n", offset)); @@ -157,7 +157,7 @@ uint8_t nes_txc_22211_device::read_l(offs_t offset) return 0x00; } -void nes_txc_22211_device::write_h(offs_t offset, uint8_t data) +WRITE8_MEMBER(nes_txc_22211_device::write_h) { LOG_MMC(("TXC 22111 write_h, offset: %04x, data: %02x\n", offset, data)); @@ -180,7 +180,7 @@ void nes_txc_22211_device::write_h(offs_t offset, uint8_t data) -------------------------------------------------*/ -void nes_txc_dumarc_device::write_h(offs_t offset, uint8_t data) +WRITE8_MEMBER(nes_txc_dumarc_device::write_h) { LOG_MMC(("TXC Du Ma Racing write_h, offset: %04x, data: %02x\n", offset, data)); @@ -203,7 +203,7 @@ void nes_txc_dumarc_device::write_h(offs_t offset, uint8_t data) -------------------------------------------------*/ -uint8_t nes_txc_mjblock_device::read_l(offs_t offset) +READ8_MEMBER(nes_txc_mjblock_device::read_l) { LOG_MMC(("TXC mjblock read_l, offset: %04x\n", offset)); @@ -226,7 +226,7 @@ uint8_t nes_txc_mjblock_device::read_l(offs_t offset) -------------------------------------------------*/ -void nes_txc_strikew_device::write_h(offs_t offset, uint8_t data) +WRITE8_MEMBER(nes_txc_strikew_device::write_h) { LOG_MMC(("TXC Strike Wolf write_h, offset: %04x, data: %02x\n", offset, data)); @@ -256,12 +256,12 @@ void nes_txc_strikew_device::write_h(offs_t offset, uint8_t data) -------------------------------------------------*/ -uint8_t nes_txc_commandos_device::read_l(offs_t offset) +READ8_MEMBER(nes_txc_commandos_device::read_l) { return 0x50; } -void nes_txc_commandos_device::write_h(offs_t offset, uint8_t data) +WRITE8_MEMBER(nes_txc_commandos_device::write_h) { LOG_MMC(("TXC Commandos write_h, offset: %04x, data: %02x\n", offset, data)); |