Changeset bd41ac52 in mainline for uspace/drv/bus/usb/xhci

Timestamp:

2018-08-25T22:21:25Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cca80a2

Parents:

e2625b1a

Message:

Get rid of sys/time.h

This commit moves the POSIX-like time functionality from libc's
sys/time.h to libposix and introduces C11-like or HelenOS-specific
interfaces to libc.

Specifically, use of sys/time.h, struct timeval, suseconds_t and
gettimeofday is replaced by time.h (C11), struct timespec (C11), usec_t
(HelenOS) and getuptime / getrealtime (HelenOS).

Also attempt to fix the implementation of clock() to return microseconds
(clocks) rather than processor cycles and move it to libc.

Location:

uspace/drv/bus/usb/xhci

Files:

• hc.c (modified) (2 diffs)
• isoch.c (modified) (6 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;

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

@@ -113 +113 @@
 {
         xhci_isoch_t *const isoch = ep->isoch;
-        const suseconds_t delay = isoch->buffer_count * ep->interval * 125 +
+        const usec_t delay = isoch->buffer_count * ep->interval * 125 +
             RESET_TIMER_DELAY;
 
@@ -210 +210 @@
 static inline uint64_t get_system_time()
 {
-        struct timeval tv;
-        getuptime(&tv);
-        return ((uint64_t) tv.tv_sec) * 1000000 + ((uint64_t) tv.tv_usec);
+        struct timespec ts;
+        getuptime(&ts);
+        return SEC2USEC(ts.tv_sec) + NSEC2USEC(ts.tv_nsec);
 }
 
@@ -314 +314 @@
         while (isoch->transfers[isoch->hw_enqueue].state == ISOCH_FILLED) {
                 xhci_isoch_transfer_t *const it = &isoch->transfers[isoch->hw_enqueue];
-                suseconds_t delay;
+                usec_t delay;
 
                 assert(it->state == ISOCH_FILLED);
@@ -324 +324 @@
                 case WINDOW_TOO_SOON:
                         delay = wd.offset * 125;
-                        usb_log_debug("[isoch] delaying feeding buffer %zu for %ldus",
+                        usb_log_debug("[isoch] delaying feeding buffer %zu for %lldus",
                             it - isoch->transfers, delay);
                         fibril_timer_set_locked(isoch->feeding_timer, delay,
@@ -400 +400 @@
         while (isoch->transfers[isoch->enqueue].state <= ISOCH_FILLED) {
                 xhci_isoch_transfer_t *const it = &isoch->transfers[isoch->enqueue];
-                suseconds_t delay;
+                usec_t delay;
 
                 /* IN buffers are "filled" with free space */
@@ -416 +416 @@
                         /* Not allowed to feed yet. Defer to later. */
                         delay = wd.offset * 125;
-                        usb_log_debug("[isoch] delaying feeding buffer %zu for %ldus",
+                        usb_log_debug("[isoch] delaying feeding buffer %zu for %lldus",
                             it - isoch->transfers, delay);
                         fibril_timer_set_locked(isoch->feeding_timer, delay,