diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/machine/acs8600_ics.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/machine/acs8600_ics.cpp')
-rw-r--r-- | src/mame/machine/acs8600_ics.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mame/machine/acs8600_ics.cpp b/src/mame/machine/acs8600_ics.cpp index 09a21cc6d39..e44d040a81b 100644 --- a/src/mame/machine/acs8600_ics.cpp +++ b/src/mame/machine/acs8600_ics.cpp @@ -16,7 +16,8 @@ acs8600_ics_device::acs8600_ics_device(const machine_config &mconfig, const char m_icscpu(*this, "icscpu"), m_out_irq1_func(*this), m_out_irq2_func(*this), - m_host_space(*this, finder_base::DUMMY_TAG, -1) + m_host_space_device(*this, finder_base::DUMMY_TAG), + m_host_space_index(-1) { } @@ -43,12 +44,12 @@ WRITE8_MEMBER(acs8600_ics_device::ctrl_w) READ8_MEMBER(acs8600_ics_device::hostram_r) { - return m_host_space->read_byte((m_hiaddr << 16) | (BIT(m_ctrl, 0) << 15) | (offset & 0x7fff)); + return m_maincpu_mem->read_byte((m_hiaddr << 16) | (BIT(m_ctrl, 0) << 15) | (offset & 0x7fff)); } WRITE8_MEMBER(acs8600_ics_device::hostram_w) { - m_host_space->write_byte((m_hiaddr << 16) | (BIT(m_ctrl, 0) << 15) | (offset & 0x7fff), data); + m_maincpu_mem->write_byte((m_hiaddr << 16) | (BIT(m_ctrl, 0) << 15) | (offset & 0x7fff), data); } WRITE_LINE_MEMBER(acs8600_ics_device::attn_w) @@ -201,6 +202,7 @@ void acs8600_ics_device::device_add_mconfig(machine_config &config) void acs8600_ics_device::device_resolve_objects() { + m_maincpu_mem = &m_host_space_device->space(m_host_space_index); m_out_irq1_func.resolve_safe(); m_out_irq2_func.resolve_safe(); } |