Changeset 60af6fc2 in mainline

Timestamp:

2012-08-20T21:38:24Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

c9abf50

Parents:

6f445a67

Message:

rtc: move boottime into the rtc structure

File:

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

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

@@ -71 +71 @@
         /** true if device is removed */
         bool removed;
+        /** time at which the system booted */
+        time_t boottime;
 } rtc_t;
 
@@ -94 +96 @@
 
 static ddf_dev_ops_t rtc_dev_ops;
-static time_t boottime = 0;
 
 /** The RTC device driver's standard operations */
@@ -298 +299 @@
         rtc_t *rtc = fun_rtc(fun);
 
-        if (boottime != 0) {
+        fibril_mutex_lock(&rtc->mutex);
+
+        if (rtc->boottime != 0) {
                 /* There is no need to read the current time from the
                  * device because it has already been cached.
                  */
 
-                time_t cur_time = boottime + uptime_get();
+                time_t cur_time = rtc->boottime + uptime_get();
+
+                fibril_mutex_unlock(&rtc->mutex);
+
                 return localtime2tm(cur_time, t);
         }
@@ -372 +378 @@
         }
 
-        fibril_mutex_unlock(&rtc->mutex);
-
         /* Try to normalize the content of the tm structure */
         time_t r = mktime(t);
 
-        boottime = r - uptime_get();
+        rtc->boottime = r - uptime_get();
+
+        fibril_mutex_unlock(&rtc->mutex);
 
         return r < 0 ? EINVAL : EOK;
@@ -410 +416 @@
         }
 
+        fibril_mutex_lock(&rtc->mutex);
+
         /* boottime must be recomputed */
-        boottime = 0;
-
-        fibril_mutex_lock(&rtc->mutex);
+        rtc->boottime = 0;
 
         /* Detect the RTC epoch */