Changeset 60742 in vbox for trunk/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp

Timestamp:

Apr 28, 2016 1:55:03 PM (9 years ago)

Author:

vboxsync

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

106933

Message:

Main/USBProxy{Service|Backend}: Rework interaction between thos two to be more sane than it currently is (calling into each other back and forth)

File:

• trunk/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp

@@ -269 +269 @@
 
 
-bool USBProxyBackendLinux::updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters,
-                                             SessionMachine **aIgnoreMachine)
-{
-    AssertReturn(aDevice, false);
-    AssertReturn(!aDevice->isWriteLockOnCurrentThread(), false);
-    AutoReadLock devLock(aDevice COMMA_LOCKVAL_SRC_POS);
-    if (    aUSBDevice->enmState == USBDEVICESTATE_USED_BY_HOST_CAPTURABLE
-        &&  aDevice->i_getUsbData()->enmState == USBDEVICESTATE_USED_BY_HOST)
-        LogRel(("USBProxy: Device %04x:%04x (%s) has become accessible.\n",
-                aUSBDevice->idVendor, aUSBDevice->idProduct, aUSBDevice->pszAddress));
-    devLock.release();
-    return updateDeviceStateFake(aDevice, aUSBDevice, aRunFilters, aIgnoreMachine);
-}
-
-
 /**
  * A device was added, we need to adjust mUdevPolls.
- *
- * See USBProxyService::deviceAdded for details.
- */
-void USBProxyBackendLinux::deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList &llOpenedMachines,
-                                       PUSBDEVICE aUSBDevice)
+ */
+void USBProxyBackendLinux::deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, PUSBDEVICE pDev)
 {
     AssertReturnVoid(aDevice);
     AssertReturnVoid(!aDevice->isWriteLockOnCurrentThread());
     AutoReadLock devLock(aDevice COMMA_LOCKVAL_SRC_POS);
-    if (aUSBDevice->enmState == USBDEVICESTATE_USED_BY_HOST)
-    {
-        LogRel(("USBProxy: Device %04x:%04x (%s) isn't accessible. giving udev a few seconds to fix this...\n",
-                aUSBDevice->idVendor, aUSBDevice->idProduct, aUSBDevice->pszAddress));
+    if (pDev->enmState == USBDEVICESTATE_USED_BY_HOST)
+    {
+        LogRel(("USBProxyBackendLinux: Device %04x:%04x (%s) isn't accessible. giving udev a few seconds to fix this...\n",
+                pDev->idVendor, pDev->idProduct, pDev->pszAddress));
         mUdevPolls = 10; /* (10 * 500ms = 5s) */
     }
 
     devLock.release();
-    USBProxyBackend::deviceAdded(aDevice, llOpenedMachines, aUSBDevice);
 }