Changeset 25048 in vbox

Timestamp:

Nov 27, 2009 12:37:09 PM (15 years ago)

Author:

vboxsync

Message:

DevFwCommon(,DevPcBios,DevEFI): nitpicking - made the prefix correspond to the filename, public interfaces uses a capitalize prefix to highlight that they are public, don't use parameters with defaults. Fixed -Wshadow warning.

Location:

trunk/src/VBox/Devices

Files:

• EFI/DevEFI.cpp (modified) (1 diff)
• PC/DevFwCommon.cpp (modified) (13 diffs)
• PC/DevFwCommon.h (modified) (3 diffs)
• PC/DevPcBios.cpp (modified) (2 diffs)

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

@@ -909 +909 @@
     uuid.Gen.u16TimeMid = RT_H2BE_U16(uuid.Gen.u16TimeMid);
     uuid.Gen.u16TimeHiAndVersion = RT_H2BE_U16(uuid.Gen.u16TimeHiAndVersion);
-    rc = sharedfwPlantDMITable(pDevIns, pThis->au8DMIPage, VBOX_DMI_TABLE_SIZE, &uuid, pCfgHandle, true);
+    rc = FwCommonPlantDMITable(pDevIns, pThis->au8DMIPage, VBOX_DMI_TABLE_SIZE, &uuid, pCfgHandle, true /* fPutSmbiosHeaders */);
     if (RT_FAILURE(rc))
         return rc;
 
-    sharedfwPlantMpsTable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE, pThis->cCpus);
+    FwCommonPlantMpsTable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE, pThis->cCpus);
 
     rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, _4K, pThis->au8DMIPage,

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * Shared firmware code.
+ * FwCommon - Shared firmware code (used by DevPcBios & DevEFI).
  */
 
@@ -23 +23 @@
 *   Header Files                                                               *
 *******************************************************************************/
-/** @todo: what should it be? */
-#define LOG_GROUP LOG_GROUP_DEV_PC_BIOS
+#define LOG_GROUP LOG_GROUP_DEV
 #include <VBox/pdmdev.h>
 
 #include <VBox/log.h>
+#include <VBox/err.h>
+#include <VBox/param.h>
+
 #include <iprt/assert.h>
-#include <iprt/alloc.h>
 #include <iprt/buildconfig.h>
 #include <iprt/file.h>
+#include <iprt/mem.h>
 #include <iprt/string.h>
 #include <iprt/uuid.h>
-#include <VBox/err.h>
-#include <VBox/param.h>
 
 #include "../Builtins.h"
@@ -41 +41 @@
 #include "DevFwCommon.h"
 
+
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
 #pragma pack(1)
 
@@ -258 +262 @@
  * @param   len             size of data
  */
