add ia32 and x64 direcotry for EdkFvbServiceLib

[mirror_edk2.git] / MdeModulePkg / Universal / VariableRuntimeDxe / reclaim.c

diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c b/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c
index 309d285e1ddd84e462c4ffd882b3f29a4d65ae64..3ee37367d59fb152b9bdd38e77d3e7d6d7a318f5 100644 (file)
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c
+++ b/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c
@@ -95,13 +95,13 @@ GetLbaAndOffsetByAddress (
   OUT UINTN                  *Offset\r
   )\r
 {\r
-  EFI_STATUS                            Status;\r
-  EFI_HANDLE                            FvbHandle;\r
-  EFI_PHYSICAL_ADDRESS                  FvbBaseAddress;\r
-  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    *Fvb;\r
-  FRAMEWORK_EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader;\r
-  EFI_FV_BLOCK_MAP_ENTRY                *FvbMapEntry;\r
-  UINT32                                LbaIndex;\r
+  EFI_STATUS                          Status;\r
+  EFI_HANDLE                          FvbHandle;\r
+  EFI_PHYSICAL_ADDRESS                FvbBaseAddress;\r
+  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *Fvb;\r
+  EFI_FIRMWARE_VOLUME_HEADER          *FwVolHeader;\r
+  EFI_FV_BLOCK_MAP_ENTRY              *FvbMapEntry;\r
+  UINT32                              LbaIndex;\r
 \r
   *Lba    = (EFI_LBA) (-1);\r
   *Offset = 0;\r
@@ -130,7 +130,7 @@ GetLbaAndOffsetByAddress (
     return Status;\r
   }\r
 \r
-  FwVolHeader = (FRAMEWORK_EFI_FIRMWARE_VOLUME_HEADER *) ((UINTN) FvbBaseAddress);\r
+  FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) ((UINTN) FvbBaseAddress);\r
 \r
   //\r
   // Get the (LBA, Offset) of Address\r
@@ -140,7 +140,7 @@ GetLbaAndOffsetByAddress (
       //\r
       // BUGBUG: Assume one FV has one type of BlockLength\r
       //\r
-      FvbMapEntry = &FwVolHeader->FvBlockMap[0];\r
+      FvbMapEntry = &FwVolHeader->BlockMap[0];\r
       for (LbaIndex = 1; LbaIndex <= FvbMapEntry->NumBlocks; LbaIndex += 1) {\r
         if (Address < (FvbBaseAddress + FvbMapEntry->Length * LbaIndex)) {\r
           //\r
@@ -149,7 +149,7 @@ GetLbaAndOffsetByAddress (
           *Lba    = LbaIndex - 1;\r
           *Offset = (UINTN) (Address - (FvbBaseAddress + FvbMapEntry->Length * (LbaIndex - 1)));\r
           return EFI_SUCCESS;\r
-        }\r
+       }\r
       }\r
     }\r
   }\r