Changes in uspace/drv/time/cmos-rtc/cmos-rtc.c [1ae74c6:a582dff] in mainline

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>
@@ -99 +100 @@
 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;
@@ -106 +109 @@
         .dev_add = rtc_dev_add,
         .dev_remove = rtc_dev_remove,
+        .fun_online = rtc_fun_online,
+        .fun_offline = rtc_fun_offline,
 };
 
@@ -405 +410 @@
         /* 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;
 }
 
@@ -637 +648 @@
         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) {
@@ -725 +742 @@
 }
 
+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)