[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 3/6] hw/ds1338.c: Fix handling of HOURS register.
From: |
Antoine Mathys |
Subject: |
[Qemu-devel] [PATCH v4 3/6] hw/ds1338.c: Fix handling of HOURS register. |
Date: |
Wed, 12 Dec 2012 23:59:41 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 |
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 <address@hidden>
---
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;
--
1.7.10.4
- [Qemu-devel] [PATCH v4 0/6] hw/ds1338.c, Antoine Mathys, 2012/12/12
- [Qemu-devel] [PATCH v4 1/6] hw/ds1338.c: Correct bug in conversion to BCD., Antoine Mathys, 2012/12/12
- [Qemu-devel] [PATCH v4 2/6] hw/ds1338.c: Add definitions for various flags in the RTC registers., Antoine Mathys, 2012/12/12
- [Qemu-devel] [PATCH v4 3/6] hw/ds1338.c: Fix handling of HOURS register.,
Antoine Mathys <=
- [Qemu-devel] [PATCH v4 4/6] hw/ds1338.c: Ensure state is properly initialized., Antoine Mathys, 2012/12/12
- [Qemu-devel] [PATCH v4 6/6] hw/ds1338.c: Fix handling of DAY (wday) register., Antoine Mathys, 2012/12/12
- [Qemu-devel] [PATCH v4 5/6] hw/ds1338.c: Implement support for the control register., Antoine Mathys, 2012/12/12
- Re: [Qemu-devel] [PATCH v4 0/6] hw/ds1338.c, Peter Maydell, 2012/12/13