Changeset 39135 in vbox for trunk/src/VBox/Devices/Bus

Timestamp:

Oct 28, 2011 9:47:55 AM (13 years ago)

Author:

vboxsync

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

74586

Message:

Changed PDMDevHlpMMIORegister to take flags and drop pfnFill. Added PDMDevHlpMMIORegisterEx for the one user of pfnFill.

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevPciIch9.cpp (modified) (2 diffs)
• MsixCommon.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -112 +112 @@
     uint8_t             uBus;
 #endif
-    /* Physical address of PCI config space MMIO region */
+    /** Physical address of PCI config space MMIO region. */
     uint64_t            u64PciConfigMMioAddress;
-    /* Length of PCI config space MMIO region */
+    /** Length of PCI config space MMIO region. */
     uint64_t            u64PciConfigMMioLength;
 
@@ -2514 +2514 @@
     if (pGlobals->u64PciConfigMMioAddress != 0)
     {
-        rc = PDMDevHlpMMIORegister(pDevIns,
-                                   pGlobals->u64PciConfigMMioAddress,
-                                   pGlobals->u64PciConfigMMioLength,
-                                   0,
-                                   ich9pciMcfgMMIOWrite,
-                                   ich9pciMcfgMMIORead,
-                                   NULL /* fill */,
-                                   "MCFG ranges");
-        if (RT_FAILURE(rc))
-        {
-            AssertMsgRC(rc, ("Cannot register MCFG MMIO: %Rrc\n", rc));
-            return rc;
-        }
+        rc = PDMDevHlpMMIORegister(pDevIns, pGlobals->u64PciConfigMMioAddress, pGlobals->u64PciConfigMMioLength, NULL /*pvUser*/,
+                                   IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU,
+                                   ich9pciMcfgMMIOWrite, ich9pciMcfgMMIORead, "MCFG ranges");
+        AssertMsgRCReturn(rc, ("rc=%Rrc %#llx/%#llx\n", rc,  pGlobals->u64PciConfigMMioAddress, pGlobals->u64PciConfigMMioLength), rc);
 
         if (fGCEnabled)

trunk/src/VBox/Devices/Bus/MsixCommon.cpp

@@ -157 +157 @@
 
     int rc = PDMDevHlpMMIORegister(pPciDev->pDevIns, GCPhysAddress, cb, pPciDev,
-                                   msixMMIOWrite, msixMMIORead, NULL, "MSI-X tables");
+                                   IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU,
+                                   msixMMIOWrite, msixMMIORead, "MSI-X tables");
 
     if (RT_FAILURE(rc))