Changeset 8033f89 in mainline for uspace/drv/bus/usb/xhci/isoch.c

Timestamp:

2018-01-23T12:41:22Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

e7e1fd3

Parents:

e546142

Message:

xhci: cstyle

File:

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

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

@@ -81 +81 @@
         fibril_timer_clear_locked(isoch->feeding_timer);
         isoch->last_mf = -1U;
-        usb_log_info("[isoch] Endpoint" XHCI_EP_FMT ": Data flow reset.", XHCI_EP_ARGS(*ep));
+        usb_log_info("[isoch] Endpoint" XHCI_EP_FMT ": Data flow reset.",
+            XHCI_EP_ARGS(*ep));
 }
 
@@ -110 +111 @@
 static void timer_schedule_reset(xhci_endpoint_t *ep) {
         xhci_isoch_t * const isoch = ep->isoch;
-        const suseconds_t delay = isoch->buffer_count * ep->interval * 125 + RESET_TIMER_DELAY;
+        const suseconds_t delay = isoch->buffer_count * ep->interval * 125
+            + RESET_TIMER_DELAY;
 
         fibril_timer_clear_locked(isoch->reset_timer);
@@ -213 +215 @@
         const uint32_t reg_mfindex = XHCI_REG_RD(hc->rt_regs, XHCI_RT_MFINDEX);
         /*
-         * If the mfindex is low and the time passed since last mfindex wrap
-         * is too high, we have entered the new epoch already (and haven't received event yet).
+         * If the mfindex is low and the time passed since last mfindex wrap is too
+         * high, we have entered the new epoch already (and haven't received event
+         * yet).
          */
         uint64_t epoch = hc->wrap_count;
-        if (reg_mfindex < EPOCH_LOW_MFINDEX && get_system_time() - hc->wrap_time > EPOCH_DELAY) {
+        if (reg_mfindex < EPOCH_LOW_MFINDEX
+            && get_system_time() - hc->wrap_time > EPOCH_DELAY) {
                 ++epoch;
         }
@@ -230 +234 @@
                 const xhci_hc_t *hc = bus->hc;
 
-                /* Delay the first frame by some time to fill the buffer, but at most 10 miliseconds. */
+                /*
+                 * Delay the first frame by some time to fill the buffer, but at most 10
+                 * miliseconds.
+                 */
                 const uint64_t delay = min(isoch->buffer_count * ep->interval, 10 * 8);
                 it->mfindex = get_current_microframe(hc) + 1 + delay + hc->ist;
@@ -262 +269 @@
  * uframes it's off.
  */
-static inline void window_decide(window_decision_t *res, xhci_hc_t *hc, uint64_t mfindex)
+static inline void window_decide(window_decision_t *res, xhci_hc_t *hc,
+    uint64_t mfindex)
 {
         const uint64_t current_mf = get_current_microframe(hc);
@@ -333 +341 @@
 
                 case WINDOW_TOO_LATE:
-                        /* Missed the opportunity to schedule. Just mark this transfer as skipped. */
-                        usb_log_debug("[isoch] missed feeding buffer %lu at 0x%llx by %llu uframes",
-                            it - isoch->transfers, it->mfindex, wd.offset);
+                        /*
+                         * Missed the opportunity to schedule. Just mark this transfer as
+                         * skipped.
+                         */
+                        usb_log_debug("[isoch] missed feeding buffer %lu at 0x%llx by "
+                                "%llu uframes", it - isoch->transfers, it->mfindex, wd.offset);
                         it->state = ISOCH_COMPLETE;
                         it->error = EOK;
@@ -348 +359 @@
         if (fed) {
                 hc_ring_ep_doorbell(ep, 0);
-                /* The ring may be dead. If no event happens until the delay, reset the endpoint. */
+                /*
+                 * The ring may be dead. If no event happens until the delay, reset the
+                 * endpoint.
+                 */
                 timer_schedule_reset(ep);
         }
@@ -405 +419 @@
 
                 case WINDOW_TOO_LATE:
-                        usb_log_debug("[isoch] missed feeding buffer %lu at 0x%llx by %llu uframes",
-                            it - isoch->transfers, it->mfindex, wd.offset);
+                        usb_log_debug("[isoch] missed feeding buffer %lu at 0x%llx by"
+                                "%llu uframes", it - isoch->transfers, it->mfindex, wd.offset);
                         /* Missed the opportunity to schedule. Schedule ASAP. */
                         it->mfindex += wd.offset;
@@ -435 +449 @@
         if (fed) {
                 hc_ring_ep_doorbell(ep, 0);
-                /* The ring may be dead. If no event happens until the delay, reset the endpoint. */
+                /*
+                 * The ring may be dead. If no event happens until the delay, reset the
+                 * endpoint.
+                 */
                 timer_schedule_reset(ep);
         }
@@ -502 +519 @@
         calc_next_mfindex(ep, it);
         isoch->last_mf = it->mfindex;
-        usb_log_debug("[isoch] buffer %zu will be on schedule at 0x%llx", it - isoch->transfers, it->mfindex);
+        usb_log_debug("[isoch] buffer %zu will be on schedule at 0x%llx",
+            it - isoch->transfers, it->mfindex);
 
         /* Prepare the transfer. */
@@ -543 +561 @@
                 isoch_feed_in(ep);
 
-                usb_log_debug("[isoch] waiting for buffer %zu to be completed", it - isoch->transfers);
+                usb_log_debug("[isoch] waiting for buffer %zu to be completed",
+                    it - isoch->transfers);
                 fibril_condvar_wait(&isoch->avail, &isoch->guard);
 
@@ -568 +587 @@
 }
 
-void isoch_handle_transfer_event(xhci_hc_t *hc, xhci_endpoint_t *ep, xhci_trb_t *trb)
+void isoch_handle_transfer_event(xhci_hc_t *hc, xhci_endpoint_t *ep,
+    xhci_trb_t *trb)
 {
         assert(ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS);
@@ -581 +601 @@
                 case XHCI_TRBC_RING_OVERRUN:
                 case XHCI_TRBC_RING_UNDERRUN:
-                        /* For OUT, there was nothing to process */
-                        /* For IN, the buffer has overfilled, we empty the buffers and readd TRBs */
+                        /*
+                         * For OUT, there was nothing to process.
+                         * For IN, the buffer has overfilled.
+                         * In either case, reset the ring.
+                         */
                         usb_log_warning("Ring over/underrun.");
                         isoch_reset_no_timer(ep);