Changeset 65539 in vbox for trunk/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp

Timestamp:

Jan 31, 2017 12:30:31 PM (8 years ago)

Author:

vboxsync

Message:

Main/USBProxyBackendFreeBSD: Fixes to make it work again, contributed by Hans Petter Selasky, thanks

File:

• trunk/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp

@@ -151 +151 @@
 
     return VINF_SUCCESS;
+}
+
+
+bool USBProxyBackendFreeBSD::isFakeUpdateRequired()
+{
+    return true;
 }
 
@@ -271 +277 @@
             }
 
-            pDevice->enmState           = USBDEVICESTATE_UNUSED;
+            pDevice->enmState           = USBDEVICESTATE_USED_BY_HOST_CAPTURABLE;
             pDevice->bBus               = UsbDevInfo.udi_bus;
+            pDevice->bPort              = UsbDevInfo.udi_hubport;
             pDevice->bDeviceClass       = UsbDevInfo.udi_class;
             pDevice->bDeviceSubClass    = UsbDevInfo.udi_subclass;
@@ -293 +300 @@
                     break;
                 case USB_SPEED_SUPER:
+                    pDevice->enmSpeed = USBDEVICESPEED_SUPER;
+                    break;
                 case USB_SPEED_VARIABLE:
+                    pDevice->enmSpeed = USBDEVICESPEED_VARIABLE;
+                    break;
                 default:
                     pDevice->enmSpeed = USBDEVICESPEED_UNKNOWN;
+                    break;
             }
 
             if (UsbDevInfo.udi_vendor[0] != '\0')
             {
+                USBLibPurgeEncoding(UsbDevInfo.udi_vendor);
                 pDevice->pszManufacturer = RTStrDupN(UsbDevInfo.udi_vendor, sizeof(UsbDevInfo.udi_vendor));
-                USBLibPurgeEncoding(pDevice->pszManufacturer);
             }
 
             if (UsbDevInfo.udi_product[0] != '\0')
             {
+                USBLibPurgeEncoding(UsbDevInfo.udi_product);
                 pDevice->pszProduct = RTStrDupN(UsbDevInfo.udi_product, sizeof(UsbDevInfo.udi_product));
-                USBLibPurgeEncoding(pDevice->pszProduct);
             }
 
             if (UsbDevInfo.udi_serial[0] != '\0')
             {
+                USBLibPurgeEncoding(UsbDevInfo.udi_serial);
                 pDevice->pszSerialNumber = RTStrDupN(UsbDevInfo.udi_serial, sizeof(UsbDevInfo.udi_serial));
-                USBLibPurgeEncoding(pDevice->pszSerialNumber);
-                pDevice->u64SerialHash   = USBLibHashSerial(pDevice->pszSerialNumber);
+                pDevice->u64SerialHash = USBLibHashSerial(UsbDevInfo.udi_serial);
             }
             rc = ioctl(FileUsb, USB_GET_PLUGTIME, &PlugTime);
@@ -322 +334 @@
             pDevice->pszAddress = RTStrDup(pszDevicePath);
             pDevice->pszBackend = RTStrDup("host");
-            pDevice->enmState   = USBDEVICESTATE_USED_BY_HOST_CAPTURABLE;
 
             usbLogDevice(pDevice);
@@ -338 +349 @@
     return pDevices;
 }
-