-static uint8_t sharedfwChecksum(const uint8_t * const au8Data, uint32_t u32Length)
+static uint8_t fwCommonChecksum(const uint8_t * const au8Data, uint32_t u32Length)
 {
     uint8_t u8Sum = 0;
@@ -270 +274 @@
  *
  * @returns VBox status code.
- * @param   pDevIns     The device instance.
- * @param   pTable      Where to create the DMI table.
- * @param   cbMax       The max size of the DMI table.
- * @param   pUuid       Pointer to the UUID to use if the DmiUuid
- *                      configuration string isn't present.
- * @param   pCfgHandle  The handle to our config node.
+ * @param   pDevIns             The device instance.
+ * @param   pTable              Where to create the DMI table.
+ * @param   cbMax               The max size of the DMI table.
+ * @param   pUuid               Pointer to the UUID to use if the DmiUuid
+ *                              configuration string isn't present.
+ * @param   pCfgHandle          The handle to our config node.
+ * @param   fPutSmbiosHeaders   Plant SMBIOS headers if true.
  */
-int sharedfwPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PRTUUID pUuid, PCFGMNODE pCfgHandle, bool fPutSmbiosHeaders)
+int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfgHandle, bool fPutSmbiosHeaders)
 {
     char *pszStr = (char *)pTable;
@@ -421 +426 @@
     if (pszDmiSystemUuid)
     {
-        int rc = RTUuidFromStr(&uuid, pszDmiSystemUuid);
+        rc = RTUuidFromStr(&uuid, pszDmiSystemUuid);
         if (RT_FAILURE(rc))
             return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
@@ -551 +556 @@
         };
 
-        aBiosHeaders.smbios.u8Checksum = sharedfwChecksum((uint8_t*)&aBiosHeaders.smbios, sizeof(aBiosHeaders.smbios));
-        aBiosHeaders.dmi.u8Checksum = sharedfwChecksum((uint8_t*)&aBiosHeaders.dmi, sizeof(aBiosHeaders.dmi));
+        aBiosHeaders.smbios.u8Checksum = fwCommonChecksum((uint8_t*)&aBiosHeaders.smbios, sizeof(aBiosHeaders.smbios));
+        aBiosHeaders.dmi.u8Checksum = fwCommonChecksum((uint8_t*)&aBiosHeaders.dmi, sizeof(aBiosHeaders.dmi));
 
         //Log(("Write SMBIOS\n"));
@@ -589 +594 @@
  * @param   addr       physical address in guest memory.
  */
-void sharedfwPlantMpsTable(PPDMDEVINS pDevIns, uint8_t *pTable, uint16_t numCpus)
+void FwCommonPlantMpsTable(PPDMDEVINS pDevIns, uint8_t *pTable, uint16_t cCpus)
 {
     /* configuration table */
@@ -599 +604 @@
     pCfgTab->u32OemTablePtr        =  0;
     pCfgTab->u16OemTableSize       =  0;
-    pCfgTab->u16EntryCount         =  numCpus /* Processors */
+    pCfgTab->u16EntryCount         =  cCpus /* Processors */
                                    +  1 /* ISA Bus */
                                    +  1 /* I/O-APIC */
@@ -622 +627 @@
     /* Construct MPS table for each VCPU. */
     PMPSPROCENTRY pProcEntry = (PMPSPROCENTRY)(pCfgTab+1);
-    for (int i = 0; i<numCpus; i++)
+    for (int i = 0; i < cCpus; i++)
     {
         pProcEntry->u8EntryType        = 0; /* processor entry */
@@ -647 +652 @@
      *           ... At least one I/O APIC must be enabled." */
     PMPSIOAPICENTRY pIOAPICEntry   = (PMPSIOAPICENTRY)(pBusEntry+1);
-    uint16_t apicId = numCpus;
+    uint16_t apicId = cCpus;
     pIOAPICEntry->u8EntryType      = 2; /* I/O-APIC entry */
     pIOAPICEntry->u8Id             = apicId; /* this ID is referenced by the interrupt entries */
@@ -668 +673 @@
 
     pCfgTab->u16Length             = (uint8_t*)pIrqEntry - pTable;
-    pCfgTab->u8Checksum            = sharedfwChecksum(pTable, pCfgTab->u16Length);
+    pCfgTab->u8Checksum            = fwCommonChecksum(pTable, pCfgTab->u16Length);
 
     AssertMsg(pCfgTab->u16Length < 0x1000 - 0x100,
@@ -688 +693 @@
     floatPtr.au8Feature[3]         = 0;
     floatPtr.au8Feature[4]         = 0;
-    floatPtr.u8Checksum            = sharedfwChecksum((uint8_t*)&floatPtr, 16);
+    floatPtr.u8Checksum            = fwCommonChecksum((uint8_t*)&floatPtr, 16);
     PDMDevHlpPhysWrite (pDevIns, 0x9fff0, &floatPtr, 16);
 }
+

trunk/src/VBox/Devices/PC/DevFwCommon.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * DevFwCommon - shared header for code common between different firmware types (EFI, BIOS).
+ * FwCommon - Shared firmware code, header.
  */
 
@@ -20 +20 @@
  */
 
-#ifndef DEV_FWCOMMON_H
-#define DEV_FWCOMMON_H
+#ifndef ___PC_FwCommon_h
+#define ___PC_FwCommon_h
 
 #include "DevPcBios.h"
@@ -32 +32 @@
 
 /* Plant DMI table */
-int sharedfwPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PRTUUID pUuid, PCFGMNODE pCfgHandle, bool fPutSmbiosHeaders = false);
+int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfgHandle, bool fPutSmbiosHeaders);
 
 /* Plant MPS table */
-void sharedfwPlantMpsTable(PPDMDEVINS pDevIns, uint8_t *pTable, uint16_t numCpus);
+void FwCommonPlantMpsTable(PPDMDEVINS pDevIns, uint8_t *pTable, uint16_t cCpus);
 
 #endif
+

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

@@ -747 +747 @@
 
     if (pThis->u8IOAPIC)
-        sharedfwPlantMpsTable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE, pThis->cCpus);
+        FwCommonPlantMpsTable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE, pThis->cCpus);
 
     /*
@@ -1029 +1029 @@
     uuid.Gen.u16TimeMid = RT_H2BE_U16(uuid.Gen.u16TimeMid);
     uuid.Gen.u16TimeHiAndVersion = RT_H2BE_U16(uuid.Gen.u16TimeHiAndVersion);
-    rc = sharedfwPlantDMITable(pDevIns, pThis->au8DMIPage, VBOX_DMI_TABLE_SIZE, &uuid, pCfgHandle);
+    rc = FwCommonPlantDMITable(pDevIns, pThis->au8DMIPage, VBOX_DMI_TABLE_SIZE, &uuid, pCfgHandle, false /*fPutSmbiosHeaders*/);
     if (RT_FAILURE(rc))
         return rc;
     if (pThis->u8IOAPIC)
-        sharedfwPlantMpsTable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE, pThis->cCpus);
+        FwCommonPlantMpsTable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE, pThis->cCpus);
 
     rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, _4K, pThis->au8DMIPage,