/*++\r
\r
-Copyright (c) 2006 - 2007, Intel Corporation\r
+Copyright (c) 2006 - 2010, Intel Corporation\r
All rights reserved. This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
//\r
VARIABLE_GLOBAL *mGlobal;\r
\r
+/**\r
+ Update the variable region with Variable information. These are the same \r
+ arguments as the EFI Variable services.\r
+\r
+ @param[in] VariableName Name of variable\r
+\r
+ @param[in] VendorGuid Guid of variable\r
+\r
+ @param[in] Data Variable data\r
+\r
+ @param[in] DataSize Size of data. 0 means delete\r
+\r
+ @param[in] Attributes Attribues of the variable\r
+\r
+ @param[in] Variable The variable information which is used to keep track of variable usage.\r
+\r
+ @retval EFI_SUCCESS The update operation is success.\r
+\r
+ @retval EFI_OUT_OF_RESOURCES Variable region is full, can not write other data into this region.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+UpdateVariable (\r
+ IN CHAR16 *VariableName,\r
+ IN EFI_GUID *VendorGuid,\r
+ IN VOID *Data,\r
+ IN UINTN DataSize,\r
+ IN UINT32 Attributes OPTIONAL,\r
+ IN VARIABLE_POINTER_TRACK *Variable\r
+ );\r
+\r
VOID\r
EFIAPI\r
OnVirtualAddressChangeFsv (\r
\r
--*/\r
{\r
- if (Variable == NULL ||\r
- Variable->StartId != VARIABLE_DATA ||\r
- (sizeof (VARIABLE_HEADER) + Variable->NameSize + Variable->DataSize) > FixedPcdGet32(PcdMaxVariableSize)\r
- ) {\r
+ if (Variable == NULL || Variable->StartId != VARIABLE_DATA) {\r
return FALSE;\r
}\r
\r
//\r
Variable = (VARIABLE_HEADER *) (VariableStoreHeader + 1);\r
\r
- \r
+ //\r
+ // recaluate the total size of Common/HwErr type variables in non-volatile area.\r
+ //\r
+ if (!StorageType) {\r
+ mGlobal->CommonVariableTotalSize = 0;\r
+ mGlobal->HwErrVariableTotalSize = 0;\r
+ }\r
//\r
// To make the reclaim, here we just allocate a memory that equal to the original memory\r
//\r
CopyMem (CurrPtr, (UINT8 *) Variable, VariableSize);\r
ValidBufferSize += VariableSize;\r
CurrPtr += VariableSize;\r
+ if ((!StorageType) && ((Variable->Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {\r
+ mGlobal->HwErrVariableTotalSize += VariableSize;\r
+ } else if ((!StorageType) && ((Variable->Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {\r
+ mGlobal->CommonVariableTotalSize += VariableSize;\r
+ }\r
} else if (Variable->State == (VAR_ADDED & VAR_IN_DELETED_TRANSITION)) {\r
//\r
// As variables that with the same guid and name may exist in NV due to power failure during SetVariable,\r
}\r
CurrPtr += VariableSize;\r
ValidBufferSize += VariableSize;\r
+ if ((!StorageType) && ((Variable->Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {\r
+ mGlobal->HwErrVariableTotalSize += VariableSize;\r
+ } else if ((!StorageType) && ((Variable->Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {\r
+ mGlobal->CommonVariableTotalSize += VariableSize;\r
+ }\r
}\r
}\r
Variable = NextVariable;\r
}\r
\r
+ mGlobal->LastVariableOffset[StorageType] = ValidBufferSize;\r
+\r
//\r
// TODO: cannot restore to original state, basic FTW needed\r
//\r
ValidBuffer\r
);\r
\r
- // ASSERT_EFI_ERROR (Status);\r
+ if (EFI_ERROR (Status)) {\r
+ //\r
+ // If error, then reset the last variable offset to zero.\r
+ //\r
+ mGlobal->LastVariableOffset[StorageType] = 0;\r
+ };\r
\r
- mGlobal->LastVariableOffset[StorageType] = ValidBufferSize;\r
gBS->FreePool (ValidBuffer);\r
\r
return Status;\r
PtrTrack->StartPtr = Variable;\r
PtrTrack->EndPtr = GetEndPointer (VariableStoreHeader);\r
\r
- while (IsValidVariableHeader (Variable) && (Variable < PtrTrack->EndPtr)) {\r
+ while ((Variable < PtrTrack->EndPtr) && IsValidVariableHeader (Variable)) {\r
if (Variable->State == VAR_ADDED) {\r
if (!EfiAtRuntime () || (Variable->Attributes & EFI_VARIABLE_RUNTIME_ACCESS)) {\r
if (VariableName[0] == 0) {\r
//\r
}\r
//\r
- // for (...)\r
+ // for (...)\r
+ //\r
+\r
+ //\r
+ // if VAR_IN_DELETED_TRANSITION found, and VAR_ADDED not found,\r
+ // we return it.\r
+ //\r
+ if (InDeleteVariable != NULL) {\r
+ PtrTrack->CurrPtr = InDeleteVariable;\r
+ PtrTrack->Type = (VARIABLE_STORAGE_TYPE) InDeleteIndex;\r
+ PtrTrack->StartPtr = InDeleteStartPtr;\r
+ PtrTrack->EndPtr = InDeleteEndPtr;\r
+ return EFI_SUCCESS;\r
+ }\r
+\r
+ PtrTrack->CurrPtr = NULL;\r
+ return EFI_NOT_FOUND;\r
+}\r
+\r
+/**\r
+ Get index from supported language codes according to language string.\r
+\r
+ This code is used to get corresponding index in supported language codes. It can handle\r
+ RFC4646 and ISO639 language tags.\r
+ In ISO639 language tags, take 3-characters as a delimitation to find matched string and calculate the index.\r
+ In RFC4646 language tags, take semicolon as a delimitation to find matched string and calculate the index.\r
+\r
+ For example:\r
+ SupportedLang = "engfraengfra"\r
+ Lang = "eng"\r
+ Iso639Language = TRUE\r
+ The return value is "0".\r
+ Another example:\r
+ SupportedLang = "en;fr;en-US;fr-FR"\r
+ Lang = "fr-FR"\r
+ Iso639Language = FALSE\r
+ The return value is "3".\r
+\r
+ @param SupportedLang Platform supported language codes.\r
+ @param Lang Configured language.\r
+ @param Iso639Language A bool value to signify if the handler is operated on ISO639 or RFC4646.\r
+\r
+ @retval the index of language in the language codes.\r
+\r
+**/\r
+UINTN\r
+EFIAPI\r
+GetIndexFromSupportedLangCodes(\r
+ IN CHAR8 *SupportedLang,\r
+ IN CHAR8 *Lang,\r
+ IN BOOLEAN Iso639Language\r
+ ) \r
+{\r
+ UINTN Index;\r
+ UINT32 CompareLength;\r
+ CHAR8 *Supported;\r
+\r
+ Index = 0;\r
+ Supported = SupportedLang;\r
+ if (Iso639Language) {\r
+ CompareLength = 3;\r
+ for (Index = 0; Index < AsciiStrLen (SupportedLang); Index += CompareLength) {\r
+ if (AsciiStrnCmp (Lang, SupportedLang + Index, CompareLength) == 0) {\r
+ //\r
+ // Successfully find the index of Lang string in SupportedLang string.\r
+ //\r
+ Index = Index / CompareLength;\r
+ return Index;\r
+ }\r
+ }\r
+ ASSERT (FALSE);\r
+ return 0;\r
+ } else {\r
+ //\r
+ // Compare RFC4646 language code\r
+ //\r
+ while (*Supported != '\0') {\r
+ //\r
+ // take semicolon as delimitation, sequentially traverse supported language codes.\r
+ //\r
+ for (CompareLength = 0; *Supported != ';' && *Supported != '\0'; CompareLength++) {\r
+ Supported++;\r
+ }\r
+ if (AsciiStrnCmp (Lang, Supported - CompareLength, CompareLength) == 0) {\r
+ //\r
+ // Successfully find the index of Lang string in SupportedLang string.\r
+ //\r
+ return Index;\r
+ }\r
+ Index++;\r
+ }\r
+ ASSERT (FALSE);\r
+ return 0;\r
+ }\r
+}\r
+\r
+/**\r
+ Get language string from supported language codes according to index.\r
+\r
+ This code is used to get corresponding language string in supported language codes. It can handle\r
+ RFC4646 and ISO639 language tags.\r
+ In ISO639 language tags, take 3-characters as a delimitation. Find language string according to the index.\r
+ In RFC4646 language tags, take semicolon as a delimitation. Find language string according to the index.\r
+\r
+ For example:\r
+ SupportedLang = "engfraengfra"\r
+ Index = "1"\r
+ Iso639Language = TRUE\r
+ The return value is "fra".\r
+ Another example:\r
+ SupportedLang = "en;fr;en-US;fr-FR"\r
+ Index = "1"\r
+ Iso639Language = FALSE\r
+ The return value is "fr".\r
+\r
+ @param SupportedLang Platform supported language codes.\r
+ @param Index the index in supported language codes.\r
+ @param Iso639Language A bool value to signify if the handler is operated on ISO639 or RFC4646.\r
+\r
+ @retval the language string in the language codes.\r
+\r
+**/\r
+CHAR8 *\r
+EFIAPI\r
+GetLangFromSupportedLangCodes (\r
+ IN CHAR8 *SupportedLang,\r
+ IN UINTN Index,\r
+ IN BOOLEAN Iso639Language\r
+)\r
+{\r
+ UINTN SubIndex;\r
+ UINT32 CompareLength;\r
+ CHAR8 *Supported;\r
+\r
+ SubIndex = 0;\r
+ Supported = SupportedLang;\r
+ if (Iso639Language) {\r
+ //\r
+ // according to the index of Lang string in SupportedLang string to get the language.\r
+ // As this code will be invoked in RUNTIME, therefore there is not memory allocate/free operation.\r
+ // In driver entry, it pre-allocates a runtime attribute memory to accommodate this string.\r
+ //\r
+ CompareLength = 3;\r
+ SetMem (mGlobal->Lang, sizeof(mGlobal->Lang), 0);\r
+ return CopyMem (mGlobal->Lang, SupportedLang + Index * CompareLength, CompareLength);\r
+ \r
+ } else {\r
+ while (TRUE) {\r
+ //\r
+ // take semicolon as delimitation, sequentially traverse supported language codes.\r
+ //\r
+ for (CompareLength = 0; *Supported != ';' && *Supported != '\0'; CompareLength++) {\r
+ Supported++;\r
+ }\r
+ if ((*Supported == '\0') && (SubIndex != Index)) {\r
+ //\r
+ // Have completed the traverse, but not find corrsponding string.\r
+ // This case is not allowed to happen.\r
+ //\r
+ ASSERT(FALSE);\r
+ return NULL;\r
+ }\r
+ if (SubIndex == Index) {\r
+ //\r
+ // according to the index of Lang string in SupportedLang string to get the language.\r
+ // As this code will be invoked in RUNTIME, therefore there is not memory allocate/free operation.\r
+ // In driver entry, it pre-allocates a runtime attribute memory to accommodate this string.\r
+ //\r
+ SetMem (mGlobal->PlatformLang, sizeof (mGlobal->PlatformLang), 0);\r
+ return CopyMem (mGlobal->PlatformLang, Supported - CompareLength, CompareLength);\r
+ }\r
+ SubIndex++;\r
+ }\r
+ }\r
+}\r
+\r
+/**\r
+ Hook the operations in PlatformLangCodes, LangCodes, PlatformLang and Lang.\r
+\r
+ When setting Lang/LangCodes, simultaneously update PlatformLang/PlatformLangCodes.\r
+\r
+ According to UEFI spec, PlatformLangCodes/LangCodes are only set once in firmware initialization,\r
+ and are read-only. Therefore, in variable driver, only store the original value for other use.\r
+\r
+ @param[in] VariableName Name of variable\r
+\r
+ @param[in] Data Variable data\r
+\r
+ @param[in] DataSize Size of data. 0 means delete\r
+\r
+ @retval EFI_SUCCESS auto update operation is successful.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+AutoUpdateLangVariable(\r
+ IN CHAR16 *VariableName,\r
+ IN VOID *Data,\r
+ IN UINTN DataSize\r
+ )\r
+{\r
+ EFI_STATUS Status;\r
+ CHAR8 *BestPlatformLang;\r
+ CHAR8 *BestLang;\r
+ UINTN Index;\r
+ UINT32 Attributes;\r
+ VARIABLE_POINTER_TRACK Variable;\r
+\r
+ //\r
+ // According to UEFI spec, "Lang" and "PlatformLang" is NV|BS|RT attributions.\r
+ //\r
+ Attributes = EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS;\r
+\r
+ if (StrCmp (VariableName, L"PlatformLangCodes") == 0) {\r
+ //\r
+ // According to UEFI spec, PlatformLangCodes is only set once in firmware initialization, and is read-only\r
+ // Therefore, in variable driver, only store the original value for other use.\r
+ //\r
+ AsciiStrnCpy (mGlobal->PlatformLangCodes, Data, DataSize);\r
+ } else if (StrCmp (VariableName, L"LangCodes") == 0) {\r
+ //\r
+ // According to UEFI spec, LangCodes is only set once in firmware initialization, and is read-only\r
+ // Therefore, in variable driver, only store the original value for other use.\r
+ //\r
+ AsciiStrnCpy (mGlobal->LangCodes, Data, DataSize);\r
+ } else if ((StrCmp (VariableName, L"PlatformLang") == 0) && (DataSize != 0)) {\r
+ ASSERT (AsciiStrLen (mGlobal->PlatformLangCodes) != 0);\r
+\r
+ //\r
+ // When setting PlatformLang, firstly get most matched language string from supported language codes.\r
+ //\r
+ BestPlatformLang = GetBestLanguage(mGlobal->PlatformLangCodes, FALSE, Data, NULL);\r
+\r
+ //\r
+ // Get the corresponding index in language codes.\r
+ //\r
+ Index = GetIndexFromSupportedLangCodes(mGlobal->PlatformLangCodes, BestPlatformLang, FALSE);\r
+\r
+ //\r
+ // Get the corresponding ISO639 language tag according to RFC4646 language tag.\r
+ //\r
+ BestLang = GetLangFromSupportedLangCodes(mGlobal->LangCodes, Index, TRUE);\r
+\r
+ //\r
+ // Successfully convert PlatformLang to Lang, and set the BestLang value into Lang variable simultaneously.\r
+ //\r
+ FindVariable(L"Lang", &gEfiGlobalVariableGuid, &Variable);\r
+\r
+ Status = UpdateVariable(L"Lang", &gEfiGlobalVariableGuid, \r
+ BestLang, ISO_639_2_ENTRY_SIZE + 1, Attributes, &Variable);\r
+\r
+ DEBUG((EFI_D_INFO, "Variable Driver Auto Update PlatformLang, PlatformLang:%a, Lang:%a\n", BestPlatformLang, BestLang));\r
+\r
+ ASSERT_EFI_ERROR(Status);\r
+ \r
+ } else if ((StrCmp (VariableName, L"Lang") == 0) && (DataSize != 0)) {\r
+ ASSERT (AsciiStrLen (mGlobal->LangCodes) != 0);\r
+\r
+ //\r
+ // When setting Lang, firstly get most matched language string from supported language codes.\r
+ //\r
+ BestLang = GetBestLanguage(mGlobal->LangCodes, TRUE, Data, NULL);\r
+\r
+ //\r
+ // Get the corresponding index in language codes.\r
+ //\r
+ Index = GetIndexFromSupportedLangCodes(mGlobal->LangCodes, BestLang, TRUE);\r
+\r
+ //\r
+ // Get the corresponding RFC4646 language tag according to ISO639 language tag.\r
+ //\r
+ BestPlatformLang = GetLangFromSupportedLangCodes(mGlobal->PlatformLangCodes, Index, FALSE);\r
+\r
+ //\r
+ // Successfully convert Lang to PlatformLang, and set the BestPlatformLang value into PlatformLang variable simultaneously.\r
+ //\r
+ FindVariable(L"PlatformLang", &gEfiGlobalVariableGuid, &Variable);\r
+\r
+ Status = UpdateVariable(L"PlatformLang", &gEfiGlobalVariableGuid, \r
+ BestPlatformLang, AsciiStrSize (BestPlatformLang), Attributes, &Variable);\r
+\r
+ DEBUG((EFI_D_INFO, "Variable Driver Auto Update Lang, Lang:%a, PlatformLang:%a\n", BestLang, BestPlatformLang));\r
+ ASSERT_EFI_ERROR(Status);\r
+ }\r
+ return EFI_SUCCESS;\r
+}\r
+\r
+/**\r
+ Update the variable region with Variable information. These are the same \r
+ arguments as the EFI Variable services.\r
+\r
+ @param[in] VariableName Name of variable\r
+\r
+ @param[in] VendorGuid Guid of variable\r
+\r
+ @param[in] Data Variable data\r
+\r
+ @param[in] DataSize Size of data. 0 means delete\r
+\r
+ @param[in] Attributes Attribues of the variable\r
+\r
+ @param[in] Variable The variable information which is used to keep track of variable usage.\r
+\r
+ @retval EFI_SUCCESS The update operation is success.\r
+\r
+ @retval EFI_OUT_OF_RESOURCES Variable region is full, can not write other data into this region.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+UpdateVariable (\r
+ IN CHAR16 *VariableName,\r
+ IN EFI_GUID *VendorGuid,\r
+ IN VOID *Data,\r
+ IN UINTN DataSize,\r
+ IN UINT32 Attributes OPTIONAL,\r
+ IN VARIABLE_POINTER_TRACK *Variable\r
+ )\r
+{\r
+ EFI_STATUS Status;\r
+ VARIABLE_HEADER *NextVariable;\r
+ UINTN VarNameOffset;\r
+ UINTN VarDataOffset;\r
+ UINTN VarNameSize;\r
+ UINTN VarSize;\r
+ UINT8 State;\r
+ BOOLEAN Reclaimed;\r
+ VARIABLE_STORAGE_TYPE StorageType;\r
+\r
+ Reclaimed = FALSE;\r
+\r
+ if (Variable->CurrPtr != NULL) { \r
+ //\r
+ // Update/Delete existing variable\r
+ //\r
+ \r
+ if (EfiAtRuntime ()) { \r
+ //\r
+ // If EfiAtRuntime and the variable is Volatile and Runtime Access, \r
+ // the volatile is ReadOnly, and SetVariable should be aborted and \r
+ // return EFI_WRITE_PROTECTED.\r
+ //\r
+ if (Variable->Type == Volatile) {\r
+ return EFI_WRITE_PROTECTED;\r
+ }\r
+ //\r
+ // Only variable have NV attribute can be updated/deleted in Runtime\r
+ //\r
+ if (!(Variable->CurrPtr->Attributes & EFI_VARIABLE_NON_VOLATILE)) {\r
+ return EFI_INVALID_PARAMETER; \r
+ }\r
+ }\r
+ \r
+ //\r
+ // Setting a data variable with no access, or zero DataSize attributes\r
+ // specified causes it to be deleted.\r
+ //\r
+ if (DataSize == 0 || (Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == 0) {\r
+ //\r
+ // Found this variable in storage\r
+ //\r
+ State = Variable->CurrPtr->State;\r
+ State &= VAR_DELETED;\r
+\r
+ Status = mGlobal->VariableStore[Variable->Type]->Write (\r
+ mGlobal->VariableStore[Variable->Type],\r
+ VARIABLE_MEMBER_OFFSET (State, (UINTN) Variable->CurrPtr - (UINTN) Variable->StartPtr),\r
+ sizeof (Variable->CurrPtr->State),\r
+ &State\r
+ );\r
+ //\r
+ // NOTE: Write operation at least can write data to memory cache\r
+ // Discard file writing failure here.\r
+ //\r
+ return EFI_SUCCESS;\r
+ }\r
+ \r
+ //\r
+ // Found this variable in storage\r
+ // If the variable is marked valid and the same data has been passed in\r
+ // then return to the caller immediately.\r
+ //\r
+ if ((Variable->CurrPtr->DataSize == DataSize) &&\r
+ (CompareMem (Data, GetVariableDataPtr (Variable->CurrPtr), DataSize) == 0)\r
+ ) {\r
+ return EFI_SUCCESS;\r
+ } else if ((Variable->CurrPtr->State == VAR_ADDED) ||\r
+ (Variable->CurrPtr->State == (VAR_ADDED & VAR_IN_DELETED_TRANSITION))) {\r
+ //\r
+ // Mark the old variable as in delete transition\r
+ //\r
+ State = Variable->CurrPtr->State;\r
+ State &= VAR_IN_DELETED_TRANSITION;\r
+\r
+ Status = mGlobal->VariableStore[Variable->Type]->Write (\r
+ mGlobal->VariableStore[Variable->Type],\r
+ VARIABLE_MEMBER_OFFSET (State, (UINTN) Variable->CurrPtr - (UINTN) Variable->StartPtr),\r
+ sizeof (Variable->CurrPtr->State),\r
+ &State\r
+ );\r
+ //\r
+ // NOTE: Write operation at least can write data to memory cache\r
+ // Discard file writing failure here.\r
+ //\r
+ }\r
+ } else {\r
+ //\r
+ // Create a new variable\r
+ // \r
+ \r
+ //\r
+ // Make sure we are trying to create a new variable.\r
+ // Setting a data variable with no access, or zero DataSize attributes means to delete it. \r
+ //\r
+ if (DataSize == 0 || (Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == 0) {\r
+ return EFI_NOT_FOUND;\r
+ } \r
+ //\r
+ // Only variable have NV|RT attribute can be created in Runtime\r
+ //\r
+ if (EfiAtRuntime () &&\r
+ (!(Attributes & EFI_VARIABLE_RUNTIME_ACCESS) || !(Attributes & EFI_VARIABLE_NON_VOLATILE))) {\r
+ return EFI_INVALID_PARAMETER;\r
+ } \r
+ \r
+ } \r
+\r
+ //\r
+ // Function part - create a new variable and copy the data.\r
+ // Both update a variable and create a variable will come here. \r
+ // We can firstly write all the data in memory, then write them to file\r
+ // This can reduce the times of write operation\r
+ //\r
+ \r
+ NextVariable = (VARIABLE_HEADER *) mGlobal->Scratch;\r
+\r
+ NextVariable->StartId = VARIABLE_DATA;\r
+ NextVariable->Attributes = Attributes;\r
+ NextVariable->State = VAR_ADDED;\r
+ NextVariable->Reserved = 0;\r
+ VarNameOffset = sizeof (VARIABLE_HEADER);\r
+ VarNameSize = StrSize (VariableName);\r
+ CopyMem (\r
+ (UINT8 *) ((UINTN) NextVariable + VarNameOffset),\r
+ VariableName,\r
+ VarNameSize\r
+ );\r
+ VarDataOffset = VarNameOffset + VarNameSize + GET_PAD_SIZE (VarNameSize);\r
+ CopyMem (\r
+ (UINT8 *) ((UINTN) NextVariable + VarDataOffset),\r
+ Data,\r
+ DataSize\r
+ );\r
+ CopyMem (&NextVariable->VendorGuid, VendorGuid, sizeof (EFI_GUID));\r
+ //\r
+ // There will be pad bytes after Data, the NextVariable->NameSize and\r
+ // NextVariable->DataSize should not include pad size so that variable\r
+ // service can get actual size in GetVariable\r
+ //\r
+ NextVariable->NameSize = (UINT32)VarNameSize;\r
+ NextVariable->DataSize = (UINT32)DataSize;\r
+\r
+ //\r
+ // The actual size of the variable that stores in storage should\r
+ // include pad size.\r
+ // VarDataOffset: offset from begin of current variable header\r
+ //\r
+ VarSize = VarDataOffset + DataSize + GET_PAD_SIZE (DataSize);\r
+\r
+ StorageType = (Attributes & EFI_VARIABLE_NON_VOLATILE) ? NonVolatile : Volatile;\r
+\r
+ if ((UINT32) (VarSize + mGlobal->LastVariableOffset[StorageType]) >\r
+ ((VARIABLE_STORE_HEADER *) mGlobal->VariableBase[StorageType])->Size\r
+ ) {\r
+ if ((StorageType == NonVolatile) && EfiAtRuntime ()) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
+ //\r
+ // Perform garbage collection & reclaim operation\r
+ //\r
+ Status = Reclaim (StorageType, Variable->CurrPtr);\r
+ if (EFI_ERROR (Status)) {\r
+ //\r
+ // Reclaim error\r
+ // we cannot restore to original state, fetal error, report to user\r
+ //\r
+ DEBUG ((EFI_D_ERROR, "FSVariable: Recalim error (fetal error) - %r\n", Status));\r
+ return Status;\r
+ }\r
+ //\r
+ // If still no enough space, return out of resources\r
+ //\r
+ if ((UINT32) (VarSize + mGlobal->LastVariableOffset[StorageType]) >\r
+ ((VARIABLE_STORE_HEADER *) mGlobal->VariableBase[StorageType])->Size\r
+ ) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
+\r
+ Reclaimed = TRUE;\r
+ }\r
+ Status = mGlobal->VariableStore[StorageType]->Write (\r
+ mGlobal->VariableStore[StorageType],\r
+ mGlobal->LastVariableOffset[StorageType],\r
+ VarSize,\r
+ NextVariable\r
+ );\r
+ //\r
+ // NOTE: Write operation at least can write data to memory cache\r
+ // Discard file writing failure here.\r
//\r
+ mGlobal->LastVariableOffset[StorageType] += VarSize;\r
+\r
+ if ((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) {\r
+ mGlobal->HwErrVariableTotalSize += VarSize;\r
+ } else {\r
+ mGlobal->CommonVariableTotalSize += VarSize;\r
+ }\r
\r
//\r
- // if VAR_IN_DELETED_TRANSITION found, and VAR_ADDED not found,\r
- // we return it.\r
+ // Mark the old variable as deleted\r
//\r
- if (InDeleteVariable != NULL) {\r
- PtrTrack->CurrPtr = InDeleteVariable;\r
- PtrTrack->Type = (VARIABLE_STORAGE_TYPE) InDeleteIndex;\r
- PtrTrack->StartPtr = InDeleteStartPtr;\r
- PtrTrack->EndPtr = InDeleteEndPtr;\r
- return EFI_SUCCESS;\r
- }\r
+ if (!Reclaimed && !EFI_ERROR (Status) && Variable->CurrPtr != NULL) {\r
+ State = Variable->CurrPtr->State;\r
+ State &= VAR_DELETED;\r
\r
- PtrTrack->CurrPtr = NULL;\r
- return EFI_NOT_FOUND;\r
+ Status = mGlobal->VariableStore[StorageType]->Write (\r
+ mGlobal->VariableStore[StorageType],\r
+ VARIABLE_MEMBER_OFFSET (State, (UINTN) Variable->CurrPtr - (UINTN) Variable->StartPtr),\r
+ sizeof (Variable->CurrPtr->State),\r
+ &State\r
+ );\r
+ //\r
+ // NOTE: Write operation at least can write data to memory cache\r
+ // Discard file writing failure here.\r
+ //\r
+ }\r
+ return EFI_SUCCESS;\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
-GetVariable (\r
+DuetGetVariable (\r
IN CHAR16 *VariableName,\r
IN EFI_GUID *VendorGuid,\r
OUT UINT32 *Attributes OPTIONAL,\r
{\r
VARIABLE_POINTER_TRACK Variable;\r
EFI_STATUS Status;\r
- VARIABLE_HEADER *NextVariable;\r
- UINTN VarNameSize;\r
- UINTN VarNameOffset;\r
- UINTN VarDataOffset;\r
- UINTN VarSize;\r
- UINT8 State;\r
- BOOLEAN Reclaimed;\r
- VARIABLE_STORAGE_TYPE StorageType;\r
-\r
- Reclaimed = FALSE;\r
- \r
+\r
//\r
// Check input parameters\r
// \r
-\r
if (VariableName == NULL || VariableName[0] == 0 || VendorGuid == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
+ if (DataSize != 0 && Data == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
//\r
// Make sure if runtime bit is set, boot service bit is set also\r
//\r
\r
//\r
// The size of the VariableName, including the Unicode Null in bytes plus\r
- // the DataSize is limited to maximum size of FixedPcdGet32(PcdMaxHardwareErrorVariableSize)\r
- // bytes for HwErrRec, and FixedPcdGet32(PcdMaxVariableSize) bytes for the others.\r
+ // the DataSize is limited to maximum size of PcdGet32 (PcdMaxHardwareErrorVariableSize)\r
+ // bytes for HwErrRec, and PcdGet32 (PcdMaxVariableSize) bytes for the others.\r
//\r
if ((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == EFI_VARIABLE_HARDWARE_ERROR_RECORD) {\r
- if ((DataSize > FixedPcdGet32(PcdMaxHardwareErrorVariableSize)) || \r
- (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > FixedPcdGet32(PcdMaxHardwareErrorVariableSize))) {\r
+ if ((DataSize > PcdGet32(PcdMaxHardwareErrorVariableSize)) || \r
+ (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > PcdGet32(PcdMaxHardwareErrorVariableSize))) {\r
return EFI_INVALID_PARAMETER;\r
- } \r
+ }\r
+ //\r
+ // According to UEFI spec, HARDWARE_ERROR_RECORD variable name convention should be L"HwErrRecXXXX"\r
+ //\r
+ if (StrnCmp(VariableName, L"HwErrRec", StrLen(L"HwErrRec")) != 0) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
} else {\r
- if ((DataSize > FixedPcdGet32(PcdMaxVariableSize)) ||\r
- (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > FixedPcdGet32(PcdMaxVariableSize))) {\r
+ if ((DataSize > PcdGet32(PcdMaxVariableSize)) ||\r
+ (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > PcdGet32(PcdMaxVariableSize))) {\r
return EFI_INVALID_PARAMETER;\r
} \r
} \r
//\r
// Check whether the input variable is already existed\r
//\r
-\r
Status = FindVariable (VariableName, VendorGuid, &Variable);\r
\r
- if (Status == EFI_SUCCESS && Variable.CurrPtr != NULL) { \r
- //\r
- // Update/Delete existing variable\r
- //\r
- \r
- if (EfiAtRuntime ()) { \r
- //\r
- // If EfiAtRuntime and the variable is Volatile and Runtime Access, \r
- // the volatile is ReadOnly, and SetVariable should be aborted and \r
- // return EFI_WRITE_PROTECTED.\r
- //\r
- if (Variable.Type == Volatile) {\r
- return EFI_WRITE_PROTECTED;\r
- }\r
- //\r
- // Only variable have NV attribute can be updated/deleted in Runtime\r
- //\r
- if (!(Variable.CurrPtr->Attributes & EFI_VARIABLE_NON_VOLATILE)) {\r
- return EFI_INVALID_PARAMETER; \r
- }\r
- }\r
- \r
- //\r
- // Setting a data variable with no access, or zero DataSize attributes\r
- // specified causes it to be deleted.\r
- //\r
- if (DataSize == 0 || (Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == 0) {\r
- //\r
- // Found this variable in storage\r
- //\r
- State = Variable.CurrPtr->State;\r
- State &= VAR_DELETED;\r
-\r
- Status = mGlobal->VariableStore[Variable.Type]->Write (\r
- mGlobal->VariableStore[Variable.Type],\r
- VARIABLE_MEMBER_OFFSET (State, (UINTN) Variable.CurrPtr - (UINTN) Variable.StartPtr),\r
- sizeof (Variable.CurrPtr->State),\r
- &State\r
- );\r
- //\r
- // NOTE: Write operation at least can write data to memory cache\r
- // Discard file writing failure here.\r
- //\r
- return EFI_SUCCESS;\r
- }\r
- \r
- //\r
- // Found this variable in storage\r
- // If the variable is marked valid and the same data has been passed in\r
- // then return to the caller immediately.\r
- //\r
- if ((Variable.CurrPtr->DataSize == DataSize) &&\r
- (CompareMem (Data, GetVariableDataPtr (Variable.CurrPtr), DataSize) == 0)\r
- ) {\r
- return EFI_SUCCESS;\r
- } else if ((Variable.CurrPtr->State == VAR_ADDED) ||\r
- (Variable.CurrPtr->State == (VAR_ADDED & VAR_IN_DELETED_TRANSITION))) {\r
- //\r
- // Mark the old variable as in delete transition\r
- //\r
- State = Variable.CurrPtr->State;\r
- State &= VAR_IN_DELETED_TRANSITION;\r
-\r
- Status = mGlobal->VariableStore[Variable.Type]->Write (\r
- mGlobal->VariableStore[Variable.Type],\r
- VARIABLE_MEMBER_OFFSET (State, (UINTN) Variable.CurrPtr - (UINTN) Variable.StartPtr),\r
- sizeof (Variable.CurrPtr->State),\r
- &State\r
- );\r
- //\r
- // NOTE: Write operation at least can write data to memory cache\r
- // Discard file writing failure here.\r
- //\r
- }\r
- } else if (Status == EFI_NOT_FOUND) {\r
- //\r
- // Create a new variable\r
- // \r
- \r
- //\r
- // Make sure we are trying to create a new variable.\r
- // Setting a data variable with no access, or zero DataSize attributes means to delete it. \r
- //\r
- if (DataSize == 0 || (Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == 0) {\r
- return EFI_NOT_FOUND;\r
- } \r
- //\r
- // Only variable have NV|RT attribute can be created in Runtime\r
- //\r
- if (EfiAtRuntime () &&\r
- (!(Attributes & EFI_VARIABLE_RUNTIME_ACCESS) || !(Attributes & EFI_VARIABLE_NON_VOLATILE))) {\r
- return EFI_INVALID_PARAMETER;\r
- } \r
- \r
- } else {\r
- //\r
- // Status should be EFI_INVALID_PARAMETER here according to return status of FindVariable().\r
- //\r
- return Status;\r
- } \r
-\r
//\r
- // Function part - create a new variable and copy the data.\r
- // Both update a variable and create a variable will come here. \r
- // We can firstly write all the data in memory, then write them to file\r
- // This can reduce the times of write operation\r
- //\r
- \r
- NextVariable = (VARIABLE_HEADER *) mGlobal->Scratch;\r
-\r
- NextVariable->StartId = VARIABLE_DATA;\r
- NextVariable->Attributes = Attributes;\r
- NextVariable->State = VAR_ADDED;\r
- NextVariable->Reserved = 0;\r
- VarNameOffset = sizeof (VARIABLE_HEADER);\r
- VarNameSize = StrSize (VariableName);\r
- CopyMem (\r
- (UINT8 *) ((UINTN) NextVariable + VarNameOffset),\r
- VariableName,\r
- VarNameSize\r
- );\r
- VarDataOffset = VarNameOffset + VarNameSize + GET_PAD_SIZE (VarNameSize);\r
- CopyMem (\r
- (UINT8 *) ((UINTN) NextVariable + VarDataOffset),\r
- Data,\r
- DataSize\r
- );\r
- CopyMem (&NextVariable->VendorGuid, VendorGuid, sizeof (EFI_GUID));\r
- //\r
- // There will be pad bytes after Data, the NextVariable->NameSize and\r
- // NextVariable->DataSize should not include pad size so that variable\r
- // service can get actual size in GetVariable\r
- //\r
- NextVariable->NameSize = (UINT32)VarNameSize;\r
- NextVariable->DataSize = (UINT32)DataSize;\r
-\r
- //\r
- // The actual size of the variable that stores in storage should\r
- // include pad size.\r
- // VarDataOffset: offset from begin of current variable header\r
- //\r
- VarSize = VarDataOffset + DataSize + GET_PAD_SIZE (DataSize);\r
-\r
- StorageType = (Attributes & EFI_VARIABLE_NON_VOLATILE) ? NonVolatile : Volatile;\r
-\r
- if ((UINT32) (VarSize + mGlobal->LastVariableOffset[StorageType]) >\r
- ((VARIABLE_STORE_HEADER *) mGlobal->VariableBase[StorageType])->Size\r
- ) {\r
- if ((StorageType == NonVolatile) && EfiAtRuntime ()) {\r
- return EFI_OUT_OF_RESOURCES;\r
- }\r
- //\r
- // Perform garbage collection & reclaim operation\r
- //\r
- Status = Reclaim (StorageType, Variable.CurrPtr);\r
- if (EFI_ERROR (Status)) {\r
- //\r
- // Reclaim error\r
- // we cannot restore to original state, fetal error, report to user\r
- //\r
- DEBUG ((EFI_D_ERROR, "FSVariable: Recalim error (fetal error) - %r\n", Status));\r
- return Status;\r
- }\r
- //\r
- // If still no enough space, return out of resources\r
- //\r
- if ((UINT32) (VarSize + mGlobal->LastVariableOffset[StorageType]) >\r
- ((VARIABLE_STORE_HEADER *) mGlobal->VariableBase[StorageType])->Size\r
- ) {\r
- return EFI_OUT_OF_RESOURCES;\r
- }\r
-\r
- Reclaimed = TRUE;\r
- }\r
- Status = mGlobal->VariableStore[StorageType]->Write (\r
- mGlobal->VariableStore[StorageType],\r
- mGlobal->LastVariableOffset[StorageType],\r
- VarSize,\r
- NextVariable\r
- );\r
- //\r
- // NOTE: Write operation at least can write data to memory cache\r
- // Discard file writing failure here.\r
+ // Hook the operation of setting PlatformLangCodes/PlatformLang and LangCodes/Lang\r
//\r
- mGlobal->LastVariableOffset[StorageType] += VarSize;\r
-\r
- //\r
- // Mark the old variable as deleted\r
- //\r
- if (!Reclaimed && !EFI_ERROR (Status) && Variable.CurrPtr != NULL) {\r
- State = Variable.CurrPtr->State;\r
- State &= VAR_DELETED;\r
+ AutoUpdateLangVariable (VariableName, Data, DataSize);\r
\r
- Status = mGlobal->VariableStore[StorageType]->Write (\r
- mGlobal->VariableStore[StorageType],\r
- VARIABLE_MEMBER_OFFSET (State, (UINTN) Variable.CurrPtr - (UINTN) Variable.StartPtr),\r
- sizeof (Variable.CurrPtr->State),\r
- &State\r
- );\r
- //\r
- // NOTE: Write operation at least can write data to memory cache\r
- // Discard file writing failure here.\r
- //\r
- }\r
+ Status = UpdateVariable (VariableName, VendorGuid, Data, DataSize, Attributes, &Variable);\r
\r
- return EFI_SUCCESS;\r
+ return Status;\r
}\r
\r
EFI_STATUS\r
VARIABLE_HEADER *NextVariable;\r
UINT64 VariableSize;\r
VARIABLE_STORE_HEADER *VariableStoreHeader;\r
+ UINT64 CommonVariableTotalSize;\r
+ UINT64 HwErrVariableTotalSize;\r
+\r
+ CommonVariableTotalSize = 0;\r
+ HwErrVariableTotalSize = 0;\r
\r
if(MaximumVariableStorageSize == NULL || RemainingVariableStorageSize == NULL || MaximumVariableSize == NULL || Attributes == 0) {\r
return EFI_INVALID_PARAMETER;\r
// Make sure RT Attribute is set if we are in Runtime phase.\r
//\r
return EFI_INVALID_PARAMETER;\r
- } \r
+ } else if ((Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) == EFI_VARIABLE_HARDWARE_ERROR_RECORD) {\r
+ //\r
+ // Make sure Hw Attribute is set with NV.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
\r
VariableStoreHeader = (VARIABLE_STORE_HEADER *) mGlobal->VariableBase[\r
(Attributes & EFI_VARIABLE_NON_VOLATILE) ? NonVolatile : Volatile\r
// with the storage size (excluding the storage header size).\r
//\r
*MaximumVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER);\r
- *RemainingVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER);\r
-\r
- //\r
- // Let *MaximumVariableSize be FixedPcdGet32(PcdMaxVariableSize) with the exception of the variable header size.\r
- //\r
- *MaximumVariableSize = FixedPcdGet32(PcdMaxVariableSize) - sizeof (VARIABLE_HEADER);\r
\r
//\r
// Harware error record variable needs larger size.\r
//\r
- if ((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == EFI_VARIABLE_HARDWARE_ERROR_RECORD) {\r
- *MaximumVariableSize = FixedPcdGet32(PcdMaxHardwareErrorVariableSize) - sizeof (VARIABLE_HEADER);\r
+ if ((Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) == (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {\r
+ *MaximumVariableStorageSize = PcdGet32(PcdHwErrStorageSize);\r
+ *MaximumVariableSize = PcdGet32(PcdMaxHardwareErrorVariableSize) - sizeof (VARIABLE_HEADER);\r
+ } else {\r
+ if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {\r
+ ASSERT (PcdGet32(PcdHwErrStorageSize) < VariableStoreHeader->Size);\r
+ *MaximumVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER) - PcdGet32(PcdHwErrStorageSize);\r
+ }\r
+\r
+ //\r
+ // Let *MaximumVariableSize be PcdGet32(PcdMaxVariableSize) with the exception of the variable header size.\r
+ //\r
+ *MaximumVariableSize = PcdGet32(PcdMaxVariableSize) - sizeof (VARIABLE_HEADER);\r
}\r
\r
//\r
//\r
// Now walk through the related variable store.\r
//\r
- while (IsValidVariableHeader (Variable) && (Variable < GetEndPointer (VariableStoreHeader))) {\r
+ while ((Variable < GetEndPointer (VariableStoreHeader)) && IsValidVariableHeader (Variable)) {\r
NextVariable = GetNextVariablePtr (Variable);\r
VariableSize = (UINT64) (UINTN) NextVariable - (UINT64) (UINTN) Variable;\r
\r
// since the space occupied by variables not marked with\r
// VAR_ADDED is not allowed to be reclaimed in Runtime.\r
//\r
- *RemainingVariableStorageSize -= VariableSize;\r
+ if ((NextVariable->Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == EFI_VARIABLE_HARDWARE_ERROR_RECORD) {\r
+ HwErrVariableTotalSize += VariableSize;\r
+ } else {\r
+ CommonVariableTotalSize += VariableSize;\r
+ }\r
} else {\r
//\r
// Only care about Variables with State VAR_ADDED,because\r
// the space not marked as VAR_ADDED is reclaimable now.\r
//\r
- if ((Variable->State == VAR_ADDED) ||\r
- (Variable->State == (VAR_ADDED & VAR_IN_DELETED_TRANSITION))) {\r
- *RemainingVariableStorageSize -= VariableSize;\r
+ if ((Variable->State == VAR_ADDED) || (Variable->State == (VAR_ADDED & VAR_IN_DELETED_TRANSITION))) {\r
+ if ((NextVariable->Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == EFI_VARIABLE_HARDWARE_ERROR_RECORD) {\r
+ HwErrVariableTotalSize += VariableSize;\r
+ } else {\r
+ CommonVariableTotalSize += VariableSize;\r
+ }\r
}\r
}\r
\r
Variable = NextVariable;\r
}\r
\r
- if (*RemainingVariableStorageSize < sizeof (VARIABLE_HEADER)) {\r
- *MaximumVariableSize = 0;\r
- } else if ((*RemainingVariableStorageSize - sizeof (VARIABLE_HEADER)) < *MaximumVariableSize) {\r
- *MaximumVariableSize = *RemainingVariableStorageSize - sizeof (VARIABLE_HEADER);\r
+ if ((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == EFI_VARIABLE_HARDWARE_ERROR_RECORD){\r
+ *RemainingVariableStorageSize = *MaximumVariableStorageSize - HwErrVariableTotalSize;\r
+ } else {\r
+ *RemainingVariableStorageSize = *MaximumVariableStorageSize - CommonVariableTotalSize;\r
}\r
\r
return EFI_SUCCESS;\r
EFI_HANDLE NewHandle;\r
VS_DEV *Dev;\r
EFI_PEI_HOB_POINTERS GuidHob;\r
+ VARIABLE_HEADER *Variable;\r
VARIABLE_HEADER *NextVariable;\r
VARIABLE_STORE_HEADER *VariableStoreHeader;\r
EFI_FLASH_MAP_FS_ENTRY_DATA *FlashMapEntryData;\r
return Status;\r
}\r
\r
+ ZeroMem (mGlobal, (UINTN) sizeof (VARIABLE_GLOBAL));\r
+\r
GuidHob.Raw = GetHobList ();\r
FlashMapEntryData = NULL;\r
while ((GuidHob.Raw = GetNextGuidHob (&gEfiFlashMapHobGuid, GuidHob.Raw)) != NULL) {\r
//\r
// Calculate LastVariableOffset\r
//\r
- NextVariable = (VARIABLE_HEADER *) (VariableStoreHeader + 1);\r
- while (IsValidVariableHeader (NextVariable)) {\r
- NextVariable = GetNextVariablePtr (NextVariable);\r
+ Variable = (VARIABLE_HEADER *) (VariableStoreHeader + 1);\r
+ while (IsValidVariableHeader (Variable)) {\r
+ UINTN VariableSize = 0;\r
+ NextVariable = GetNextVariablePtr (Variable);\r
+ VariableSize = NextVariable - Variable;\r
+ if ((NextVariable->Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) == (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {\r
+ mGlobal->HwErrVariableTotalSize += HEADER_ALIGN (VariableSize);\r
+ } else {\r
+ mGlobal->CommonVariableTotalSize += HEADER_ALIGN (VariableSize);\r
+ }\r
+ Variable = NextVariable;\r
}\r
- mGlobal->LastVariableOffset[NonVolatile] = (UINTN) NextVariable - (UINTN) VariableStoreHeader;\r
- mGlobal->VariableBase[NonVolatile] = VariableStoreHeader;\r
+\r
+ mGlobal->LastVariableOffset[NonVolatile] = (UINTN) Variable - (UINTN) VariableStoreHeader;\r
+ mGlobal->VariableBase[NonVolatile] = VariableStoreHeader;\r
\r
//\r
// Reclaim if remaining space is too small\r
// Reclaim error\r
// we cannot restore to original state\r
//\r
- DEBUG ((EFI_D_ERROR, "FSVariable: Recalim error (fetal error) - %r\n", Status));\r
+ DEBUG ((EFI_D_ERROR, "FSVariable: Reclaim error (fatal error) - %r\n", Status));\r
ASSERT_EFI_ERROR (Status);\r
}\r
}\r
);\r
\r
\r
- SystemTable->RuntimeServices->GetVariable = GetVariable;\r
+ SystemTable->RuntimeServices->GetVariable = DuetGetVariable;\r
SystemTable->RuntimeServices->GetNextVariableName = GetNextVariableName;\r
SystemTable->RuntimeServices->SetVariable = SetVariable;\r
\r
ASSERT_EFI_ERROR (Status);\r
\r
return Status;\r
-\r
-//Shutdown:\r
-// EfiShutdownRuntimeDriverLib ();\r
-// return Status;\r
}\r
\r
\r
projects / mirror_edk2.git / blobdiff