Changeset c33c40e in mainline

Timestamp:

2017-08-20T14:27:34Z (8 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

9304b66

Parents:

17f24d9

Message:

Fixed infinite loop bug. Support non-zero address for RH.

Location:

uspace/drv/bus/usb/xhci

Files:

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

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

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

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

@@ -382 +382 @@
         /* TODO: Implement me! */
         usb_log_debug2("Called req_status_change_handler().");
-        return EOK;
+        return ENAK;
 }
 

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

@@ -74 +74 @@
 {
         assert(rh);
-        /* FIXME: The line end below causes infinite loop. */
-        return 0; // virthub_base_get_address(&rh->base);
+        return virthub_base_get_address(&rh->base);
 }