From nobody Sat Feb 7 08:28:17 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 1530814951574377.6700522746537; Thu, 5 Jul 2018 11:22:31 -0700 (PDT) Received: from localhost ([::1]:54278 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb8ti-0005Z6-LC for importer@patchew.org; Thu, 05 Jul 2018 14:22:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb8rc-0004Jx-Sy for qemu-devel@nongnu.org; Thu, 05 Jul 2018 14:20:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb8ra-00069s-T3 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 14:20:20 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:36496) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb8ra-00069g-Kg for qemu-devel@nongnu.org; Thu, 05 Jul 2018 14:20:18 -0400 Received: by mail-pf0-x244.google.com with SMTP id u16-v6so6121804pfh.3 for ; Thu, 05 Jul 2018 11:20:18 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 11:20:16 -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=qqUC8nq03ucnduazObyS4Vw2mIYZ2sV4BklgCg/JcDk=; b=Fxl5CKNOV63X7v7T5L5BBBXTH8tWNX2yNxI8p203LJgAvjgxOzG7azslvd00M8rlqT 2o+cBPNiofYYPET4XPoGX/Q8sR20UyjW6qYYL9BhzF0lsx86GqB2X6oL8I6fCsshr4wq pnnrJptF+0KWfOsIDNI6GW3w99bKdl9qEINqZ33npbD+aLNzHI8GBLi7JnC5BJtGOnkZ TXdQev03Qq5REQMqbsvovKXX1+yTXqQiByykMjuIabuZIDaSwXxeWN94ucjTUle8pD1F cd+uon9/WeIAupPu0t1a1BLDVda8MSyto/TSOIdleM13/qv/aXDHM5Bv2JgZYUtEVRsA xiwg== 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=qqUC8nq03ucnduazObyS4Vw2mIYZ2sV4BklgCg/JcDk=; b=jx8EKe7wv+5+649+qYP7Zyxa1yLfZF9WnSl8ZWHTiP4P7JtS5cmoVom292OVyR3A2W ohf9y8fLNS+dv2pqTMjdBgD57sMo7If5St2aCghkVelxT4/E4fsdUSA5xO5g+UGZ6J+j QkiwNH80q0COe2gR94d0/abEWXW+z5HVmI5iQsHjSvkKg/biwKPXVLzzjlbOoqnuvCBw niYqQvqPoP/3f5WQq42vQuxdLVNnGvf5uN2L0GunvYDs3r7W2soCpyrhJFoF4ygmyfBL zlweNe2LJTY4QqmBr7k1a8K2JEpgfO02FRJ7EuhVc6UpnXWAC2Nae+pnjRY+r4rz9Emu 1pOQ== X-Gm-Message-State: APt69E3vaZSHI+dFkfCNuOeNiYDZGB7QZK5y67oPNM5rjI59Atc+PJ6v mKZmKv1dGJPXrgNY6ITq60E83w== X-Google-Smtp-Source: AAOMgpc/3zYlXzZ/uDPpPs7JYW6CDEe+HyJx6EczBb2LeodB6XNuno7ABUSGKiL6xtiLGCMa8sWwiQ== X-Received: by 2002:a63:9311:: with SMTP id b17-v6mr6594338pge.261.1530814817771; Thu, 05 Jul 2018 11:20:17 -0700 (PDT) From: Michael Davidsaver To: Peter Maydell , Paolo Bonzini Date: Thu, 5 Jul 2018 11:19:49 -0700 Message-Id: <20180705182001.16537-3-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::244 Subject: [Qemu-devel] [PATCH 02/14] timer: ds1338 use registerfields.h 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" Use names for registers and bits except for R_CTRL which will be dealt with later, and isn't modeled anyway. Signed-off-by: Michael Davidsaver Reviewed-by: Peter Maydell Reviewed-by: David Gibson --- hw/timer/ds1338.c | 80 +++++++++++++++++++++++++++++++++++++--------------= ---- 1 file changed, 54 insertions(+), 26 deletions(-) diff --git a/hw/timer/ds1338.c b/hw/timer/ds1338.c index 3849b74a68..7298c5af43 100644 --- a/hw/timer/ds1338.c +++ b/hw/timer/ds1338.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "hw/i2c/i2c.h" +#include "hw/registerfields.h" #include "qemu/bcd.h" =20 /* Size of NVRAM including both the user-accessible area and the @@ -20,15 +21,42 @@ */ #define NVRAM_SIZE 64 =20 -/* Flags definitions */ -#define SECONDS_CH 0x80 -#define HOURS_12 0x40 -#define HOURS_PM 0x20 #define CTRL_OSF 0x20 =20 #define TYPE_DS1338 "ds1338" #define DS1338(obj) OBJECT_CHECK(DS1338State, (obj), TYPE_DS1338) =20 +/* values stored in BCD */ +/* 00-59 */ +#define R_SEC (0x0) +/* 00-59 */ +#define R_MIN (0x1) +#define R_HOUR (0x2) +/* 1-7 */ +#define R_WDAY (0x3) +/* 0-31 */ +#define R_DATE (0x4) +#define R_MONTH (0x5) +/* 0-99 */ +#define R_YEAR (0x6) + +#define R_CTRL (0x7) + +/* use 12 hour mode when set */ +FIELD(HOUR, SET12, 6, 1) +/* 00-23 */ +FIELD(HOUR, HOUR24, 0, 6) +/* PM when set */ +FIELD(HOUR, AMPM, 5, 1) +/* 1-12 (not 0-11!) */ +FIELD(HOUR, HOUR12, 0, 5) + +/* 1-12 */ +FIELD(MONTH, MONTH, 0, 5) +FIELD(MONTH, CENTURY, 7, 1) + +FIELD(CTRL, OSF, 5, 1) + typedef struct DS1338State { I2CSlave parent_obj; =20 @@ -61,25 +89,25 @@ static void capture_current_time(DS1338State *s) */ struct tm now; qemu_get_timedate(&now, s->offset); - s->nvram[0] =3D to_bcd(now.tm_sec); - s->nvram[1] =3D to_bcd(now.tm_min); - if (s->nvram[2] & HOURS_12) { + 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; } if (tmp <=3D 12) { - s->nvram[2] =3D HOURS_12 | to_bcd(tmp); + s->nvram[R_HOUR] =3D R_HOUR_SET12_MASK | to_bcd(tmp); } else { - s->nvram[2] =3D HOURS_12 | HOURS_PM | to_bcd(tmp - 12); + s->nvram[R_HOUR] =3D R_HOUR_SET12_MASK | R_HOUR_AMPM_MASK | to= _bcd(tmp - 12); } } else { - s->nvram[2] =3D to_bcd(now.tm_hour); + s->nvram[R_HOUR] =3D to_bcd(now.tm_hour); } - s->nvram[3] =3D (now.tm_wday + s->wday_offset) % 7 + 1; - s->nvram[4] =3D to_bcd(now.tm_mday); - s->nvram[5] =3D to_bcd(now.tm_mon + 1); - s->nvram[6] =3D to_bcd(now.tm_year - 100); + s->nvram[R_WDAY] =3D (now.tm_wday + s->wday_offset) % 7 + 1; + s->nvram[R_DATE] =3D to_bcd(now.tm_mday); + s->nvram[R_MONTH] =3D to_bcd(now.tm_mon + 1); + s->nvram[R_YEAR] =3D to_bcd(now.tm_year - 100); } =20 static void inc_regptr(DS1338State *s) @@ -141,17 +169,17 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data) struct tm now; qemu_get_timedate(&now, s->offset); switch(s->ptr) { - case 0: + case R_SEC: /* TODO: Implement CH (stop) bit. */ now.tm_sec =3D from_bcd(data & 0x7f); break; - case 1: + case R_MIN: now.tm_min =3D from_bcd(data & 0x7f); break; - case 2: - if (data & HOURS_12) { - int tmp =3D from_bcd(data & (HOURS_PM - 1)); - if (data & HOURS_PM) { + case R_HOUR: + if (FIELD_EX32(data, HOUR, SET12)) { + int tmp =3D from_bcd(FIELD_EX32(data, HOUR, HOUR12)); + if (FIELD_EX32(data, HOUR, AMPM)) { tmp +=3D 12; } if (tmp % 12 =3D=3D 0) { @@ -159,10 +187,10 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data) } now.tm_hour =3D tmp; } else { - now.tm_hour =3D from_bcd(data & (HOURS_12 - 1)); + now.tm_hour =3D from_bcd(FIELD_EX32(data, HOUR, HOUR24)); } break; - case 3: + case R_WDAY: { /* The day field is supposed to contain a value in the range 1-7. Otherwise behavior is undefined. @@ -171,18 +199,18 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data) s->wday_offset =3D (user_wday - now.tm_wday + 7) % 7; } break; - case 4: + case R_DATE: now.tm_mday =3D from_bcd(data & 0x3f); break; - case 5: + case R_MONTH: now.tm_mon =3D from_bcd(data & 0x1f) - 1; break; - case 6: + case R_YEAR: now.tm_year =3D from_bcd(data) + 100; break; } s->offset =3D qemu_timedate_diff(&now); - } else if (s->ptr =3D=3D 7) { + } else if (s->ptr =3D=3D R_CTRL) { /* Control register. */ =20 /* Ensure bits 2, 3 and 6 will read back as zero. */ --=20 2.11.0