Revert "OvmfPkg: SmbiosPlatformDxe: move IsEntryPointStructureValid()…

… to Xen.c" This reverts commit a136af4. bhyve smbios code wants to be a second user of the IsEntryPointStructureValid() function.
freebsd · Mar 21, 2019 · 3c74b29 · 3c74b29
1 parent 89910a3
commit 3c74b29
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 35 deletions.
diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -64,6 +64,41 @@ STATIC CONST OVMF_TYPE0 mOvmfDefaultType0 = {
 };
 
 
+/**
+  Validates the SMBIOS entry point structure
+
+  @param  EntryPointStructure  SMBIOS entry point structure
+
+  @retval TRUE   The entry point structure is valid
+  @retval FALSE  The entry point structure is not valid
+
+**/
+BOOLEAN
+IsEntryPointStructureValid (
+  IN SMBIOS_TABLE_ENTRY_POINT  *EntryPointStructure
+  )
+{
+  UINTN                     Index;
+  UINT8                     Length;
+  UINT8                     Checksum;
+  UINT8                     *BytePtr;
+
+  BytePtr = (UINT8*) EntryPointStructure;
+  Length = EntryPointStructure->EntryPointLength;
+  Checksum = 0;
+
+  for (Index = 0; Index < Length; Index++) {
+    Checksum = Checksum + (UINT8) BytePtr[Index];
+  }
+
+  if (Checksum != 0) {
+    return FALSE;
+  } else {
+    return TRUE;
+  }
+}
+
+
 /**
   Get SMBIOS record length.
 

diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h
@@ -51,4 +51,19 @@ GetQemuSmbiosTables (
   VOID
   );
 
+
+/**
+  Validates the SMBIOS entry point structure
+
+  @param  EntryPointStructure  SMBIOS entry point structure
+
+  @retval TRUE   The entry point structure is valid
+  @retval FALSE  The entry point structure is not valid
+
+**/
+BOOLEAN
+IsEntryPointStructureValid (
+  IN SMBIOS_TABLE_ENTRY_POINT  *EntryPointStructure
+  );
+
 #endif
diff --git a/OvmfPkg/SmbiosPlatformDxe/X86Xen.c b/OvmfPkg/SmbiosPlatformDxe/X86Xen.c
@@ -21,41 +21,6 @@
 #define XEN_SMBIOS_PHYSICAL_ADDRESS       0x000EB000
 #define XEN_SMBIOS_PHYSICAL_END           0x000F0000
 
-/**
-  Validates the SMBIOS entry point structure
-
-  @param  EntryPointStructure  SMBIOS entry point structure
-
-  @retval TRUE   The entry point structure is valid
-  @retval FALSE  The entry point structure is not valid
-
-**/
-STATIC
-BOOLEAN
-IsEntryPointStructureValid (
-  IN SMBIOS_TABLE_ENTRY_POINT  *EntryPointStructure
-  )
-{
-  UINTN                     Index;
-  UINT8                     Length;
-  UINT8                     Checksum;
-  UINT8                     *BytePtr;
-
-  BytePtr = (UINT8*) EntryPointStructure;
-  Length = EntryPointStructure->EntryPointLength;
-  Checksum = 0;
-
-  for (Index = 0; Index < Length; Index++) {
-    Checksum = Checksum + (UINT8) BytePtr[Index];
-  }
-
-  if (Checksum != 0) {
-    return FALSE;
-  } else {
-    return TRUE;
-  }
-}
-
 /**
   Locates the Xen SMBIOS data if it exists