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

Timestamp:

Oct 24, 2016 2:27:35 PM (8 years ago)

Author:

vboxsync

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

111500

Message:

PDMPCIDEV: s/name/pszName/ everywhere, removing the legacy alias.

File:

• trunk/src/VBox/Devices/USB/DevOHCI.cpp (modified) (6 diffs)

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

@@ -4154 +4154 @@
     pThis->dqic = 0x7;
 
-    Log(("ohci: %s: Bus started\n", pThis->PciDev.name));
+    Log(("ohci: %s: Bus started\n", pThis->PciDev.pszNameR3));
 
     pThis->SofTime = PDMDevHlpTMTimeVirtGet(pThis->CTX_SUFF(pDevIns));
@@ -4893 +4893 @@
     {
         Log(("ohci: %s: invalid write to NDP or DT in roothub descriptor A!!! val=0x%.8x\n",
-                pThis->PciDev.name, val));
+             pThis->PciDev.pszNameR3, val));
         val &= ~(OHCI_RHA_NDP | OHCI_RHA_DT);
         val |= OHCI_NDP_CFG(pThis);
@@ -4929 +4929 @@
     if ( pThis->RootHub.desc_b != val )
         Log(("ohci: %s: unsupported write to root descriptor B!!! 0x%.8x -> 0x%.8x\n",
-                pThis->PciDev.name,
-                pThis->RootHub.desc_b, val));
+             pThis->PciDev.pszNameR3, pThis->RootHub.desc_b, val));
     pThis->RootHub.desc_b = val;
     return VINF_SUCCESS;
@@ -4974 +4973 @@
     {
         unsigned i;
-        Log2(("ohci: %s: global power up\n", pThis->PciDev.name));
+        Log2(("ohci: %s: global power up\n", pThis->PciDev.pszNameR3));
         for (i = 0; i < OHCI_NDP_CFG(pThis); i++)
             rhport_power(&pThis->RootHub, i, true /* power up */);
@@ -4983 +4982 @@
     {
         unsigned i;
-        Log2(("ohci: %s: global power down\n", pThis->PciDev.name));
+        Log2(("ohci: %s: global power down\n", pThis->PciDev.pszNameR3));
         for (i = 0; i < OHCI_NDP_CFG(pThis); i++)
             rhport_power(&pThis->RootHub, i, false /* power down */);
@@ -5636 +5635 @@
         static SSMFIELD const s_aOhciFields22[] =
         {
-            SSMFIELD_ENTRY_OLD(           PciDev.config,                256),   /* DevPCI restores this. */
+            SSMFIELD_ENTRY_OLD(           PciDev.abConfig,              256),   /* DevPCI restores this. */
             SSMFIELD_ENTRY_OLD(           PciDev.Int,                   224),
-            SSMFIELD_ENTRY_OLD(           PciDev.devfn,                 4),
+            SSMFIELD_ENTRY_OLD(           PciDev.uDevFn,                4),
             SSMFIELD_ENTRY_OLD(           PciDev.Alignment0,            4),
-            SSMFIELD_ENTRY_OLD_HCPTR(     PciDev.name),
-            SSMFIELD_ENTRY_OLD_HCPTR(     PciDev.pDevIns),
+            SSMFIELD_ENTRY_OLD_HCPTR(     PciDev.pszNameR3),
+            SSMFIELD_ENTRY_OLD_HCPTR(     PciDev.pvReserved),
             SSMFIELD_ENTRY_OLD_HCPTR(     pDevInsR3),
             SSMFIELD_ENTRY_OLD_HCPTR(     pEndOfFrameTimerR3),