From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LNCz7-0000CW-Hi for qemu-devel@nongnu.org; Wed, 14 Jan 2009 16:09:09 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LNCz6-0000C7-T9 for qemu-devel@nongnu.org; Wed, 14 Jan 2009 16:09:09 -0500 Received: from [199.232.76.173] (port=45378 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LNCz6-0000C2-QU for qemu-devel@nongnu.org; Wed, 14 Jan 2009 16:09:08 -0500 Received: from savannah.gnu.org ([199.232.41.3]:58589 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LNCz6-0003Yd-Hg for qemu-devel@nongnu.org; Wed, 14 Jan 2009 16:09:08 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LNCz6-0003fK-3b for qemu-devel@nongnu.org; Wed, 14 Jan 2009 21:09:08 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LNCz5-0003f9-OE for qemu-devel@nongnu.org; Wed, 14 Jan 2009 21:09:07 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Wed, 14 Jan 2009 21:09:07 +0000 Subject: [Qemu-devel] [6310] Fix day of week in mc146818 Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 6310 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6310 Author: aurel32 Date: 2009-01-14 21:09:07 +0000 (Wed, 14 Jan 2009) Log Message: ----------- Fix day of week in mc146818 According to mc146818 specification, Day of Week register (#6) is between 1 and 7, 1 representing Sunday. According C specification, tm_wday field in struct tm is between 0 and 6, 0 representing Sunday. Bit 2 of register B (#11) is named DM (data mode) and specifies if RTC stores values in BCD or in binary form. Signed-off-by: Herv?\195?\169 Poussineau Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/hw/mc146818rtc.c Modified: trunk/hw/mc146818rtc.c =================================================================== --- trunk/hw/mc146818rtc.c 2009-01-14 21:02:59 UTC (rev 6309) +++ trunk/hw/mc146818rtc.c 2009-01-14 21:09:07 UTC (rev 6310) @@ -54,6 +54,7 @@ #define REG_B_PIE 0x40 #define REG_B_AIE 0x20 #define REG_B_UIE 0x10 +#define REG_B_DM 0x04 struct RTCState { uint8_t cmos_data[128]; @@ -186,7 +187,7 @@ static inline int to_bcd(RTCState *s, int a) { - if (s->cmos_data[RTC_REG_B] & 0x04) { + if (s->cmos_data[RTC_REG_B] & REG_B_DM) { return a; } else { return ((a / 10) << 4) | (a % 10); @@ -195,7 +196,7 @@ static inline int from_bcd(RTCState *s, int a) { - if (s->cmos_data[RTC_REG_B] & 0x04) { + if (s->cmos_data[RTC_REG_B] & REG_B_DM) { return a; } else { return ((a >> 4) * 10) + (a & 0x0f); @@ -213,7 +214,7 @@ (s->cmos_data[RTC_HOURS] & 0x80)) { tm->tm_hour += 12; } - tm->tm_wday = from_bcd(s, s->cmos_data[RTC_DAY_OF_WEEK]); + tm->tm_wday = from_bcd(s, s->cmos_data[RTC_DAY_OF_WEEK]) - 1; tm->tm_mday = from_bcd(s, s->cmos_data[RTC_DAY_OF_MONTH]); tm->tm_mon = from_bcd(s, s->cmos_data[RTC_MONTH]) - 1; tm->tm_year = from_bcd(s, s->cmos_data[RTC_YEAR]) + 100; @@ -234,7 +235,7 @@ if (tm->tm_hour >= 12) s->cmos_data[RTC_HOURS] |= 0x80; } - s->cmos_data[RTC_DAY_OF_WEEK] = to_bcd(s, tm->tm_wday); + s->cmos_data[RTC_DAY_OF_WEEK] = to_bcd(s, tm->tm_wday + 1); s->cmos_data[RTC_DAY_OF_MONTH] = to_bcd(s, tm->tm_mday); s->cmos_data[RTC_MONTH] = to_bcd(s, tm->tm_mon + 1); s->cmos_data[RTC_YEAR] = to_bcd(s, tm->tm_year % 100);