Changeset 850235d in mainline for uspace/drv/time/cmos-rtc/cmos-rtc.c

Timestamp:

2013-03-10T14:56:21Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (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 mainline changes

File:

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

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

@@ -40 +40 @@
 #include <as.h>
 #include <sysinfo.h>
-#include <libarch/ddi.h>
 #include <libarch/barrier.h>
 #include <stdio.h>
@@ -100 +99 @@
 static time_t uptime_get(void);
 static bool is_battery_ok(rtc_t *rtc);
+static int  rtc_fun_online(ddf_fun_t *fun);
+static int  rtc_fun_offline(ddf_fun_t *fun);
 
 static ddf_dev_ops_t rtc_dev_ops;
@@ -107 +108 @@
         .dev_add = rtc_dev_add,
         .dev_remove = rtc_dev_remove,
+        .fun_online = rtc_fun_online,
+        .fun_offline = rtc_fun_offline,
 };
 
@@ -406 +409 @@
         /* Try to normalize the content of the tm structure */
         time_t r = mktime(t);
-
-        rtc->boottime = r - uptime_get();
+        int result;
+
+        if (r < 0)
+                result = EINVAL;
+        else {
+                rtc->boottime = r - uptime_get();
+                result = EOK;
+        }
 
         fibril_mutex_unlock(&rtc->mutex);
 
-        return r < 0 ? EINVAL : EOK;
+        return result;
 }
 
@@ -638 +647 @@
         fibril_mutex_unlock(&rtc->mutex);
 
+        rc = rtc_fun_offline(rtc->fun);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed to offline function");
+                return rc;
+        }
+
         rc = ddf_fun_unbind(rtc->fun);
         if (rc != EOK) {
@@ -726 +741 @@
 }
 
+static int
+rtc_fun_online(ddf_fun_t *fun)
+{
+        int rc;
+
+        ddf_msg(LVL_DEBUG, "rtc_fun_online()");
+
+        rc = ddf_fun_online(fun);
+        if (rc == EOK)
+                ddf_fun_add_to_category(fun, "clock");
+
+        return rc;
+}
+
+static int
+rtc_fun_offline(ddf_fun_t *fun)
+{
+        ddf_msg(LVL_DEBUG, "rtc_fun_offline()");
+        return ddf_fun_offline(fun);
+}
+
 int
 main(int argc, char **argv)