From patchwork Tue Dec 11 22:57:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Mathys X-Patchwork-Id: 205333 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 9FD702C007E for ; Wed, 12 Dec 2012 09:57:30 +1100 (EST) Received: from localhost ([::1]:39019 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiYlU-0002Ga-Sc for incoming@patchwork.ozlabs.org; Tue, 11 Dec 2012 17:57:28 -0500 Received: from eggs.gnu.org ([208.118.235.92]:47385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiYlN-0002GG-E5 for qemu-devel@nongnu.org; Tue, 11 Dec 2012 17:57:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TiYlG-0000va-4t for qemu-devel@nongnu.org; Tue, 11 Dec 2012 17:57:21 -0500 Received: from mail-we0-f173.google.com ([74.125.82.173]:39520) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiYlF-0000vT-Uz for qemu-devel@nongnu.org; Tue, 11 Dec 2012 17:57:14 -0500 Received: by mail-we0-f173.google.com with SMTP id z2so4398wey.4 for ; Tue, 11 Dec 2012 14:57:13 -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=KJ2yr21nI1Cmz/kXWwxlvp0pZgdWObolAAWWP+0IM9A=; b=0Dr5nsqIsFu0ZO5lXIxg8TSmHAwAt0CKwRpIvTZxJYXcv5jVtiXbWxvkSmkKu/uL/6 IJTTsic1NW6obpvlZ5YTbN2XE+omBoU05ab8Moi/8WuGp7IESue34r0Mc2CeLb9cVwtX knctRmZdXyDtml/Fk27Sv4gZmO0I84ZeII2rtmVrHU7gtOvrkN8xwW31wzkO6HUVqwbD rBFGk94yq6rhjwtw8wzk44Gi0Fkmz7QQW5rVnSVM/8+MNFJAbwfc0YvQTdqDX9/1upDg kEnJ6EUZEUKQYwNhQT13FBGpcgQQ8U5bWzTvBI5QOFAN/GMyHXBrX8UgJ5JZUWCToOAj BqSg== Received: by 10.180.106.34 with SMTP id gr2mr19405674wib.18.1355266633016; Tue, 11 Dec 2012 14:57:13 -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 p3sm727838wic.8.2012.12.11.14.57.11 (version=SSLv3 cipher=OTHER); Tue, 11 Dec 2012 14:57:12 -0800 (PST) Message-ID: <50C7BA46.6000009@gmail.com> Date: Tue, 11 Dec 2012 23:57:10 +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: <50C7B767.8020406@gmail.com> In-Reply-To: <50C7B767.8020406@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.125.82.173 Cc: Peter Maydell , paul@codesourcery.com Subject: [Qemu-devel] [PATCH v2 3/6] hw/ds1338.c: Fix handling of HOURS register. 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 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 Reviewed-by: Peter Maydell --- hw/ds1338.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/hw/ds1338.c b/hw/ds1338.c index 69018bc..0f88720 100644 --- a/hw/ds1338.c +++ b/hw/ds1338.c @@ -55,10 +55,15 @@ 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); @@ -132,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;