From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=47639 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Phgi9-0001WM-QZ for qemu-devel@nongnu.org; Tue, 25 Jan 2011 06:05:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Phgi7-0004yX-RC for qemu-devel@nongnu.org; Tue, 25 Jan 2011 06:05:21 -0500 Received: from hall.aurel32.net ([88.191.126.93]:43375) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Phgi7-0004yK-Jm for qemu-devel@nongnu.org; Tue, 25 Jan 2011 06:05:19 -0500 From: Aurelien Jarno Date: Tue, 25 Jan 2011 12:05:14 +0100 Message-Id: <1295953515-17818-1-git-send-email-aurelien@aurel32.net> Subject: [Qemu-devel] [PATCH 1/2] mc146818rtc: constantify List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Aurelien Jarno Signed-off-by: Aurelien Jarno --- hw/mc146818rtc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 6466aff..ec7c4ec 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -72,6 +72,7 @@ #define REG_B_UIE 0x10 #define REG_B_SQWE 0x08 #define REG_B_DM 0x04 +#define REG_B_24H 0x02 #define REG_C_UF 0x10 #define REG_C_IRQF 0x80 @@ -285,7 +286,7 @@ static void rtc_set_time(RTCState *s) tm->tm_sec = rtc_from_bcd(s, s->cmos_data[RTC_SECONDS]); tm->tm_min = rtc_from_bcd(s, s->cmos_data[RTC_MINUTES]); tm->tm_hour = rtc_from_bcd(s, s->cmos_data[RTC_HOURS] & 0x7f); - if (!(s->cmos_data[RTC_REG_B] & 0x02) && + if (!(s->cmos_data[RTC_REG_B] & REG_B_24H) && (s->cmos_data[RTC_HOURS] & 0x80)) { tm->tm_hour += 12; } @@ -304,7 +305,7 @@ static void rtc_copy_date(RTCState *s) s->cmos_data[RTC_SECONDS] = rtc_to_bcd(s, tm->tm_sec); s->cmos_data[RTC_MINUTES] = rtc_to_bcd(s, tm->tm_min); - if (s->cmos_data[RTC_REG_B] & 0x02) { + if (s->cmos_data[RTC_REG_B] & REG_B_24H) { /* 24 hour format */ s->cmos_data[RTC_HOURS] = rtc_to_bcd(s, tm->tm_hour); } else { -- 1.7.2.3