Changeset 64471 in vbox for trunk/src/VBox

Timestamp:

Oct 28, 2016 3:24:14 PM (8 years ago)

Author:

vboxsync

Message:

DevPci: Cleaning up ich9pciUpdateMappings and friends.

File:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (6 diffs)

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

@@ -1760 +1760 @@
 
 
+/* -=-=-=-=-=- PCI Config Space -=-=-=-=-=- */
+
+
 /**
  * @callback_method_impl{PFNPCICONFIGREAD, Default config space read callback.}
@@ -1808 +1811 @@
 }
 
+
 /**
  * Worker for ich9pciResetDevice and devpciR3UpdateMappings that unmaps a region.
@@ -1852 +1856 @@
 }
 
-static void devpciR3UpdateMappings(PDMPCIDEV* pDev)
-{
-    uint16_t const u16Cmd = ich9pciGetWord(pDev, VBOX_PCI_COMMAND);
+
+/**
+ * Worker for devpciR3IsConfigByteWritable that update BAR and ROM mappings.
+ *
+ * @param   pDev                The PCI device to update the mappings for.
+ */
+static void devpciR3UpdateMappings(PPDMPCIDEV pPciDev)
+{
+    uint16_t const u16Cmd = ich9pciGetWord(pPciDev, VBOX_PCI_COMMAND);
     for (unsigned iRegion = 0; iRegion < VBOX_PCI_NUM_REGIONS; iRegion++)
     {
-        PCIIORegion   *pRegion  = &pDev->Int.s.aIORegions[iRegion];
+        PCIIORegion   *pRegion  = &pPciDev->Int.s.aIORegions[iRegion];
         uint64_t const cbRegion = pRegion->size;
         if (cbRegion != 0)
@@ -1873 +1883 @@
                 if (u16Cmd & PCI_COMMAND_IOACCESS)
                 {
-                    uint32_t uIoBase = ich9pciGetDWord(pDev, offCfgReg);
+                    uint32_t uIoBase = ich9pciGetDWord(pPciDev, offCfgReg);
                     uIoBase &= ~(uint32_t)(cbRegion - 1);
 
@@ -1891 +1901 @@
             else if (u16Cmd & PCI_COMMAND_MEMACCESS)
             {
-                uint64_t uMemBase = ich9pciGetDWord(pDev, offCfgReg);
+                uint64_t uMemBase = ich9pciGetDWord(pPciDev, offCfgReg);
                 if (f64Bit)
                 {
                     Assert(iRegion < VBOX_PCI_ROM_SLOT);
-                    uMemBase |= (uint64_t)ich9pciGetDWord(pDev, offCfgReg + 4) << 32;
+                    uMemBase |= (uint64_t)ich9pciGetDWord(pPciDev, offCfgReg + 4) << 32;
                 }
                 if (   iRegion != PCI_ROM_SLOT
@@ -1917 +1927 @@
             {
                 LogRel2(("PCI: config dev %u/%u (%s) BAR%i: %#RX64 -> %#RX64 (LB %RX64 (%RU64))\n",
-                         pDev->uDevFn >> VBOX_PCI_DEVFN_DEV_SHIFT, pDev->uDevFn & VBOX_PCI_DEVFN_FUN_MASK, pDev->pszNameR3,
-                         iRegion, pRegion->addr, uNew, cbRegion, cbRegion));
-
-                ich9pciUnmapRegion(pDev, iRegion);
+                         pPciDev->uDevFn >> VBOX_PCI_DEVFN_DEV_SHIFT, pPciDev->uDevFn & VBOX_PCI_DEVFN_FUN_MASK,
+                         pPciDev->pszNameR3, iRegion, pRegion->addr, uNew, cbRegion, cbRegion));
+
+                ich9pciUnmapRegion(pPciDev, iRegion);
                 pRegion->addr = uNew;
                 if (uNew != INVALID_PCI_ADDRESS)
                 {
-                    int rc;
-                    rc = pRegion->map_func(pDev->Int.s.pDevInsR3, pDev, iRegion, uNew, cbRegion, (PCIADDRESSSPACE)(pRegion->type));
+                    int rc = pRegion->map_func(pPciDev->Int.s.pDevInsR3, pPciDev, iRegion, uNew, cbRegion,
+                                               (PCIADDRESSSPACE)(pRegion->type));
                     AssertRC(rc);
                 }