Changeset 60744 in vbox for trunk

Timestamp:

Apr 28, 2016 3:30:02 PM (9 years ago)

Author:

vboxsync

Message:

Main/USBProxyBackend: Add flag for each backend indicating whether we have to fake the device state update or Linux and USB/IP backends don't work

Location:

trunk/src/VBox/Main

Files:

• include/USBProxyBackend.h (modified) (3 diffs)
• src-server/USBProxyBackend.cpp (modified) (2 diffs)
• src-server/generic/USBProxyBackendUsbIp.cpp (modified) (1 diff)
• src-server/linux/USBProxyBackendLinux.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/USBProxyBackend.h

@@ -95 +95 @@
      */
     virtual void deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, PUSBDEVICE pDev);
+    virtual bool isFakeUpdateRequired();
 
 private:
@@ -205 +206 @@
     virtual PUSBDEVICE getDevices(void);
     virtual void deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, PUSBDEVICE aUSBDevice);
+    virtual bool isFakeUpdateRequired();
 
 private:
@@ -404 +406 @@
     virtual int interruptWait(void);
     virtual PUSBDEVICE getDevices(void);
+    virtual bool isFakeUpdateRequired();
 
 private:

trunk/src/VBox/Main/src-server/USBProxyBackend.cpp

@@ -232 +232 @@
 }
 
+
+bool USBProxyBackend::isFakeUpdateRequired()
+{
+    return false;
+}
 
 // Internals
@@ -661 +666 @@
             devLock.release();
             alock.release();
-            /** @todo: Add mthod for every backend indicating whether to use fake updating. */
-#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
-            m_pUsbProxyService->i_updateDeviceState(pHostDevice, pCur, true /* fFakeUpdate */);
-#else
-            m_pUsbProxyService->i_updateDeviceState(pHostDevice, pCur, false /* fFakeUpdate */);
-#endif
+            m_pUsbProxyService->i_updateDeviceState(pHostDevice, pCur, isFakeUpdateRequired());
             alock.acquire();
             ++it;

trunk/src/VBox/Main/src-server/generic/USBProxyBackendUsbIp.cpp

@@ -435 +435 @@
 
 
+bool USBProxyBackendUsbIp::isFakeUpdateRequired()
+{
+    return true;
+}
+
+
 int USBProxyBackendUsbIp::wait(RTMSINTERVAL aMillies)
 {

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

@@ -288 +288 @@
 
 
+bool USBProxyBackendLinux::isFakeUpdateRequired()
+{
+    return true;
+}
+
 int USBProxyBackendLinux::wait(RTMSINTERVAL aMillies)
 {