Changeset 81667 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Nov 5, 2019 11:08:21 AM (5 years ago)

Author:

vboxsync

Message:

Main: Added a portPath attribute to IUSBDevice. This will allow uniquely identifying a specific USB port in a system (see bugref:9518).

Location:

trunk/src/VBox/Main/src-client

Files:

• RemoteUSBDeviceImpl.cpp (modified) (6 diffs)
• USBDeviceImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp

@@ -78 +78 @@
     unconst(mData.backend)      = "vrdp";
 
+    char port[16];
+    RTStrPrintf(port, sizeof(port), "%u", pDevDesc->idPort);
+    unconst(mData.portPath)     = port;
+
     unconst(mData.port)         = pDevDesc->idPort;
     unconst(mData.version)      = (uint16_t)(pDevDesc->bcdUSB >> 8);
@@ -89 +93 @@
             case VRDE_USBDEVICESPEED_LOW:
             case VRDE_USBDEVICESPEED_FULL:
-                unconst(mData.portVersion) = 1;
                 unconst(mData.speed) = USBConnectionSpeed_Full;
                 break;
@@ -95 +98 @@
             case VRDE_USBDEVICESPEED_HIGH:
             case VRDE_USBDEVICESPEED_VARIABLE:
-                unconst(mData.portVersion) = 2;
                 unconst(mData.speed) = USBConnectionSpeed_High;
                 break;
 
             case VRDE_USBDEVICESPEED_SUPERSPEED:
-                unconst(mData.portVersion) = 3;
                 unconst(mData.speed) = USBConnectionSpeed_Super;
                 break;
@@ -107 +108 @@
     else
     {
-        unconst(mData.portVersion)  = mData.version;
         unconst(mData.speed) = mData.version == 3 ? USBConnectionSpeed_Super
                              : mData.version == 2 ? USBConnectionSpeed_High
@@ -154 +154 @@
 
     unconst(mData.port) = 0;
+    unconst(mData.portPath).setNull();
     unconst(mData.version) = 1;
-    unconst(mData.portVersion) = 1;
 
     unconst(mData.dirty) = FALSE;
@@ -237 +237 @@
 }
 
+HRESULT RemoteUSBDevice::getPortPath(com::Utf8Str &aPortPath)
+{
+    /* this is const, no need to lock */
+    aPortPath = mData.portPath;
+
+    return S_OK;
+}
+
 HRESULT RemoteUSBDevice::getVersion(USHORT *aVersion)
 {
     /* this is const, no need to lock */
     *aVersion = mData.version;
-
-    return S_OK;
-}
-
-HRESULT RemoteUSBDevice::getPortVersion(USHORT *aPortVersion)
-{
-    /* this is const, no need to lock */
-    *aPortVersion = mData.portVersion;
 
     return S_OK;

trunk/src/VBox/Main/src-client/USBDeviceImpl.cpp

@@ -96 +96 @@
     ComAssertComRCRet(hrc, hrc);
 
+    hrc = aUSBDevice->COMGETTER(PortPath)(bstr.asOutParam());
+    ComAssertComRCRet(hrc, hrc);
+
     hrc = aUSBDevice->COMGETTER(Version)(&unconst(mData.version));
     ComAssertComRCRet(hrc, hrc);
@@ -143 +146 @@
 
     unconst(mData.port) = 0;
+    unconst(mData.portPath).setNull();
     unconst(mData.version) = 1;
 
@@ -273 +277 @@
     /* this is const, no need to lock */
     *aPort = mData.port;
+
+    return S_OK;
+}
+
+HRESULT OUSBDevice::getPortPath(com::Utf8Str &aPortPath)
+{
+    /* this is const, no need to lock */
+    aPortPath = mData.portPath;
 
     return S_OK;