Changeset 26172 in vbox

Timestamp:

Feb 2, 2010 8:41:40 PM (15 years ago)

Author:

vboxsync

Message:

PDM: s/pCfgHandle/pCfg/g - part 1.

Location:

trunk

Files:

• include/VBox/pdmdev.h (modified) (2 diffs)
• include/VBox/pdmdrv.h (modified) (2 diffs)
• include/VBox/pdmusb.h (modified) (1 diff)
• src/VBox/Devices/EFI/DevEFI.cpp (modified) (1 diff)
• src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp (modified) (3 diffs)
• src/VBox/Devices/PC/DevACPI.cpp (modified) (2 diffs)
• src/VBox/Devices/Storage/DevAHCI.cpp (modified) (2 diffs)
• src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)
• src/VBox/VMM/PDMDevice.cpp (modified) (2 diffs)
• src/VBox/VMM/PDMDriver.cpp (modified) (2 diffs)
• src/VBox/VMM/testcase/tstVMStructRC.cpp (modified) (2 diffs)

trunk/include/VBox/pdmdev.h

@@ -59 +59 @@
  * @param   pDevIns     The device instance data. If the registration structure
  *                      is needed, it can be accessed thru  pDevIns->pReg.
- * @param   iInstance   Instance number. Use this to figure out which registers and such to use.
- *                      The instance number is also found in pDevIns->iInstance, but since it's
- *                      likely to be freqently used PDM passes it as parameter.
- * @param   pCfgHandle  Configuration node handle for the device. Use this to obtain the configuration
- *                      of the device instance. It's also found in pDevIns->pCfgHandle, but since it's
- *                      primary usage will in this function it's passed as a parameter.
- */
-typedef DECLCALLBACK(int)   FNPDMDEVCONSTRUCT(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle);
+ * @param   iInstance   Instance number. Use this to figure out which registers
+ *                      and such to use. The instance number is also found in
+ *                      pDevIns->iInstance, but since it's likely to be
+ *                      freqently used PDM passes it as parameter.
+ * @param   pCfg        Configuration node handle for the driver.  This is
+ *                      expected to be in high demand in the constructor and is
+ *                      therefore passed as an argument.  When using it at other
+ *                      times, it can be found in pDrvIns->pCfg.
+ */
+typedef DECLCALLBACK(int)   FNPDMDEVCONSTRUCT(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg);
 /** Pointer to a FNPDMDEVCONSTRUCT() function. */
 typedef FNPDMDEVCONSTRUCT *PFNPDMDEVCONSTRUCT;
@@ -3492 +3494 @@
     R3PTRTYPE(PCPDMDEVREG)      pReg;
     /** Configuration handle. */
-    R3PTRTYPE(PCFGMNODE)        pCfgHandle;
+    R3PTRTYPE(PCFGMNODE)        pCfg;
 
     /** The base interface of the device.

trunk/include/VBox/pdmdrv.h

@@ -67 +67 @@
  * @param   pDrvIns     The driver instance data. If the registration structure
  *                      is needed, it can be accessed thru pDrvIns->pReg.
- * @param   pCfgHandle  Configuration node handle for the driver. Use this to
- *                      obtain the configuration of the driver instance. It's
- *                      also found in pDrvIns->pCfgHandle as it's expected to be
- *                      used frequently in this function.
+ * @param   pCfg        Configuration node handle for the driver.  This is
+ *                      expected to be in high demand in the constructor and is
+ *                      therefore passed as an argument.  When using it at other
+ *                      times, it can be accessed via pDrvIns->pCfg.
  * @param   fFlags      Flags, combination of the PDM_TACH_FLAGS_* \#defines.
  */
