Changeset 25058 in vbox

Timestamp:

Nov 27, 2009 5:55:17 PM (15 years ago)

Author:

vboxsync

Message:

EFI: safe part of tables changes (rest to come after branch), required for ACPI work

Location:

trunk/src/VBox/Devices/PC

Files:

• DevAPIC.cpp (modified) (1 diff)
• DevFwCommon.cpp (modified) (4 diffs)
• DevFwCommon.h (modified) (2 diffs)

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

@@ -1032 +1032 @@
                 break;
             case APIC_DM_FIXED:
+            {
                 /** @todo implement APIC_DM_FIXED! */
+                static unsigned s_c = 0;
+                if (s_c++ < 5)
+                    LogRel(("delivery type APIC_DM_FIXED not implemented. u8Pin=%d u8Level=%d", u8Pin, u8Level));
+                return  VINF_SUCCESS;
+            }
             case APIC_DM_INIT:
                 /** @todo implement APIC_DM_INIT? */

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

@@ -67 +67 @@
     uint32_t        u32TableBase;
     uint16_t        u16TableEntries;
-    uint16_t        u8TableVersion;
-    uint8_t         u8Pad;
+    uint8_t         u8TableVersion;
 } *DMIMAINHDRPTR;
+AssertCompileSize(DMIMAINHDR, 15);
 
 /** DMI header */
@@ -269 +269 @@
     return -u8Sum;
 }
+
+static bool sharedfwChecksumOk(const uint8_t * const au8Data, uint32_t u32Length)
+{
+    uint8_t u8Sum = 0;
+    for (size_t i = 0; i < u32Length; i++)
+        u8Sum += au8Data[i];
+    return (u8Sum == 0);
+}
+
 
 /**
@@ -552 +561 @@
                 VBOX_DMI_TABLE_ENTR,               // DMI tables entries
                 VBOX_DMI_TABLE_VER,                // DMI version
-                0x00
             }
         };
@@ -559 +567 @@
         aBiosHeaders.dmi.u8Checksum = fwCommonChecksum((uint8_t*)&aBiosHeaders.dmi, sizeof(aBiosHeaders.dmi));
 
-        //Log(("Write SMBIOS\n"));
-        PDMDevHlpPhysWrite (pDevIns, 0xff30, &aBiosHeaders, sizeof(aBiosHeaders));
+        PDMDevHlpPhysWrite (pDevIns, 0xfe300, &aBiosHeaders, sizeof(aBiosHeaders));
     }
 

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

@@ -29 +29 @@
  * Must be located in the same page as the DMI table.
  */
-#define VBOX_MPS_TABLE_BASE          0xe1100
+#define VBOX_MPS_TABLE_BASE          (VBOX_DMI_TABLE_BASE+VBOX_DMI_TABLE_SIZE)
 
 /* Plant DMI table */
@@ -38 +38 @@
 
 #endif
-