Changeset 8471 in vbox for trunk/src/VBox/Main/ConsoleImpl.cpp

Timestamp:

Apr 29, 2008 3:20:44 PM (17 years ago)

Author:

vboxsync

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

30336

Message:

More USB stuff.

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2011 +2011 @@
             Guid (aId).raw());
 
-# ifdef RT_OS_DARWIN
-    /* Notify the USB Proxy that we're about to detach the device. Since
-     * we don't dare do IPC when holding the console lock, so we'll have
-     * to revalidate the device when we get back. */
+# if defined(RT_OS_DARWIN) || defined(NEW_HOSTUSBDEVICE_STATE)
+    /*
+     * Inform the USB device and USB proxy about what's cooking.
+     */
     alock.leave();
     HRESULT rc2 = mControl->DetachUSBDevice (aId, false /* aDone */);
@@ -2020 +2020 @@
         return rc2;
     alock.enter();
-
+#  ifndef NEW_HOSTUSBDEVICE_STATE
     for (it = mUSBDevices.begin(); it != mUSBDevices.end(); ++ it)
         if ((*it)->id() == aId)
@@ -2026 +2026 @@
     if (it == mUSBDevices.end())
         return S_OK;
+#  endif
 # endif
 
-    /* First, request VMM to detach the device */
+    /* Request the PDM to detach the USB device. */
     HRESULT rc = detachUSBDevice (it);