Changeset 95060d5b in mainline

Timestamp:

2012-04-13T20:23:29Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1170ea3c

Parents:

bb8f69d

Message:

rtc: introduce support to 12h mode of operation

Location:

uspace/drv/time/cmos-rtc

Files:

• cmos-regs.h (modified) (1 diff)
• cmos-rtc.c (modified) (3 diffs)

uspace/drv/time/cmos-rtc/cmos-regs.h

@@ -38 +38 @@
 
 #define RTC_STATUS_B    0x0B
+#define RTC_MASK_24H    0x02
 #define RTC_MASK_BCD    0x04
 

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

@@ -268 +268 @@
 {
         bool bcd_mode;
+        bool pm_mode = false;
         rtc_t *rtc = RTC_FROM_FNODE(fun);
 
@@ -290 +291 @@
                  t->tm_mon  != rtc_register_read(rtc, RTC_MON) ||
                  t->tm_year != rtc_register_read(rtc, RTC_YEAR));
+
+        /* Check if the RTC is working in 12h mode */
+        bool _12h_mode = !(rtc_register_read(rtc, RTC_STATUS_B) &
+            RTC_MASK_24H);
+
+        if (_12h_mode) {
+                /* 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.
+                         */
+                        t->tm_hour &= ~0x80;
+                        pm_mode = true;
+                }
+        }
 
         /* Check if the RTC is working in BCD mode */
@@ -301 +317 @@
                 t->tm_mon  = bcd2dec(t->tm_mon);
                 t->tm_year = bcd2dec(t->tm_year);
+        }
+
+        if (_12h_mode) {
+                /* Convert to 24h mode */
+                if (pm_mode) {
+                        if (t->tm_hour < 12)
+                                t->tm_hour += 12;
+                } else if (t->tm_hour == 12)
+                        t->tm_hour = 0;
         }