Changeset 28424 in vbox for trunk/src/VBox/Devices/EFI

Timestamp:

Apr 16, 2010 5:46:28 PM (15 years ago)

Author:

vboxsync

Message:

firmware: Factored out the SMBIOS & DMI header planting from FwCommonPlantDMITable.

File:

• trunk/src/VBox/Devices/EFI/DevEFI.cpp (modified) (3 diffs)

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

@@ -474 +474 @@
     pThis->szPanicMsg[0] = '\0';
 
+    /*
+     * Plan some structures in RAM.
+     */
+    FwCommonPlantSmbiosAndDmiHdrs(pDevIns);
     if (pThis->u8IOAPIC)
         FwCommonPlantMpsFloatPtr(pDevIns);
-    
-    /*
-     * Plant DMI and MPS tables
-     */
-    rc = FwCommonPlantDMITable(pDevIns,
-                               pThis->au8DMIPage,
-                               VBOX_DMI_TABLE_SIZE,
-                               &pThis->aUuid,
-                               pDevIns->pCfg,
-                               true /*fPutSmbiosHeaders*/);
-    AssertRC(rc);
-    if (pThis->u8IOAPIC)
-        FwCommonPlantMpsTable(pDevIns,
-                              pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE,
-                              _4K - VBOX_DMI_TABLE_SIZE,
-                              pThis->cCpus);
-    
 
     /*
@@ -1206 +1193 @@
 
     /*
-     * Call reset to set things up.
-     */
-    efiReset(pDevIns);
-
-
+     * Plant DMI and MPS tables
+     */
+    rc = FwCommonPlantDMITable(pDevIns,
+                               pThis->au8DMIPage,
+                               VBOX_DMI_TABLE_SIZE,
+                               &pThis->aUuid,
+                               pDevIns->pCfg);
+    AssertRCReturn(rc, rc);
+    if (pThis->u8IOAPIC)
+        FwCommonPlantMpsTable(pDevIns,
+                              pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE,
+                              _4K - VBOX_DMI_TABLE_SIZE,
+                              pThis->cCpus);
     rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, _4K, pThis->au8DMIPage,
                               PGMPHYS_ROM_FLAGS_PERMANENT_BINARY, "DMI tables");
@@ -1216 +1211 @@
     AssertRCReturn(rc, rc);
 
-
+    /*
+     * Call reset to set things up.
+     */
+    efiReset(pDevIns);
 
     return VINF_SUCCESS;