Changeset 32077 in vbox for trunk/src

Timestamp:

Aug 30, 2010 8:11:18 AM (14 years ago)

Author:

vboxsync

Message:

OHCI: ED checks must be less strict when looking for URBs to be undone.

File:

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

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

@@ -3139 +3139 @@
 
 /**
+ * Checks if an endpoint has TDs queued (not necessarily ready to have them processed).
+ *
+ * @returns true if endpoint may have TDs queued.
+ * @param   pEd     The endpoint data.
+ */
+DECLINLINE(bool) ohciIsEdPresent(PCOHCIED pEd)
+{
+    return (pEd->HeadP & ED_PTR_MASK) != (pEd->TailP & ED_PTR_MASK)
+         && !(pEd->HeadP & ED_HEAD_HALTED);
+}
+
+
+/**
  * Services the bulk list.
  *
@@ -3262 +3275 @@
         ohciReadEd(pOhci, EdAddr, &Ed);
         Assert(!(Ed.hwinfo & ED_HWINFO_ISO)); /* the guest is screwing us */
-        if (ohciIsEdReady(&Ed))
+        if (ohciIsEdPresent(&Ed))
         {
             uint32_t TdAddr = Ed.HeadP & ED_PTR_MASK;