From nobody Tue Feb 10 12:59:05 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1630578285603110.34348286484442; Thu, 2 Sep 2021 03:24:45 -0700 (PDT) Received: from localhost ([::1]:53870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLjtk-0001iW-J2 for importer@patchew.org; Thu, 02 Sep 2021 06:24:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLjs2-0006Zj-0Z for qemu-devel@nongnu.org; Thu, 02 Sep 2021 06:22:58 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:57668 helo=mail.default.ilande.bv.iomart.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLjs0-0001lC-9o for qemu-devel@nongnu.org; Thu, 02 Sep 2021 06:22:57 -0400 Received: from host86-133-17-27.range86-133.btcentralplus.com ([86.133.17.27] helo=kentang.home) by mail.default.ilande.bv.iomart.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mLjrY-0000t5-RY; Thu, 02 Sep 2021 11:22:34 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, laurent@vivier.eu Date: Thu, 2 Sep 2021 11:22:04 +0100 Message-Id: <20210902102205.7554-9-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210902102205.7554-1-mark.cave-ayland@ilande.co.uk> References: <20210902102205.7554-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.133.17.27 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 8/9] escc: re-use escc_reset_chn() for hard and soft reset X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.bv.iomart.io) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.bv.iomart.io X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1630578286761100001 Content-Type: text/plain; charset="utf-8" This removes duplication of the internal device state initialisation from a= ll of device reset, soft reset and hard reset. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/escc.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/hw/char/escc.c b/hw/char/escc.c index c6b477ef78..29fcdcb625 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -291,7 +291,8 @@ static void escc_reset_chn(ESCCChannelState *s) =20 static void escc_soft_reset_chn(ESCCChannelState *s) { - s->reg =3D 0; + escc_reset_chn(s); + s->wregs[W_CMD] =3D 0; s->wregs[W_INTR] &=3D ~(INTR_INTALL | INTR_TXINT | INTR_RXINT1ST | INTR_RXINTALL | INTR_WTDMA_EN | INTR_WTDMA_RQ); @@ -318,17 +319,12 @@ static void escc_soft_reset_chn(ESCCChannelState *s) s->rregs[R_SPEC] |=3D SPEC_BITS8; s->rregs[R_INTR] =3D 0; s->rregs[R_MISC] &=3D ~MISC_2CLKMISS; - - s->rx =3D s->tx =3D 0; - s->rxint =3D s->txint =3D 0; - s->rxint_under_svc =3D s->txint_under_svc =3D 0; - s->e0_mode =3D s->led_mode =3D s->caps_lock_mode =3D s->num_lock_mode = =3D 0; - clear_queue(s); } =20 static void escc_hard_reset_chn(ESCCChannelState *s) { - s->reg =3D 0; + escc_reset_chn(s); + s->wregs[W_CMD] =3D 0; s->wregs[W_INTR] &=3D ~(INTR_INTALL | INTR_TXINT | INTR_RXINT1ST | INTR_RXINTALL | INTR_WTDMA_EN | INTR_WTDMA_RQ); @@ -357,12 +353,6 @@ static void escc_hard_reset_chn(ESCCChannelState *s) s->rregs[R_SPEC] |=3D SPEC_BITS8; s->rregs[R_INTR] =3D 0; s->rregs[R_MISC] &=3D ~MISC_2CLKMISS; - - s->rx =3D s->tx =3D 0; - s->rxint =3D s->txint =3D 0; - s->rxint_under_svc =3D s->txint_under_svc =3D 0; - s->e0_mode =3D s->led_mode =3D s->caps_lock_mode =3D s->num_lock_mode = =3D 0; - clear_queue(s); } =20 static void escc_reset(DeviceState *d) --=20 2.20.1