Changeset 17f24d9 in mainline

Timestamp:

2017-08-20T14:00: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:

c33c40e

Parents:

60ac352

Message:

Discovered correct way of determining RH address.

Location:

uspace/drv/bus/usb/xhci

Files:

• hc.c (modified) (1 diff)
• rh.h (modified) (1 diff)

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

@@ -369 +369 @@
         /* Check for root hub communication */
         /* FIXME: Zero is a very crude workaround. Detect RH better. */
-        if (batch->ep->address == 0) {
+        if (batch->ep->address == xhci_rh_get_address(&hc->rh)) {
                 usb_log_debug("XHCI root hub request.\n");
                 return xhci_rh_schedule(&hc->rh, batch);

uspace/drv/bus/usb/xhci/rh.h

@@ -65 +65 @@
 int xhci_rh_interrupt(xhci_rh_t *);
 
+/** Get XHCI rh address.
+ *
+ * @param rh XHCI rh instance.
+ * @return USB address assigned to the hub.
+ * Wrapper for virtual hub address
+ */
+static inline usb_address_t xhci_rh_get_address(xhci_rh_t *rh)
+{
+        assert(rh);
+        /* FIXME: The line end below causes infinite loop. */
+        return 0; // virthub_base_get_address(&rh->base);
+}
+
 #endif