Changeset 32010 in vbox for trunk/src/VBox

Timestamp:

Aug 26, 2010 4:51:26 PM (14 years ago)

Author:

vboxsync

Message:

VUSB: Added a way to cancel URBs without failing the transfer.

Location:

trunk/src/VBox/Devices/USB

Files:

• DevOHCI.cpp (modified) (2 diffs)
• DrvVUSBRootHub.cpp (modified) (2 diffs)
• VUSBDevice.cpp (modified) (1 diff)
• VUSBInternal.h (modified) (2 diffs)
• VUSBUrb.cpp (modified) (2 diffs)

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

@@ -2416 +2416 @@
      */
     int cFmAge = ohci_in_flight_remove_urb(pOhci, pUrb);
+    if (pUrb->enmStatus == VUSBSTATUS_UNDO)
+    {
+        /* Leave the TD alone - the HCD doesn't want us talking to the device. */
+        Log(("%s: ohciRhXferCompletion: CANCELED {ED=%#010x cTds=%d TD0=%#010x age %d}\n",
+             pUrb->pszDesc, pUrb->Hci.EdAddr, pUrb->Hci.cTds, pUrb->Hci.paTds[0].TdAddr, cFmAge));
+        STAM_COUNTER_INC(&pOhci->StatDroppedUrbs);
+        return;
+    }
     bool fHasBeenCanceled = false;
     if (    (Ed.HeadP & ED_HEAD_HALTED)
@@ -2438 +2446 @@
     /*
      * Complete the TD updating and write the back.
-     * When appropirate also copy data back to the guest memory.
+     * When appropriate also copy data back to the guest memory.
      */
     if (pUrb->enmType == VUSBXFERTYPE_ISOC)

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

@@ -585 +585 @@
      */
     LogFlow(("vusbRhCancelUrbsEp: pRh=%p pUrb=%p\n", pRh));
-    vusbUrbCancel(pUrb);
+    vusbUrbCancel(pUrb, CANCELMODE_UNDO);
 
     PVUSBURB pRipe;
@@ -613 +613 @@
     {
         PVUSBURB pNext = pUrb->VUsb.pNext;
-        vusbUrbCancel(pUrb);
+        vusbUrbCancel(pUrb, CANCELMODE_FAIL);
         pUrb = pNext;
     }

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

@@ -1046 +1046 @@
         {
             LogFlow(("%s: vusbDevCancelAllUrbs: CANCELING URB\n", pUrb->pszDesc));
-            vusbUrbCancel(pUrb);
+            vusbUrbCancel(pUrb, CANCELMODE_FAIL);
         }
         pUrb = pNext;

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

@@ -407 +407 @@
 #define VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface) (PVUSBROOTHUB)( (uintptr_t)(pInterface) - RT_OFFSETOF(VUSBROOTHUB, IRhConnector) )
 
+/**
+ * URB cancellation modes
+ */
+typedef enum CANCELMODE
+{
+    /** complete the URB with an error (CRC). */
+    CANCELMODE_FAIL = 0,
+    /** do not change the URB contents. */
+    CANCELMODE_UNDO
+} CANCELMODE;
 
 /* @} */
@@ -417 +427 @@
 void vusbUrbTrace(PVUSBURB pUrb, const char *pszMsg, bool fComplete);
 void vusbUrbDoReapAsync(PVUSBURB pHead, RTMSINTERVAL cMillies);
-void vusbUrbCancel(PVUSBURB pUrb);
+void vusbUrbCancel(PVUSBURB pUrb, CANCELMODE mode);
 void vusbUrbRipe(PVUSBURB pUrb);
 void vusbUrbCompletionRh(PVUSBURB pUrb);

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

@@ -2011 +2011 @@
  * state and in the async list until its reaped. When it's finally reaped
  * it will be unlinked and freed without doing any completion.
+ * 
+ * There are different modes of canceling an URB. When devices are being
+ * disconnected etc., they will be completed with an error (CRC). However,
+ * when the HC needs to temporarily halt communication with a device, the
+ * URB/TD must be left alone if possible.
  *
  * @param   pUrb        The URB to cancel.
- */
-void vusbUrbCancel(PVUSBURB pUrb)
+ * @param   mode        The way the URB should be canceled.
+ */
+void vusbUrbCancel(PVUSBURB pUrb, CANCELMODE mode)
 {
     vusbUrbAssert(pUrb);
@@ -2054 +2060 @@
     {
         AssertMsg(pUrb->enmState == VUSBURBSTATE_CANCELLED, ("Invalid state %d, pUrb=%p\n", pUrb->enmState, pUrb));
-        pUrb->enmStatus = VUSBSTATUS_CRC;
+        switch (mode)
+        {
+            default:
+                AssertMsgFailed(("Invalid cancel mode\n"));
+            case CANCELMODE_FAIL:
+                pUrb->enmStatus = VUSBSTATUS_CRC;
+                break;
+            case CANCELMODE_UNDO:
+                pUrb->enmStatus = VUSBSTATUS_UNDO;
+                break;
+
+        }
     }
 }