MdeModulePkg: Replace BSD License with BSD+Patent License

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

diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
index 93ddcc35913badc81ae3b141dc6c78fad5a3166a..e2f58c4d82a81a770c493d2e9f5bec65692b47d6 100644 (file)
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
@@ -3,14 +3,8 @@
   Layers on top of Firmware Block protocol to produce a file abstraction\r
   of FV based files.\r
 \r
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -329,8 +323,6 @@ FvCheck (
   FFS_FILE_LIST_ENTRY                   *FfsFileEntry;\r
   EFI_FFS_FILE_HEADER                   *FfsHeader;\r
   UINT8                                 *CacheLocation;\r
-  UINTN                                 LbaOffset;\r
-  UINTN                                 HeaderSize;\r
   UINTN                                 Index;\r
   EFI_LBA                               LbaIndex;\r
   UINTN                                 Size;\r
@@ -353,11 +345,7 @@ FvCheck (
     return Status;\r
   }\r
 \r
-  //\r
-  // Size is the size of the FV minus the head. We have already allocated\r
-  // the header to check to make sure the volume is valid\r
-  //\r
-  Size = (UINTN)(FwVolHeader->FvLength - FwVolHeader->HeaderLength);\r
+  Size = (UINTN) FwVolHeader->FvLength;\r
   if ((FvbAttributes & EFI_FVB2_MEMORY_MAPPED) != 0) {\r
     FvDevice->IsMemoryMapped = TRUE;\r
 \r
@@ -369,7 +357,7 @@ FvCheck (
     //\r
     // Don't cache memory mapped FV really.\r
     //\r
-    FvDevice->CachedFv = (UINT8 *) (UINTN) (PhysicalAddress + FwVolHeader->HeaderLength);\r
+    FvDevice->CachedFv = (UINT8 *) (UINTN) PhysicalAddress;\r
   } else {\r
     FvDevice->IsMemoryMapped = FALSE;\r
     FvDevice->CachedFv = AllocatePool (Size);\r
@@ -380,52 +368,27 @@ FvCheck (
   }\r
 \r
   //\r
-  // Remember a pointer to the end fo the CachedFv\r
+  // Remember a pointer to the end of the CachedFv\r
   //\r
   FvDevice->EndOfCachedFv = FvDevice->CachedFv + Size;\r
 \r
   if (!FvDevice->IsMemoryMapped) {\r
     //\r
-    // Copy FV minus header into memory using the block map we have all ready\r
-    // read into memory.\r
+    // Copy FV into memory using the block map.\r
     //\r
     BlockMap = FwVolHeader->BlockMap;\r
     CacheLocation = FvDevice->CachedFv;\r
     LbaIndex = 0;\r
-    LbaOffset = 0;\r
-    HeaderSize = FwVolHeader->HeaderLength;\r
     while ((BlockMap->NumBlocks != 0) || (BlockMap->Length != 0)) {\r
-      Index = 0;\r
-      Size  = BlockMap->Length;\r
-      if (HeaderSize > 0) {\r
-        //\r
-        // Skip header size\r
-        //\r
-        for (; Index < BlockMap->NumBlocks && HeaderSize >= BlockMap->Length; Index ++) {\r
-          HeaderSize -= BlockMap->Length;\r
-          LbaIndex ++;\r
-        }\r
-\r
-        //\r
-        // Check whether FvHeader is crossing the multi block range.\r
-        //\r
-        if (Index >= BlockMap->NumBlocks) {\r
-          BlockMap++;\r
-          continue;\r
-        } else if (HeaderSize > 0) {\r
-          LbaOffset = HeaderSize;\r
-          Size = BlockMap->Length - HeaderSize;\r
-          HeaderSize = 0;\r
-        }\r
-      }\r
-\r
       //\r
       // read the FV data\r
       //\r
-      for (; Index < BlockMap->NumBlocks; Index ++) {\r
-        Status = Fvb->Read (Fvb,\r
+      Size = BlockMap->Length;\r
+      for (Index = 0; Index < BlockMap->NumBlocks; Index++) {\r
+        Status = Fvb->Read (\r
+                        Fvb,\r
                         LbaIndex,\r
-                        LbaOffset,\r
+                        0,\r
                         &Size,\r
                         CacheLocation\r
                         );\r
@@ -438,13 +401,7 @@ FvCheck (
         }\r
 \r
         LbaIndex++;\r
-        CacheLocation += Size;\r
-\r
-        //\r
-        // After we skip Fv Header always read from start of block\r
-        //\r
-        LbaOffset = 0;\r
-        Size  = BlockMap->Length;\r
+        CacheLocation += BlockMap->Length;\r
       }\r
 \r
       BlockMap++;\r
@@ -475,12 +432,12 @@ FvCheck (
     //\r
     // Searching for files starts on an 8 byte aligned boundary after the end of the Extended Header if it exists.\r
     //\r
-    FwVolExtHeader = (EFI_FIRMWARE_VOLUME_EXT_HEADER *) (FvDevice->CachedFv + (FwVolHeader->ExtHeaderOffset - FwVolHeader->HeaderLength));\r
+    FwVolExtHeader = (EFI_FIRMWARE_VOLUME_EXT_HEADER *) (FvDevice->CachedFv + FwVolHeader->ExtHeaderOffset);\r
     FfsHeader = (EFI_FFS_FILE_HEADER *) ((UINT8 *) FwVolExtHeader + FwVolExtHeader->ExtHeaderSize);\r
-    FfsHeader = (EFI_FFS_FILE_HEADER *) ALIGN_POINTER (FfsHeader, 8);\r
   } else {\r
-    FfsHeader = (EFI_FFS_FILE_HEADER *) (FvDevice->CachedFv);\r
+    FfsHeader = (EFI_FFS_FILE_HEADER *) (FvDevice->CachedFv + FwVolHeader->HeaderLength);\r
   }\r
+  FfsHeader = (EFI_FFS_FILE_HEADER *) ALIGN_POINTER (FfsHeader, 8);\r
   TopFvAddress = FvDevice->EndOfCachedFv;\r
   while (((UINTN) FfsHeader >= (UINTN) FvDevice->CachedFv) && ((UINTN) FfsHeader <= (UINTN) ((UINTN) TopFvAddress - sizeof (EFI_FFS_FILE_HEADER)))) {\r
 \r