Changeset 56271 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Jun 8, 2015 10:35:35 AM (10 years ago)

Author:

vboxsync

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

100849

Message:

VUSB: Rename VUSBIDevIsEmulated to VUSBIDevIsSavedStateSupported to make the use case clear

Location:

trunk/src/VBox/Devices/USB

Files:

• DevOHCI.cpp (modified) (4 diffs)
• VUSBDevice.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/USB/DevOHCI.cpp

@@ -5177 +5177 @@
         if (pDev)
         {
-            if (!VUSBIDevIsEmulated(pDev))
+            if (!VUSBIDevIsSavedStateSupported(pDev))
             {
                 VUSBIRhDetachDevice(pRh->pIRhConn, pDev);
@@ -5261 +5261 @@
     {
         if (   pRh->aPorts[i].pDev
-            && !VUSBIDevIsEmulated(pRh->aPorts[i].pDev))
+            && !VUSBIDevIsSavedStateSupported(pRh->aPorts[i].pDev))
             pRh->aPorts[i].pDev = NULL;
     }
@@ -5272 +5272 @@
         PVUSBIDEVICE pDev = Rh.aPorts[i].pDev;
         if (   pDev
-            && !VUSBIDevIsEmulated(pDev))
+            && !VUSBIDevIsSavedStateSupported(pDev))
             VUSBIRhAttachDevice(pRh->pIRhConn, pDev);
     }
@@ -5311 +5311 @@
             PVUSBIDEVICE pDev = pRh->aPorts[i].pDev;
             if (   pDev
-                && !VUSBIDevIsEmulated(pDev))
+                && !VUSBIDevIsSavedStateSupported(pDev))
             {
                 Load.apDevs[Load.cDevs++] = pDev;

trunk/src/VBox/Devices/USB/VUSBDevice.cpp

@@ -1554 +1554 @@
 
 /**
- * @interface_method_impl{VUSBIDEVICE,pfnIsEmulated}
- */
-DECLCALLBACK(bool) vusbIDeviceIsEmulated(PVUSBIDEVICE pInterface)
+ * @interface_method_impl{VUSBIDEVICE,pfnIsSavedStateSupported}
+ */
+DECLCALLBACK(bool) vusbIDeviceIsSavedStateSupported(PVUSBIDEVICE pInterface)
 {
     PVUSBDEV pDev = (PVUSBDEV)pInterface;
-    bool fEmulated = !!(pDev->pUsbIns->pReg->fFlags & PDM_USBREG_EMULATED_DEVICE);
+    bool fSavedStateSupported = RT_BOOL(pDev->pUsbIns->pReg->fFlags & PDM_USBREG_SAVED_STATE_SUPPORTED);
 
     LogFlowFunc(("pInterface=%p\n", pInterface));
 
-    LogFlowFunc(("returns %RTbool\n", fEmulated));
-    return fEmulated;
+    LogFlowFunc(("returns %RTbool\n", fSavedStateSupported));
+    return fSavedStateSupported;
 }
 
@@ -1715 +1715 @@
     Assert(!pDev->IDevice.pfnPowerOff);
     Assert(!pDev->IDevice.pfnGetState);
-    Assert(!pDev->IDevice.pfnIsEmulated);
+    Assert(!pDev->IDevice.pfnIsSavedStateSupported);
 
     pDev->IDevice.pfnReset = vusbIDeviceReset;
@@ -1721 +1721 @@
     pDev->IDevice.pfnPowerOff = vusbIDevicePowerOff;
     pDev->IDevice.pfnGetState = vusbIDeviceGetState;
-    pDev->IDevice.pfnIsEmulated = vusbIDeviceIsEmulated;
+    pDev->IDevice.pfnIsSavedStateSupported = vusbIDeviceIsSavedStateSupported;
     pDev->IDevice.pfnGetSpeed = vusbIDeviceGetSpeed;
     pDev->pUsbIns = pUsbIns;