Changeset f004318 in mainline

Timestamp:

2012-04-17T21:06:26Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

e5fbe06

Parents:

074324f1

Message:

rtc: some minor fixes

• Fix a comment
• return the sanity check result when reading the current time from the cmos
• Force the 24h mode of operation only if it is not enabled yet.
• Do not restore the 12h mode of operation at the end of time_set()

File:

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

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

@@ -317 +317 @@
                 /* The RTC is working in 12h mode, check if it is AM or PM */
                 if (t->tm_hour & 0x80) {
-                        /* PM flag is active, it must to be cleared
-                         * or the BCD conversion will fail.
-                         */
+                        /* PM flag is active, it must be cleared */
                         t->tm_hour &= ~0x80;
                         pm_mode = true;
@@ -357 +355 @@
 
         fibril_mutex_unlock(&rtc->mutex);
-        return EOK;
+
+        return rtc_tm_sanity_check(t);
 }
 
@@ -386 +385 @@
         reg_b = rtc_register_read(rtc, RTC_STATUS_B);
 
-        /* Force 24h mode of operation */
-        rtc_register_write(rtc, RTC_STATUS_B, reg_b | RTC_MASK_24H);
+        if (!(reg_b & RTC_MASK_24H)) {
+                /* Force 24h mode of operation */
+                reg_b |= RTC_MASK_24H;
+                rtc_register_write(rtc, RTC_STATUS_B, reg_b);
+        }
 
         if (rtc_register_read(rtc, RTC_YEAR) < 100) {