summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/am9513.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/am9513.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/am9513.cpp')
-rw-r--r--src/devices/machine/am9513.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/machine/am9513.cpp b/src/devices/machine/am9513.cpp
index 6506510369f..c17ae1f09fe 100644
--- a/src/devices/machine/am9513.cpp
+++ b/src/devices/machine/am9513.cpp
@@ -1382,7 +1382,7 @@ void am9513_device::data_write(u16 data)
// read8 - 8-bit read access
//-------------------------------------------------
-u8 am9513_device::read8(offs_t offset)
+READ8_MEMBER(am9513_device::read8)
{
if (BIT(offset, 0))
return status_read();
@@ -1395,7 +1395,7 @@ u8 am9513_device::read8(offs_t offset)
// write8 - 8-bit write access
//-------------------------------------------------
-void am9513_device::write8(offs_t offset, u8 data)
+WRITE8_MEMBER(am9513_device::write8)
{
if (BIT(offset, 0))
{
@@ -1412,7 +1412,7 @@ void am9513_device::write8(offs_t offset, u8 data)
// read16 - 16-bit read access
//-------------------------------------------------
-u16 am9513_device::read16(offs_t offset)
+READ16_MEMBER(am9513_device::read16)
{
if (BIT(offset, 0))
return status_read() | 0xff00;
@@ -1429,7 +1429,7 @@ u16 am9513_device::read16(offs_t offset)
// write16 - 16-bit write access
//-------------------------------------------------
-void am9513_device::write16(offs_t offset, u16 data)
+WRITE16_MEMBER(am9513_device::write16)
{
if ((!bus_is_16_bit() || BIT(offset, 0)) && (data & 0xff00) != 0xff00)
logerror("Errant write of %02X to upper byte of %s register in %d-bit bus mode\n",