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

Timestamp:

Feb 1, 2013 11:12:13 AM (12 years ago)

Author:

vboxsync

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

83542

Message:

DevPCI.cpp: Some cleaning up.

File:

• trunk/src/VBox/Devices/Bus/DevPCI.cpp (modified) (46 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -222 +222 @@
 
 #ifdef IN_RING3
-DECLINLINE(PPCIDEVICE) pciFindBridge(PPCIBUS pBus, uint8_t iBus);
+DECLINLINE(PPCIDEVICE) pciR3FindBridge(PPCIBUS pBus, uint8_t iBus);
 #endif
 
@@ -242 +242 @@
 
 #ifdef IN_RING3
+
 static void pci_update_mappings(PCIDevice *d)
 {
@@ -501 +502 @@
         {
 #ifdef IN_RING3 /** @todo do lookup in R0/RC too! */
-            PPCIDEVICE pBridgeDevice = pciFindBridge(&pGlobals->PciBus, iBus);
+            PPCIDEVICE pBridgeDevice = pciR3FindBridge(&pGlobals->PciBus, iBus);
             if (pBridgeDevice)
             {
@@ -547 +548 @@
         {
 #ifdef IN_RING3 /** @todo do lookup in R0/RC too! */
-            PPCIDEVICE pBridgeDevice = pciFindBridge(&pGlobals->PciBus, iBus);
+            PPCIDEVICE pBridgeDevice = pciR3FindBridge(&pGlobals->PciBus, iBus);
             if (pBridgeDevice)
             {
@@ -757 +758 @@
 
 #ifdef IN_RING3
+
 /**
  * Finds a bridge on the bus which contains the destination bus.
@@ -765 +767 @@
  * @param  iBus    Destination bus number.
  */
-DECLINLINE(PPCIDEVICE) pciFindBridge(PPCIBUS pBus, uint8_t iBus)
+DECLINLINE(PPCIDEVICE) pciR3FindBridge(PPCIBUS pBus, uint8_t iBus)
 {
     /* Search for a fitting bridge. */
@@ -787 +789 @@
 }
 
-static void piix3_reset(PIIX3State *d)
+static void pciR3Piix3Reset(PIIX3State *d)
 {
     uint8_t *pci_conf = d->dev.config;
@@ -1247 +1249 @@
  * @param   pSSM            The handle to save the state to.
  */
-static DECLCALLBACK(int) pciGenericSaveExec(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PSSMHANDLE pSSM)
+static DECLCALLBACK(int) pciR3GenericSaveExec(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PSSMHANDLE pSSM)
 {
     NOREF(pDevIns);
@@ -1262 +1264 @@
  * @param   pSSM            The handle to the saved state.
  */
-static DECLCALLBACK(int) pciGenericLoadExec(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PSSMHANDLE pSSM)
+static DECLCALLBACK(int) pciR3GenericLoadExec(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PSSMHANDLE pSSM)
 {
     NOREF(pDevIns);
@@ -1687 +1689 @@
  * @param   pszName         Pointer to device name (permanent, readonly). For debugging, not unique.
  */
-static int pciRegisterInternal(PPCIBUS pBus, int iDev, PPCIDEVICE pPciDev, const char *pszName)
+static int pciR3RegisterDeviceInternal(PPCIBUS pBus, int iDev, PPCIDEVICE pPciDev, const char *pszName)
 {
     /*
@@ -1829 +1831 @@
  * @param   iDev            The PCI device number. Use a negative value for auto assigning one.
  */
-static DECLCALLBACK(int) pciRegister(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, const char *pszName, int iDev)
+static DECLCALLBACK(int) pciR3Register(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, const char *pszName, int iDev)
 {
     PPCIBUS     pBus = DEVINS_2_PCIBUS(pDevIns);
@@ -1848 +1850 @@
      * Register the device.
      */
-    return pciRegisterInternal(pBus, iDev, pPciDev, pszName);
-}
-
-
-static DECLCALLBACK(int) pciIORegionRegister(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, int iRegion, uint32_t cbRegion, PCIADDRESSSPACE enmType, PFNPCIIOREGIONMAP pfnCallback)
+    return pciR3RegisterDeviceInternal(pBus, iDev, pPciDev, pszName);
+}
+
+
+static DECLCALLBACK(int) pciR3CommonIORegionRegister(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, int iRegion, uint32_t cbRegion,
+                                                     PCIADDRESSSPACE enmType, PFNPCIIOREGIONMAP pfnCallback)
 {
     NOREF(pDevIns);
@@ -1895 +1898 @@
  * @copydoc PDMPCIBUSREG::pfnSetConfigCallbacksR3
  */
-static DECLCALLBACK(void) pciSetConfigCallbacks(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PFNPCICONFIGREAD pfnRead, PPFNPCICONFIGREAD ppfnReadOld,
-                                                PFNPCICONFIGWRITE pfnWrite, PPFNPCICONFIGWRITE ppfnWriteOld)
+static DECLCALLBACK(void) pciR3CommonSetConfigCallbacks(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PFNPCICONFIGREAD pfnRead, PPFNPCICONFIGREAD ppfnReadOld,
+                                                        PFNPCICONFIGWRITE pfnWrite, PPFNPCICONFIGWRITE ppfnWriteOld)
 {
     NOREF(pDevIns);
@@ -1916 +1919 @@
  * @param   pDevIns     Device instance of the first bus.
  */
-static DECLCALLBACK(int) pciFakePCIBIOS(PPDMDEVINS pDevIns)
+static DECLCALLBACK(int) pciR3FakePCIBIOS(PPDMDEVINS pDevIns)
 {
     unsigned    i;
@@ -1976 +1979 @@
  * @param   pszArgs     Argument string. Optional and specific to the handler.
  */
-static DECLCALLBACK(void) pciIrqInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
+static DECLCALLBACK(void) pciR3IrqInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
     PPCIGLOBALS pGlobals = PDMINS_2_DATA(pDevIns, PPCIGLOBALS);
@@ -1998 +2001 @@
 }
 
-static void printIndent(PCDBGFINFOHLP pHlp, int iIndent)
-{
-    for (int i = 0; i < iIndent; i++)
-    {
+static void pciR3PrintIndent(PCDBGFINFOHLP pHlp, int iIndent)
+{
+    while (iIndent-- > 0)
         pHlp->pfnPrintf(pHlp, "    ");
-    }
-}
-
-static void pciBusInfo(PPCIBUS pBus, PCDBGFINFOHLP pHlp, int iIndent, bool fRegisters)
+}
+
+static void pciR3BusInfo(PPCIBUS pBus, PCDBGFINFOHLP pHlp, int iIndent, bool fRegisters)
 {
     for (uint32_t iDev = 0; iDev < RT_ELEMENTS(pBus->devices); iDev++)
@@ -2013 +2014 @@
         if (pPciDev != NULL)
         {
-            printIndent(pHlp, iIndent);
+            pciR3PrintIndent(pHlp, iIndent);
 
             /*
@@ -2062 +2063 @@
                     }
 
-                    printIndent(pHlp, iIndent + 2);
+                    pciR3PrintIndent(pHlp, iIndent + 2);
                     pHlp->pfnPrintf(pHlp, "%s region #%d: %x..%x\n",
                                     pszDesc, iRegion, u32Addr, u32Addr+iRegionSize);
@@ -2070 +2071 @@
             }
 
-            printIndent(pHlp, iIndent + 2);
+            pciR3PrintIndent(pHlp, iIndent + 2);
             uint16_t iStatus = PCIDevGetWord(pPciDev, VBOX_PCI_STATUS);
             pHlp->pfnPrintf(pHlp, "Command: %.*Rhxs, Status: %.*Rhxs\n",
                             sizeof(uint16_t), &iCmd, sizeof(uint16_t), &iStatus);
-            printIndent(pHlp, iIndent + 2);
+            pciR3PrintIndent(pHlp, iIndent + 2);
             pHlp->pfnPrintf(pHlp, "Bus master: %s\n",
                             iCmd & VBOX_PCI_COMMAND_MASTER ? "Yes" : "No");
@@ -2080 +2081 @@
             if (fRegisters)
             {
-                printIndent(pHlp, iIndent + 2);
+                pciR3PrintIndent(pHlp, iIndent + 2);
                 pHlp->pfnPrintf(pHlp, "PCI registers:\n");
                 for (int iReg = 0; iReg < 0x100; )
@@ -2086 +2087 @@
                     int iPerLine = 0x10;
                     Assert (0x100 % iPerLine == 0);
-                    printIndent(pHlp, iIndent + 3);
+                    pciR3PrintIndent(pHlp, iIndent + 3);
 
                     while (iPerLine-- > 0)
@@ -2100 +2101 @@
     if (pBus->cBridges > 0)
     {
-        printIndent(pHlp, iIndent);
+        pciR3PrintIndent(pHlp, iIndent);
         pHlp->pfnPrintf(pHlp, "Registered %d bridges, subordinate buses info follows\n", pBus->cBridges);
         for (uint32_t iBridge = 0; iBridge < pBus->cBridges; iBridge++)
         {
             PPCIBUS pBusSub = PDMINS_2_DATA(pBus->papBridgesR3[iBridge]->pDevIns, PPCIBUS);
-            pciBusInfo(pBusSub, pHlp, iIndent + 1, fRegisters);
+            pciR3BusInfo(pBusSub, pHlp, iIndent + 1, fRegisters);
         }
     }
@@ -2117 +2118 @@
  * @param   pszArgs     Argument string. Optional and specific to the handler.
  */
-static DECLCALLBACK(void) pciInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
+static DECLCALLBACK(void) pciR3Info(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
     PPCIBUS pBus = DEVINS_2_PCIBUS(pDevIns);
 
     if (pszArgs == NULL || !*pszArgs || !strcmp(pszArgs, "basic"))
-        pciBusInfo(pBus, pHlp, 0, false);
+        pciR3BusInfo(pBus, pHlp, 0, false);
     else if (!strcmp(pszArgs, "verbose"))
-        pciBusInfo(pBus, pHlp, 0, true);
+        pciR3BusInfo(pBus, pHlp, 0, true);
     else
         pHlp->pfnPrintf(pHlp, "Invalid argument. Recognized arguments are 'basic', 'verbose'.\n");
@@ -2132 +2133 @@
  * @copydoc FNPDMDEVRELOCATE
  */
-static DECLCALLBACK(void) pciRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
+static DECLCALLBACK(void) pciR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
     PPCIGLOBALS pGlobals = PDMINS_2_DATA(pDevIns, PPCIGLOBALS);
@@ -2153 +2154 @@
  * @copydoc FNPDMDEVRESET
  */
-static DECLCALLBACK(void) pciReset(PPDMDEVINS pDevIns)
-{
-    pciFakePCIBIOS(pDevIns);
+static DECLCALLBACK(void) pciR3Reset(PPDMDEVINS pDevIns)
+{
+    pciR3FakePCIBIOS(pDevIns);
 }
 
@@ -2161 +2162 @@
  * @interface_method_impl{PDMDEVREG,pfnConstruct}
  */
-static DECLCALLBACK(int)   pciConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
+static DECLCALLBACK(int)   pciR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
     Assert(iInstance == 0);
@@ -2211 +2212 @@
     pGlobals->PciBus.pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
     pGlobals->PciBus.pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
-    pGlobals->PciBus.papBridgesR3 = (PPCIDEVICE *)PDMDevHlpMMHeapAllocZ(pDevIns, sizeof(PPCIDEVICE) * RT_ELEMENTS(pGlobals->PciBus.devices));
+    pGlobals->PciBus.papBridgesR3 = (PPCIDEVICE *)PDMDevHlpMMHeapAllocZ(pDevIns,   sizeof(PPCIDEVICE)
+                                                                                 * RT_ELEMENTS(pGlobals->PciBus.devices));
 
     PDMPCIBUSREG PciBusReg;
     PPCIBUS      pBus = &pGlobals->PciBus;
     PciBusReg.u32Version              = PDM_PCIBUSREG_VERSION;
-    PciBusReg.pfnRegisterR3           = pciRegister;
+    PciBusReg.pfnRegisterR3           = pciR3Register;
     PciBusReg.pfnRegisterMsiR3        = NULL;
-    PciBusReg.pfnIORegionRegisterR3   = pciIORegionRegister;
-    PciBusReg.pfnSetConfigCallbacksR3 = pciSetConfigCallbacks;
+    PciBusReg.pfnIORegionRegisterR3   = pciR3CommonIORegionRegister;
+    PciBusReg.pfnSetConfigCallbacksR3 = pciR3CommonSetConfigCallbacks;
     PciBusReg.pfnSetIrqR3             = pciSetIrq;
-    PciBusReg.pfnSaveExecR3           = pciGenericSaveExec;
-    PciBusReg.pfnLoadExecR3           = pciGenericLoadExec;
-    PciBusReg.pfnFakePCIBIOSR3        = pciFakePCIBIOS;
+    PciBusReg.pfnSaveExecR3           = pciR3GenericSaveExec;
+    PciBusReg.pfnLoadExecR3           = pciR3GenericLoadExec;
+    PciBusReg.pfnFakePCIBIOSR3        = pciR3FakePCIBIOS;
     PciBusReg.pszSetIrqRC             = fGCEnabled ? "pciSetIrq" : NULL;
     PciBusReg.pszSetIrqR0             = fR0Enabled ? "pciSetIrq" : NULL;
@@ -2255 +2257 @@
     pBus->PciDev.pDevIns              = pDevIns;
     pciDevSetRequestedDevfunc(&pBus->PciDev);
-    pciRegisterInternal(pBus, 0, &pBus->PciDev, "i440FX");
+    pciR3RegisterDeviceInternal(pBus, 0, &pBus->PciDev, "i440FX");
 
     /* PIIX3 */
@@ -2266 +2268 @@
     pGlobals->PIIX3State.dev.pDevIns      = pDevIns;
     pciDevSetRequestedDevfunc(&pGlobals->PIIX3State.dev);
-    pciRegisterInternal(pBus, 8, &pGlobals->PIIX3State.dev, "PIIX3");
-    piix3_reset(&pGlobals->PIIX3State);
+    pciR3RegisterDeviceInternal(pBus, 8, &pGlobals->PIIX3State.dev, "PIIX3");
+    pciR3Piix3Reset(&pGlobals->PIIX3State);
 
     pBus->iDevSearch = 16;
@@ -2306 +2308 @@
         return rc;
 
-    PDMDevHlpDBGFInfoRegister(pDevIns, "pci", "Display PCI bus status. Recognizes 'basic' or 'verbose' "
-                                              "as arguments, defaults to 'basic'.", pciInfo);
-
-    PDMDevHlpDBGFInfoRegister(pDevIns, "pciirq", "Display PCI IRQ routing state. (no arguments)", pciIrqInfo);
+    PDMDevHlpDBGFInfoRegister(pDevIns, "pci",
+                              "Display PCI bus status. Recognizes 'basic' or 'verbose' as arguments, defaults to 'basic'.",
+                              pciR3Info);
+    PDMDevHlpDBGFInfoRegister(pDevIns, "pciirq", "Display PCI IRQ routing state. (no arguments)", pciR3IrqInfo);
 
     return VINF_SUCCESS;
@@ -2339 +2341 @@
     sizeof(PCIGLOBALS),
     /* pfnConstruct */
-    pciConstruct,
+    pciR3Construct,
     /* pfnDestruct */
     NULL,
     /* pfnRelocate */
-    pciRelocate,
+    pciR3Relocate,
     /* pfnIOCtl */
     NULL,
@@ -2349 +2351 @@
     NULL,
     /* pfnReset */
-    pciReset,
+    pciR3Reset,
     /* pfnSuspend */
     NULL,
@@ -2413 +2415 @@
 #ifdef IN_RING3
 
-static void pcibridgeConfigWrite(PPDMDEVINSR3 pDevIns, uint8_t iBus, uint8_t iDevice, uint32_t u32Address, uint32_t u32Value, unsigned cb)
+/**
+ * @callback_method_impl{FNPCIBRIDGECONFIGWRITE}
+ */
+static void pcibridgeR3ConfigWrite(PPDMDEVINSR3 pDevIns, uint8_t iBus, uint8_t iDevice, uint32_t u32Address, uint32_t u32Value, unsigned cb)
 {
     PPCIBUS pBus = PDMINS_2_DATA(pDevIns, PPCIBUS);
@@ -2422 +2427 @@
     if (iBus != pBus->PciDev.config[VBOX_PCI_SECONDARY_BUS])
     {
-        PPCIDEVICE pBridgeDevice = pciFindBridge(pBus, iBus);
+        PPCIDEVICE pBridgeDevice = pciR3FindBridge(pBus, iBus);
         if (pBridgeDevice)
         {
@@ -2441 +2446 @@
 }
 
-static uint32_t pcibridgeConfigRead(PPDMDEVINSR3 pDevIns, uint8_t iBus, uint8_t iDevice, uint32_t u32Address, unsigned cb)
+/**
+ * @callback_method_impl{FNPCIBRIDGECONFIGREAD}
+ */
+static uint32_t pcibridgeR3ConfigRead(PPDMDEVINSR3 pDevIns, uint8_t iBus, uint8_t iDevice, uint32_t u32Address, unsigned cb)
 {
     PPCIBUS pBus = PDMINS_2_DATA(pDevIns, PPCIBUS);
@@ -2451 +2459 @@
     if (iBus != pBus->PciDev.config[VBOX_PCI_SECONDARY_BUS])
     {
-        PPCIDEVICE pBridgeDevice = pciFindBridge(pBus, iBus);
+        PPCIDEVICE pBridgeDevice = pciR3FindBridge(pBus, iBus);
         if (pBridgeDevice)
         {
@@ -2506 +2514 @@
  * @param   iDev            The PCI device number. Use a negative value for auto assigning one.
  */
-static DECLCALLBACK(int) pcibridgeRegister(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, const char *pszName, int iDev)
+static DECLCALLBACK(int) pcibridgeR3RegisterDevice(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, const char *pszName, int iDev)
 {
     PPCIBUS pBus = PDMINS_2_DATA(pDevIns, PPCIBUS);
@@ -2524 +2532 @@
      * Register the device.
      */
-    return pciRegisterInternal(pBus, iDev, pPciDev, pszName);
+    return pciR3RegisterDeviceInternal(pBus, iDev, pPciDev, pszName);
 }
 
@@ -2531 +2539 @@
  * @copydoc FNPDMDEVRESET
  */
-static DECLCALLBACK(void) pcibridgeReset(PPDMDEVINS pDevIns)
+static DECLCALLBACK(void) pcibridgeR3Reset(PPDMDEVINS pDevIns)
 {
     PPCIBUS pBus = PDMINS_2_DATA(pDevIns, PPCIBUS);
@@ -2545 +2553 @@
  * @copydoc FNPDMDEVRELOCATE
  */
-static DECLCALLBACK(void) pcibridgeRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
+static DECLCALLBACK(void) pcibridgeR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
     PPCIBUS pBus = PDMINS_2_DATA(pDevIns, PPCIBUS);
@@ -2562 +2570 @@
  * @interface_method_impl{PDMDEVREG,pfnConstruct}
  */
-static DECLCALLBACK(int)   pcibridgeConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
+static DECLCALLBACK(int)   pcibridgeR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
@@ -2598 +2606 @@
     PDMPCIBUSREG PciBusReg;
     PciBusReg.u32Version              = PDM_PCIBUSREG_VERSION;
-    PciBusReg.pfnRegisterR3           = pcibridgeRegister;
+    PciBusReg.pfnRegisterR3           = pcibridgeR3RegisterDevice;
     PciBusReg.pfnRegisterMsiR3        = NULL;
-    PciBusReg.pfnIORegionRegisterR3   = pciIORegionRegister;
-    PciBusReg.pfnSetConfigCallbacksR3 = pciSetConfigCallbacks;
+    PciBusReg.pfnIORegionRegisterR3   = pciR3CommonIORegionRegister;
+    PciBusReg.pfnSetConfigCallbacksR3 = pciR3CommonSetConfigCallbacks;
     PciBusReg.pfnSetIrqR3             = pcibridgeSetIrq;
-    PciBusReg.pfnSaveExecR3           = pciGenericSaveExec;
-    PciBusReg.pfnLoadExecR3           = pciGenericLoadExec;
+    PciBusReg.pfnSaveExecR3           = pciR3GenericSaveExec;
+    PciBusReg.pfnLoadExecR3           = pciR3GenericLoadExec;
     PciBusReg.pfnFakePCIBIOSR3        = NULL; /* Only needed for the first bus. */
     PciBusReg.pszSetIrqRC             = fGCEnabled ? "pcibridgeSetIrq" : NULL;
@@ -2644 +2652 @@
     /* Bridge-specific data */
     pciDevSetPci2PciBridge(&pBus->PciDev);
-    pBus->PciDev.Int.s.pfnBridgeConfigRead  = pcibridgeConfigRead;
-    pBus->PciDev.Int.s.pfnBridgeConfigWrite = pcibridgeConfigWrite;
+    pBus->PciDev.Int.s.pfnBridgeConfigRead  = pcibridgeR3ConfigRead;
+    pBus->PciDev.Int.s.pfnBridgeConfigWrite = pcibridgeR3ConfigWrite;
 
     /*
@@ -2705 +2713 @@
     sizeof(PCIBUS),
     /* pfnConstruct */
-    pcibridgeConstruct,
+    pcibridgeR3Construct,
     /* pfnDestruct */
     NULL,
     /* pfnRelocate */
-    pcibridgeRelocate,
+    pcibridgeR3Relocate,
     /* pfnIOCtl */
     NULL,
@@ -2715 +2723 @@
     NULL,
     /* pfnReset */
-    pcibridgeReset,
+    pcibridgeR3Reset,
     /* pfnSuspend */
     NULL,