Changeset ea5cc5b in mainline

Timestamp:

2012-08-12T18:24:56Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

43e660c

Parents:

db80a2e

Message:

remove the CLOCK_GET_BOOTTIME operation

Location:

uspace

Files:

• drv/time/cmos-rtc/cmos-rtc.c (modified) (4 diffs)
• lib/c/include/ipc/clock_ctl.h (modified) (1 diff)

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

@@ -297 +297 @@
         rtc_t *rtc = RTC_FROM_FNODE(fun);
 
+        if (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();
+                *t = *gmtime(&cur_time);
+                return EOK;
+        }
+
         fibril_mutex_lock(&rtc->mutex);
 
@@ -366 +376 @@
         /* Try to normalize the content of the tm structure */
         time_t r = mktime(t);
+
+        boottime = r - uptime_get();
 
         return r < 0 ? EINVAL : EOK;
@@ -578 +590 @@
         rtc_t *rtc = RTC_FROM_FNODE(fun);
         bool batt_ok;
-        sysarg_t r = EOK;
 
         switch (method) {
@@ -586 +597 @@
                     RTC_D_BATTERY_OK;
                 async_answer_1(callid, EOK, batt_ok);
-                break;
-        case CLOCK_GET_BOOTTIME:
-                /* Get the boot time */
-                if (boottime == 0) {
-                        struct tm cur_tm;
-                        time_t uptime;
-
-                        uptime = uptime_get();
-                        r = rtc_time_get(fun, &cur_tm);
-                        if (r == EOK) {
-                                time_t current_time = mktime(&cur_tm);
-                                if (current_time < uptime)
-                                        r = EINVAL;
-                                else
-                                        boottime = current_time - uptime;
-                        }
-                }
-                async_answer_1(callid, r, boottime);
                 break;
         default:

uspace/lib/c/include/ipc/clock_ctl.h

@@ -34 +34 @@
 typedef enum {
         CLOCK_GET_BATTERY_STATUS = DEV_FIRST_CUSTOM_METHOD,
-        CLOCK_GET_BOOTTIME,
 } clock_ctl_t;