From nobody Tue Nov 4 21:57:04 2025 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 1530815126469168.5781323758988; Thu, 5 Jul 2018 11:25:26 -0700 (PDT) Received: from localhost ([::1]:54292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb8wT-0007rU-Od for importer@patchew.org; Thu, 05 Jul 2018 14:25:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57985) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb8re-0004Ld-U1 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 14:20:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb8rd-0006BV-VZ for qemu-devel@nongnu.org; Thu, 05 Jul 2018 14:20:22 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:41448) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb8rd-0006B9-Pa for qemu-devel@nongnu.org; Thu, 05 Jul 2018 14:20:21 -0400 Received: by mail-pf0-x242.google.com with SMTP id c21-v6so1515042pfn.8 for ; Thu, 05 Jul 2018 11:20:21 -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 g75-v6sm14170847pfg.145.2018.07.05.11.20.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 11:20:20 -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=+4BdEeH/fbVen0GPKM1aC4KKLQgxUqa9SlMk6K6b1hU=; b=q3A6XXlh942sLVmQoozEY4bmm/MxW0Um6qHm67IwgNDrbzf6R8wAaGtcCAQ3zJNCvR lYImIoNP/FWb0PSmDrD6KEoVppc8zQ/EBoTk9uqxxPEXEsxt/5sU2psL2JbYJddT8/R/ D3r/j3KwW4RqpXWPnOUUfebPP2UJ8LMamTaLvtFWFawnPXUz9a34lMxE7oLTmW3y8Oao bSQxAUcCxWND2Re+CbDmlAKh3+aigmt3U0jcNLoCApGjjTiwWDvi5aUacm+vjzwNigV7 O1rHDJiHGG8zblbpuM21Gzl/YCcpFZzi34lJON1UHyeXXd0cvuCojKw+HSC6RM3XNoqD 7EUQ== 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=+4BdEeH/fbVen0GPKM1aC4KKLQgxUqa9SlMk6K6b1hU=; b=XcWD8kJpeavQ40/6m8lwupW3YmgcNEAnvlclEHxIXPJB4/pOKOaFxnEO/LT500HoH2 g5XgRembM18euUSaMbftXmJlY81B9T/zj+CavD0cZcdjgjXuzqnoqwmDGZxHfRuL+gft ZMShTKozeq6LGkvyo1uTY5HC8htl9lWl7ft7pTXuC3dZ6RVtrH4roLcC+T/Aky5O6JsJ 6ysky5RkHLMToLfBqzdJCh0N5l8RurTMdxDkfWL1gamy1JIbHDh6pDXScDCeapn5p5R4 MTssLOZslr7OBGovp6sns2AIKfqoSrAwWjx9sNMINqL2YZrpci5T281AWqiAItDfSxXs lPuw== X-Gm-Message-State: APt69E2iiNJQvfbFzf2ml3zTDfZghTARWDTc+tzw9QY1j6mVoagEWYoe DGK3RAYzplEnzHEpyYMS+nA= X-Google-Smtp-Source: AAOMgpdyHIPwY4ryr0RenrmUduC6ge7SWG93xKD06/Oe4vjfiBazmkKSI6ARb9c9DPMeFnUHmp2KXQ== X-Received: by 2002:a65:6211:: with SMTP id d17-v6mr6694167pgv.450.1530814820944; Thu, 05 Jul 2018 11:20:20 -0700 (PDT) From: Michael Davidsaver To: Peter Maydell , Paolo Bonzini Date: Thu, 5 Jul 2018 11:19:51 -0700 Message-Id: <20180705182001.16537-5-mdavidsaver@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180705182001.16537-1-mdavidsaver@gmail.com> References: <20180705182001.16537-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::242 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 , Thomas Huth , 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 Reviewed-by: David Gibson --- hw/timer/ds1338.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/timer/ds1338.c b/hw/timer/ds1338.c index b56db5852e..637a0f4246 100644 --- a/hw/timer/ds1338.c +++ b/hw/timer/ds1338.c @@ -89,9 +89,13 @@ static void capture_current_time(DS1338State *s) */ struct tm now; 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)) { + /* 12 hour mode. + * map 0-23 to 1-12 am/pm + */ int tmp =3D now.tm_hour; if (tmp % 12 =3D=3D 0) { tmp +=3D 12; @@ -101,7 +105,9 @@ static void capture_current_time(DS1338State *s) } else { s->nvram[R_HOUR] =3D R_HOUR_SET12_MASK | R_HOUR_AMPM_MASK | to= _bcd(tmp - 12); } + } else { + /* 24 hour mode. */ s->nvram[R_HOUR] =3D to_bcd(now.tm_hour); } s->nvram[R_WDAY] =3D (now.tm_wday + s->wday_offset) % 7 + 1; @@ -178,14 +184,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