Changeset 3415 in vbox

Timestamp:

Jul 4, 2007 3:21:30 PM (18 years ago)

Author:

vboxsync

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

22620

Message:

(re-)run filters when the device becomes available (again).

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (1 diff)
• HostUSBDeviceImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -2082 +2082 @@
         aDevice->handlePendingStateChange();
     }
+    else if (   aDevice->state() == USBDeviceState_USBDeviceAvailable
+             || aDevice->state() == USBDeviceState_USBDeviceBusy)
+    {
+        /* The device has gone from being unavailable (not subject to filters) to being
+           available / busy. This transition can be triggered by udevd or manual
+           permission changes on Linux. On all systems may be triggered by the host
+           ceasing to use the device - like unmounting an MSD in the Finder or invoking
+           the "Safely remove XXXX" stuff on Windows (perhaps). */
+        ComObjPtr <HostUSBDevice> device (aDevice);
+        HRESULT rc = applyAllUSBFilters (device);
+        AssertComRC (rc);
+    }
     else
     {

trunk/src/VBox/Main/HostUSBDeviceImpl.cpp

@@ -915 +915 @@
  *  @param   aDev    The current device state as seen by the proxy backend.
  *
+ *  @return Whether the Host object should be bothered with this state change.
+ *
  *  @note Locks this object for writing.
  */
@@ -949 +951 @@
      * change it later and, e.g. re-run all USB filters when the device goes from
      * from Busy to Available).
+     *
+     * 2007-07-04: State transitions from Unavailable to Busy or Available
+     *             are now considered important and will cause filters to
+     *             be rerun on the device. (See #2030 and #1870.)
      */
 
@@ -991 +997 @@
                 case USBDeviceState_USBDeviceBusy:
                     return false;
-                /* the following state changes don't require any action for now */
-                case USBDeviceState_USBDeviceUnavailable:
                 case USBDeviceState_USBDeviceAvailable:
                     isImportant = false;
@@ -1003 +1007 @@
 #endif
                 default:
+                    /* USBDeviceState_USBDeviceUnavailable: The device has become capturable, re-run filters. */
+                    /* USBDeviceState_USBDeviceHeld:        Pending request. */
+                    /* USBDeviceState_USBDeviceCaptured:    Pending request. */
+                    /* USBDeviceState_USBDeviceNotSupported: Something is broken. */
                     isImportant = true;
             }
@@ -1023 +1031 @@
 #endif
                 /* the following state changes don't require any action for now */
-                case USBDeviceState_USBDeviceUnavailable:
                 case USBDeviceState_USBDeviceBusy:
                     isImportant = false;
                     break;
                 default:
+                /* USBDeviceState_USBDeviceUnavailable: The device has become available, re-run filters. */
+                /* USBDeviceState_USBDeviceHeld:        Pending request. */
+                /* USBDeviceState_USBDeviceNotSupported: Something is broken. */
                     isImportant = true;
             }