diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/devices/bus/nes/txc.cpp | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
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 f3ab8efc5f9..4149c6262a3 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() -------------------------------------------------*/ -WRITE8_MEMBER(nes_txc_22211_device::write_l) +void nes_txc_22211_device::write_l(offs_t offset, uint8_t data) { LOG_MMC(("TXC 22111 write_l, offset: %04x, data: %02x\n", offset, data)); @@ -147,7 +147,7 @@ WRITE8_MEMBER(nes_txc_22211_device::write_l) m_reg[offset & 0x03] = data; } -READ8_MEMBER(nes_txc_22211_device::read_l) +uint8_t nes_txc_22211_device::read_l(offs_t offset) { LOG_MMC(("TXC 22111 read_l, offset: %04x\n", offset)); @@ -157,7 +157,7 @@ READ8_MEMBER(nes_txc_22211_device::read_l) return 0x00; } -WRITE8_MEMBER(nes_txc_22211_device::write_h) +void nes_txc_22211_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("TXC 22111 write_h, offset: %04x, data: %02x\n", offset, data)); @@ -180,7 +180,7 @@ WRITE8_MEMBER(nes_txc_22211_device::write_h) -------------------------------------------------*/ -WRITE8_MEMBER(nes_txc_dumarc_device::write_h) +void nes_txc_dumarc_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("TXC Du Ma Racing write_h, offset: %04x, data: %02x\n", offset, data)); @@ -203,7 +203,7 @@ WRITE8_MEMBER(nes_txc_dumarc_device::write_h) -------------------------------------------------*/ -READ8_MEMBER(nes_txc_mjblock_device::read_l) +uint8_t nes_txc_mjblock_device::read_l(offs_t offset) { LOG_MMC(("TXC mjblock read_l, offset: %04x\n", offset)); @@ -226,7 +226,7 @@ READ8_MEMBER(nes_txc_mjblock_device::read_l) -------------------------------------------------*/ -WRITE8_MEMBER(nes_txc_strikew_device::write_h) +void nes_txc_strikew_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("TXC Strike Wolf write_h, offset: %04x, data: %02x\n", offset, data)); @@ -256,12 +256,12 @@ WRITE8_MEMBER(nes_txc_strikew_device::write_h) -------------------------------------------------*/ -READ8_MEMBER(nes_txc_commandos_device::read_l) +uint8_t nes_txc_commandos_device::read_l(offs_t offset) { return 0x50; } -WRITE8_MEMBER(nes_txc_commandos_device::write_h) +void nes_txc_commandos_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("TXC Commandos write_h, offset: %04x, data: %02x\n", offset, data)); |