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/coco/coco_t4426.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/coco/coco_t4426.cpp')
-rw-r--r-- | src/devices/bus/coco/coco_t4426.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp index 11c4499990a..eaa6f651ef2 100644 --- a/src/devices/bus/coco/coco_t4426.cpp +++ b/src/devices/bus/coco/coco_t4426.cpp @@ -332,13 +332,16 @@ READ8_MEMBER(coco_t4426_device::scs_read) if ((offset >= 0x00) && (offset <= 0x07)) { LOGPIA("- PIA\n"); - result = m_pia->read(offset & 3); + result = m_pia->read(space, offset & 3); LOGPIA("- Offs:%04x Data:%02x\n", offset - 0x04, result); } else if ((offset >= 0x08) && (offset <= 0x0f) && (offset & 2)) { LOGACIA("- ACIA\n"); - result = m_uart->read(offset & 1); + if (offset & 1) + result = m_uart->status_r(space, offset & 1); + else + result = m_uart->data_r(space, offset & 1); LOGACIA("- Offs:%04x Data:%02x\n", offset - 0x04, result); } else @@ -363,12 +366,15 @@ WRITE8_MEMBER(coco_t4426_device::scs_write) if ((offset >= 0x00) && (offset <= 0x07)) { LOG("- PIA\n"); - m_pia->write(offset & 3, data); + m_pia->write(space, offset & 3, data); } else if ((offset >= 0x08) && (offset <= 0x0f) && (offset & 2)) { LOGACIA("- ACIA"); - m_uart->write(offset & 1, data); + if (offset & 1) + m_uart->control_w(space, offset & 1, data); + else + m_uart->data_w(space, offset & 1, data); LOGACIA(" - Offs:%04x Data:%02x\n", offset & 1, data); } else |