Changeset d32d51d in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2017-08-20T12:01:35Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

07c08ea

Parents:

5ff9e1d

Message:

Updated RH implementation with virtual hub emulation structure.

File:

• uspace/drv/bus/usb/xhci/hc.c (modified) (4 diffs)

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

@@ -220 +220 @@
                 goto err_event_ring;
 
-        return EOK;
-
+        if ((err = xhci_rh_init(&hc->rh)))
+                goto err_rh;
+
+        return EOK;
+
+err_rh:
+        xhci_rh_fini(&hc->rh);
 err_event_ring:
         xhci_event_ring_fini(&hc->event_ring);
@@ -362 +367 @@
         assert(batch);
 
+        /* Check for root hub communication */
+        /* FIXME: Zero is a very crude workaround. Detect RH better. */
+        if (batch->ep->address == 0) {
+                usb_log_debug("XHCI root hub request.\n");
+                return xhci_rh_schedule(&hc->rh, batch);
+        }
+
         usb_log_debug2("EP(%d:%d) started %s transfer of size %lu.",
                 batch->ep->address, batch->ep->endpoint,
@@ -386 +398 @@
         }
 
-        return ENAK;
+        return EOK;
 }
 
@@ -515 +527 @@
         hc_dcbaa_fini(hc);
         xhci_fini_commands(hc);
+        xhci_rh_fini(&hc->rh);
         pio_disable(hc->base, RNGSZ(hc->mmio_range));
         usb_log_info("HC(%p): Finalized.", hc);