Import Usb/UsbBusDxe and Usb/UsbMassStorageDxe into MdeModulePkg.

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

diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c
index f6aa468e359d6ac4e917e0671b53c0b4e9304aa9..784a1987a8c3991fcf2702571e170b73a6a4ad45 100644 (file)
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c
@@ -21,8 +21,6 @@ Revision History
 \r
 \r
 #include "Variable.h"\r
-#include "reclaim.h"\r
-\r
 #include <Common/FlashMap.h>\r
 \r
 //\r
@@ -134,15 +132,15 @@ Returns:
   UINTN                       BlockIndex2;\r
   UINTN                       LinearOffset;\r
   UINTN                       CurrWriteSize;\r
-  UINTN                                 CurrWritePtr;\r
-  UINT8                                 *CurrBuffer;\r
-  EFI_LBA                               LbaNumber;\r
-  UINTN                                 Size;\r
-  FRAMEWORK_EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader;\r
-  VARIABLE_STORE_HEADER                 *VolatileBase;\r
-  EFI_PHYSICAL_ADDRESS                  FvVolHdr;\r
-  EFI_PHYSICAL_ADDRESS                  DataPtr;\r
-  EFI_STATUS                            Status;\r
+  UINTN                       CurrWritePtr;\r
+  UINT8                       *CurrBuffer;\r
+  EFI_LBA                     LbaNumber;\r
+  UINTN                       Size;\r
+  EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader;\r
+  VARIABLE_STORE_HEADER       *VolatileBase;\r
+  EFI_PHYSICAL_ADDRESS        FvVolHdr;\r
+  EFI_PHYSICAL_ADDRESS        DataPtr;\r
+  EFI_STATUS                  Status;\r
 \r
   FwVolHeader = NULL;\r
   DataPtr     = DataPtrIndex;\r
@@ -152,7 +150,7 @@ Returns:
   //\r
   if (!Volatile) {\r
     EfiFvbGetPhysicalAddress (Instance, &FvVolHdr);\r
-    FwVolHeader = (FRAMEWORK_EFI_FIRMWARE_VOLUME_HEADER *) ((UINTN) FvVolHdr);\r
+    FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) ((UINTN) FvVolHdr);\r
     //\r
     // Data Pointer should point to the actual Address where data is to be\r
     // written\r
@@ -198,7 +196,7 @@ Returns:
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  for (PtrBlockMapEntry = FwVolHeader->FvBlockMap; PtrBlockMapEntry->NumBlocks != 0; PtrBlockMapEntry++) {\r
+  for (PtrBlockMapEntry = FwVolHeader->BlockMap; PtrBlockMapEntry->NumBlocks != 0; PtrBlockMapEntry++) {\r
     for (BlockIndex2 = 0; BlockIndex2 < PtrBlockMapEntry->NumBlocks; BlockIndex2++) {\r
       //\r
       // Check to see if the Variable Writes are spanning through multiple\r