-typedef DECLCALLBACK(int)   FNPDMDRVCONSTRUCT(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags);
+typedef DECLCALLBACK(int)   FNPDMDRVCONSTRUCT(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
 /** Pointer to a FNPDMDRVCONSTRUCT() function. */
 typedef FNPDMDRVCONSTRUCT *PFNPDMDRVCONSTRUCT;
@@ -367 +367 @@
     R3PTRTYPE(PCPDMDRVREG)      pReg;
     /** Configuration handle. */
-    R3PTRTYPE(PCFGMNODE)        pCfgHandle;
+    R3PTRTYPE(PCFGMNODE)        pCfg;
 
     /** Pointer to the base interface of the device/driver instance above. */

trunk/include/VBox/pdmusb.h

@@ -112 +112 @@
      *                      pUsbDev->iInstance, but since it's likely to be
      *                      freqently used PDM passes it as parameter.
-     * @param   pCfg        Configuration node handle for the device. Use this to
-     *                      obtain the configuration of the device instance. It's
-     *                      also found in pUsbDev->pCfg, but since it's primary
-     *                      usage will in this function it's passed as a parameter.
-     * @param   pCfgGlobal  Handle to the global device configuration. Also foundin
-     *                      pUsbDev->pCfgGlobal.
+     * @param   pCfg        Configuration node handle for the device.  Use this to
+     *                      obtain the configuration of the device instance.  It is
+     *                      also found in pUsbDev->pCfg, but since it is primary
+     *                      usage will in this function it is passed as a parameter.
+     * @param   pCfgGlobal  Handle to the global device configuration.  Also found
+     *                      in pUsbDev->pCfgGlobal.
      * @remarks This callback is required.
      */

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -426 +426 @@
                                VBOX_DMI_TABLE_SIZE,
                                &pThis->aUuid,
-                               pDevIns->pCfgHandle,
+                               pDevIns->pCfg,
                                true /* fPutSmbiosHeaders */);
     Assert(RT_SUCCESS(rc));

trunk/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp

@@ -66 +66 @@
     int rc;
 
-    rc = CFGMR3QueryU16Def(pDevIns->pCfgHandle, "NumCPUs", &cNumCpus, 1);
+    rc = CFGMR3QueryU16Def(pDevIns->pCfg, "NumCPUs", &cNumCpus, 1);
 
     if (RT_FAILURE(rc))
@@ -73 +73 @@
     /* Clear CPU objects at all, if needed */
     bool fShowCpu;
-    rc = CFGMR3QueryBoolDef(pDevIns->pCfgHandle, "ShowCpu", &fShowCpu, false);
+    rc = CFGMR3QueryBoolDef(pDevIns->pCfg, "ShowCpu", &fShowCpu, false);
     if (RT_FAILURE(rc))
         return rc;
@@ -146 +146 @@
     size_t cbAmlCode = 0;
     char *pszAmlFilePath = NULL;
-    int rc = CFGMR3QueryStringAlloc(pDevIns->pCfgHandle, "AmlFilePath", &pszAmlFilePath);
+    int rc = CFGMR3QueryStringAlloc(pDevIns->pCfg, "AmlFilePath", &pszAmlFilePath);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -1958 +1958 @@
     cbXsdt += cAddr*sizeof(uint64_t);  /* each entry: 64 bits phys. address. */
 
