儲存庫 vbox 的更動 52388

時間撮記:

2014-8-15 上午09:45:12 (10 年 以前)

作者:

vboxsync

訊息:

Device/Driver: 5986: Applying patch from qemu-devel related to "Hours in 12-hour mode are in the 1-12 range, not 0-11"

檔案:

• trunk/src/VBox/Devices/PC/DevRTC.cpp (修改) (2 筆差異)

trunk/src/VBox/Devices/PC/DevRTC.cpp

@@ -275 +275 @@
     tm->tm_min  = from_bcd(pThis, pThis->cmos_data[RTC_MINUTES]);
     tm->tm_hour = from_bcd(pThis, pThis->cmos_data[RTC_HOURS] & 0x7f);
-    if (   !(pThis->cmos_data[RTC_REG_B] & 0x02)
-        && (pThis->cmos_data[RTC_HOURS] & 0x80))
-        tm->tm_hour += 12;
+    if (!(pThis->cmos_data[RTC_REG_B] & 0x02))
+    {
+        tm->tm_hour %= 12;
+        if (pThis->cmos_data[RTC_HOURS] & 0x80)
+            tm->tm_hour += 12;
+    }
     tm->tm_wday = from_bcd(pThis, pThis->cmos_data[RTC_DAY_OF_WEEK]);
     tm->tm_mday = from_bcd(pThis, pThis->cmos_data[RTC_DAY_OF_MONTH]);
@@ -659 +662 @@
     {
         /* 12 hour format */
-        pThis->cmos_data[RTC_HOURS] = to_bcd(pThis, tm->tm_hour % 12);
+        int h = (tm->tm_hour % 12) ? tm->tm_hour % 12 : 12;
+        pThis->cmos_data[RTC_HOURS] = to_bcd(pThis, h);
         if (tm->tm_hour >= 12)
             pThis->cmos_data[RTC_HOURS] |= 0x80;