Changeset 44852 in vbox for trunk/src/VBox/Devices/Network

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/Network

Files:

• DevE1000.cpp (modified) (5 diffs)
• DevVirtioNet.cpp (modified) (1 diff)

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");