Changeset 231b3fd in mainline for uspace/drv/time/cmos-rtc/cmos-rtc.c

Timestamp:

2018-08-25T21:35:26Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

e2625b1a (diff), 3c45353 (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.

git-author:

Jakub Jermář <jakub@…> (2018-08-25 21:35:26)

git-committer:

GitHub <noreply@…> (2018-08-25 21:35:26)

Message:

Merge 3c453534a2b093c8039d8e8059b923c71f3492a3 into e2625b1a1e5a2895b86f0e39c2d70a39e49e042a

File:

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

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

@@ -75 +75 @@
         int clients_connected;
         /** time at which the system booted */
-        struct timeval boot_time;
+        struct timespec boot_time;
 } rtc_t;
 
@@ -204 +204 @@
 
         rtc->boot_time.tv_sec = 0;
-        rtc->boot_time.tv_usec = 0;
+        rtc->boot_time.tv_nsec = 0;
         rtc->clients_connected = 0;
 
@@ -331 +331 @@
                  */
 
-                struct timeval curtime;
+                struct timespec curtime;
 
                 getuptime(&curtime);
-                tv_add(&curtime, &rtc->boot_time);
+                ts_add(&curtime, &rtc->boot_time);
                 fibril_mutex_unlock(&rtc->mutex);
 
-                return time_tv2tm(&curtime, t);
+                return time_ts2tm(&curtime, t);
         }
 
@@ -346 +346 @@
         }
 
-        /* Microseconds are below RTC's resolution, assume 0. */
-        t->tm_usec = 0;
+        /* Nanoseconds are below RTC's resolution, assume 0. */
+        t->tm_nsec = 0;
 
         /* now read the registers */
@@ -419 +419 @@
                 result = EINVAL;
         else {
-                struct timeval uptime;
+                struct timespec uptime;
 
                 getuptime(&uptime);
                 rtc->boot_time.tv_sec = r;
-                rtc->boot_time.tv_usec = t->tm_usec;    /* normalized */
-                tv_sub(&rtc->boot_time, &uptime);
+                rtc->boot_time.tv_nsec = t->tm_nsec;    /* normalized */
+                ts_sub(&rtc->boot_time, &uptime);
                 result = EOK;
         }
@@ -445 +445 @@
         bool bcd_mode;
         time_t norm_time;
-        struct timeval uptime;
-        struct timeval ntv;
+        struct timespec uptime;
+        struct timespec ntv;
         int  reg_b;
         int  reg_a;
@@ -457 +457 @@
 
         ntv.tv_sec = norm_time;
-        ntv.tv_usec = t->tm_usec;
+        ntv.tv_nsec = t->tm_nsec;
         getuptime(&uptime);
 
-        if (tv_gteq(&uptime, &ntv)) {
+        if (ts_gteq(&uptime, &ntv)) {
                 /* This is not acceptable */
                 return EINVAL;
@@ -474 +474 @@
         /* boot_time must be recomputed */
         rtc->boot_time.tv_sec = 0;
-        rtc->boot_time.tv_usec = 0;
+        rtc->boot_time.tv_nsec = 0;
 
         /* Detect the RTC epoch */