From mboxrd@z Thu Jan 1 00:00:00 1970 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) From: Michael Davidsaver Date: Thu, 5 Jul 2018 11:19:55 -0700 Message-Id: <20180705182001.16537-9-mdavidsaver@gmail.com> In-Reply-To: <20180705182001.16537-1-mdavidsaver@gmail.com> References: <20180705182001.16537-1-mdavidsaver@gmail.com> Subject: [Qemu-devel] [PATCH 08/14] timer: rename ds1338 -> dsrtc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , Paolo Bonzini Cc: Thomas Huth , Antoine Mathys , David Gibson , qemu-devel@nongnu.org, Michael Davidsaver 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 @@ #define CTRL_OSF 0x20 -#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) /* values stored in BCD */ /* 00-59 */ @@ -57,7 +57,7 @@ FIELD(MONTH, CENTURY, 7, 1) FIELD(CTRL, OSF, 5, 1) -typedef struct DS1338State { +typedef struct DSRTCState { I2CSlave parent_obj; int64_t offset; @@ -65,24 +65,24 @@ typedef struct DS1338State { uint8_t nvram[NVRAM_SIZE]; int32_t ptr; bool addr_byte; -} DS1338State; +} DSRTCState; -static const VMStateDescription vmstate_ds1338 = { +static const VMStateDescription vmstate_dsrtc = { .name = "ds1338", .version_id = 2, .minimum_version_id = 1, .fields = (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() } }; -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] = to_bcd(now.tm_year - 100); } -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) } } -static int ds1338_event(I2CSlave *i2c, enum i2c_event event) +static int dsrtc_event(I2CSlave *i2c, enum i2c_event event) { - DS1338State *s = DS1338(i2c); + DSRTCState *s = DSRTC(i2c); switch (event) { case I2C_START_RECV: @@ -154,9 +154,9 @@ static int ds1338_event(I2CSlave *i2c, enum i2c_event event) return 0; } -static int ds1338_recv(I2CSlave *i2c) +static int dsrtc_recv(I2CSlave *i2c) { - DS1338State *s = DS1338(i2c); + DSRTCState *s = DSRTC(i2c); uint8_t res; res = 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) { struct tm now = {}; @@ -204,9 +204,9 @@ static void ds1338_update(DS1338State *s) } } -static int ds1338_send(I2CSlave *i2c, uint8_t data) +static int dsrtc_send(I2CSlave *i2c, uint8_t data) { - DS1338State *s = DS1338(i2c); + DSRTCState *s = DSRTC(i2c); if (s->addr_byte) { s->ptr = data & (NVRAM_SIZE - 1); @@ -226,15 +226,15 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data) } s->nvram[s->ptr] = data; if (s->ptr <= R_YEAR) { - ds1338_update(s); + dsrtc_update(s); } inc_regptr(s); return 0; } -static void ds1338_reset(DeviceState *dev) +static void dsrtc_reset(DeviceState *dev) { - DS1338State *s = DS1338(dev); + DSRTCState *s = DSRTC(dev); /* The clock is running and synchronized with the host */ s->offset = 0; @@ -244,28 +244,28 @@ static void ds1338_reset(DeviceState *dev) s->addr_byte = false; } -static void ds1338_class_init(ObjectClass *klass, void *data) +static void dsrtc_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); I2CSlaveClass *k = I2C_SLAVE_CLASS(klass); - k->event = ds1338_event; - k->recv = ds1338_recv; - k->send = ds1338_send; - dc->reset = ds1338_reset; - dc->vmsd = &vmstate_ds1338; + k->event = dsrtc_event; + k->recv = dsrtc_recv; + k->send = dsrtc_send; + dc->reset = dsrtc_reset; + dc->vmsd = &vmstate_dsrtc; } -static const TypeInfo ds1338_info = { - .name = TYPE_DS1338, +static const TypeInfo dsrtc_info = { + .name = TYPE_DSRTC, .parent = TYPE_I2C_SLAVE, - .instance_size = sizeof(DS1338State), - .class_init = ds1338_class_init, + .instance_size = sizeof(DSRTCState), + .class_init = dsrtc_class_init, }; -static void ds1338_register_types(void) +static void dsrtc_register_types(void) { - type_register_static(&ds1338_info); + type_register_static(&dsrtc_info); } -type_init(ds1338_register_types) +type_init(dsrtc_register_types) -- 2.11.0