Node->Signature = UEFI_IFR_BUFFER_STORAGE_NODE_SIGNATURE;\r
Node->Name = AllocateCopyPool (StrSize (Storage->Name), Storage->Name);\r
Node->DefaultId = DefaultStore->DefaultId;\r
+ Node->StoreId = Storage->VarStoreId;\r
CopyGuid (&Node->Guid, &Storage->Guid);\r
Node->Size = Storage->Size;\r
Node->Buffer = AllocateZeroPool (Node->Size);\r
// So the default storage of Var Store in VFR from a Framework module \r
// should be translated to 0xFFEE.\r
//\r
- if (Node->StoreId == 0xFFEE) {\r
+ if (Node->StoreId == RESERVED_VARSTORE_ID) {\r
Pack->VariableId = 0;\r
+ } else {\r
+ Pack->VariableId = Node->StoreId;\r
}\r
//\r
// Initialize EFI_HII_VARIABLE_PACK\r
//\r
Pack->Header.Type = 0;\r
Pack->Header.Length = Size;\r
- Pack->VariableId = Node->StoreId;\r
Pack->VariableNameLength = StrSize (Node->Name);\r
CopyMem (&Pack->VariableGuid, &Node->Guid, sizeof (EFI_GUID));\r
\r
a UEFI form set.\r
\r
\r
- @retval EFI_SUCCESS Successful.\r
- @retval EFI_INVALID_PARAMETER The default mask is not FRAMEWORK_EFI_IFR_FLAG_DEFAULT or \r
- FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING.\r
+ @retval VOID\r
**/\r
VOID\r
FreeDefaultList (\r