Changeset 55901 in vbox for trunk

Timestamp:

May 18, 2015 10:39:35 AM (10 years ago)

Author:

vboxsync

Message:

USB: Fix attaching multiple devices to the same roothub on xHCI

Location:

trunk/src/VBox/Devices/USB

Files:

• VUSBDevice.cpp (modified) (3 diffs)
• VUSBInternal.h (modified) (3 diffs)

trunk/src/VBox/Devices/USB/VUSBDevice.cpp

@@ -1014 +1014 @@
     PVUSBROOTHUB pRh = vusbDevGetRh(pDev);
     AssertPtrReturnVoid(pRh);
-    if (pDev->u8Address == VUSB_DEFAULT_ADDRESS)
-        pRh->pDefaultAddress = NULL;
 
     vusbDevAddressUnHash(pDev);
 
     if (u8Address == VUSB_DEFAULT_ADDRESS)
-    {
-        if (pRh->pDefaultAddress != NULL)
-        {
-            vusbDevAddressUnHash(pRh->pDefaultAddress);
-            vusbDevSetState(pRh->pDefaultAddress, VUSB_DEVICE_STATE_POWERED);
-            Log(("2 DEFAULT ADDRS\n"));
-        }
-
-        pRh->pDefaultAddress = pDev;
         vusbDevSetState(pDev, VUSB_DEVICE_STATE_DEFAULT);
-    }
     else
         vusbDevSetState(pDev, VUSB_DEVICE_STATE_ADDRESS);
@@ -1179 +1167 @@
     ASMAtomicXchgBool(&pDev->fTerminate, false);
     rc = RTThreadCreateF(&pDev->hUrbIoThread, vusbDevUrbIoThread, pDev, 0, RTTHREADTYPE_IO,
-                         RTTHREADFLAGS_WAITABLE, "USBDevIo-%d", pDev->i16Port);
+                         RTTHREADFLAGS_WAITABLE, "%s-%d", pDev->pUsbIns->pReg->szName,
+                         pDev->pUsbIns->iInstance);
     if (RT_SUCCESS(rc))
     {
@@ -1233 +1222 @@
     if (!pRh)
         AssertMsgFailedReturn(("Not attached!\n"), VERR_VUSB_DEVICE_NOT_ATTACHED);
-    if (pRh->pDefaultAddress == pDev)
-        pRh->pDefaultAddress = NULL;
 
     pDev->pHub->pOps->pfnDetach(pDev->pHub, pDev);

trunk/src/VBox/Devices/USB/VUSBInternal.h

@@ -354 +354 @@
     /** Address hash table. */
     PVUSBDEV                apAddrHash[VUSB_ADDR_HASHSZ];
-    /** The default address. */
-    PVUSBDEV                pDefaultAddress;
+
+#if HC_ARCH_BITS == 32
+    uint32_t                Alignment0;
+#endif
 
     /** Pointer to the driver instance. */
@@ -365 +367 @@
 
 #if HC_ARCH_BITS == 32
-    uint32_t                Alignment0;
-#endif
+    uint32_t                Alignment1;
+#endif
+
     /** Critical section protecting the device list. */
     RTCRITSECT              CritSectDevices;
@@ -373 +376 @@
 
 #if HC_ARCH_BITS == 32
-    uint32_t                Alignment1;
+    uint32_t                Alignment2;
 #endif