Changeset 56395 in vbox

Timestamp:

Jun 12, 2015 3:12:23 PM (9 years ago)

Author:

vboxsync

Message:

VUSB: Reverted r100358, fixed xHCI device attaching differently.

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);
@@ -1167 +1179 @@
     ASMAtomicXchgBool(&pDev->fTerminate, false);
     rc = RTThreadCreateF(&pDev->hUrbIoThread, vusbDevUrbIoThread, pDev, 0, RTTHREADTYPE_IO,
-                         RTTHREADFLAGS_WAITABLE, "%s-%d", pDev->pUsbIns->pReg->szName,
-                         pDev->pUsbIns->iInstance);
+                         RTTHREADFLAGS_WAITABLE, "USBDevIo-%d", pDev->i16Port);
     if (RT_SUCCESS(rc))
     {
@@ -1222 +1233 @@
     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

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