/** @file\r
Variable operation that will be used by bootmaint\r
\r
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>\r
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
Status = gRT->SetVariable (\r
L"BootOrder",\r
&gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
BootOrderListSize * sizeof (UINT16),\r
BootOrderList\r
);\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
+ //\r
+ // Changing variable without increasing its size with current variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
}\r
return EFI_SUCCESS;\r
}\r
Status = gRT->SetVariable (\r
L"DriverOrder",\r
&gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
DriverOrderListSize * sizeof (UINT16),\r
DriverOrderList\r
);\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
+ //\r
+ // Changing variable without increasing its size with current variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
}\r
return EFI_SUCCESS;\r
}\r
Status = gRT->SetVariable (\r
L"ConOut",\r
&gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
GetDevicePathSize (OutDevicePath),\r
OutDevicePath\r
);\r
- ASSERT (!EFI_ERROR (Status));\r
+ //\r
+ // Changing variable without increasing its size with current variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
}\r
\r
if (InpDevicePath != NULL) {\r
Status = gRT->SetVariable (\r
L"ConIn",\r
&gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
GetDevicePathSize (InpDevicePath),\r
InpDevicePath\r
);\r
- ASSERT (!EFI_ERROR (Status));\r
+ //\r
+ // Changing variable without increasing its size with current variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
}\r
\r
if (ErrDevicePath != NULL) {\r
Status = gRT->SetVariable (\r
L"ErrOut",\r
&gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
GetDevicePathSize (ErrDevicePath),\r
ErrDevicePath\r
);\r
- ASSERT (!EFI_ERROR (Status));\r
+ //\r
+ // Changing variable without increasing its size with current variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
}\r
}\r
\r
(EFI_DEVICE_PATH_PROTOCOL *) &Vendor\r
);\r
ASSERT (TerminalDevicePath != NULL);\r
- ChangeTerminalDevicePath (TerminalDevicePath, TRUE);\r
+ ChangeTerminalDevicePath (&TerminalDevicePath, TRUE);\r
ConDevicePath = AppendDevicePathInstance (\r
ConDevicePath,\r
TerminalDevicePath\r
Status = gRT->SetVariable (\r
ConsoleName,\r
&gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
GetDevicePathSize (ConDevicePath),\r
ConDevicePath\r
);\r
Status = gRT->SetVariable (\r
DriverString,\r
&gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
BufferSize,\r
Buffer\r
);\r
- ASSERT_EFI_ERROR (Status);\r
- DriverOrderList = BdsLibGetVariableAndSize (\r
- L"DriverOrder",\r
- &gEfiGlobalVariableGuid,\r
- &DriverOrderListSize\r
- );\r
- NewDriverOrderList = AllocateZeroPool (DriverOrderListSize + sizeof (UINT16));\r
- ASSERT (NewDriverOrderList != NULL);\r
- CopyMem (NewDriverOrderList, DriverOrderList, DriverOrderListSize);\r
- NewDriverOrderList[DriverOrderListSize / sizeof (UINT16)] = Index;\r
- if (DriverOrderList != NULL) {\r
- EfiLibDeleteVariable (L"DriverOrder", &gEfiGlobalVariableGuid);\r
- }\r
+ if (!EFI_ERROR (Status)) {\r
+ DriverOrderList = BdsLibGetVariableAndSize (\r
+ L"DriverOrder",\r
+ &gEfiGlobalVariableGuid,\r
+ &DriverOrderListSize\r
+ );\r
+ NewDriverOrderList = AllocateZeroPool (DriverOrderListSize + sizeof (UINT16));\r
+ ASSERT (NewDriverOrderList != NULL);\r
+ if (DriverOrderList != NULL) {\r
+ CopyMem (NewDriverOrderList, DriverOrderList, DriverOrderListSize);\r
+ EfiLibDeleteVariable (L"DriverOrder", &gEfiGlobalVariableGuid);\r
+ }\r
+ NewDriverOrderList[DriverOrderListSize / sizeof (UINT16)] = Index;\r
\r
- Status = gRT->SetVariable (\r
- L"DriverOrder",\r
- &gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
- DriverOrderListSize + sizeof (UINT16),\r
- NewDriverOrderList\r
- );\r
- ASSERT_EFI_ERROR (Status);\r
- if (DriverOrderList != NULL) {\r
- FreePool (DriverOrderList);\r
- }\r
- DriverOrderList = NULL;\r
- FreePool (NewDriverOrderList);\r
- InsertTailList (&DriverOptionMenu.Head, &NewMenuEntry->Link);\r
- DriverOptionMenu.MenuNumber++;\r
+ Status = gRT->SetVariable (\r
+ L"DriverOrder",\r
+ &gEfiGlobalVariableGuid,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
+ DriverOrderListSize + sizeof (UINT16),\r
+ NewDriverOrderList\r
+ );\r
+ if (DriverOrderList != NULL) {\r
+ FreePool (DriverOrderList);\r
+ }\r
+ DriverOrderList = NULL;\r
+ FreePool (NewDriverOrderList);\r
+ if (!EFI_ERROR (Status)) {\r
+ InsertTailList (&DriverOptionMenu.Head, &NewMenuEntry->Link);\r
+ DriverOptionMenu.MenuNumber++;\r
\r
- *DescriptionData = 0x0000;\r
- *OptionalData = 0x0000;\r
+ *DescriptionData = 0x0000;\r
+ *OptionalData = 0x0000;\r
+ }\r
+ }\r
return EFI_SUCCESS;\r
}\r
\r
Status = gRT->SetVariable (\r
BootString,\r
&gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
BufferSize,\r
Buffer\r
);\r
- ASSERT_EFI_ERROR (Status);\r
+ if (!EFI_ERROR (Status)) {\r
\r
- BootOrderList = BdsLibGetVariableAndSize (\r
+ BootOrderList = BdsLibGetVariableAndSize (\r
+ L"BootOrder",\r
+ &gEfiGlobalVariableGuid,\r
+ &BootOrderListSize\r
+ );\r
+ ASSERT (BootOrderList != NULL);\r
+ NewBootOrderList = AllocateZeroPool (BootOrderListSize + sizeof (UINT16));\r
+ ASSERT (NewBootOrderList != NULL);\r
+ CopyMem (NewBootOrderList, BootOrderList, BootOrderListSize);\r
+ NewBootOrderList[BootOrderListSize / sizeof (UINT16)] = Index;\r
+\r
+ if (BootOrderList != NULL) {\r
+ FreePool (BootOrderList);\r
+ }\r
+\r
+ Status = gRT->SetVariable (\r
L"BootOrder",\r
&gEfiGlobalVariableGuid,\r
- &BootOrderListSize\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
+ BootOrderListSize + sizeof (UINT16),\r
+ NewBootOrderList\r
);\r
+ if (!EFI_ERROR (Status)) {\r
\r
- NewBootOrderList = AllocateZeroPool (BootOrderListSize + sizeof (UINT16));\r
- ASSERT (NewBootOrderList != NULL);\r
- CopyMem (NewBootOrderList, BootOrderList, BootOrderListSize);\r
- NewBootOrderList[BootOrderListSize / sizeof (UINT16)] = Index;\r
+ FreePool (NewBootOrderList);\r
+ NewBootOrderList = NULL;\r
+ InsertTailList (&BootOptionMenu.Head, &NewMenuEntry->Link);\r
+ BootOptionMenu.MenuNumber++;\r
\r
- if (BootOrderList != NULL) {\r
- FreePool (BootOrderList);\r
+ NvRamMap->DescriptionData[0] = 0x0000;\r
+ NvRamMap->OptionalData[0] = 0x0000;\r
+ }\r
}\r
-\r
- Status = gRT->SetVariable (\r
- L"BootOrder",\r
- &gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
- BootOrderListSize + sizeof (UINT16),\r
- NewBootOrderList\r
- );\r
- ASSERT_EFI_ERROR (Status);\r
-\r
- FreePool (NewBootOrderList);\r
- NewBootOrderList = NULL;\r
- InsertTailList (&BootOptionMenu.Head, &NewMenuEntry->Link);\r
- BootOptionMenu.MenuNumber++;\r
-\r
- NvRamMap->DescriptionData[0] = 0x0000;\r
- NvRamMap->OptionalData[0] = 0x0000;\r
return EFI_SUCCESS;\r
}\r
\r
Status = gRT->SetVariable (\r
L"BootNext",\r
&gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
sizeof (UINT16),\r
&NewMenuEntry->OptionNumber\r
);\r
}\r
}\r
\r
- GroupMultipleLegacyBootOption4SameType (\r
- BootOrderList,\r
- BootOrderListSize / sizeof (UINT16)\r
- );\r
-\r
Status = gRT->SetVariable (\r
L"BootOrder",\r
&gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
BootOrderListSize,\r
BootOrderList\r
);\r
+ //\r
+ // Changing the content without increasing its size with current variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
FreePool (BootOrderList);\r
\r
+ GroupMultipleLegacyBootOption4SameType ();\r
+\r
BOpt_FreeMenu (&BootOptionMenu);\r
BOpt_GetBootOptions (CallbackData);\r
\r
Status = gRT->SetVariable (\r
L"DriverOrder",\r
&gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
DriverOrderListSize,\r
NewDriverOrderList\r
);\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
-\r
+ //\r
+ // Changing the content without increasing its size with current variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
+ \r
BOpt_FreeMenu (&DriverOptionMenu);\r
BOpt_GetDriverOptions (CallbackData);\r
return EFI_SUCCESS;\r
}\r
\r
/**\r
- Update the legacy BBS boot option. L"LegacyDevOrder" and EfiLegacyDevOrderGuid EFI Variable\r
+ Update the legacy BBS boot option. VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable\r
is udpated with the new Legacy Boot order. The EFI Variable of "Boot####" and gEfiGlobalVariableGuid\r
is also updated.\r
\r
@param CallbackData The context data for BMM.\r
\r
@return EFI_SUCCESS The function completed successfully.\r
- @retval EFI_NOT_FOUND If L"LegacyDevOrder" and EfiLegacyDevOrderGuid EFI Variable can be found.\r
+ @retval EFI_NOT_FOUND If VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable can be found.\r
@retval EFI_OUT_OF_RESOURCES Fail to allocate memory resource\r
**/\r
EFI_STATUS\r
UINT8 *LegacyDev;\r
UINT8 *VarData;\r
UINTN VarSize;\r
- BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;\r
+ LEGACY_DEV_ORDER_ENTRY *DevOrder;\r
UINT8 *OriginalPtr;\r
UINT8 *DisMap;\r
UINTN Pos;\r
UINTN EnBootOptionCount;\r
UINT16 *DisBootOption;\r
UINTN DisBootOptionCount;\r
- UINT16 *BootOrder;\r
\r
DisMap = NULL;\r
NewOrder = NULL;\r
//\r
VarData = (UINT8 *) BdsLibGetVariableAndSize (\r
VAR_LEGACY_DEV_ORDER,\r
- &EfiLegacyDevOrderGuid,\r
+ &gEfiLegacyDevOrderVariableGuid,\r
&VarSize\r
);\r
\r
}\r
\r
OriginalPtr = VarData;\r
- DevOrder = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;\r
+ DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
\r
while (VarData < OriginalPtr + VarSize) {\r
if (DevOrder->BbsType == CallbackData->BbsType) {\r
}\r
\r
VarData += sizeof (BBS_TYPE) + DevOrder->Length;\r
- DevOrder = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;\r
+ DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
}\r
\r
if (VarData >= OriginalPtr + VarSize) {\r
\r
Status = gRT->SetVariable (\r
VAR_LEGACY_DEV_ORDER,\r
- &EfiLegacyDevOrderGuid,\r
- VAR_FLAG,\r
+ &gEfiLegacyDevOrderVariableGuid,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
VarSize,\r
OriginalPtr\r
);\r
// 1. Re-order the Option Number in BootOrder according to Legacy Dev Order\r
//\r
ASSERT (OptionMenu->MenuNumber == DevOrder->Length / sizeof (UINT16) - 1);\r
- BootOrder = BdsLibGetVariableAndSize (\r
- L"BootOrder",\r
- &gEfiGlobalVariableGuid,\r
- &VarSize\r
- );\r
- ASSERT (BootOrder != NULL);\r
-\r
- DisBootOption = AllocatePool (VarSize);\r
- ASSERT (DisBootOption != NULL);\r
- EnBootOption = AllocatePool (VarSize);\r
- ASSERT (EnBootOption != NULL);\r
- \r
+\r
OrderLegacyBootOption4SameType (\r
- BootOrder,\r
- VarSize / sizeof (UINT16),\r
DevOrder->Data,\r
DevOrder->Length / sizeof (UINT16) - 1,\r
- EnBootOption,\r
+ &EnBootOption,\r
&EnBootOptionCount,\r
- DisBootOption,\r
+ &DisBootOption,\r
&DisBootOptionCount\r
);\r
- \r
- Status = gRT->SetVariable (\r
- L"BootOrder",\r
- &gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
- VarSize,\r
- BootOrder\r
- );\r
- ASSERT_EFI_ERROR (Status);\r
-\r
- FreePool (BootOrder);\r
\r
//\r
// 2. Deactivate the DisBootOption and activate the EnBootOption\r
Status = gRT->SetVariable (\r
VarName,\r
&gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
OptionSize,\r
BootOptionVar\r
);\r
+ //\r
+ // Changing the content without increasing its size with current variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
\r
FreePool (BootOptionVar);\r
}\r
Status = gRT->SetVariable (\r
VarName,\r
&gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
OptionSize,\r
BootOptionVar\r
);\r
+ //\r
+ // Changing the content without increasing its size with current variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
\r
FreePool (BootOptionVar);\r
}\r
\r
Status = gST->ConOut->QueryMode (gST->ConOut, Mode, &(ModeInfo.Column), &(ModeInfo.Row));\r
if (!EFI_ERROR(Status)) {\r
- PcdSet32 (PcdConOutColumn, (UINT32) ModeInfo.Column);\r
- PcdSet32 (PcdConOutRow, (UINT32) ModeInfo.Row);\r
+ PcdSet32 (PcdSetupConOutColumn, (UINT32) ModeInfo.Column);\r
+ PcdSet32 (PcdSetupConOutRow, (UINT32) ModeInfo.Row);\r
}\r
\r
return EFI_SUCCESS;\r
projects / mirror_edk2.git / blobdiff