tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 23:54:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add the missing HEADER_ALIGN macro.

Browse Source 
Signed-off-by: niruiyu
Reviewed-by: erictian

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12597 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
niruiyu 2011-10-28 09:35:10 +00:00
parent 675253b4a4
commit d26727de5f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
View File

@ -268,7 +268,7 @@ GetEndPointer (
// //
// The end of variable store // The end of variable store
// //
return (VARIABLE_HEADER *) ((UINTN) VolHeader + VolHeader->Size); return (VARIABLE_HEADER *) HEADER_ALIGN (VolHeader + 1);
} }
/** /**
@ -990,9 +990,9 @@ UpdateVariable (
if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) { if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {
NonVolatileVarableStoreSize = ((VARIABLE_STORE_HEADER *)(UINTN)(Global->NonVolatileVariableBase))->Size; NonVolatileVarableStoreSize = ((VARIABLE_STORE_HEADER *)(UINTN)(Global->NonVolatileVariableBase))->Size;
if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0)
&& ((VarSize + mVariableModuleGlobal->HwErrVariableTotalSize) > PcdGet32 (PcdHwErrStorageSize))) && ((HEADER_ALIGN (VarSize) + mVariableModuleGlobal->HwErrVariableTotalSize) > PcdGet32 (PcdHwErrStorageSize)))
|| (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0) || (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0)
&& ((VarSize + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize)))) { && ((HEADER_ALIGN (VarSize) + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize)))) {
Status = EFI_OUT_OF_RESOURCES; Status = EFI_OUT_OF_RESOURCES;
goto Done; goto Done;
} }
@ -1007,7 +1007,7 @@ UpdateVariable (
mVariableModuleGlobal->CommonVariableTotalSize += HEADER_ALIGN (VarSize); mVariableModuleGlobal->CommonVariableTotalSize += HEADER_ALIGN (VarSize);
} }
} else { } else {
if ((UINT32) (VarSize + mVariableModuleGlobal->VolatileLastVariableOffset) > if ((UINT32) (HEADER_ALIGN (VarSize) + mVariableModuleGlobal->VolatileLastVariableOffset) >
((VARIABLE_STORE_HEADER *) ((UINTN) (Global->VolatileVariableBase)))->Size ((VARIABLE_STORE_HEADER *) ((UINTN) (Global->VolatileVariableBase)))->Size
) { ) {
Status = EFI_OUT_OF_RESOURCES; Status = EFI_OUT_OF_RESOURCES;
@ -1103,8 +1103,8 @@ FindVariable (
// Start Pointers for the variable. // Start Pointers for the variable.
// Actual Data Pointer where data can be written. // Actual Data Pointer where data can be written.
// //
Variable[0] = (VARIABLE_HEADER *) (VariableStoreHeader[0] + 1); Variable[0] = (VARIABLE_HEADER *) HEADER_ALIGN (VariableStoreHeader[0] + 1);
Variable[1] = (VARIABLE_HEADER *) (VariableStoreHeader[1] + 1); Variable[1] = (VARIABLE_HEADER *) HEADER_ALIGN (VariableStoreHeader[1] + 1);
if (VariableName[0] != 0 && VendorGuid == NULL) { if (VariableName[0] != 0 && VendorGuid == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -1113,7 +1113,7 @@ FindVariable (
// Find the variable by walk through non-volatile and volatile variable store // Find the variable by walk through non-volatile and volatile variable store
// //
for (Index = 0; Index < 2; Index++) { for (Index = 0; Index < 2; Index++) {
PtrTrack->StartPtr = (VARIABLE_HEADER *) (VariableStoreHeader[Index] + 1); PtrTrack->StartPtr = (VARIABLE_HEADER *) HEADER_ALIGN (VariableStoreHeader[Index] + 1);
PtrTrack->EndPtr = GetEndPointer (VariableStoreHeader[Index]); PtrTrack->EndPtr = GetEndPointer (VariableStoreHeader[Index]);
while ((Variable[Index] < GetEndPointer (VariableStoreHeader[Index])) && (Variable[Index] != NULL)) { while ((Variable[Index] < GetEndPointer (VariableStoreHeader[Index])) && (Variable[Index] != NULL)) {
@ -1282,7 +1282,7 @@ EmuGetNextVariableName (
if (Variable.CurrPtr >= Variable.EndPtr || Variable.CurrPtr == NULL) { if (Variable.CurrPtr >= Variable.EndPtr || Variable.CurrPtr == NULL) {
Variable.Volatile = (BOOLEAN) (Variable.Volatile ^ ((BOOLEAN) 0x1)); Variable.Volatile = (BOOLEAN) (Variable.Volatile ^ ((BOOLEAN) 0x1));
if (Variable.Volatile) { if (Variable.Volatile) {
Variable.StartPtr = (VARIABLE_HEADER *) ((UINTN) (Global->VolatileVariableBase + sizeof (VARIABLE_STORE_HEADER))); Variable.StartPtr = (VARIABLE_HEADER *) HEADER_ALIGN ((UINTN) (Global->VolatileVariableBase + sizeof (VARIABLE_STORE_HEADER)));
Variable.EndPtr = (VARIABLE_HEADER *) GetEndPointer ((VARIABLE_STORE_HEADER *) ((UINTN) Global->VolatileVariableBase)); Variable.EndPtr = (VARIABLE_HEADER *) GetEndPointer ((VARIABLE_STORE_HEADER *) ((UINTN) Global->VolatileVariableBase));
} else { } else {
Status = EFI_NOT_FOUND; Status = EFI_NOT_FOUND;
@ -1556,7 +1556,7 @@ EmuQueryVariableInfo (
// //
// Point to the starting address of the variables. // Point to the starting address of the variables.
// //
Variable = (VARIABLE_HEADER *) (VariableStoreHeader + 1); Variable = (VARIABLE_HEADER *) HEADER_ALIGN (VariableStoreHeader + 1);
// //
// Now walk through the related variable store. // Now walk through the related variable store.
@ -1701,7 +1701,7 @@ InitializeVariableStore (
// //
// Flush the HOB variable to Emulation Variable storage. // Flush the HOB variable to Emulation Variable storage.
// //
for ( Variable = (VARIABLE_HEADER *) (VariableStoreHeader + 1) for ( Variable = (VARIABLE_HEADER *) HEADER_ALIGN (VariableStoreHeader + 1)
; (Variable < GetEndPointer (VariableStoreHeader) && (Variable != NULL)) ; (Variable < GetEndPointer (VariableStoreHeader) && (Variable != NULL))
; Variable = GetNextVariablePtr (Variable) ; Variable = GetNextVariablePtr (Variable)
) { ) {