Changeset 45671 in vbox for trunk/src/VBox

Timestamp:

Apr 22, 2013 4:06:38 PM (12 years ago)

Author:

vboxsync

Message:

OHCI: Endpoints may need to be skipped when looking for orphaned URBs.

File:

• trunk/src/VBox/Devices/USB/DevOHCI.cpp (modified) (2 diffs)

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

@@ -3553 +3553 @@
     PVUSBURB    pUrb;
 
-    /* If the HCCA is not currently valid, there's nothing to do. */
-    if (!fValidHCCA)
+    /* If the HCCA is not currently valid, or there are no in-flight URBs,
+     * there's nothing to do.
+     */
+    if (!fValidHCCA || !pThis->cInFlight)
         return;
 
@@ -3591 +3593 @@
             ohciReadEd(pThis, EdAddr, &Ed);
             uint32_t TdAddr = Ed.HeadP & ED_PTR_MASK;
+            uint32_t TailP  = Ed.TailP & ED_PTR_MASK;
             unsigned k = 0;
-            do
+            if (  !(Ed.hwinfo & ED_HWINFO_SKIP)
+                && (TdAddr != TailP)) 
             {
-                ohciReadTd(pThis, TdAddr, &Td);
-                j = ohci_in_flight_find(pThis, TdAddr);
-                if (j > -1)
-                    pThis->aInFlight[j].fInactive = false;
-                TdAddr = Td.NextTD & ED_PTR_MASK;
-                /* Failsafe for temporarily looped lists. */
-                if (++k == 128)
-                    break;
-            } while (TdAddr != (Ed.TailP & ED_PTR_MASK));
+                do
+                {
+                    ohciReadTd(pThis, TdAddr, &Td);
+                    j = ohci_in_flight_find(pThis, TdAddr);
+                    if (j > -1)
+                        pThis->aInFlight[j].fInactive = false;
+                    TdAddr = Td.NextTD & ED_PTR_MASK;
+                    /* Failsafe for temporarily looped lists. */
+                    if (++k == 128)
+                        break;
+                } while (TdAddr != (Ed.TailP & ED_PTR_MASK));
+            }
             EdAddr = Ed.NextED & ED_PTR_MASK;
         }