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/mb8421.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/mb8421.cpp')
-rw-r--r-- | src/devices/machine/mb8421.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/devices/machine/mb8421.cpp b/src/devices/machine/mb8421.cpp index e6344843f92..a5b08f5ea90 100644 --- a/src/devices/machine/mb8421.cpp +++ b/src/devices/machine/mb8421.cpp @@ -129,14 +129,14 @@ void mb8421_master_device::update_intr(offs_t offset) // (write to 7FF asserts INTR) //------------------------------------------------- -void mb8421_device::left_w(offs_t offset, u8 data) +WRITE8_MEMBER(mb8421_device::left_w) { offset &= 0x7ff; m_ram[offset] = data; update_intr<read_or_write::WRITE, false>(offset); } -void mb8421_mb8431_16_device::left_w(offs_t offset, u16 data, u16 mem_mask) +WRITE16_MEMBER(mb8421_mb8431_16_device::left_w) { offset &= 0x7ff; COMBINE_DATA(&m_ram[offset]); @@ -148,14 +148,14 @@ void mb8421_mb8431_16_device::left_w(offs_t offset, u16 data, u16 mem_mask) // (read from 7FE acknowledges INTL) //------------------------------------------------- -u8 mb8421_device::left_r(offs_t offset) +READ8_MEMBER(mb8421_device::left_r) { offset &= 0x7ff; update_intr<read_or_write::READ, false>(offset); return m_ram[offset]; } -u16 mb8421_mb8431_16_device::left_r(offs_t offset, u16 mem_mask) +READ16_MEMBER(mb8421_mb8431_16_device::left_r) { offset &= 0x7ff; update_intr<read_or_write::READ, false>(offset); @@ -167,14 +167,14 @@ u16 mb8421_mb8431_16_device::left_r(offs_t offset, u16 mem_mask) // (write to 7FE asserts INTL) //------------------------------------------------- -void mb8421_device::right_w(offs_t offset, u8 data) +WRITE8_MEMBER(mb8421_device::right_w) { offset &= 0x7ff; m_ram[offset] = data; update_intr<read_or_write::WRITE, true>(offset); } -void mb8421_mb8431_16_device::right_w(offs_t offset, u16 data, u16 mem_mask) +WRITE16_MEMBER(mb8421_mb8431_16_device::right_w) { offset &= 0x7ff; COMBINE_DATA(&m_ram[offset]); @@ -186,14 +186,14 @@ void mb8421_mb8431_16_device::right_w(offs_t offset, u16 data, u16 mem_mask) // (read from 7FF acknowledges INTR) //------------------------------------------------- -u8 mb8421_device::right_r(offs_t offset) +READ8_MEMBER(mb8421_device::right_r) { offset &= 0x7ff; update_intr<read_or_write::READ, true>(offset); return m_ram[offset]; } -u16 mb8421_mb8431_16_device::right_r(offs_t offset, u16 mem_mask) +READ16_MEMBER(mb8421_mb8431_16_device::right_r) { offset &= 0x7ff; update_intr<read_or_write::READ, true>(offset); |