From: Antoine Mathys Date: Thu, 28 Feb 2013 18:23:12 +0000 (+0000) Subject: hw/ds1338: Fix conversion between 12 hours and 24 hours modes. X-Git-Tag: v1.5.0-rc0~551 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c78d6a84b504e831adc8f1917cde0c79061dff0;p=thirdparty%2Fqemu.git hw/ds1338: Fix conversion between 12 hours and 24 hours modes. 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 Signed-off-by: Peter Maydell --- diff --git a/hw/ds1338.c b/hw/ds1338.c index 6f70538eb30..1da0f96fdc3 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 {