Changeset 5308 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Oct 15, 2007 10:32:38 PM (17 years ago)

Author:

vboxsync

Message:

get rid of the struct tm mess.

File:

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

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

@@ -103 +103 @@
 #define REG_B_UIE 0x10
 
+struct my_tm 
+{
+    int32_t tm_sec;
+    int32_t tm_min;
+    int32_t tm_hour;
+    int32_t tm_mday;
+    int32_t tm_mon;
+    int32_t tm_year;
+    int32_t tm_wday;
+    int32_t tm_yday;
+};
+
+
 struct RTCState {
     uint8_t cmos_data[128];
     uint8_t cmos_index;
     uint8_t Alignment0[7];
-    struct tm current_tm;
-#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32 && IN_GC
-# if !defined(RT_OS_WINDOWS)
-    uint32_t Alignment1[3];
-# endif
-#endif
+    struct my_tm current_tm;
     int32_t irq;
     /* periodic timer */
@@ -267 +275 @@
 static void rtc_set_time(RTCState *s)
 {
-    struct tm *tm = &s->current_tm;
+    struct my_tm *tm = &s->current_tm;
 
     tm->tm_sec = from_bcd(s, s->cmos_data[RTC_SECONDS]);
@@ -284 +292 @@
 static void rtc_copy_date(RTCState *s)
 {
-    const struct tm *tm = &s->current_tm;
+    const struct my_tm *tm = &s->current_tm;
 
     s->cmos_data[RTC_SECONDS] = to_bcd(s, tm->tm_sec);
@@ -321 +329 @@
 
 /* update 'tm' to the next second */
-static void rtc_next_second(struct tm *tm)
+static void rtc_next_second(struct my_tm *tm)
 {
     int days_in_month;
@@ -458 +466 @@
 }
 
-static void rtc_set_date(RTCState *s, const struct tm *tm)
+static void rtc_set_date(RTCState *s, const struct my_tm *tm)
 {
     s->current_tm = *tm;
@@ -717 +725 @@
     /** @todo this should be (re)done at power on if we didn't load a state... */
     RTCState   *pData = PDMINS2DATA(pDevIns, RTCState *);
-    struct tm   Tm;
-    struct tm  *pTm;
 
     /*
@@ -731 +737 @@
         RTTimeLocalExplode(&Time, &Now);
 
+    struct my_tm Tm;
     memset(&Tm, 0, sizeof(Tm));
     Tm.tm_year = Time.i32Year - 1900;
@@ -740 +747 @@
     Tm.tm_min  = Time.u8Minute;
     Tm.tm_sec  = Time.u8Second;
-    Tm.tm_isdst = -1;
-    pTm = &Tm;
-
-    rtc_set_date(pData, pTm);
+
+    rtc_set_date(pData, &Tm);
 
     int iYear = to_bcd(pData, (Tm.tm_year / 100) + 19); /* tm_year is 1900 based */