Changeset fc7d28e in mainline

Timestamp:

2012-04-03T19:07:05Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

aa04e81

Parents:

a408d5f

Message:

rtc: driver improvements

• Fix bcd mode detection
• Check if the year field in the rtc starts from 2000 instead of 1900

File:

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

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

@@ -285 +285 @@
 
         /* Check if the RTC is working in BCD mode */
-        bcd_mode = rtc_register_read(rtc, RTC_STATUS_B) & RTC_MASK_BCD;
-
-        if (1 || bcd_mode) {
+        bcd_mode = !(rtc_register_read(rtc, RTC_STATUS_B) & RTC_MASK_BCD);
+
+        if (bcd_mode) {
                 t->tm_sec  = bcd2dec(t->tm_sec);
                 t->tm_min  = bcd2dec(t->tm_min);
@@ -299 +299 @@
         t->tm_mon--;
 
+        if (t->tm_year < 100) {
+                /* tm_year is the number of years since 1900, it is not
+                 * possible it is < 100.
+                 */
+                t->tm_year += 100;
+        }
+
         fibril_mutex_unlock(&rtc->mutex);
         return EOK;