From nobody Wed Nov 19 20:00:26 2025 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 170267053083314.676168977409702; Fri, 15 Dec 2023 12:02:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rEEMj-0005uW-ME; Fri, 15 Dec 2023 15:00:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rEEMZ-0005ry-Ef for qemu-devel@nongnu.org; Fri, 15 Dec 2023 15:00:55 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rEEMV-0002W6-BE for qemu-devel@nongnu.org; Fri, 15 Dec 2023 15:00:45 -0500 Received: from [2a00:23c4:8bb0:f100:5e2c:460f:a6a7:b066] (helo=localhost.localdomain) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rEEM4-000AEs-8j; Fri, 15 Dec 2023 20:00:20 +0000 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=t7NYmuuKOglnRq+iVZqx0e5y2gO1A/159zsXHO+M4qk=; b=QZW73i0iyBHymChJK3XtVk0hC1 UgYywS/x5Lbb8ZdnGsEuQB0FeemgSFSV3fREppfbUhjQH9rfU30z4MKa0B12F9pYN5ytHzmARGX12 rfYYoPRdGknXL4IdWTOd3dc5IUuQxYzDk9XWknjk2OqDwP9DPFvUMnrxy8kXMpf7C0JMxwAITnnLC C8raXJ4qJ/WgjGg2r6KeZTvzkKhYXh9LfwwVH4HiQAdxLO+eIVhkzVKvvFH4MoMhP1azdjkA1JNUT +5NTp/lGHB6pXvvjPtRb990SwOsT0AhykI+X7nzPc39T2zxJf4AT2TEQgZCpLaVy/czpiX7PwloNQ z26K6BOM7V/TKg7xX+ygStOyC4H3T3qdvS6n0f0aucxiGSWPjrOuL+jdgp3STSx6HP1x/5+gLo757 AJdmfH2dVJJZQzdeAv3yaaT09CWaqZ9mIChWS9NRZFdPWotHEuFk8OlUwVHE33Xpm1pDuW4nqf4cV 5UCuJCCEvjaO+po0bpOZTiDsZTUP+VH0h8Aw/K3PdJRf0L1jpBA9Ro+A+cZLw++0I/5Xq1J4D5ptn XMl0/XMUF+wPJjc/fUNKNcsnqgNCrW3iR3mzxavehFpDJAIDwLk9YS14lEXOFqzZO6/591vdZxgI3 ZBegl578A7Ge6wyp2cq8DXZz4jwYcI/RfBMD8qi1s=; From: Mark Cave-Ayland To: huth@tuxfamily.org, qemu-devel@nongnu.org Date: Fri, 15 Dec 2023 20:00:05 +0000 Message-Id: <20231215200009.346212-9-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231215200009.346212-1-mark.cave-ayland@ilande.co.uk> References: <20231215200009.346212-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8bb0:f100:5e2c:460f:a6a7:b066 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 08/12] next-cube.c: move LED logic to new next_scr2_led_update() function 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1702670532182100003 Content-Type: text/plain; charset="utf-8" Ensure that the LED status is updated by calling next_scr2_led_update() whe= never the SC2 register is written. Signed-off-by: Mark Cave-Ayland --- hw/m68k/next-cube.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index f2222554fa..7ffd1c412e 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -123,6 +123,18 @@ static const uint8_t rtc_ram2[32] =3D { #define SCR2_RTDATA 0x4 #define SCR2_TOBCD(x) (((x / 10) << 4) + (x % 10)) =20 +static void next_scr2_led_update(NeXTPC *s) +{ + if (s->scr2 & 0x1) { + DPRINTF("fault!\n"); + s->led++; + if (s->led =3D=3D 10) { + DPRINTF("LED flashing, possible fault!\n"); + s->led =3D 0; + } + } +} + static void nextscr2_write(NeXTPC *s, uint32_t val, int size) { static uint8_t old_scr2; @@ -135,15 +147,6 @@ static void nextscr2_write(NeXTPC *s, uint32_t val, in= t size) scr2_2 =3D val & 0xFF; } =20 - if (val & 0x1) { - DPRINTF("fault!\n"); - s->led++; - if (s->led =3D=3D 10) { - DPRINTF("LED flashing, possible fault!\n"); - s->led =3D 0; - } - } - if (scr2_2 & 0x1) { /* DPRINTF("RTC %x phase %i\n", scr2_2, rtc->phase); */ if (rtc->phase =3D=3D -1) { @@ -318,6 +321,7 @@ static void next_mmio_write(void *opaque, hwaddr addr, = uint64_t val, break; =20 case 0xd000 ... 0xd003: + next_scr2_led_update(s); nextscr2_write(s, val, size); break; =20 --=20 2.39.2