From nobody Tue Nov 4 21:57:01 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 1530815181116600.8900474936503; Thu, 5 Jul 2018 11:26:21 -0700 (PDT) Received: from localhost ([::1]:54300 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb8xQ-0000NV-8g for importer@patchew.org; Thu, 05 Jul 2018 14:26:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb8rn-0004Se-OD for qemu-devel@nongnu.org; Thu, 05 Jul 2018 14:20:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb8rl-0006FF-1u for qemu-devel@nongnu.org; Thu, 05 Jul 2018 14:20:31 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:43482) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb8rk-0006Eg-Df for qemu-devel@nongnu.org; Thu, 05 Jul 2018 14:20:28 -0400 Received: by mail-pf0-x242.google.com with SMTP id y8-v6so6129918pfm.10 for ; Thu, 05 Jul 2018 11:20:28 -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.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 11:20:26 -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=7b83ynxXJ4lVBRT0e+nUb2QNX3cnx8XgEz7aLa+8rJk=; b=NohlyJ0iuQ93kOa3xBuAVNtUkH+m/b0ypzjgJd5EYSPHcB6g868bAQ/FxOheovRE8O ke48oDkxGtGvWHSAp/117Sr1+aY6bLm4s0ziHF/nCtj9/d8LTOdMTsCcs7Ff5e4u0sUd 8ENcpnJz1ZkQyWLKHkcdM98YZftfYfBGudpTp8a3dvnCgWP7v+N96wCA0mBkUMkWu1ar 7I6P9u+1KYhT3zcLPq3Gq0e5OVQ9c/TnXofOGMhaxG72x123BBgJygzQR8XMp6yPze1y DJ/fZr56rGOBNVYWKPa3VWdayUieUuoL0Zyj4yFxgUR5wSIaPQoN32aGhSjRrCcdzPKC BWMw== 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=7b83ynxXJ4lVBRT0e+nUb2QNX3cnx8XgEz7aLa+8rJk=; b=CuHDswNNctmgE5N1tNL91EEm1vilGVcrAUjrXhgRz5+nXwxYkhU+eMS/2hHYiQ0FY4 uKc7/Uc312lIjnbkI+dLE9X2mwgMaIuWz3dlgF32YMLEokHVtJADNS+UPOb5VXiTBL3b ToKMAghZNoe7A3WarDz/QG6GmZ2/S5N/26e1Veav0fTxueq8v26tOKkiNiNHyXcYmSni BsMy3dXGKEGwKyRu/XpK0uq29w9NkIT7550XDbVkDRz3nlNYWqL6NabQrc6kHQOVPUF8 mSWELkzhr4Hmqg0T0Bt98C8Xo2D8i+iHqVgHqjrKdqK8l//G0SZ/Z57yRs1peS3zZhMZ b5Mw== X-Gm-Message-State: APt69E04D7UQ7Ui+3w1Q8XdfaGo27mNFQ0LJr1w4LWBsCArCmA0q9v3B hZRBox7Vp0TFS45+5N/xTG4= X-Google-Smtp-Source: AAOMgpeUZkN92SF3ev4AL8cAo7hq+lHoakGGNpN1iR1hkxT1qnoBiHTuKBvN53kUGux1hq0d4WBkkQ== X-Received: by 2002:a63:b047:: with SMTP id z7-v6mr6644364pgo.335.1530814827520; Thu, 05 Jul 2018 11:20:27 -0700 (PDT) From: Michael Davidsaver To: Peter Maydell , Paolo Bonzini Date: Thu, 5 Jul 2018 11:19:55 -0700 Message-Id: <20180705182001.16537-9-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 08/14] timer: rename ds1338 -> dsrtc 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" Prepare to generalize with a more generic name. Keep device name and vmstate name "ds1338" for compatibility. Signed-off-by: Michael Davidsaver Reviewed-by: Peter Maydell --- hw/timer/ds1338.c | 72 +++++++++++++++++++++++++++------------------------= ---- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/hw/timer/ds1338.c b/hw/timer/ds1338.c index 0134ffd72a..3c5781d53c 100644 --- a/hw/timer/ds1338.c +++ b/hw/timer/ds1338.c @@ -23,8 +23,8 @@ =20 #define CTRL_OSF 0x20 =20 -#define TYPE_DS1338 "ds1338" -#define DS1338(obj) OBJECT_CHECK(DS1338State, (obj), TYPE_DS1338) +#define TYPE_DSRTC "ds1338" +#define DSRTC(obj) OBJECT_CHECK(DSRTCState, (obj), TYPE_DSRTC) =20 /* values stored in BCD */ /* 00-59 */ @@ -57,7 +57,7 @@ FIELD(MONTH, CENTURY, 7, 1) =20 FIELD(CTRL, OSF, 5, 1) =20 -typedef struct DS1338State { +typedef struct DSRTCState { I2CSlave parent_obj; =20 int64_t offset; @@ -65,24 +65,24 @@ typedef struct DS1338State { uint8_t nvram[NVRAM_SIZE]; int32_t ptr; bool addr_byte; -} DS1338State; +} DSRTCState; =20 -static const VMStateDescription vmstate_ds1338 =3D { +static const VMStateDescription vmstate_dsrtc =3D { .name =3D "ds1338", .version_id =3D 2, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_I2C_SLAVE(parent_obj, DS1338State), - VMSTATE_INT64(offset, DS1338State), - VMSTATE_UINT8_V(wday_offset, DS1338State, 2), - VMSTATE_UINT8_ARRAY(nvram, DS1338State, NVRAM_SIZE), - VMSTATE_INT32(ptr, DS1338State), - VMSTATE_BOOL(addr_byte, DS1338State), + VMSTATE_I2C_SLAVE(parent_obj, DSRTCState), + VMSTATE_INT64(offset, DSRTCState), + VMSTATE_UINT8_V(wday_offset, DSRTCState, 2), + VMSTATE_UINT8_ARRAY(nvram, DSRTCState, NVRAM_SIZE), + VMSTATE_INT32(ptr, DSRTCState), + VMSTATE_BOOL(addr_byte, DSRTCState), VMSTATE_END_OF_LIST() } }; =20 -static void capture_current_time(DS1338State *s) +static void capture_current_time(DSRTCState *s) { /* Capture the current time into the secondary registers * which will be actually read by the data transfer operation. @@ -119,7 +119,7 @@ static void capture_current_time(DS1338State *s) s->nvram[R_YEAR] =3D to_bcd(now.tm_year - 100); } =20 -static void inc_regptr(DS1338State *s) +static void inc_regptr(DSRTCState *s) { /* The register pointer wraps around after 0x3F; wraparound * causes the current time/date to be retransferred into @@ -131,9 +131,9 @@ static void inc_regptr(DS1338State *s) } } =20 -static int ds1338_event(I2CSlave *i2c, enum i2c_event event) +static int dsrtc_event(I2CSlave *i2c, enum i2c_event event) { - DS1338State *s =3D DS1338(i2c); + DSRTCState *s =3D DSRTC(i2c); =20 switch (event) { case I2C_START_RECV: @@ -154,9 +154,9 @@ static int ds1338_event(I2CSlave *i2c, enum i2c_event e= vent) return 0; } =20 -static int ds1338_recv(I2CSlave *i2c) +static int dsrtc_recv(I2CSlave *i2c) { - DS1338State *s =3D DS1338(i2c); + DSRTCState *s =3D DSRTC(i2c); uint8_t res; =20 res =3D s->nvram[s->ptr]; @@ -167,7 +167,7 @@ static int ds1338_recv(I2CSlave *i2c) /* call after guest writes to current time registers * to re-compute our offset from host time. */ -static void ds1338_update(DS1338State *s) +static void dsrtc_update(DSRTCState *s) { =20 struct tm now =3D {}; @@ -204,9 +204,9 @@ static void ds1338_update(DS1338State *s) } } =20 -static int ds1338_send(I2CSlave *i2c, uint8_t data) +static int dsrtc_send(I2CSlave *i2c, uint8_t data) { - DS1338State *s =3D DS1338(i2c); + DSRTCState *s =3D DSRTC(i2c); =20 if (s->addr_byte) { s->ptr =3D data & (NVRAM_SIZE - 1); @@ -226,15 +226,15 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data) } s->nvram[s->ptr] =3D data; if (s->ptr <=3D R_YEAR) { - ds1338_update(s); + dsrtc_update(s); } inc_regptr(s); return 0; } =20 -static void ds1338_reset(DeviceState *dev) +static void dsrtc_reset(DeviceState *dev) { - DS1338State *s =3D DS1338(dev); + DSRTCState *s =3D DSRTC(dev); =20 /* The clock is running and synchronized with the host */ s->offset =3D 0; @@ -244,28 +244,28 @@ static void ds1338_reset(DeviceState *dev) s->addr_byte =3D false; } =20 -static void ds1338_class_init(ObjectClass *klass, void *data) +static void dsrtc_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); I2CSlaveClass *k =3D I2C_SLAVE_CLASS(klass); =20 - k->event =3D ds1338_event; - k->recv =3D ds1338_recv; - k->send =3D ds1338_send; - dc->reset =3D ds1338_reset; - dc->vmsd =3D &vmstate_ds1338; + k->event =3D dsrtc_event; + k->recv =3D dsrtc_recv; + k->send =3D dsrtc_send; + dc->reset =3D dsrtc_reset; + dc->vmsd =3D &vmstate_dsrtc; } =20 -static const TypeInfo ds1338_info =3D { - .name =3D TYPE_DS1338, +static const TypeInfo dsrtc_info =3D { + .name =3D TYPE_DSRTC, .parent =3D TYPE_I2C_SLAVE, - .instance_size =3D sizeof(DS1338State), - .class_init =3D ds1338_class_init, + .instance_size =3D sizeof(DSRTCState), + .class_init =3D dsrtc_class_init, }; =20 -static void ds1338_register_types(void) +static void dsrtc_register_types(void) { - type_register_static(&ds1338_info); + type_register_static(&dsrtc_info); } =20 -type_init(ds1338_register_types) +type_init(dsrtc_register_types) --=20 2.11.0