Changeset 231b3fd in mainline for uspace/lib/c/generic/io/console.c

Timestamp:

2018-08-25T21:35:26Z (7 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/lib/c/generic/io/console.c (modified) (2 diffs)

uspace/lib/c/generic/io/console.c

@@ -223 +223 @@
 
 bool console_get_event_timeout(console_ctrl_t *ctrl, cons_event_t *event,
-    suseconds_t *timeout)
-{
-        struct timeval t0;
-        gettimeofday(&t0, NULL);
+    usec_t *timeout)
+{
+        struct timespec t0;
+        getuptime(&t0);
 
         if (ctrl->input_aid == 0) {
@@ -257 +257 @@
 
         /* Update timeout */
-        struct timeval t1;
-        gettimeofday(&t1, NULL);
-        *timeout -= tv_sub_diff(&t1, &t0);
+        struct timespec t1;
+        getuptime(&t1);
+        *timeout -= NSEC2USEC(ts_sub_diff(&t1, &t0));
 
         return true;