From nobody Sat Nov 23 22:34:44 2024 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 1729674272448936.6294498796241; Wed, 23 Oct 2024 02:04:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3XFG-0006MN-2u; Wed, 23 Oct 2024 05:01:34 -0400 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 1t3XF9-0005tf-TD for qemu-devel@nongnu.org; Wed, 23 Oct 2024 05:01:29 -0400 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 1t3XEz-0000g6-By for qemu-devel@nongnu.org; Wed, 23 Oct 2024 05:01:27 -0400 Received: from [2a02:8012:c93d:0:260e:bf57:a4e9:8142] (helo=cheesecake.fritz.box) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1t3XEV-0008EL-79; Wed, 23 Oct 2024 10:00:51 +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; bh=Zkf4E9xSwfU0NaWXZbfTcqEQP2V9EDxty6Leuw/m/Qk=; b=HvsgiwtlHvedJ1WSaJCWqjA9hC qvqJp2bRrycDtl2zX0h9RKFBvjpMpO6XrbyO+XquUFwbtj9O8Hb0D4CR48xrD6N04IDpzw/iWxGZk V5Iv4HYRADBsMbiOIceL5jLU6Vr1+g/phD+L6vKi2A59Ejdog+RjYl+9bMNUm2XuMZEG28S3nSMMi DierqeuKoql+4IbGsikPcLBexB0gMtWE918mujj61wYGFSAcYSZ+6LSsYPVTTOmTKhpLs8UORW14j OIZQoVNk8QxreCLupwgpKtFnxPB83S5wnvbpeTA7+ljsupG01YI9KloQO/Syvq36THaIh6aY1w5T5 G6qIICLZc6kekX82MbK67s39MmWSKndG+nyTMBfbXDQeWj18iBm2GhT5ZA4Bjoil8t6KL7fAS6x2O mtIRE2kZZEM+3pfOfO4kypPnKZzpryoWdnMwVYRz9vp8pX77R22bHNbm6ZbsPMpYg2N53sGS7FxoI GlwDyyV23sD2GhnhnRNNq+oX6cMg5rWjqWsWzQSXWUWe/mAL8dcNwDCfPh9RPaPZKSEM0kXmozy5w xNy+BIeC2/QhkMdDGiU8R9MIIzyt8KP1aUOcw90M2CfDbL8L1guuJXq0ivOqDx1dqp+Z1H09ta1EG xqKnAhACNs+RheofKpAbgWGzLYX4LReG3HdTuYeEs=; From: Mark Cave-Ayland To: huth@tuxfamily.org, qemu-devel@nongnu.org Date: Wed, 23 Oct 2024 09:58:49 +0100 Message-Id: <20241023085852.1061031-34-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241023085852.1061031-1-mark.cave-ayland@ilande.co.uk> References: <20241023085852.1061031-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a02:8012:c93d:0:260e:bf57:a4e9:8142 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 33/36] next-cube: move next_rtc_cmd_is_write() and next_rtc_data_in_irq() functions 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 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: 1729674273357116600 Content-Type: text/plain; charset="utf-8" Move these functions in next-cube.c so that they are with the rest of the next-rtc functions. Signed-off-by: Mark Cave-Ayland --- hw/m68k/next-cube.c | 172 ++++++++++++++++++++++---------------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 0a8b899515..076c9d1f3a 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -175,92 +175,6 @@ static void next_scr2_led_update(NeXTPC *s) } } =20 -static bool next_rtc_cmd_is_write(uint8_t cmd) -{ - return (cmd >=3D 0x80 && cmd <=3D 0x9f) || - (cmd =3D=3D 0xb1); -} - -static void next_rtc_data_in_irq(void *opaque, int n, int level) -{ - NeXTRTC *rtc =3D NEXT_RTC(opaque); - - if (rtc->phase < 8) { - rtc->command =3D (rtc->command << 1) | level; - - if (rtc->phase =3D=3D 7 && !next_rtc_cmd_is_write(rtc->command)) { - if (rtc->command <=3D 0x1f) { - /* RAM registers */ - rtc->retval =3D rtc->ram[rtc->command]; - } - if ((rtc->command >=3D 0x20) && (rtc->command <=3D 0x2f)) { - /* RTC */ - time_t time_h =3D time(NULL); - struct tm *info =3D localtime(&time_h); - rtc->retval =3D 0; - - switch (rtc->command) { - case 0x20: - rtc->retval =3D SCR2_TOBCD(info->tm_sec); - break; - case 0x21: - rtc->retval =3D SCR2_TOBCD(info->tm_min); - break; - case 0x22: - rtc->retval =3D SCR2_TOBCD(info->tm_hour); - break; - case 0x24: - rtc->retval =3D SCR2_TOBCD(info->tm_mday); - break; - case 0x25: - rtc->retval =3D SCR2_TOBCD((info->tm_mon + 1)); - break; - case 0x26: - rtc->retval =3D SCR2_TOBCD((info->tm_year - 100)); - break; - } - } - if (rtc->command =3D=3D 0x30) { - /* read the status 0x30 */ - rtc->retval =3D rtc->status; - } - if (rtc->command =3D=3D 0x31) { - /* read the control 0x31 */ - rtc->retval =3D rtc->control; - } - } - } - if (rtc->phase >=3D 8 && rtc->phase < 16) { - if (next_rtc_cmd_is_write(rtc->command)) { - /* Shift in value to write */ - rtc->value =3D (rtc->value << 1) | level; - } else { - /* Shift out value to read */ - if (rtc->retval & (0x80 >> (rtc->phase - 8))) { - qemu_irq_raise(rtc->data_out_irq); - } else { - qemu_irq_lower(rtc->data_out_irq); - } - } - } - - rtc->phase++; - if (rtc->phase =3D=3D 16 && next_rtc_cmd_is_write(rtc->command)) { - if (rtc->command >=3D 0x80 && rtc->command <=3D 0x9f) { - /* RAM registers */ - rtc->ram[rtc->command - 0x80] =3D rtc->value; - } - if (rtc->command =3D=3D 0xb1) { - /* write to 0x30 register */ - if (rtc->value & 0x04) { - /* clear FTU */ - rtc->status =3D rtc->status & (~0x18); - qemu_irq_lower(rtc->power_irq); - } - } - } -} - static void next_scr2_rtc_update(NeXTPC *s) { uint8_t old_scr2, scr2_2; @@ -1012,6 +926,92 @@ static const MemoryRegionOps next_dummy_en_ops =3D { .endianness =3D DEVICE_BIG_ENDIAN, }; =20 +static bool next_rtc_cmd_is_write(uint8_t cmd) +{ + return (cmd >=3D 0x80 && cmd <=3D 0x9f) || + (cmd =3D=3D 0xb1); +} + +static void next_rtc_data_in_irq(void *opaque, int n, int level) +{ + NeXTRTC *rtc =3D NEXT_RTC(opaque); + + if (rtc->phase < 8) { + rtc->command =3D (rtc->command << 1) | level; + + if (rtc->phase =3D=3D 7 && !next_rtc_cmd_is_write(rtc->command)) { + if (rtc->command <=3D 0x1f) { + /* RAM registers */ + rtc->retval =3D rtc->ram[rtc->command]; + } + if ((rtc->command >=3D 0x20) && (rtc->command <=3D 0x2f)) { + /* RTC */ + time_t time_h =3D time(NULL); + struct tm *info =3D localtime(&time_h); + rtc->retval =3D 0; + + switch (rtc->command) { + case 0x20: + rtc->retval =3D SCR2_TOBCD(info->tm_sec); + break; + case 0x21: + rtc->retval =3D SCR2_TOBCD(info->tm_min); + break; + case 0x22: + rtc->retval =3D SCR2_TOBCD(info->tm_hour); + break; + case 0x24: + rtc->retval =3D SCR2_TOBCD(info->tm_mday); + break; + case 0x25: + rtc->retval =3D SCR2_TOBCD((info->tm_mon + 1)); + break; + case 0x26: + rtc->retval =3D SCR2_TOBCD((info->tm_year - 100)); + break; + } + } + if (rtc->command =3D=3D 0x30) { + /* read the status 0x30 */ + rtc->retval =3D rtc->status; + } + if (rtc->command =3D=3D 0x31) { + /* read the control 0x31 */ + rtc->retval =3D rtc->control; + } + } + } + if (rtc->phase >=3D 8 && rtc->phase < 16) { + if (next_rtc_cmd_is_write(rtc->command)) { + /* Shift in value to write */ + rtc->value =3D (rtc->value << 1) | level; + } else { + /* Shift out value to read */ + if (rtc->retval & (0x80 >> (rtc->phase - 8))) { + qemu_irq_raise(rtc->data_out_irq); + } else { + qemu_irq_lower(rtc->data_out_irq); + } + } + } + + rtc->phase++; + if (rtc->phase =3D=3D 16 && next_rtc_cmd_is_write(rtc->command)) { + if (rtc->command >=3D 0x80 && rtc->command <=3D 0x9f) { + /* RAM registers */ + rtc->ram[rtc->command - 0x80] =3D rtc->value; + } + if (rtc->command =3D=3D 0xb1) { + /* write to 0x30 register */ + if (rtc->value & 0x04) { + /* clear FTU */ + rtc->status =3D rtc->status & (~0x18); + qemu_irq_lower(rtc->power_irq); + } + } + } +} + static void next_rtc_cmd_reset_irq(void *opaque, int n, int level) { NeXTRTC *rtc =3D NEXT_RTC(opaque); --=20 2.39.5