diff options
| author | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-14 21:09:07 +0000 |
|---|---|---|
| committer | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-14 21:09:07 +0000 |
| commit | 6f1bf24d1bd8d3fcea4f118b15781aee1932364a (patch) | |
| tree | aed94de3469eb4a57707f19846afc669c26601f0 /hw | |
| parent | 5b7141a11e2ef24caf26af95e59b2ed9552daa0e (diff) | |
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é Poussineau <hpoussin@reactos.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6310 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/mc146818rtc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index faf847dca2..f57a9a6783 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -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 void cmos_ioport_write(void *opaque, uint32_t addr, uint32_t data) 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 to_bcd(RTCState *s, int a) 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 @@ static void rtc_set_time(RTCState *s) (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 @@ static void rtc_copy_date(RTCState *s) 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); |