From patchwork Wed Dec 12 22:35:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Mathys X-Patchwork-Id: 205675 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 599462C0087 for ; Thu, 13 Dec 2012 09:36:01 +1100 (EST) Received: from localhost ([::1]:39517 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiuuF-0003i5-HV for incoming@patchwork.ozlabs.org; Wed, 12 Dec 2012 17:35:59 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tiuu3-0003X1-Gp for qemu-devel@nongnu.org; Wed, 12 Dec 2012 17:35:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tiuu2-0007Aq-4V for qemu-devel@nongnu.org; Wed, 12 Dec 2012 17:35:47 -0500 Received: from mail-ea0-f173.google.com ([209.85.215.173]:48838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tiuu1-0007AX-S4 for qemu-devel@nongnu.org; Wed, 12 Dec 2012 17:35:46 -0500 Received: by mail-ea0-f173.google.com with SMTP id i13so447792eaa.4 for ; Wed, 12 Dec 2012 14:35:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=/04zH8kxLdluuwlPI2/qH5FPPGyVhkpatzzSokjKIhE=; b=sz2JApvrK0nEYEZwU2weiGX9FbqTp/Qnp5PqrtCshq7gDJMf2xm3CufA5seGa9+rFX wMoM3VE7VPgPi2N973B7bgrZvbrATe30gQ0fZtd0fmeBBYNIbRs+iKpP3uBZC973MUx1 s1jZwYXTowRik19Z1k2wAP74mJW/uWQIyqb9lQs531A5eOj++P87BulLYlD7zye7AqoJ h48KyWHtmm/Cw9F7cSVQIvpLCt0O6WjoDIgXJlsbVBi7zvVcrSOJ/wW6Spb5DEUbz90r RVhMUFrfQicXyr9p4PVtaHjrPdn+0df7MRWHzSWB4XJGe+DYqbFIXfJ5VaUVGVgIDyCw neAQ== Received: by 10.14.215.194 with SMTP id e42mr6604260eep.32.1355351745166; Wed, 12 Dec 2012 14:35:45 -0800 (PST) Received: from [192.168.1.33] (adsl-84-227-232-139.adslplus.ch. [84.227.232.139]) by mx.google.com with ESMTPS id q44sm58665866eep.5.2012.12.12.14.35.43 (version=SSLv3 cipher=OTHER); Wed, 12 Dec 2012 14:35:44 -0800 (PST) Message-ID: <50C906BF.2030806@gmail.com> Date: Wed, 12 Dec 2012 23:35:43 +0100 From: Antoine Mathys User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: qemu-devel@nongnu.org References: <50C9041A.8020202@gmail.com> In-Reply-To: <50C9041A.8020202@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.215.173 Cc: Peter Maydell , paul@codesourcery.com Subject: Re: [Qemu-devel] [PATCH v3 4/6] hw/ds1338.c: Ensure state is properly initialized. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Antoine Mathys --- hw/ds1338.c | 51 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/hw/ds1338.c b/hw/ds1338.c index b576d56..d2f52fc 100644 --- a/hw/ds1338.c +++ b/hw/ds1338.c @@ -17,6 +17,12 @@ */ #define NVRAM_SIZE 64 +/* Flags definitions */ +#define SECONDS_CH 0x80 +#define HOURS_12 0x40 +#define HOURS_PM 0x20 +#define CTRL_OSF 0x20 + typedef struct { I2CSlave i2c; int64_t offset; @@ -49,17 +55,22 @@ static void capture_current_time(DS1338State *s) qemu_get_timedate(&now, s->offset); s->nvram[0] = to_bcd(now.tm_sec); s->nvram[1] = to_bcd(now.tm_min); - if (s->nvram[2] & 0x40) { - s->nvram[2] = (to_bcd((now.tm_hour % 12)) + 1) | 0x40; - if (now.tm_hour >= 12) { - s->nvram[2] |= 0x20; + if (s->nvram[2] & HOURS_12) { + int tmp = now.tm_hour; + if (tmp == 0) { + tmp = 24; + } + if (tmp <= 12) { + s->nvram[2] = HOURS_12 | to_bcd(tmp); + } else { + s->nvram[2] = HOURS_12 | HOURS_PM | to_bcd(tmp - 12); } } else { s->nvram[2] = to_bcd(now.tm_hour); } - s->nvram[3] = to_bcd(now.tm_wday) + 1; + s->nvram[3] = to_bcd(now.tm_wday + 1); s->nvram[4] = to_bcd(now.tm_mday); - s->nvram[5] = to_bcd(now.tm_mon) + 1; + s->nvram[5] = to_bcd(now.tm_mon + 1); s->nvram[6] = to_bcd(now.tm_year - 100); } @@ -126,16 +137,18 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data) now.tm_min = from_bcd(data & 0x7f); break; case 2: - if (data & 0x40) { - if (data & 0x20) { - data = from_bcd(data & 0x4f) + 11; - } else { - data = from_bcd(data & 0x1f) - 1; + if (data & HOURS_12) { + int tmp = from_bcd(data & (HOURS_PM - 1)); + if (data & HOURS_PM) { + tmp += 12; } + if (tmp == 24) { + tmp = 0; + } + now.tm_hour = tmp; } else { - data = from_bcd(data); + now.tm_hour = from_bcd(data & (HOURS_12 - 1)); } - now.tm_hour = data; break; case 3: now.tm_wday = from_bcd(data & 7) - 1; @@ -166,6 +179,17 @@ static int ds1338_init(I2CSlave *i2c) return 0; } +static void ds1338_reset(DeviceState *dev) +{ + DS1338State *s = FROM_I2C_SLAVE(DS1338State, I2C_SLAVE_FROM_QDEV(dev)); + + /* The clock is running and synchronized with the host */ + s->offset = 0; + memset(s->nvram, 0, NVRAM_SIZE); + s->ptr = 0; + s->addr_byte = false; +} + static void ds1338_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -175,6 +199,7 @@ static void ds1338_class_init(ObjectClass *klass, void *data) k->event = ds1338_event; k->recv = ds1338_recv; k->send = ds1338_send; + dc->reset = ds1338_reset; dc->vmsd = &vmstate_ds1338; }