Changeset e5fbe06 in mainline

Timestamp:

2012-04-18T00:17:52Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f4ebaf3c

Parents:

f004318

Message:

rtc: Check the rtc epoch in rtc_tm_sanity_check()

File:

• uspace/drv/time/cmos-rtc/cmos-rtc.c (modified) (7 diffs)

uspace/drv/time/cmos-rtc/cmos-rtc.c

@@ -90 +90 @@
     ipc_callid_t callid, ipc_call_t *call);
 static int rtc_dev_remove(ddf_dev_t *dev);
-static int rtc_tm_sanity_check(struct tm *t);
+static int rtc_tm_sanity_check(struct tm *t, int epoch);
 static void rtc_register_write(rtc_t *rtc, int reg, int data);
 static bool is_leap_year(int year);
@@ -287 +287 @@
         bool bcd_mode;
         bool pm_mode = false;
+        int  epoch = 1900;
         rtc_t *rtc = RTC_FROM_FNODE(fun);
 
@@ -348 +349 @@
 
         if (t->tm_year < 100) {
-                /* tm_year is the number of years since 1900, it is not
-                 * possible it is < 100.
+                /* tm_year is the number of years since 1900 but the
+                 * RTC epoch is 2000.
                  */
+                epoch = 2000;
                 t->tm_year += 100;
         }
@@ -356 +358 @@
         fibril_mutex_unlock(&rtc->mutex);
 
-        return rtc_tm_sanity_check(t);
+        return rtc_tm_sanity_check(t, epoch);
 }
 
@@ -373 +375 @@
         int  reg_b;
         int  reg_a;
+        int  epoch;
         rtc_t *rtc = RTC_FROM_FNODE(fun);
 
-        rc = rtc_tm_sanity_check(t);
-        if (rc != EOK)
+        fibril_mutex_lock(&rtc->mutex);
+
+        /* Detect the RTC epoch */
+        if (rtc_register_read(rtc, RTC_YEAR) < 100)
+                epoch = 2000;
+        else
+                epoch = 1900;
+
+        rc = rtc_tm_sanity_check(t, epoch);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&rtc->mutex);
                 return rc;
+        }
 
         t->tm_mon++; /* counts from 1, not from 0 */
-
-        fibril_mutex_lock(&rtc->mutex);
 
         reg_b = rtc_register_read(rtc, RTC_STATUS_B);
@@ -435 +446 @@
  *
  * @param t     The tm structure to check
+ * @param epoch The RTC epoch year
  *
  * @return      EOK on success or EINVAL
  */
 static int
-rtc_tm_sanity_check(struct tm *t)
+rtc_tm_sanity_check(struct tm *t, int epoch)
 {
         int ndays;
@@ -453 +465 @@
         else if (t->tm_mon < 0 || t->tm_mon > 11)
                 return EINVAL;
+        else if (epoch == 2000 && t->tm_year < 100)
+                return EINVAL;
         else if (t->tm_year < 0)
                 return EINVAL;