Changeset 1384 in vbox

Timestamp:

Mar 9, 2007 7:08:16 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

19380

Message:

Fixed RTC alarm (problem seen in Norton Diagnostics). We need to a) compare tm_min instead
of tm_mon(!!), and b) properly convert from BCD if necessary.

File:

• trunk/src/VBox/Devices/PC/DevRTC.cpp (modified) (3 diffs)

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

@@ -117 +117 @@
 # if !defined(__WIN__)
     uint32_t Alignment1[3];
-# endif 
+# endif
 #endif
     int32_t irq;
@@ -209 +209 @@
         case RTC_MINUTES_ALARM:
         case RTC_HOURS_ALARM:
-            /* XXX: not supported */
             s->cmos_data[s->cmos_index] = data;
             break;
@@ -402 +401 @@
     if (s->cmos_data[RTC_REG_B] & REG_B_AIE) {
         if (((s->cmos_data[RTC_SECONDS_ALARM] & 0xc0) == 0xc0 ||
-             s->cmos_data[RTC_SECONDS_ALARM] == s->current_tm.tm_sec) &&
+             from_bcd(s, s->cmos_data[RTC_SECONDS_ALARM]) == s->current_tm.tm_sec) &&
             ((s->cmos_data[RTC_MINUTES_ALARM] & 0xc0) == 0xc0 ||
-             s->cmos_data[RTC_MINUTES_ALARM] == s->current_tm.tm_mon) &&
+             from_bcd(s, s->cmos_data[RTC_MINUTES_ALARM]) == s->current_tm.tm_min) &&
             ((s->cmos_data[RTC_HOURS_ALARM] & 0xc0) == 0xc0 ||
-             s->cmos_data[RTC_HOURS_ALARM] == s->current_tm.tm_hour)) {
+             from_bcd(s, s->cmos_data[RTC_HOURS_ALARM]) == s->current_tm.tm_hour)) {
 
             s->cmos_data[RTC_REG_C] |= 0xa0;