Changeset 81567 in vbox

Timestamp:

Oct 29, 2019 10:53:14 AM (5 years ago)

Author:

vboxsync

Message:

DevE1000: Eliminated e1kR3Map(). bugref:9218

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (5 diffs)

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

@@ -1057 +1057 @@
     PDMCRITSECT             csTx;
 #endif /* E1K_WITH_TX_CS */
-    /** Base address of memory-mapped registers. */
-    RTGCPHYS    addrMMReg;
     /** MAC address obtained from the configuration. */
     RTMAC       macConfigured;
-    /** Base port of I/O space region. */
-    RTIOPORT    IOPortBase;
+    uint16_t    u16Padding0;
     /** EMT: Last time the interrupt was acknowledged.  */
     uint64_t    u64AckedAt;
@@ -6353 +6350 @@
 }
 
-/**
- * @callback_method_impl{FNPCIIOREGIONMAP}
- *
- * @todo Can remove this one later, it's realy just here for taking down
- *       addresses for e1kInfo(), an alignment assertion and sentimentality.
- */
-static DECLCALLBACK(int) e1kR3Map(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t iRegion,
-                                  RTGCPHYS GCPhysAddress, RTGCPHYS cb, PCIADDRESSSPACE enmType)
-{
-    PE1KSTATE pThis = PDMINS_2_DATA(pDevIns, PE1KSTATE);
-    E1kLog(("%s e1kR3Map: iRegion=%u GCPhysAddress=%RGp\n", pThis->szPrf, iRegion, GCPhysAddress));
-    RT_NOREF(pPciDev, iRegion, cb);
-    Assert(pPciDev == pDevIns->apPciDevs[0]);
-
-    switch (enmType)
-    {
-        case PCI_ADDRESS_SPACE_IO:
-            pThis->IOPortBase = (RTIOPORT)GCPhysAddress;
-            break;
-
-        case PCI_ADDRESS_SPACE_MEM:
-            pThis->addrMMReg = GCPhysAddress;
-            Assert(!(GCPhysAddress & 7) || GCPhysAddress == NIL_RTGCPHYS);
-            break;
-
-        default:
-            /* We should never get here */
-            AssertMsgFailedReturn(("Invalid PCI address space param in map callback"), VERR_INTERNAL_ERROR);
-    }
-    return VINF_SUCCESS;
-}
-
 
 /* -=-=-=-=- PDMINETWORKDOWN -=-=-=-=- */
@@ -7296 +7261 @@
      * Show info.
      */
-    pHlp->pfnPrintf(pHlp, "E1000 #%d: port=%RTiop mmio=%RGp mac-cfg=%RTmac %s%s%s\n",
-                    pDevIns->iInstance, pThis->IOPortBase, pThis->addrMMReg,
+    pHlp->pfnPrintf(pHlp, "E1000 #%d: port=%04x mmio=%RGp mac-cfg=%RTmac %s%s%s\n",
+                    pDevIns->iInstance,
+                    PDMDevHlpIoPortGetMappingAddress(pDevIns, pThis->hIoPorts),
+                    PDMDevHlpMmioGetMappingAddress(pDevIns, pThis->hMmioRegion),
                     &pThis->macConfigured, g_aChips[pThis->eChip].pcszName,
                     pDevIns->fRCEnabled ? " RC" : "", pDevIns->fR0Enabled ? " R0" : "");
@@ -7900 +7867 @@
                                e1kMMIOWrite, e1kMMIORead, NULL /*pfnFill*/, NULL /*pvUser*/, "E1000", &pThis->hMmioRegion);
     AssertRCReturn(rc, rc);
-    rc = PDMDevHlpPCIIORegionRegisterMmio(pDevIns, 0, E1K_MM_SIZE, PCI_ADDRESS_SPACE_MEM, pThis->hMmioRegion, e1kR3Map);
+    rc = PDMDevHlpPCIIORegionRegisterMmio(pDevIns, 0, E1K_MM_SIZE, PCI_ADDRESS_SPACE_MEM, pThis->hMmioRegion, NULL);
     AssertRCReturn(rc, rc);
 
@@ -7913 +7880 @@
                                e1kIOPortOut, e1kIOPortIn, NULL /*pvUser*/, "E1000", s_aExtDescs, &pThis->hIoPorts);
     AssertRCReturn(rc, rc);
-    rc = PDMDevHlpPCIIORegionRegisterIo(pDevIns, 2, E1K_IOPORT_SIZE, pThis->hIoPorts, e1kR3Map);
+    rc = PDMDevHlpPCIIORegionRegisterIo(pDevIns, 2, E1K_IOPORT_SIZE, pThis->hIoPorts, NULL);
     AssertRCReturn(rc, rc);