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/ntdec.cpp | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/devices/bus/nes/ntdec.cpp')
-rw-r--r-- | src/devices/bus/nes/ntdec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/bus/nes/ntdec.cpp b/src/devices/bus/nes/ntdec.cpp index 5ea3458e8f3..6fbcd6f31ef 100644 --- a/src/devices/bus/nes/ntdec.cpp +++ b/src/devices/bus/nes/ntdec.cpp @@ -102,7 +102,7 @@ void nes_ntdec_fh_device::pcb_reset() -------------------------------------------------*/ -WRITE8_MEMBER(nes_ntdec_asder_device::write_h) +void nes_ntdec_asder_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("ntdec_asder write_h, offset: %04x, data: %02x\n", offset, data)); @@ -165,7 +165,7 @@ WRITE8_MEMBER(nes_ntdec_asder_device::write_h) -------------------------------------------------*/ -WRITE8_MEMBER(nes_ntdec_fh_device::write_m) +void nes_ntdec_fh_device::write_m(offs_t offset, uint8_t data) { LOG_MMC(("ntdec_fh write_m, offset: %04x, data: %02x\n", offset, data)); |