Changeset c99d470 in mainline

Timestamp:

2012-09-23T16:27:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f3b97d1

Parents:

0d8322da (diff), 0a586f4c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:rtc-helenos.

File:

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

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

@@ -99 +99 @@
 static void rtc_register_write(rtc_t *rtc, int reg, int data);
 static time_t uptime_get(void);
+static bool is_battery_ok(rtc_t *rtc);
 
 static ddf_dev_ops_t rtc_dev_ops;
@@ -334 +335 @@
         }
 
+        /* Check if the RTC battery is OK */
+        if (!is_battery_ok(rtc)) {
+                fibril_mutex_unlock(&rtc->mutex);
+                return EIO;
+        }
+
         /* now read the registers */
         do {
@@ -436 +443 @@
 
         fibril_mutex_lock(&rtc->mutex);
+
+        if (!is_battery_ok(rtc)) {
+                fibril_mutex_unlock(&rtc->mutex);
+                return EIO;
+        }
 
         /* boottime must be recomputed */
@@ -516 +528 @@
 {
         rtc_t *rtc = fun_rtc(fun);
-        const bool batt_ok = rtc_register_read(rtc, RTC_STATUS_D) &
-            RTC_D_BATTERY_OK;
+
+        fibril_mutex_lock(&rtc->mutex);
+        const bool batt_ok = is_battery_ok(rtc);
+        fibril_mutex_unlock(&rtc->mutex);
 
         *status = batt_ok ? BATTERY_OK : BATTERY_LOW;
 
         return EOK;
+}
+
+/** Check if the battery is working properly or not.
+ *  The caller already holds the rtc->mutex lock.
+ *
+ *  @param rtc   The RTC instance.
+ *
+ *  @return      true if the battery is ok, false otherwise.
+ */
+static bool
+is_battery_ok(rtc_t *rtc)
+{
+        return rtc_register_read(rtc, RTC_STATUS_D) & RTC_D_BATTERY_OK;
 }