Changeset 32192 in vbox for trunk/src/VBox

Timestamp:

Sep 2, 2010 12:32:20 PM (14 years ago)

Author:

vboxsync

Message:

USB-win: Map URB cancellation to endpoint abort like Darwin/Solaris.

File:

• trunk/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp

@@ -404 +404 @@
  * Aborts a pipe/endpoint (cancels all outstanding URBs on the endpoint).
  */
-static bool usbProxyWinAbortEndPt(PUSBPROXYDEV pProxyDev, unsigned int ep)
+static int usbProxyWinAbortEndPt(PUSBPROXYDEV pProxyDev, unsigned int ep)
 {
     PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
     USBSUP_CLEAR_ENDPOINT in;
     DWORD cbReturned;
+    int  rc;
 
     Assert(pPriv);
@@ -417 +418 @@
     cbReturned = 0;
     if (DeviceIoControl(pPriv->hDev, SUPUSB_IOCTL_USB_ABORT_ENDPOINT, &in, sizeof(in), NULL, 0, &cbReturned, NULL))
-        return true;
-
-    if (    GetLastError() == ERROR_INVALID_HANDLE_STATE
-        ||  GetLastError() == ERROR_BAD_COMMAND)
+        return VINF_SUCCESS;
+
+    rc = GetLastError();
+    if (    rc == ERROR_INVALID_HANDLE_STATE
+        ||  rc == ERROR_BAD_COMMAND)
     {
         Log(("usbproxy: device %x unplugged!!\n", pPriv->hDev));
@@ -427 +429 @@
     else
         AssertMsgFailed(("lasterr=%d\n", GetLastError()));
-    return false;
+    return RTErrConvertFromWin32(rc);
 }
 
@@ -735 +737 @@
 
 /**
- * Cancel an in-flight URB.
+ * Cancels an in-flight URB.
+ *
+ * The URB requires reaping, so we don't change its state.
+ *
+ * @remark  There isn't a way to cancel a specific URB on Windows.
+ *          on darwin. The interface only supports the aborting of
+ *          all URBs pending on an endpoint. Luckily that is usually
+ *          exactly what the guest wants to do.
  */
 static void usbProxyWinUrbCancel(PVUSBURB pUrb)
@@ -742 +751 @@
     PPRIV_USBW32      pPriv     = (PPRIV_USBW32)pProxyDev->Backend.pv;
     PQUEUED_URB       pQUrbWin  = (PQUEUED_URB)pUrb->Dev.pvPrivate;
+    int                     rc;
+    USBSUP_CLEAR_ENDPOINT   in;
+    DWORD                   cbReturned;
     Assert(pQUrbWin);
 
-    /*
-     * We've no way of canceling it, so we'll have to wait till
-     * it's ripe and can be reaped. The caller will deal with this.
-     */
-    pQUrbWin->fCancelled = TRUE;
-    Log(("Cancel urb %p\n", pUrb));
-
-    /* Note CancelIoEx can cancel all pending IO requests for a file handle or a specific overlapped request.
-     * Unfortunately Vista+ only.
-     */
+    in.bEndpoint = pUrb->EndPt | (pUrb->enmDir == VUSBDIRECTION_IN ? 0x80 : 0);
+    Log(("Cancel urb %p, endpoint %x\n", pUrb, in.bEndpoint));
+
+    cbReturned = 0;
+    if (DeviceIoControl(pPriv->hDev, SUPUSB_IOCTL_USB_ABORT_ENDPOINT, &in, sizeof(in), NULL, 0, &cbReturned, NULL))
+        return;
+    
+    rc = GetLastError();
+    if (    rc == ERROR_INVALID_HANDLE_STATE
+        ||  rc == ERROR_BAD_COMMAND)
+    {
+        Log(("usbproxy: device %x unplugged!!\n", pPriv->hDev));
+        pProxyDev->fDetached = true;
+    }
+    else
+        AssertMsgFailed(("lasterr=%d\n", GetLastError()));
 }