From nobody Tue Feb 10 17:14:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657664706923492.52708015446103; Tue, 12 Jul 2022 15:25:06 -0700 (PDT) Received: from localhost ([::1]:49438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBOJU-0004zi-Sw for importer@patchew.org; Tue, 12 Jul 2022 18:25:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBNqa-0004WS-N3; Tue, 12 Jul 2022 17:55:12 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:42464) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBNqZ-0007y1-3s; Tue, 12 Jul 2022 17:55:12 -0400 Received: from [2a00:23c4:8ba5:df00:fd7d:1c3a:1dd0:c576] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oBNoq-000Bqt-OP; Tue, 12 Jul 2022 22:53:28 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=4SGkGXr1/y9u8npp54SOz4TilYqVNmQFSGSm53nVSZE=; b=cLaOqiwUGO35GWWIEzP8/kLjP5 jktlckfUppsrPI5wMEyxhFpRKGH7nWu6cOawT50a84T5ZVpia5iYU24f4swmws17WCjQmciuXw/l3 WeMTUohCpLGCR67QdKZMDljlTqw/VFZ1lT3f5xWkc/8NwU0zVpe46a9oXPky/fQHJqJ8BtZsB/Q3V oaGeKP0xQdDG6caxmRH2g4LMhgr7xhh8ar59FUSz7K/ymavadkf6JoRHpxKwEoIX1/P2tQlcnLFY9 POyfrwe608uMtEYEhReRf8mi5bVJ5aXxNaUNNCRkCvdxSh9rmG7+qfeTWHMvCKdF5g3ksfbfnRajM Jb4HEqydHwygczFerTuDL6DdkmXC6Hx+0/n30Uh/79UTjs2q0kGBfh/znoJn7RrkF1fWdQAiaxjU4 jOSLKikdocEHaqsNhphTymhJADNpjr/3TYFN9Jq5W3MP5oHVTFIyEy76++QKxMPuVVBrmX9dQZif6 ijK747UkSmetAjvYVnJ2xfBGbXHz5gUfAFR57CHO9xKq3CGvZhL54AuiS3GeCOwLFGvca8uQXF3vN Hzdpe31rYowr1hFBvuRPN2TBftrpcrodz0XxQ3vjf4M1rHkMqKD+4xsWDPNFp/w0+tJ63m5N/PAOu WIKIRqRiiUtAYLAHOy4USZ4aUoUA4i79exBhNPJV8=; From: Mark Cave-Ayland To: richard.henderson@linaro.org, deller@gmx.de, svens@stackframe.org, pbonzini@redhat.com, peter.maydell@linaro.org, hpoussin@reactos.org, aleksandar.rikalo@syrmia.com, f4bug@amsat.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org Date: Tue, 12 Jul 2022 22:52:41 +0100 Message-Id: <20220712215251.7944-31-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220712215251.7944-1-mark.cave-ayland@ilande.co.uk> References: <20220712215251.7944-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba5:df00:fd7d:1c3a:1dd0:c576 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 30/40] lasips2: standardise on lp name for LASIPS2Port variables X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1657664708981100001 Content-Type: text/plain; charset="utf-8" This is shorter to type and keeps the naming convention consistent within t= he LASIPS2 device. Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Acked-by: Helge Deller Reviewed-by: Peter Maydell --- hw/input/lasips2.c | 52 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index 0f392e2bee..09d909c843 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -139,28 +139,28 @@ static void lasips2_set_irq(void *opaque, int n, int = level) static void lasips2_reg_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - LASIPS2Port *port =3D opaque; + LASIPS2Port *lp =3D LASIPS2_PORT(opaque); =20 - trace_lasips2_reg_write(size, port->id, addr, + trace_lasips2_reg_write(size, lp->id, addr, lasips2_write_reg_name(addr), val); =20 switch (addr & 0xc) { case REG_PS2_CONTROL: - port->control =3D val; + lp->control =3D val; break; =20 case REG_PS2_XMTDATA: - if (port->control & LASIPS2_CONTROL_LOOPBACK) { - port->buf =3D val; - port->loopback_rbne =3D true; - qemu_set_irq(port->irq, 1); + if (lp->control & LASIPS2_CONTROL_LOOPBACK) { + lp->buf =3D val; + lp->loopback_rbne =3D true; + qemu_set_irq(lp->irq, 1); break; } =20 - if (port->id) { - ps2_write_mouse(PS2_MOUSE_DEVICE(port->ps2dev), val); + if (lp->id) { + ps2_write_mouse(PS2_MOUSE_DEVICE(lp->ps2dev), val); } else { - ps2_write_keyboard(PS2_KBD_DEVICE(port->ps2dev), val); + ps2_write_keyboard(PS2_KBD_DEVICE(lp->ps2dev), val); } break; =20 @@ -176,53 +176,53 @@ static void lasips2_reg_write(void *opaque, hwaddr ad= dr, uint64_t val, =20 static uint64_t lasips2_reg_read(void *opaque, hwaddr addr, unsigned size) { - LASIPS2Port *port =3D opaque; + LASIPS2Port *lp =3D LASIPS2_PORT(opaque); uint64_t ret =3D 0; =20 switch (addr & 0xc) { case REG_PS2_ID: - ret =3D port->id; + ret =3D lp->id; break; =20 case REG_PS2_RCVDATA: - if (port->control & LASIPS2_CONTROL_LOOPBACK) { - port->loopback_rbne =3D false; - qemu_set_irq(port->irq, 0); - ret =3D port->buf; + if (lp->control & LASIPS2_CONTROL_LOOPBACK) { + lp->loopback_rbne =3D false; + qemu_set_irq(lp->irq, 0); + ret =3D lp->buf; break; } =20 - ret =3D ps2_read_data(port->ps2dev); + ret =3D ps2_read_data(lp->ps2dev); break; =20 case REG_PS2_CONTROL: - ret =3D port->control; + ret =3D lp->control; break; =20 case REG_PS2_STATUS: ret =3D LASIPS2_STATUS_DATSHD | LASIPS2_STATUS_CLKSHD; =20 - if (port->control & LASIPS2_CONTROL_DIAG) { - if (!(port->control & LASIPS2_CONTROL_DATDIR)) { + if (lp->control & LASIPS2_CONTROL_DIAG) { + if (!(lp->control & LASIPS2_CONTROL_DATDIR)) { ret &=3D ~LASIPS2_STATUS_DATSHD; } =20 - if (!(port->control & LASIPS2_CONTROL_CLKDIR)) { + if (!(lp->control & LASIPS2_CONTROL_CLKDIR)) { ret &=3D ~LASIPS2_STATUS_CLKSHD; } } =20 - if (port->control & LASIPS2_CONTROL_LOOPBACK) { - if (port->loopback_rbne) { + if (lp->control & LASIPS2_CONTROL_LOOPBACK) { + if (lp->loopback_rbne) { ret |=3D LASIPS2_STATUS_RBNE; } } else { - if (!ps2_queue_empty(port->ps2dev)) { + if (!ps2_queue_empty(lp->ps2dev)) { ret |=3D LASIPS2_STATUS_RBNE; } } =20 - if (port->lasips2->int_status) { + if (lp->lasips2->int_status) { ret |=3D LASIPS2_STATUS_CMPINTR; } break; @@ -233,7 +233,7 @@ static uint64_t lasips2_reg_read(void *opaque, hwaddr a= ddr, unsigned size) break; } =20 - trace_lasips2_reg_read(size, port->id, addr, + trace_lasips2_reg_read(size, lp->id, addr, lasips2_read_reg_name(addr), ret); return ret; } --=20 2.30.2