Changes in uspace/drv/bus/usb/xhci/isoch.c [3bacee1:205f1add] in mainline

File:

• uspace/drv/bus/usb/xhci/isoch.c (modified) (6 diffs)

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,