Add core FFS3 support, DxeCore.

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / FwVol / Ffs.c

diff --git a/MdeModulePkg/Core/Dxe/FwVol/Ffs.c b/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
index 2bd4405cf13f7feb15b40b627d5bced8e334d11a..20dade18a275c7a4c830cd53d36ced5cda5d05de 100644 (file)
--- a/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
@@ -133,7 +133,11 @@ VerifyHeaderChecksum (
 {\r
   UINT8 HeaderChecksum;\r
 \r
-  HeaderChecksum = CalculateSum8 ((UINT8 *) FfsHeader, sizeof (EFI_FFS_FILE_HEADER));\r
+  if (IS_FFS_FILE2 (FfsHeader)) {\r
+    HeaderChecksum = CalculateSum8 ((UINT8 *) FfsHeader, sizeof (EFI_FFS_FILE_HEADER2));\r
+  } else {\r
+    HeaderChecksum = CalculateSum8 ((UINT8 *) FfsHeader, sizeof (EFI_FFS_FILE_HEADER));\r
+  }\r
   HeaderChecksum = (UINT8) (HeaderChecksum - FfsHeader->State - FfsHeader->IntegrityCheck.Checksum.File);\r
 \r
   if (HeaderChecksum == 0) {\r
@@ -202,7 +206,6 @@ IsValidFfsFile (
 {\r
   EFI_FFS_FILE_STATE  FileState;\r
   UINT8               DataCheckSum;\r
-  UINT32              FileLength;\r
 \r
   FileState = GetFileState (ErasePolarity, FfsHeader);\r
   switch (FileState) {\r
@@ -211,9 +214,12 @@ IsValidFfsFile (
   case EFI_FILE_DATA_VALID:\r
   case EFI_FILE_MARKED_FOR_UPDATE:\r
     DataCheckSum = FFS_FIXED_CHECKSUM;\r
-    FileLength   = *(UINT32 *)(FfsHeader->Size) & 0x00FFFFFF;\r
     if ((FfsHeader->Attributes & FFS_ATTRIB_CHECKSUM) == FFS_ATTRIB_CHECKSUM) {\r
-      DataCheckSum = CalculateCheckSum8 ((CONST UINT8 *)FfsHeader + sizeof(EFI_FFS_FILE_HEADER), FileLength - sizeof(EFI_FFS_FILE_HEADER));\r
+      if (IS_FFS_FILE2 (FfsHeader)) {\r
+        DataCheckSum = CalculateCheckSum8 ((CONST UINT8 *) FfsHeader + sizeof (EFI_FFS_FILE_HEADER2), FFS_FILE2_SIZE (FfsHeader) - sizeof(EFI_FFS_FILE_HEADER2));\r
+      } else {\r
+        DataCheckSum = CalculateCheckSum8 ((CONST UINT8 *) FfsHeader + sizeof (EFI_FFS_FILE_HEADER), FFS_FILE_SIZE (FfsHeader) - sizeof(EFI_FFS_FILE_HEADER));\r
+      }\r
     }\r
     if (FfsHeader->IntegrityCheck.Checksum.File == DataCheckSum) {\r
       return TRUE;\r