-    rc = CFGMR3QueryU64(s->pDevIns->pCfgHandle, "RamSize", &s->u64RamSize);
+    rc = CFGMR3QueryU64(s->pDevIns->pCfg, "RamSize", &s->u64RamSize);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(s->pDevIns, rc,
@@ -1964 +1964 @@
 
     uint32_t cbRamHole;
-    rc = CFGMR3QueryU32Def(s->pDevIns->pCfgHandle, "RamHoleSize", &cbRamHole, MM_RAM_HOLE_SIZE_DEFAULT);
+    rc = CFGMR3QueryU32Def(s->pDevIns->pCfg, "RamHoleSize", &cbRamHole, MM_RAM_HOLE_SIZE_DEFAULT);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(s->pDevIns, rc,

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

@@ -5776 +5776 @@
     {
         uint32_t iPort;
-        int rc = CFGMR3QueryU32Def(pDevIns->pCfgHandle, s_apszIdeEmuPortNames[i], &iPort, i);
+        int rc = CFGMR3QueryU32Def(pDevIns->pCfg, s_apszIdeEmuPortNames[i], &iPort, i);
         AssertRCReturn(rc, rc);
         SSMR3PutU32(pSSM, iPort);
@@ -5934 +5934 @@
         {
             uint32_t iPort;
-            rc = CFGMR3QueryU32Def(pDevIns->pCfgHandle, s_apszIdeEmuPortNames[i], &iPort, i);
+            rc = CFGMR3QueryU32Def(pDevIns->pCfg, s_apszIdeEmuPortNames[i], &iPort, i);
             AssertRCReturn(rc, rc);
 

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

@@ -108 +108 @@
     GEN_CHECK_OFF(PDMDEVINS, Internal);
     GEN_CHECK_OFF(PDMDEVINS, pReg);
-    GEN_CHECK_OFF(PDMDEVINS, pCfgHandle);
+    GEN_CHECK_OFF(PDMDEVINS, pCfg);
     GEN_CHECK_OFF(PDMDEVINS, iInstance);
     GEN_CHECK_OFF(PDMDEVINS, IBase);

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -329 +329 @@
         pDevIns->pHlpR0                         = pHlpR0;
         pDevIns->pReg                           = paDevs[i].pDev->pReg;
-        pDevIns->pCfgHandle                     = pConfigNode;
+        pDevIns->pCfg                           = pConfigNode;
         pDevIns->iInstance                      = paDevs[i].iInstance;
         pDevIns->pvInstanceDataR3               = &pDevIns->achInstanceData[0];
@@ -367 +367 @@
         paDevs[i].pDev->cInstances++;
         Log(("PDM: Constructing device '%s' instance %d...\n", pDevIns->pReg->szName, pDevIns->iInstance));
-        rc = pDevIns->pReg->pfnConstruct(pDevIns, pDevIns->iInstance, pDevIns->pCfgHandle);
+        rc = pDevIns->pReg->pfnConstruct(pDevIns, pDevIns->iInstance, pDevIns->pCfg);
         if (RT_FAILURE(rc))
         {

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -449 +449 @@
                     pNew->Internal.s.pCfgHandle     = pNode;
                     pNew->pReg                      = pDrv->pReg;
-                    pNew->pCfgHandle                = pConfigNode;
+                    pNew->pCfg                      = pConfigNode;
                     pNew->iInstance                 = pDrv->iNextInstance;
                     pNew->pUpBase                   = pBaseInterface;
@@ -490 +490 @@
                      * Invoke the constructor.
                      */
-                    rc = pDrv->pReg->pfnConstruct(pNew, pNew->pCfgHandle, 0 /*fFlags*/);
+                    rc = pDrv->pReg->pfnConstruct(pNew, pNew->pCfg, 0 /*fFlags*/);
                     if (RT_SUCCESS(rc))
                     {

trunk/src/VBox/VMM/testcase/tstVMStructRC.cpp

@@ -376 +376 @@
     GEN_CHECK_OFF(PDMDEVINS, pvInstanceDataR3);
     GEN_CHECK_OFF(PDMDEVINS, pReg);
-    GEN_CHECK_OFF(PDMDEVINS, pCfgHandle);
+    GEN_CHECK_OFF(PDMDEVINS, pCfg);
     GEN_CHECK_OFF(PDMDEVINS, IBase);
     GEN_CHECK_OFF(PDMDEVINS, Internal);
@@ -403 +403 @@
     GEN_CHECK_OFF(PDMDRVINS, pvInstanceDataR3);
     GEN_CHECK_OFF(PDMDRVINS, pReg);
-    GEN_CHECK_OFF(PDMDRVINS, pCfgHandle);
+    GEN_CHECK_OFF(PDMDRVINS, pCfg);
     GEN_CHECK_OFF(PDMDRVINS, IBase);
     GEN_CHECK_OFF(PDMDRVINS, Internal);