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

Timestamp:

Dec 22, 2017 4:53:41 PM (7 years ago)

Author:

vboxsync

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

119922

Message:

USB: When capturing devices, provide the speed rather than USB port version, since the speed provides a superset of the information (bugref:7280).

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (3 diffs)

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

@@ -8922 +8922 @@
     }
 
-    USHORT portVersion = 0;
-    hrc = aHostDevice->COMGETTER(PortVersion)(&portVersion);
+    USBConnectionSpeed_T enmSpeed;
+    hrc = aHostDevice->COMGETTER(Speed)(&enmSpeed);
     AssertComRCReturnRC(hrc);
-    Assert(portVersion == 1 || portVersion == 2 || portVersion == 3);
 
     int vrc = VMR3ReqCallWaitU(ptrVM.rawUVM(), 0 /* idDstCpu (saved state, see #6232) */,
                                (PFNRT)i_usbAttachCallback, 10,
                                this, ptrVM.rawUVM(), aHostDevice, uuid.raw(), Backend.c_str(),
-                               Address.c_str(), pvRemoteBackend, portVersion, aMaskedIfs,
+                               Address.c_str(), pvRemoteBackend, enmSpeed, aMaskedIfs,
                                aCaptureFilename.isEmpty() ? NULL : aCaptureFilename.c_str());
     if (RT_SUCCESS(vrc))
@@ -8981 +8980 @@
 DECLCALLBACK(int)
 Console::i_usbAttachCallback(Console *that, PUVM pUVM, IUSBDevice *aHostDevice, PCRTUUID aUuid, const char *pszBackend,
-                             const char *aAddress, void *pvRemoteBackend, USHORT aPortVersion, ULONG aMaskedIfs,
+                             const char *aAddress, void *pvRemoteBackend, USBConnectionSpeed_T aEnmSpeed, ULONG aMaskedIfs,
                              const char *pszCaptureFilename)
 {
@@ -8991 +8990 @@
     AssertReturn(!that->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
 
+    VUSBSPEED enmSpeed = VUSB_SPEED_UNKNOWN;
+    switch (aEnmSpeed)
+    {
+        case USBConnectionSpeed_Low:        enmSpeed = VUSB_SPEED_LOW;          break;
+        case USBConnectionSpeed_Full:       enmSpeed = VUSB_SPEED_FULL;         break;
+        case USBConnectionSpeed_High:       enmSpeed = VUSB_SPEED_HIGH;         break;
+        case USBConnectionSpeed_Super:      enmSpeed = VUSB_SPEED_SUPER;        break;
+        case USBConnectionSpeed_SuperPlus:  enmSpeed = VUSB_SPEED_SUPERPLUS;    break;
+        default:                            AssertFailed();                     break;
+    }
+
     int vrc = PDMR3UsbCreateProxyDevice(pUVM, aUuid, pszBackend, aAddress, pvRemoteBackend,
-                                        aPortVersion == 3 ? VUSB_STDVER_30 :
-                                        aPortVersion == 2 ? VUSB_STDVER_20 : VUSB_STDVER_11,
-                                        aMaskedIfs, pszCaptureFilename);
+                                        enmSpeed, aMaskedIfs, pszCaptureFilename);
     LogFlowFunc(("vrc=%Rrc\n", vrc));
     LogFlowFuncLeave();