Changeset 3046 in vbox for trunk/src

Timestamp:

Jun 5, 2007 11:06:18 AM (18 years ago)

Author:

vboxsync

Message:

Fixed linux and darwin regressions.

File:

• trunk/src/VBox/Main/HostUSBDeviceImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/HostUSBDeviceImpl.cpp

@@ -847 +847 @@
     AssertReturn (isLockedOnCurrentThread(), -1);
 
+#ifdef __WIN__
     return compare (mUsb, aDev2, !isStatePending());
+#else
+    /* Since we fake the requests anyway, there is no need to unnecessarily
+       expose ourselves to trouble the non-strict compare may cause on
+       release/capture/unplug/plug/similar-devices. */
+    return compare (mUsb, aDev2, true /* strict */);
+#endif
 }
 
 /**
  *  Compares two USB devices and decides which comes first.
- * 
+ *
  *  If @a aIsStrict is @c true then the comparison will indicate a difference
  *  even if the same physical device (represented by @a aDev1) has been just
@@ -964 +971 @@
                     isImportant = false;
                     break;
+#ifndef __WIN__ /* Only windows really knows whether the device is busy or used captured. */
+                case USBDeviceState_USBDeviceCaptured:
+                    if (!mIsStatePending)
+                        return false;
+                    /* fall thru */
+#endif
                 default:
                     isImportant = true;
@@ -982 +995 @@
                     isImportant = false;
                     break;
+#ifndef __WIN__ /* Only Windows really knows whether the device is busy or used captured. */
+                case USBDeviceState_USBDeviceCaptured:
+                    if (!mIsStatePending)
+                        return false;
+                    /* fall thru */
+#endif
                 default:
                     isImportant = true;
@@ -995 +1014 @@
                 case USBDeviceState_USBDeviceAvailable:
                     return false;
-#ifdef __LINUX__ /* hack for /proc/bus/usb/devices not putting up a driver any longer. */
+#ifdef __LINUX__ /* Hack for /proc/bus/usb/devices not necessarily putting up a driver. */
                 case USBDeviceState_USBDeviceCaptured:
                     if (!mIsStatePending)