From nobody Tue Feb 10 19:14:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521920348998366.8764643840751; Sat, 24 Mar 2018 12:39:08 -0700 (PDT) Received: from localhost ([::1]:47359 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezp0O-0000QC-3c for importer@patchew.org; Sat, 24 Mar 2018 15:39:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezoxd-0000Bv-Bd for qemu-devel@nongnu.org; Sat, 24 Mar 2018 15:37:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ezomu-0005lC-KO for qemu-devel@nongnu.org; Sat, 24 Mar 2018 15:28:50 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:33136) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ezomu-0005ku-E2 for qemu-devel@nongnu.org; Sat, 24 Mar 2018 15:25:12 -0400 Received: by mail-pf0-x243.google.com with SMTP id f15so243982pfn.0 for ; Sat, 24 Mar 2018 12:25:12 -0700 (PDT) Received: from localhost.localdomain (c-73-158-53-43.hsd1.ca.comcast.net. [73.158.53.43]) by smtp.gmail.com with ESMTPSA id o2sm13353501pgq.87.2018.03.24.12.25.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Mar 2018 12:25:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=61tm8g8WxGzc8lT5vJ79WZsP2A+E/TKcEFA8TYOUxYQ=; b=KH8PYzGQVAxzQBuAGh88tPXy5PT/QAghN0Wcgi7RDvany5PKfZzE7NHk8CFix73rQ5 DelK8KZitphg+JMxCP8bC1ju7UmDzU/1RXnG+3f0EVhYQ1Xtws1De+Hsp6WYbk/ktmDz Uvj5dubGkkaH4vwiB1hAt8kkoRfaVISpUVm6n6lWoxqzZ102KoX5Y8HWs2bktADGfwaT FNfIEdgdejkgzJ/12BZdGCxDogxQ0SHnzg+ek7xTKfxAVNeHAP7mGJT92m+CNUmjei/o 3SUMuG+pZFYuQn5BTw0oWk6v8vNkDtAZr1W0Ik8CpHqPYxg9/JKVHRl0MJzFO1M2fp49 YrMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=61tm8g8WxGzc8lT5vJ79WZsP2A+E/TKcEFA8TYOUxYQ=; b=gdMFeQ7bTvUZW+l8/ONo4hdrfdn01k+MpsxVNaoxt8NEh5xzWdzn2lIzhoIU4dDCNJ zVnE43Ylhb4UGPj+EZt3SsiCr8lb5d1pNZHkqNihiWjOLwhDP7qMYr0vTM9lQ8ANSkvV R4Z0dQoxDSmjJyNDcKTG7CKNWvvlbMNja8ElLQNZjOVewu5zlwN6+hwITBjuonsCXqwf iypn5PN8RD9kKxWbwtP0PqYcXNLa3TvL+IiQp2bsQcaIHVaM7QzoIoqJk2uxTymrKhul 3/19NGyTNXS1Yp8/TYUfrmOgAvw2lQdd3uCt6E3iScxYtZPXsZUvwy0GWSKSh1ULsViw mmjg== X-Gm-Message-State: AElRT7GtmAmNtggmbAI8gOE8Q47Roq9XdIqM4myEylwuLHbmI+k1GEiu vTEVwRoV7ORyDgGvd4LOAJY= X-Google-Smtp-Source: AG47ELvOtshG1sVl1BkIETPa9DZQI1x2Um26ixLs2BzsVtIxyZvhH4ka+RqQxU48xdYKLk7JtW48tg== X-Received: by 10.167.129.217 with SMTP id c25mr8526816pfn.143.1521919511534; Sat, 24 Mar 2018 12:25:11 -0700 (PDT) From: Michael Davidsaver To: Peter Maydell , Thomas Huth Date: Sat, 24 Mar 2018 12:24:45 -0700 Message-Id: <20180324192455.12254-5-mdavidsaver@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180324192455.12254-1-mdavidsaver@gmail.com> References: <20180324192455.12254-1-mdavidsaver@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH 04/14] timer: ds1338 clarify HOUR handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Antoine Mathys , Michael Davidsaver , qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Simplify and comment the translation between registers and struct tm. Signed-off-by: Michael Davidsaver --- hw/timer/ds1338.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/hw/timer/ds1338.c b/hw/timer/ds1338.c index 72a4692d60..9bcda26e51 100644 --- a/hw/timer/ds1338.c +++ b/hw/timer/ds1338.c @@ -88,23 +88,23 @@ static void capture_current_time(DS1338State *s) * which will be actually read by the data transfer operation. */ struct tm now; + bool mode12 =3D ARRAY_FIELD_EX32(s->nvram, HOUR, SET12); qemu_get_timedate(&now, s->offset); + s->nvram[R_SEC] =3D to_bcd(now.tm_sec); s->nvram[R_MIN] =3D to_bcd(now.tm_min); - if (ARRAY_FIELD_EX32(s->nvram, HOUR, SET12)) { - int tmp =3D now.tm_hour; - if (tmp % 12 =3D=3D 0) { - tmp +=3D 12; - } - s->nvram[R_HOUR] =3D 0; + s->nvram[R_HOUR] =3D 0; + if (mode12) { + /* map 0-23 to 1-12 am/pm */ ARRAY_FIELD_DP32(s->nvram, HOUR, SET12, 1); - if (tmp <=3D 12) { - ARRAY_FIELD_DP32(s->nvram, HOUR, AMPM, 0); - ARRAY_FIELD_DP32(s->nvram, HOUR, HOUR12, to_bcd(tmp)); - } else { - ARRAY_FIELD_DP32(s->nvram, HOUR, AMPM, 1); - ARRAY_FIELD_DP32(s->nvram, HOUR, HOUR12, to_bcd(tmp - 12)); + ARRAY_FIELD_DP32(s->nvram, HOUR, AMPM, now.tm_hour >=3D 12u); + now.tm_hour %=3D 12u; /* wrap 0-23 to 0-11 */ + if (now.tm_hour =3D=3D 0u) { + /* midnight/noon stored as 12 */ + now.tm_hour =3D 12u; } + ARRAY_FIELD_DP32(s->nvram, HOUR, HOUR12, to_bcd(now.tm_hour)); + } else { ARRAY_FIELD_DP32(s->nvram, HOUR, HOUR24, to_bcd(now.tm_hour)); } @@ -182,14 +182,13 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data) break; case R_HOUR: if (FIELD_EX32(data, HOUR, SET12)) { - int tmp =3D from_bcd(FIELD_EX32(data, HOUR, HOUR12)); + /* 12 hour (1-12) */ + /* read and wrap 1-12 -> 0-11 */ + now.tm_hour =3D from_bcd(FIELD_EX32(data, HOUR, HOUR12)) %= 12u; if (FIELD_EX32(data, HOUR, AMPM)) { - tmp +=3D 12; + now.tm_hour +=3D 12; } - if (tmp % 12 =3D=3D 0) { - tmp -=3D 12; - } - now.tm_hour =3D tmp; + } else { now.tm_hour =3D from_bcd(FIELD_EX32(data, HOUR, HOUR24)); } --=20 2.11.0