From aecf4722100c4f3e66540f89747eb66362dc85ca Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 28 Jan 2018 00:37:09 +1100 Subject: [PATCH] fixup (nw) --- src/devices/machine/z80scc.cpp | 6 +++--- src/devices/machine/z80scc.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp index 69273432058..f98de82ae43 100644 --- a/src/devices/machine/z80scc.cpp +++ b/src/devices/machine/z80scc.cpp @@ -513,7 +513,7 @@ void z80scc_device::device_start() //------------------------------------------------- // device_reset - device-specific reset //------------------------------------------------- -void z80scc_device::device_reset() +void z80scc_device::device_reset_after_children() { LOG("%s %s \n",tag(), FUNCNAME); @@ -2156,14 +2156,14 @@ void z80scc_channel::do_sccreg_wr9(uint8_t data) if (m_uart->m_variant & z80scc_device::SET_Z80X30) { uint8_t tmp_wr0 = m_wr0; // Save the Shift Left/Shift Right bits - m_uart->device_reset(); + m_uart->reset(); // Restore the Shift Left/Shift Right bits m_wr0 &= 0xfc; m_wr0 |= (tmp_wr0 & 0x03); } else { - m_uart->device_reset(); + m_uart->reset(); } // Set the MIE, Status High/Status Low and DLC bits as given in this command m_uart->m_wr9 &= ~(WR9_BIT_MIE | WR9_BIT_SHSL | WR9_BIT_DLC ); diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h index 49ec17aab43..cfec10bbb3a 100644 --- a/src/devices/machine/z80scc.h +++ b/src/devices/machine/z80scc.h @@ -497,7 +497,7 @@ protected: // device-level overrides virtual void device_resolve_objects() override; virtual void device_start() override; - virtual void device_reset() override; + virtual void device_reset_after_children() override; virtual void device_add_mconfig(machine_config &config) override; // device_z80daisy_interface overrides