Changeset 231b3fd in mainline for uspace/drv/bus/usb/xhci/hc.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/bus/usb/xhci/hc.c (modified) (2 diffs)

uspace/drv/bus/usb/xhci/hc.c

@@ -229 +229 @@
         hc->max_slots = XHCI_REG_RD(hc->cap_regs, XHCI_CAP_MAX_SLOTS);
 
-        struct timeval tv;
-        getuptime(&tv);
-        hc->wrap_time = tv.tv_sec * 1000000 + tv.tv_usec;
+        struct timespec ts;
+        getuptime(&ts);
+        hc->wrap_time = SEC2USEC(ts.tv_sec) + NSEC2USEC(ts.tv_nsec);
         hc->wrap_count = 0;
 
@@ -591 +591 @@
 static errno_t xhci_handle_mfindex_wrap_event(xhci_hc_t *hc, xhci_trb_t *trb)
 {
-        struct timeval tv;
-        getuptime(&tv);
-        usb_log_debug("Microframe index wrapped (@%lu.%li, %" PRIu64 " total).",
-            tv.tv_sec, tv.tv_usec, hc->wrap_count);
-        hc->wrap_time = ((uint64_t) tv.tv_sec) * 1000000 + ((uint64_t) tv.tv_usec);
+        struct timespec ts;
+        getuptime(&ts);
+        usb_log_debug("Microframe index wrapped (@%lld.%lld, %" PRIu64 " total).",
+            ts.tv_sec, NSEC2USEC(ts.tv_nsec), hc->wrap_count);
+        hc->wrap_time = SEC2USEC(ts.tv_sec) + NSEC2USEC(ts.tv_nsec);
         ++hc->wrap_count;
         return EOK;