Changeset 44852 in vbox

Timestamp:

Feb 27, 2013 8:27:33 PM (12 years ago)

Author:

vboxsync

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

84001

Message:

s/addrIOPort/IOPortBase/g

Location:

trunk/src/VBox/Devices

Files:

• Network/DevE1000.cpp (modified) (5 diffs)
• Network/DevVirtioNet.cpp (modified) (1 diff)
• VirtIO/Virtio.cpp (modified) (6 diffs)
• VirtIO/Virtio.h (modified) (1 diff)
• testcase/tstDeviceStructSizeRC.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -1069 +1069 @@
     RTMAC       macConfigured;
     /** Base port of I/O space region. */
-    RTIOPORT    addrIOPort;
+    RTIOPORT    IOPortBase;
     /** EMT: */
     PCIDEVICE   pciDevice;
@@ -5806 +5806 @@
     STAM_PROFILE_ADV_START(&pThis->CTX_SUFF_Z(StatIORead), a);
 
-    uPort -= pThis->addrIOPort;
+    uPort -= pThis->IOPortBase;
     if (RT_LIKELY(cb == 4))
         switch (uPort)
@@ -5853 +5853 @@
     if (RT_LIKELY(cb == 4))
     {
-        uPort -= pThis->addrIOPort;
+        uPort -= pThis->IOPortBase;
         switch (uPort)
         {
@@ -5958 +5958 @@
     {
         case PCI_ADDRESS_SPACE_IO:
-            pThis->addrIOPort = (RTIOPORT)GCPhysAddress;
-            rc = PDMDevHlpIOPortRegister(pPciDev->pDevIns, pThis->addrIOPort, cb, NULL /*pvUser*/,
+            pThis->IOPortBase = (RTIOPORT)GCPhysAddress;
+            rc = PDMDevHlpIOPortRegister(pPciDev->pDevIns, pThis->IOPortBase, cb, NULL /*pvUser*/,
                                          e1kIOPortOut, e1kIOPortIn, NULL, NULL, "E1000");
             if (pThis->fR0Enabled && RT_SUCCESS(rc))
-                rc = PDMDevHlpIOPortRegisterR0(pPciDev->pDevIns, pThis->addrIOPort, cb, NIL_RTR0PTR /*pvUser*/,
+                rc = PDMDevHlpIOPortRegisterR0(pPciDev->pDevIns, pThis->IOPortBase, cb, NIL_RTR0PTR /*pvUser*/,
                                              "e1kIOPortOut", "e1kIOPortIn", NULL, NULL, "E1000");
             if (pThis->fRCEnabled && RT_SUCCESS(rc))
-                rc = PDMDevHlpIOPortRegisterRC(pPciDev->pDevIns, pThis->addrIOPort, cb, NIL_RTRCPTR /*pvUser*/,
+                rc = PDMDevHlpIOPortRegisterRC(pPciDev->pDevIns, pThis->IOPortBase, cb, NIL_RTRCPTR /*pvUser*/,
                                                "e1kIOPortOut", "e1kIOPortIn", NULL, NULL, "E1000");
             break;
@@ -6890 +6890 @@
      */
     pHlp->pfnPrintf(pHlp, "E1000 #%d: port=%RTiop mmio=%RGp mac-cfg=%RTmac %s%s%s\n",
-                    pDevIns->iInstance, pThis->addrIOPort, pThis->addrMMReg,
+                    pDevIns->iInstance, pThis->IOPortBase, pThis->addrMMReg,
                     &pThis->macConfigured, g_Chips[pThis->eChip].pcszName,
                     pThis->fRCEnabled ? " GC" : "", pThis->fR0Enabled ? " R0" : "");

trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

@@ -1756 +1756 @@
     }
 
-    pThis->VPCI.addrIOPort = (RTIOPORT)GCPhysAddress;
-    rc = PDMDevHlpIOPortRegister(pPciDev->pDevIns, pThis->VPCI.addrIOPort,
+    pThis->VPCI.IOPortBase = (RTIOPORT)GCPhysAddress;
+    rc = PDMDevHlpIOPortRegister(pPciDev->pDevIns, pThis->VPCI.IOPortBase,
                                  cb, 0, vnetIOPortOut, vnetIOPortIn,
                                  NULL, NULL, "VirtioNet");
 #ifdef VNET_GC_SUPPORT
     AssertRCReturn(rc, rc);
-    rc = PDMDevHlpIOPortRegisterR0(pPciDev->pDevIns, pThis->VPCI.addrIOPort,
+    rc = PDMDevHlpIOPortRegisterR0(pPciDev->pDevIns, pThis->VPCI.IOPortBase,
                                    cb, 0, "vnetIOPortOut", "vnetIOPortIn",
                                    NULL, NULL, "VirtioNet");
     AssertRCReturn(rc, rc);
-    rc = PDMDevHlpIOPortRegisterRC(pPciDev->pDevIns, pThis->VPCI.addrIOPort,
+    rc = PDMDevHlpIOPortRegisterRC(pPciDev->pDevIns, pThis->VPCI.IOPortBase,
                                    cb, 0, "vnetIOPortOut", "vnetIOPortIn",
                                    NULL, NULL, "VirtioNet");

trunk/src/VBox/Devices/VirtIO/Virtio.cpp

@@ -323 +323 @@
     VPCISTATE  *pState = PDMINS_2_DATA(pDevIns, VPCISTATE *);
     int         rc     = VINF_SUCCESS;
-    const char *szInst = INSTANCE(pState);
     STAM_PROFILE_ADV_START(&pState->CTXSUFF(StatIORead), a);
 
@@ -342 +341 @@
         }*/
 
-    Port -= pState->addrIOPort;
+    Port -= pState->IOPortBase;
     switch (Port)
     {
@@ -388 +387 @@
                 *pu32 = 0xFFFFFFFF;
                 rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "%s vpciIOPortIn: no valid port at offset port=%RTiop cb=%08x\n",
-                                       szInst, Port, cb);
+                                       INSTANCE(pState), Port, cb);
             }
             break;
     }
-    Log3(("%s vpciIOPortIn:  At %RTiop in  %0*x\n", szInst, Port, cb*2, *pu32));
+    Log3(("%s vpciIOPortIn:  At %RTiop in  %0*x\n", INSTANCE(pState), Port, cb*2, *pu32));
     STAM_PROFILE_ADV_STOP(&pState->CTXSUFF(StatIORead), a);
     //vpciCsLeave(pState);
@@ -428 +427 @@
     VPCISTATE  *pState = PDMINS_2_DATA(pDevIns, VPCISTATE *);
     int         rc     = VINF_SUCCESS;
-    const char *szInst = INSTANCE(pState);
     bool        fHasBecomeReady;
     STAM_PROFILE_ADV_START(&pState->CTXSUFF(StatIOWrite), a);
 
-    Port -= pState->addrIOPort;
-    Log3(("%s virtioIOPortOut: At %RTiop out          %0*x\n", szInst, Port, cb*2, u32));
+    Port -= pState->IOPortBase;
+    Log3(("%s virtioIOPortOut: At %RTiop out          %0*x\n", INSTANCE(pState), Port, cb*2, u32));
 
     switch (Port)
@@ -479 +477 @@
                 pState->uQueueSelector = u32;
             else
-                Log3(("%s vpciIOPortOut: Invalid queue selector %08x\n", szInst, u32));
+                Log3(("%s vpciIOPortOut: Invalid queue selector %08x\n", INSTANCE(pState), u32));
             break;
 
@@ -523 +521 @@
             else
                 rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "%s vpciIOPortOut: no valid port at offset Port=%RTiop cb=%08x\n",
-                                       szInst, Port, cb);
+                                       INSTANCE(pState), Port, cb);
             break;
     }

trunk/src/VBox/Devices/VirtIO/Virtio.h

@@ -183 +183 @@
     PCIDEVICE              pciDevice;
     /** Base port of I/O space region. */
-    RTIOPORT               addrIOPort;
+    RTIOPORT               IOPortBase;
 
     /* Read/write part, protected with critical section. */

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -1301 +1301 @@
     GEN_CHECK_OFF(E1KSTATE, addrMMReg);
     GEN_CHECK_OFF(E1KSTATE, macConfigured);
-    GEN_CHECK_OFF(E1KSTATE, addrIOPort);
+    GEN_CHECK_OFF(E1KSTATE, IOPortBase);
     GEN_CHECK_OFF(E1KSTATE, pciDevice);
     GEN_CHECK_OFF(E1KSTATE, u64AckedAt);
@@ -1357 +1357 @@
     GEN_CHECK_OFF(VPCISTATE, pDevInsRC);
     GEN_CHECK_OFF(VPCISTATE, pciDevice);
-    GEN_CHECK_OFF(VPCISTATE, addrIOPort);
+    GEN_CHECK_OFF(VPCISTATE, IOPortBase);
     GEN_CHECK_OFF(VPCISTATE, led);
     GEN_CHECK_OFF(VPCISTATE, uGuestFeatures);