Changeset 64391 in vbox

Timestamp:

Oct 24, 2016 2:23:16 PM (9 years ago)

Author:

vboxsync

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

111499

Message:

PDMPCIDEV: s/devfn/uDevFn/ everywhere, removing the legacy alias.

Location:

trunk

Files:

• include/VBox/vmm/pdmpcidev.h (modified) (1 diff)
• src/VBox/Devices/Bus/DevPCI.cpp (modified) (6 diffs)
• src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (4 diffs)
• src/VBox/Devices/Graphics/DevVGA.cpp (modified) (1 diff)
• src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (modified) (1 diff)
• src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (1 diff)
• src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmpcidev.h

@@ -149 +149 @@
      * @{
      */
-    union
-    {
-        /** PCI device number [11:3] and function [2:0] on the pci bus.
-         * @sa VBOX_PCI_DEVFN_MAKE, VBOX_PCI_DEVFN_FUN_MASK, VBOX_PCI_DEVFN_DEV_SHIFT */
-        uint32_t            uDevFn;
-#ifndef PDMPCIDEVICE_NO_DEPRECATED
-        /** @deprecated Use uDevFn! */
-        int32_t             devfn;
-#endif
-    };
+    /** PCI device number [11:3] and function [2:0] on the pci bus.
+     * @sa VBOX_PCI_DEVFN_MAKE, VBOX_PCI_DEVFN_FUN_MASK, VBOX_PCI_DEVFN_DEV_SHIFT */
+    uint32_t                uDevFn;
     uint32_t                Alignment0; /**< Alignment. */
 

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

@@ -305 +305 @@
                 }
             }
-            //LogRel(("PCI: config dev %u/%u BAR%i uOld=%#018llx uNew=%#018llx size=%llu\n", d->devfn >> 3, d->devfn & 7, i, r->addr, new_addr, r->size));
+            //LogRel(("PCI: config dev %u/%u BAR%i uOld=%#018llx uNew=%#018llx size=%llu\n", d->uDevFn >> 3, d->uDevFn & 7, i, r->addr, new_addr, r->size));
             /* now do the real mapping */
             if (new_addr != r->addr) {
@@ -665 +665 @@
  * @param   iLevel          IRQ level.
  * @param   uTagSrc         The IRQ tag and source ID (for tracing).
- * @remark  uDevFn and pPciDev->devfn are not the same if the device is behind a bridge.
- *          In that case uDevFn will be the slot of the bridge which is needed to calculate the
- *          PIRQ value.
+ * @remark  uDevFn and pPciDev->uDevFn are not the same if the device is behind
+ *          a bridge. In that case uDevFn will be the slot of the bridge which
+ *          is needed to calculate the PIRQ value.
  */
 static void pciSetIrqInternal(PPCIGLOBALS pGlobals, uint8_t uDevFn, PPDMPCIDEV pPciDev, int iIrq, int iLevel, uint32_t uTagSrc)
@@ -763 +763 @@
 PDMBOTHCBDECL(void) pciSetIrq(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, int iIrq, int iLevel, uint32_t uTagSrc)
 {
-    pciSetIrqInternal(PDMINS_2_DATA(pDevIns, PPCIGLOBALS), pPciDev->devfn, pPciDev, iIrq, iLevel, uTagSrc);
+    pciSetIrqInternal(PDMINS_2_DATA(pDevIns, PPCIGLOBALS), pPciDev->uDevFn, pPciDev, iIrq, iLevel, uTagSrc);
 }
 
@@ -1749 +1749 @@
         elcr[irq >> 3] |= (1 << (irq & 7));
         /* Activate irq remapping in PIIX3. */
-        pci_config_writeb(pGlobals, 0, pGlobals->PIIX3State.dev.devfn, 0x60 + i, irq);
+        pci_config_writeb(pGlobals, 0, pGlobals->PIIX3State.dev.uDevFn, 0x60 + i, irq);
     }
 
@@ -1789 +1789 @@
     NOREF(pszArgs);
 
-    uint16_t router = pGlobals->PIIX3State.dev.devfn;
+    uint16_t router = pGlobals->PIIX3State.dev.uDevFn;
     pHlp->pfnPrintf(pHlp, "PCI interrupt router at: %02X:%02X:%X\n",
                     router >> 8, (router >> 3) & 0x1f, router & 0x7);
