[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/17] hw/ds1338: Fix conversion between 12 hours an
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 01/17] hw/ds1338: Fix conversion between 12 hours and 24 hours modes. |
Date: |
Thu, 28 Feb 2013 18:53:47 +0000 |
From: Antoine Mathys <address@hidden>
The proper mapping between 24 hours and 12 hours modes is:
0 12 AM
1-11 1-11 AM
12 12 PM
13-23 1-11 PM
Fix code accordingly.
Signed-off-by: Antoine Mathys <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/ds1338.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/ds1338.c b/hw/ds1338.c
index 6f70538..1da0f96 100644
--- a/hw/ds1338.c
+++ b/hw/ds1338.c
@@ -59,8 +59,8 @@ static void capture_current_time(DS1338State *s)
s->nvram[1] = to_bcd(now.tm_min);
if (s->nvram[2] & HOURS_12) {
int tmp = now.tm_hour;
- if (tmp == 0) {
- tmp = 24;
+ if (tmp % 12 == 0) {
+ tmp += 12;
}
if (tmp <= 12) {
s->nvram[2] = HOURS_12 | to_bcd(tmp);
@@ -145,8 +145,8 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data)
if (data & HOURS_PM) {
tmp += 12;
}
- if (tmp == 24) {
- tmp = 0;
+ if (tmp % 12 == 0) {
+ tmp -= 12;
}
now.tm_hour = tmp;
} else {
--
1.7.9.5
- [Qemu-devel] [PATCH 14/17] cadence_gem: factor out can_rx() logic replication, (continued)
- [Qemu-devel] [PATCH 14/17] cadence_gem: factor out can_rx() logic replication, Peter Maydell, 2013/02/28
- [Qemu-devel] [PATCH 03/17] hw/pflash_cfi01: Treat read in unknown command state as read, Peter Maydell, 2013/02/28
- [Qemu-devel] [PATCH 06/17] arm: mptimer: Remove WDT distinction, Peter Maydell, 2013/02/28
- [Qemu-devel] [PATCH 13/17] cadence_gem: Flush queued packets, Peter Maydell, 2013/02/28
- [Qemu-devel] [PATCH 10/17] vl.c: allow for repeated -sd arguments, Peter Maydell, 2013/02/28
- [Qemu-devel] [PATCH 05/17] arm: arm11mpcore, a9mpcore: CamelCased type names, Peter Maydell, 2013/02/28
- [Qemu-devel] [PATCH 16/17] cadence_gem: Don't reset rx desc pointer on rx_en, Peter Maydell, 2013/02/28
- [Qemu-devel] [PATCH 15/17] cadence_gem: fix interrupt events, Peter Maydell, 2013/02/28
- [Qemu-devel] [PATCH 04/17] arm: mptimer: CamelCased type names, Peter Maydell, 2013/02/28
- [Qemu-devel] [PATCH 09/17] hw/sdhci: introduce standard SD host controller, Peter Maydell, 2013/02/28
- [Qemu-devel] [PATCH 01/17] hw/ds1338: Fix conversion between 12 hours and 24 hours modes.,
Peter Maydell <=
- Re: [Qemu-devel] [PULL 00/17] arm-devs queue, Blue Swirl, 2013/02/28