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/ti99/peb/pcode.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/ti99/peb/pcode.cpp')
-rw-r--r-- | src/devices/bus/ti99/peb/pcode.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/bus/ti99/peb/pcode.cpp b/src/devices/bus/ti99/peb/pcode.cpp index dbdd7c9f1a9..f0a24ad1646 100644 --- a/src/devices/bus/ti99/peb/pcode.cpp +++ b/src/devices/bus/ti99/peb/pcode.cpp @@ -142,7 +142,7 @@ SETADDRESS_DBIN_MEMBER( ti_pcode_card_device::setaddress_dbin ) } } -void ti_pcode_card_device::debugger_read(uint16_t offset, uint8_t& value) +void ti_pcode_card_device::debugger_read(address_space& space, uint16_t offset, uint8_t& value) { // The debuger does not call setaddress if (m_active && ((offset & m_select_mask)==m_select_value)) @@ -160,7 +160,7 @@ READ8Z_MEMBER( ti_pcode_card_device::readz ) // Care for debugger if (machine().side_effects_disabled()) { - debugger_read(offset, *value); + debugger_read(space, offset, *value); } if (m_active && m_inDsrArea && m_selected) @@ -200,7 +200,7 @@ READ8Z_MEMBER( ti_pcode_card_device::readz ) Write a byte in P-Code ROM space. This is only used for setting the GROM address. */ -void ti_pcode_card_device::write(offs_t offset, uint8_t data) +WRITE8_MEMBER( ti_pcode_card_device::write ) { if (machine().side_effects_disabled()) return; if (m_active && m_isgrom && m_selected) @@ -253,7 +253,7 @@ READ8Z_MEMBER(ti_pcode_card_device::crureadz) A8, A13, and A14 so bit 0 is at 0x1f00, but bit 4 is at 0x1f80. Accordingly, bit 7 would be 0x1f86 but it is not used. */ -void ti_pcode_card_device::cruwrite(offs_t offset, uint8_t data) +WRITE8_MEMBER(ti_pcode_card_device::cruwrite) { if ((offset & 0xff00)==CRU_BASE) m_crulatch->write_bit((offset & 0x80) >> 5 | (offset & 0x06) >> 1, data); |