X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FVariableRuntimeDxe%2Freclaim.c;fp=MdeModulePkg%2FUniversal%2FVariableRuntimeDxe%2Freclaim.c;h=3ee37367d59fb152b9bdd38e77d3e7d6d7a318f5;hb=a190687a9786279c67459a7f5162fe50a1d0d5d7;hp=309d285e1ddd84e462c4ffd882b3f29a4d65ae64;hpb=318ace1ea6248ff3033f041d608b6b02f6059856;p=mirror_edk2.git

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