From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52932) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfD88-0000Uf-SM for qemu-devel@nongnu.org; Sun, 02 Dec 2012 12:15:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TfD87-0007Tn-Se for qemu-devel@nongnu.org; Sun, 02 Dec 2012 12:15:00 -0500 Received: from mail-bk0-f45.google.com ([209.85.214.45]:64331) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfD87-0007Ti-LQ for qemu-devel@nongnu.org; Sun, 02 Dec 2012 12:14:59 -0500 Received: by mail-bk0-f45.google.com with SMTP id jk13so679831bkc.4 for ; Sun, 02 Dec 2012 09:14:58 -0800 (PST) Message-ID: <50BB8C7A.7010304@gmail.com> Date: Sun, 02 Dec 2012 18:14:34 +0100 From: Antoine Mathys MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 1/4] hw/ds1338.c: Fix handling of HOURS register. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, paul@codesourcery.com Per the datasheet, the mapping between 12 and 24 hours modes is: 0 <-> 12 PM 1-12 <-> 1-12 AM 13-23 <-> 1-11 PM Signed-off-by: Antoine Mathys --- hw/ds1338.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/hw/ds1338.c b/hw/ds1338.c index b576d56..1274b22 100644 --- a/hw/ds1338.c +++ b/hw/ds1338.c @@ -50,9 +50,14 @@ static void capture_current_time(DS1338State *s) 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; + int tmp = now.tm_hour; + if (tmp == 0) { + tmp = 24; + } + if (tmp <= 12) { + s->nvram[2] = 0x40 | to_bcd(tmp); + } else { + s->nvram[2] = 0x60 | to_bcd(tmp - 12); } } else { s->nvram[2] = to_bcd(now.tm_hour); @@ -127,15 +132,17 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data) break; case 2: if (data & 0x40) { + int tmp = from_bcd(data & 0x1f); if (data & 0x20) { - data = from_bcd(data & 0x4f) + 11; - } else { - data = from_bcd(data & 0x1f) - 1; + tmp += 12; + } + if (tmp == 24) { + tmp = 0; } + now.tm_hour = tmp; } else { - data = from_bcd(data); + now.tm_hour = from_bcd(data & 0x3f); } - now.tm_hour = data; break; case 3: now.tm_wday = from_bcd(data & 7) - 1; -- 1.7.10.4