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/machine/adc0844.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/adc0844.cpp')
-rw-r--r-- | src/devices/machine/adc0844.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/machine/adc0844.cpp b/src/devices/machine/adc0844.cpp index c3616035927..103702a8d14 100644 --- a/src/devices/machine/adc0844.cpp +++ b/src/devices/machine/adc0844.cpp @@ -182,14 +182,14 @@ void adc0848_device::device_timer(emu_timer &timer, device_timer_id id, int para // INTERFACE //************************************************************************** -u8 adc0844_device::read() +READ8_MEMBER( adc0844_device::read ) { m_intr_cb(CLEAR_LINE); return m_result; } -void adc0844_device::write(u8 data) +WRITE8_MEMBER( adc0844_device::write ) { m_intr_cb(CLEAR_LINE); @@ -198,7 +198,7 @@ void adc0844_device::write(u8 data) m_conversion_timer->adjust(attotime::from_usec(40)); } -void adc0848_device::write(u8 data) +WRITE8_MEMBER( adc0848_device::write ) { m_intr_cb(CLEAR_LINE); |