@@ -2232 +2232 @@
     do
     {
-        uDevFnBridge  = pBus->PciDev.devfn;
-        iIrqPinBridge = ((pPciDevBus->devfn >> 3) + iIrqPinBridge) & 3;
+        uDevFnBridge  = pBus->PciDev.uDevFn;
+        iIrqPinBridge = ((pPciDevBus->uDevFn >> 3) + iIrqPinBridge) & 3;
 
         /* Get the parent. */

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

@@ -208 +208 @@
 {
     LogFlowFunc(("invoked by %p/%d: iIrq=%d iLevel=%d uTagSrc=%#x\n", pDevIns, pDevIns->iInstance, iIrq, iLevel, uTagSrc));
-    ich9pciSetIrqInternal(PDMINS_2_DATA(pDevIns, PICH9PCIGLOBALS), pPciDev->devfn, pPciDev, iIrq, iLevel, uTagSrc);
+    ich9pciSetIrqInternal(PDMINS_2_DATA(pDevIns, PICH9PCIGLOBALS), pPciDev->uDevFn, pPciDev, iIrq, iLevel, uTagSrc);
 }
 
@@ -228 +228 @@
     do
     {
-        uDevFnBridge  = pBus->aPciDev.devfn;
-        iIrqPinBridge = ((pPciDevBus->devfn >> 3) + iIrqPinBridge) & 3;
+        uDevFnBridge  = pBus->aPciDev.uDevFn;
+        iIrqPinBridge = ((pPciDevBus->uDevFn >> 3) + iIrqPinBridge) & 3;
 
         /* Get the parent. */
@@ -938 +938 @@
                 uNew = INVALID_PCI_ADDRESS;
         }
-        LogRel2(("PCI: config dev %u/%u BAR%i uOld=%#018llx uNew=%#018llx size=%llu\n", pDev->devfn >> 3, pDev->devfn & 7, iRegion, pRegion->addr, uNew, pRegion->size));
+        LogRel2(("PCI: config dev %u/%u BAR%i uOld=%#018llx uNew=%#018llx size=%llu\n", pDev->uDevFn >> 3, pDev->uDevFn & 7, iRegion, pRegion->addr, uNew, pRegion->size));
         /* now do the real mapping */
         if (uNew != pRegion->addr)
@@ -1878 +1878 @@
             {
                 /* Get the pin the device would assert on the bridge. */
-                iPin = ((pBus->aPciDev.devfn >> 3) + iPin) & 3;
+                iPin = ((pBus->aPciDev.uDevFn >> 3) + iPin) & 3;
                 pBus = pBus->aPciDev.Int.s.pBusR3;
             };

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -6203 +6203 @@
     if (RT_FAILURE(rc))
         return rc;
-    /*AssertMsg(pThis->Dev.devfn == 16 || iInstance != 0, ("pThis->Dev.devfn=%d\n", pThis->Dev.devfn));*/
-    if (pThis->Dev.devfn != 16 && iInstance == 0)
-        Log(("!!WARNING!!: pThis->dev.devfn=%d (ignore if testcase or not started by Main)\n", pThis->Dev.devfn));
+    /*AssertMsg(pThis->Dev.uDevFn == 16 || iInstance != 0, ("pThis->Dev.uDevFn=%d\n", pThis->Dev.uDevFn));*/
+    if (pThis->Dev.uDevFn != 16 && iInstance == 0)
+        Log(("!!WARNING!!: pThis->dev.uDevFn=%d (ignore if testcase or not started by Main)\n", pThis->Dev.uDevFn));
 
 #ifdef VBOX_WITH_VMSVGA

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -3679 +3679 @@
     pPages->IOUnitPage2.u.fields.aAdapterOrder[0].fAdapterEmbedded = true;
     pPages->IOUnitPage2.u.fields.aAdapterOrder[0].u8PCIBusNumber = 0;
-    pPages->IOUnitPage2.u.fields.aAdapterOrder[0].u8PCIDevFn     = pThis->PciDev.devfn;
+    pPages->IOUnitPage2.u.fields.aAdapterOrder[0].u8PCIDevFn     = pThis->PciDev.uDevFn;
 
     /* I/O Unit page 3. */

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -4151 +4151 @@
     if (RT_FAILURE(rc))
         return rc;
-    if (pThis->PciDev.devfn != 32 || iInstance != 0)
-        Log(("!!WARNING!!: pThis->PciDev.devfn=%d (ignore if testcase or no started by Main)\n", pThis->PciDev.devfn));
+    if (pThis->PciDev.uDevFn != 32 || iInstance != 0)
+        Log(("!!WARNING!!: pThis->PciDev.uDevFn=%d (ignore if testcase or no started by Main)\n", pThis->PciDev.uDevFn));
     rc = PDMDevHlpPCIIORegionRegister(pDevIns, 0, 0x20, PCI_ADDRESS_SPACE_IO, vmmdevIOPortRegionMap);
     if (RT_FAILURE(rc))

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

@@ -151 +151 @@
     GEN_CHECK_SIZE(PDMPCIDEVICEINT);
     GEN_CHECK_SIZE(PCIIOREGION);
-    GEN_CHECK_OFF(PDMPCIDEV, config);
-    GEN_CHECK_OFF(PDMPCIDEV, devfn);
-    GEN_CHECK_OFF(PDMPCIDEV, name);
+    GEN_CHECK_OFF(PDMPCIDEV, abConfig);
+    GEN_CHECK_OFF(PDMPCIDEV, uDevFn);
+    GEN_CHECK_OFF(PDMPCIDEV, pszNameR3);
     GEN_CHECK_OFF(PDMPCIDEV, pvReserved);
     GEN_CHECK_OFF(PDMPCIDEV, Int);