summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/adc0808.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/machine/adc0808.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/adc0808.cpp')
-rw-r--r--src/devices/machine/adc0808.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/machine/adc0808.cpp b/src/devices/machine/adc0808.cpp
index 11aafe276fb..5f8aeb8f93c 100644
--- a/src/devices/machine/adc0808.cpp
+++ b/src/devices/machine/adc0808.cpp
@@ -156,7 +156,7 @@ void adc0808_device::device_timer(emu_timer &timer, device_timer_id id, int para
// INTERFACE
//**************************************************************************
-u8 adc0808_device::data_r()
+READ8_MEMBER( adc0808_device::data_r )
{
if (!machine().side_effects_disabled())
{
@@ -170,7 +170,7 @@ u8 adc0808_device::data_r()
return m_sar;
}
-void adc0808_device::address_w(u8 data)
+WRITE8_MEMBER( adc0808_device::address_w )
{
m_address = data & 7;
}
@@ -198,22 +198,22 @@ READ_LINE_MEMBER( adc0808_device::eoc_r )
return m_eoc;
}
-void adc0808_device::address_offset_start_w(offs_t offset, u8 data)
+WRITE8_MEMBER( adc0808_device::address_offset_start_w )
{
if (VERBOSE)
logerror("address_offset_start_w %02x %02x\n", offset, data);
start_w(1);
- address_w(offset);
+ address_w(space, 0, offset);
start_w(0);
}
-void adc0808_device::address_data_start_w(u8 data)
+WRITE8_MEMBER( adc0808_device::address_data_start_w )
{
if (VERBOSE)
- logerror("address_data_start_w %02x\n", data);
+ logerror("address_data_start_w %02x %02x\n", offset, data);
start_w(1);
- address_w(data);
+ address_w(space, 0, data);
start_w(0);
}