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
//\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
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