From patchwork Wed Dec 12 22:35:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Mathys X-Patchwork-Id: 205673 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 0DC962C0084 for ; Thu, 13 Dec 2012 09:35:24 +1100 (EST) Received: from localhost ([::1]:36695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tiute-00026z-5C for incoming@patchwork.ozlabs.org; Wed, 12 Dec 2012 17:35:22 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38932) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiutV-00026b-66 for qemu-devel@nongnu.org; Wed, 12 Dec 2012 17:35:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TiutT-00071q-8M for qemu-devel@nongnu.org; Wed, 12 Dec 2012 17:35:13 -0500 Received: from mail-ee0-f45.google.com ([74.125.83.45]:52312) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiutT-00071D-2r for qemu-devel@nongnu.org; Wed, 12 Dec 2012 17:35:11 -0500 Received: by mail-ee0-f45.google.com with SMTP id d49so884342eek.4 for ; Wed, 12 Dec 2012 14:35:10 -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=eLHmVRtzp1x2Ccrv34fl2+7BpRmSQkhISQlH1GwXzys=; b=wnyRkyEpUtAm7VzkiBx48m/lZj5vm/PUl+bWwTEZOUTXZLPJruHuVRAMbPrntF10pb OkUufboCOwEm0pTm8myzIhL0fm/XCxDJ5iFvE51afGn69ARwa1YVEcgBCC4KJuNSZELV 1jzeUZDItMThoi8vUIpX4J8iDUV6lUd3ErT/UwkChL9TQwmOwxdpqD7oxaUyuaXUZF8g 4rVbM8ecgREkTAGTOQMFj0sfzcGErdpCBl3EHKiC1Liao+uUVNpzXt/TJnouM63q0VZg t+dQs1p2ASj/GNWNnjT/MND3//4Dp2piKcJPCJn5vO+KwyIesBKTOzr3+fw7e4Yep7vE sKEQ== Received: by 10.14.194.199 with SMTP id m47mr6600994een.11.1355351710016; Wed, 12 Dec 2012 14:35:10 -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 6sm46645414eea.3.2012.12.12.14.35.02 (version=SSLv3 cipher=OTHER); Wed, 12 Dec 2012 14:35:09 -0800 (PST) Message-ID: <50C90694.3000402@gmail.com> Date: Wed, 12 Dec 2012 23:35:00 +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: 74.125.83.45 Cc: Peter Maydell , paul@codesourcery.com Subject: Re: [Qemu-devel] [PATCH v3 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 --- 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;