Changeset 36941 in vbox for trunk/src/VBox/Main

Timestamp:

May 3, 2011 2:56:08 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71528

Message:

usb rework

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• src-server/win/USBProxyServiceWindows.cpp (modified) (4 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -382 +382 @@
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
         $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib
- ifdef VBOX_NETFLT_ONDEMAND_BIND
-  VBoxSVC_DEFS.win += VBOX_NETFLT_ONDEMAND_BIND
- endif
 endif
 VBoxSVC_LDFLAGS.darwin    = -framework IOKit -framework SystemConfiguration

trunk/src/VBox/Main/src-server/win/USBProxyServiceWindows.cpp

@@ -143 +143 @@
 int USBProxyServiceWindows::captureDevice(HostUSBDevice *aDevice)
 {
-    AssertReturn(aDevice, VERR_GENERAL_FAILURE);
-    AssertReturn(aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
-    Assert(aDevice->getUnistate() == kHostUSBDeviceState_Capturing);
-
-/** @todo pass up a one-shot filter like on darwin?  */
-    USHORT vendorId, productId, revision;
-
-    HRESULT rc;
-
-    rc = aDevice->COMGETTER(VendorId)(&vendorId);
-    AssertComRCReturn(rc, VERR_INTERNAL_ERROR);
-
-    rc = aDevice->COMGETTER(ProductId)(&productId);
-    AssertComRCReturn(rc, VERR_INTERNAL_ERROR);
-
-    rc = aDevice->COMGETTER(Revision)(&revision);
-    AssertComRCReturn(rc, VERR_INTERNAL_ERROR);
-
-    return USBLibCaptureDevice(vendorId, productId, revision);
+    /*
+     * Create a one-shot ignore filter for the device
+     * and trigger a re-enumeration of it.
+     */
+    USBFILTER Filter;
+    USBFilterInit(&Filter, USBFILTERTYPE_ONESHOT_CAPTURE);
+    initFilterFromDevice(&Filter, aDevice);
+    Log(("USBFILTERIDX_PORT=%#x\n", USBFilterGetNum(&Filter, USBFILTERIDX_PORT)));
+    Log(("USBFILTERIDX_BUS=%#x\n", USBFilterGetNum(&Filter, USBFILTERIDX_BUS)));
+
+    void *pvId = USBLibAddFilter(&Filter);
+    if (!pvId)
+    {
+        AssertMsgFailed(("Add one-shot Filter failed\n"));
+        return VERR_GENERAL_FAILURE;
+    }
+
+    int rc = USBLibRunFilters();
+    if (!RT_SUCCESS(rc))
+    {
+        AssertMsgFailed(("Run Filters failed\n"));
+        USBLibRemoveFilter(pvId);
+        return rc;
+    }
+
+    return VINF_SUCCESS;
 }
 
@@ -167 +174 @@
 int USBProxyServiceWindows::releaseDevice(HostUSBDevice *aDevice)
 {
-    AssertReturn(aDevice, VERR_GENERAL_FAILURE);
-    AssertReturn(aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
-    Assert(aDevice->getUnistate() == kHostUSBDeviceState_ReleasingToHost);
-
-/** @todo pass up a one-shot filter like on darwin?  */
-    USHORT vendorId, productId, revision;
-    HRESULT rc;
-
-    rc = aDevice->COMGETTER(VendorId)(&vendorId);
-    AssertComRCReturn(rc, VERR_INTERNAL_ERROR);
-
-    rc = aDevice->COMGETTER(ProductId)(&productId);
-    AssertComRCReturn(rc, VERR_INTERNAL_ERROR);
-
-    rc = aDevice->COMGETTER(Revision)(&revision);
-    AssertComRCReturn(rc, VERR_INTERNAL_ERROR);
-
-    Log(("USBProxyServiceWindows::releaseDevice\n"));
-    return USBLibReleaseDevice(vendorId, productId, revision);
+    /*
+     * Create a one-shot ignore filter for the device
+     * and trigger a re-enumeration of it.
+     */
+    USBFILTER Filter;
+    USBFilterInit(&Filter, USBFILTERTYPE_ONESHOT_IGNORE);
+    initFilterFromDevice(&Filter, aDevice);
+    Log(("USBFILTERIDX_PORT=%#x\n", USBFilterGetNum(&Filter, USBFILTERIDX_PORT)));
+    Log(("USBFILTERIDX_BUS=%#x\n", USBFilterGetNum(&Filter, USBFILTERIDX_BUS)));
+
+    void *pvId = USBLibAddFilter(&Filter);
+    if (!pvId)
+    {
+        AssertMsgFailed(("Add one-shot Filter failed\n"));
+        return VERR_GENERAL_FAILURE;
+    }
+
+    int rc = USBLibRunFilters();
+    if (!RT_SUCCESS(rc))
+    {
+        AssertMsgFailed(("Run Filters failed\n"));
+        USBLibRemoveFilter(pvId);
+        return rc;
+    }
+
+
+    return VINF_SUCCESS;
 }
 
@@ -223 +238 @@
 int USBProxyServiceWindows::wait(unsigned aMillies)
 {
-    DWORD rc;
-
-    /* Not going to do something fancy where we block in the filter
-     * driver and are woken up when the state has changed.
-     * Would be better, but this is good enough.
-     */
-    do
-    {
-        rc = WaitForSingleObject(mhEventInterrupt, RT_MIN(aMillies, 100));
-        if (rc == WAIT_OBJECT_0)
-            return VINF_SUCCESS;
-        /** @todo handle WAIT_FAILED here */
-
-        if (USBLibHasPendingDeviceChanges() == true)
-        {
-            Log(("wait thread detected usb change\n"));
-            return VINF_SUCCESS;
-        }
-
-        if (aMillies > 100)
-            aMillies -= 100;
-    }
-    while (aMillies > 100);
-
-    return VERR_TIMEOUT;
+    return USBLibWaitChange(aMillies);
 }
 
@@ -253 +244 @@
 int USBProxyServiceWindows::interruptWait(void)
 {
-    SetEvent(mhEventInterrupt);
-    return VINF_SUCCESS;
-}
-
+    return USBLibInterruptWaitChange();
+}
 
 /**