From nobody Tue Feb 10 19:53:13 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 1656267577427894.6103695676397; Sun, 26 Jun 2022 11:19:37 -0700 (PDT) Received: from localhost ([::1]:46982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o5WrA-0005qo-9h for importer@patchew.org; Sun, 26 Jun 2022 14:19:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5WMg-00046c-2H for qemu-devel@nongnu.org; Sun, 26 Jun 2022 13:48:11 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:45190) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5WMe-0000BI-4s for qemu-devel@nongnu.org; Sun, 26 Jun 2022 13:48:05 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (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 1o5WLG-0007KY-F6; Sun, 26 Jun 2022 18:46:42 +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=ET6Qr9qwFkYBCBzPcwCVTQxz52+wcmPrWIHSlxt45r8=; b=w/HuMTeWhIV3fETLZRNlZd1c6m +m32cnHKOk+15QeOvRqjjdOpULmthRtrfDKzmeJ7PCJO/RbA+PqrC389izHF2Z9lyDZvZ4+xz4/iC xJQUDtiDCrAPWObl8eFiivtsSD223VXgsmkKwHfgncGCfjGrH+5XBgiXBM/lXQXBIdVX6xZ2WCU5W kZT6NcEhtVUfsfCtAj3sQ8harwzgq4bxZ/gXWyGf39fjFQI59/iuusTue2giyg87S44OBkXEGNLvx 2SKRpjJicrupSR9jtAbuAuf+FD7p6TobaETzZs5WwgBQp9y6kn4d6i96uVr904ffa5wMNZvlYUV+7 RrnZrxMOb6DERg5dqdlch9bNosSR3kktxkjxpc6MtRSN4Em56HXRPhe4JHK8j+iOAvK79Eu3eP/zM adKXNKvARvw83HtAsFqgWlk7p+2qc9Vldm+AfhgWq7tcA8BtCrE7gn9dp0GqeHcGb0ZZzvwxuqqhQ odGs86/vyZyQotjvMW59Kf8t6rLB/0AdWBuQ/Sv2yJ5fcrYpBt1BpHj1tkhh0BokOnheI5VWiiN7c zTMiagAL9fQV6omH6Z3zy2OVcqwztc6TOmpTLcnauA29VCDQDGubiqndQV8Y3RPnZPd8GFwS8tLSw 2X5cV1r25vnB39OfcY5f7FCHwp4amsYAHWtW4g0WE=; From: Mark Cave-Ayland To: richard.henderson@linaro.org, qemu-devel@nongnu.org Date: Sun, 26 Jun 2022 18:45:11 +0100 Message-Id: <20220626174531.969187-36-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220626174531.969187-1-mark.cave-ayland@ilande.co.uk> References: <20220626174531.969187-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PULL 35/55] pckbd: replace irq_kbd and irq_mouse with qemu_irq array in KBDState 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: 1656267579589100001 Content-Type: text/plain; charset="utf-8" This allows both IRQs to be declared as a single qdev gpio array. Signed-off-by: Mark Cave-Ayland Acked-by: Helge Deller Reviewed-by: Peter Maydell Message-Id: <20220624134109.881989-36-mark.cave-ayland@ilande.co.uk> --- hw/input/pckbd.c | 12 ++++++------ include/hw/input/i8042.h | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 72843f770e..5d7c969fc6 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -170,8 +170,8 @@ static void kbd_update_irq_lines(KBDState *s) } } } - qemu_set_irq(s->irq_kbd, irq_kbd_level); - qemu_set_irq(s->irq_mouse, irq_mouse_level); + qemu_set_irq(s->irqs[I8042_KBD_IRQ], irq_kbd_level); + qemu_set_irq(s->irqs[I8042_MOUSE_IRQ], irq_mouse_level); } =20 static void kbd_deassert_irq(KBDState *s) @@ -726,8 +726,8 @@ MMIOKBDState *i8042_mm_init(qemu_irq kbd_irq, qemu_irq = mouse_irq, sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); s =3D &I8042_MMIO(dev)->kbd; =20 - s->irq_kbd =3D kbd_irq; - s->irq_mouse =3D mouse_irq; + s->irqs[I8042_KBD_IRQ] =3D kbd_irq; + s->irqs[I8042_MOUSE_IRQ] =3D mouse_irq; =20 return I8042_MMIO(dev); } @@ -813,8 +813,8 @@ static void i8042_realizefn(DeviceState *dev, Error **e= rrp) return; } =20 - s->irq_kbd =3D isa_get_irq(isadev, isa_s->kbd_irq); - s->irq_mouse =3D isa_get_irq(isadev, isa_s->mouse_irq); + s->irqs[I8042_KBD_IRQ] =3D isa_get_irq(isadev, isa_s->kbd_irq); + s->irqs[I8042_MOUSE_IRQ] =3D isa_get_irq(isadev, isa_s->mouse_irq); =20 isa_register_ioport(isadev, isa_s->io + 0, 0x60); isa_register_ioport(isadev, isa_s->io + 1, 0x64); diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h index 9d1f8af964..4ba2664377 100644 --- a/include/hw/input/i8042.h +++ b/include/hw/input/i8042.h @@ -12,6 +12,9 @@ #include "hw/sysbus.h" #include "qom/object.h" =20 +#define I8042_KBD_IRQ 0 +#define I8042_MOUSE_IRQ 1 + typedef struct KBDState { uint8_t write_cmd; /* if non zero, write data to port 60 is expected */ uint8_t status; @@ -31,8 +34,7 @@ typedef struct KBDState { void *mouse; QEMUTimer *throttle_timer; =20 - qemu_irq irq_kbd; - qemu_irq irq_mouse; + qemu_irq irqs[2]; qemu_irq a20_out; hwaddr mask; } KBDState; --=20 2.30.2