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/mc146818.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/mc146818.cpp')
-rw-r--r-- | src/devices/machine/mc146818.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/machine/mc146818.cpp b/src/devices/machine/mc146818.cpp index 1259e1502ca..990d6f3ec35 100644 --- a/src/devices/machine/mc146818.cpp +++ b/src/devices/machine/mc146818.cpp @@ -510,7 +510,7 @@ void mc146818_device::update_irq() // read - I/O handler for reading //------------------------------------------------- -uint8_t mc146818_device::read(offs_t offset) +READ8_MEMBER( mc146818_device::read ) { uint8_t data = 0; switch (offset) @@ -520,14 +520,14 @@ uint8_t mc146818_device::read(offs_t offset) break; case 1: - data = read_direct(m_index); + data = read_direct(space, m_index); break; } return data; } -uint8_t mc146818_device::read_direct(offs_t offset) +READ8_MEMBER( mc146818_device::read_direct ) { uint8_t data = 0; @@ -569,7 +569,7 @@ uint8_t mc146818_device::read_direct(offs_t offset) // write - I/O handler for writing //------------------------------------------------- -void mc146818_device::write(offs_t offset, uint8_t data) +WRITE8_MEMBER( mc146818_device::write ) { switch (offset) { @@ -578,12 +578,12 @@ void mc146818_device::write(offs_t offset, uint8_t data) break; case 1: - write_direct(m_index, data); + write_direct(space, m_index, data); break; } } -void mc146818_device::write_direct(offs_t offset, uint8_t data) +WRITE8_MEMBER( mc146818_device::write_direct ) { LOG("mc146818_port_w(): offset=0x%02x data=0x%02x\n", offset, data); |