/** @file\r
The functions for Boot Maintainence Main menu.\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
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
}\r
},\r
- //\r
- // {165A028F-0BB2-4b5f-8747-77592E3F6499}\r
- //\r
- { 0x165a028f, 0xbb2, 0x4b5f, { 0x87, 0x47, 0x77, 0x59, 0x2e, 0x3f, 0x64, 0x99 } }\r
+ BOOT_MAINT_FORMSET_GUID\r
},\r
{\r
END_DEVICE_PATH_TYPE,\r
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
}\r
},\r
- //\r
- // {91DB4238-B0C8-472e-BBCF-F3A6541010F4}\r
- //\r
- { 0x91db4238, 0xb0c8, 0x472e, { 0xbb, 0xcf, 0xf3, 0xa6, 0x54, 0x10, 0x10, 0xf4 } }\r
+ FILE_EXPLORE_FORMSET_GUID\r
},\r
{\r
END_DEVICE_PATH_TYPE,\r
}\r
};\r
\r
-EFI_GUID EfiLegacyDevOrderGuid = EFI_LEGACY_DEV_ORDER_VARIABLE_GUID;\r
-EFI_GUID mBootMaintGuid = BOOT_MAINT_FORMSET_GUID;\r
-EFI_GUID mFileExplorerGuid = FILE_EXPLORE_FORMSET_GUID;\r
-\r
CHAR16 mBootMaintStorageName[] = L"BmmData";\r
CHAR16 mFileExplorerStorageName[] = L"FeData";\r
\r
}\r
\r
*Progress = Request;\r
- if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mBootMaintGuid, mBootMaintStorageName)) {\r
+ if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gBootMaintFormSetGuid, mBootMaintStorageName)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
// Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
//\r
- ConfigRequestHdr = HiiConstructConfigHdr (&mBootMaintGuid, mBootMaintStorageName, Private->BmmDriverHandle);\r
+ ConfigRequestHdr = HiiConstructConfigHdr (&gBootMaintFormSetGuid, mBootMaintStorageName, Private->BmmDriverHandle);\r
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
ConfigRequest = AllocateZeroPool (Size);\r
ASSERT (ConfigRequest != NULL);\r
UINTN Pos;\r
UINTN Bit;\r
UINT16 NewValuePos;\r
+ UINT16 Index3; \r
UINT16 Index2;\r
UINT16 Index;\r
UINT8 *OldLegacyDev;\r
UINT8 *NewLegacyDev;\r
UINT8 *DisMap;\r
- EFI_FORM_ID FormId;\r
- Status = EFI_SUCCESS;\r
\r
+ if (Action != EFI_BROWSER_ACTION_CHANGING && Action != EFI_BROWSER_ACTION_CHANGED) { \r
+ //\r
+ // All other action return unsupported.\r
+ //\r
+ return EFI_UNSUPPORTED;\r
+ }\r
+ \r
+ Status = EFI_SUCCESS;\r
+ OldValue = 0;\r
+ NewValue = 0;\r
+ Number = 0;\r
+ OldLegacyDev = NULL;\r
+ NewLegacyDev = NULL;\r
+ NewValuePos = 0;\r
+ DisMap = NULL;\r
+\r
+ Private = BMM_CALLBACK_DATA_FROM_THIS (This);\r
+ //\r
+ // Retrive uncommitted data from Form Browser\r
+ //\r
+ CurrentFakeNVMap = &Private->BmmFakeNvData;\r
+ HiiGetBrowserData (&gBootMaintFormSetGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap);\r
if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
- if ((Value == NULL) || (ActionRequest == NULL)) {\r
+ if (Value == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
+ \r
+ UpdatePageId (Private, QuestionId);\r
\r
- OldValue = 0;\r
- NewValue = 0;\r
- Number = 0;\r
- OldLegacyDev = NULL;\r
- NewLegacyDev = NULL;\r
- NewValuePos = 0;\r
- DisMap = NULL;\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
+ if (QuestionId < FILE_OPTION_OFFSET) {\r
+ if (QuestionId < CONFIG_OPTION_OFFSET) {\r
+ switch (QuestionId) {\r
+ case KEY_VALUE_BOOT_FROM_FILE:\r
+ Private->FeCurrentState = FileExplorerStateBootFromFile;\r
+ break;\r
\r
- Private = BMM_CALLBACK_DATA_FROM_THIS (This);\r
- UpdatePageId (Private, QuestionId);\r
+ case FORM_BOOT_ADD_ID:\r
+ Private->FeCurrentState = FileExplorerStateAddBootOption;\r
+ break;\r
\r
- //\r
- // Retrive uncommitted data from Form Browser\r
- //\r
- CurrentFakeNVMap = &Private->BmmFakeNvData;\r
- HiiGetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap);\r
+ case FORM_DRV_ADD_FILE_ID:\r
+ Private->FeCurrentState = FileExplorerStateAddDriverOptionState;\r
+ break;\r
+\r
+ case FORM_DRV_ADD_HANDLE_ID:\r
+ CleanUpPage (FORM_DRV_ADD_HANDLE_ID, Private);\r
+ UpdateDrvAddHandlePage (Private);\r
+ break;\r
+\r
+ case FORM_BOOT_DEL_ID:\r
+ CleanUpPage (FORM_BOOT_DEL_ID, Private);\r
+ UpdateBootDelPage (Private);\r
+ break;\r
+\r
+ case FORM_BOOT_CHG_ID:\r
+ case FORM_DRV_CHG_ID:\r
+ UpdatePageBody (QuestionId, Private);\r
+ break;\r
+\r
+ case FORM_DRV_DEL_ID:\r
+ CleanUpPage (FORM_DRV_DEL_ID, Private);\r
+ UpdateDrvDelPage (Private);\r
+ break;\r
+\r
+ case FORM_BOOT_NEXT_ID:\r
+ CleanUpPage (FORM_BOOT_NEXT_ID, Private);\r
+ UpdateBootNextPage (Private);\r
+ break;\r
+\r
+ case FORM_TIME_OUT_ID:\r
+ CleanUpPage (FORM_TIME_OUT_ID, Private);\r
+ UpdateTimeOutPage (Private);\r
+ break;\r
+\r
+ case FORM_CON_IN_ID:\r
+ case FORM_CON_OUT_ID:\r
+ case FORM_CON_ERR_ID:\r
+ UpdatePageBody (QuestionId, Private);\r
+ break;\r
+\r
+ case FORM_CON_MODE_ID:\r
+ CleanUpPage (FORM_CON_MODE_ID, Private);\r
+ UpdateConModePage (Private);\r
+ break;\r
+\r
+ case FORM_CON_COM_ID:\r
+ CleanUpPage (FORM_CON_COM_ID, Private);\r
+ UpdateConCOMPage (Private);\r
+ break;\r
+\r
+ case FORM_SET_FD_ORDER_ID:\r
+ case FORM_SET_HD_ORDER_ID:\r
+ case FORM_SET_CD_ORDER_ID:\r
+ case FORM_SET_NET_ORDER_ID:\r
+ case FORM_SET_BEV_ORDER_ID:\r
+ CleanUpPage (QuestionId, Private);\r
+ UpdateSetLegacyDeviceOrderPage (QuestionId, Private);\r
+ break;\r
+\r
+ default:\r
+ break;\r
+ }\r
+ } else if ((QuestionId >= TERMINAL_OPTION_OFFSET) && (QuestionId < CONSOLE_OPTION_OFFSET)) {\r
+ Index2 = (UINT16) (QuestionId - TERMINAL_OPTION_OFFSET);\r
+ Private->CurrentTerminal = Index2;\r
+\r
+ CleanUpPage (FORM_CON_COM_SETUP_ID, Private);\r
+ UpdateTerminalPage (Private);\r
+\r
+ } else if (QuestionId >= HANDLE_OPTION_OFFSET) {\r
+ Index2 = (UINT16) (QuestionId - HANDLE_OPTION_OFFSET);\r
+\r
+ NewMenuEntry = BOpt_GetMenuEntry (&DriverMenu, Index2);\r
+ ASSERT (NewMenuEntry != NULL);\r
+ Private->HandleContext = (BM_HANDLE_CONTEXT *) NewMenuEntry->VariableContext;\r
+\r
+ CleanUpPage (FORM_DRV_ADD_HANDLE_DESC_ID, Private);\r
+\r
+ Private->MenuEntry = NewMenuEntry;\r
+ Private->LoadContext->FilePathList = Private->HandleContext->DevicePath;\r
\r
+ UpdateDriverAddHandleDescPage (Private);\r
+ }\r
+ }\r
+ } else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
+ if ((Value == NULL) || (ActionRequest == NULL)) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ \r
//\r
// need to be subtituded.\r
//\r
// Update Select FD/HD/CD/NET/BEV Order Form\r
//\r
- if (FORM_SET_FD_ORDER_ID == Private->BmmPreviousPageId ||\r
- FORM_SET_HD_ORDER_ID == Private->BmmPreviousPageId ||\r
- FORM_SET_CD_ORDER_ID == Private->BmmPreviousPageId ||\r
- FORM_SET_NET_ORDER_ID == Private->BmmPreviousPageId ||\r
- FORM_SET_BEV_ORDER_ID == Private->BmmPreviousPageId ||\r
- ((FORM_BOOT_SETUP_ID == Private->BmmPreviousPageId) &&\r
- (QuestionId >= LEGACY_FD_QUESTION_ID) &&\r
- (QuestionId < (LEGACY_BEV_QUESTION_ID + 100)) )\r
- ) {\r
+ if ((QuestionId >= LEGACY_FD_QUESTION_ID) && (QuestionId < LEGACY_BEV_QUESTION_ID + MAX_MENU_NUMBER)) {\r
\r
DisMap = Private->BmmOldFakeNVData.DisableMap;\r
\r
- FormId = Private->BmmPreviousPageId;\r
- if (FormId == FORM_BOOT_SETUP_ID) {\r
- FormId = Private->BmmCurrentPageId;\r
- }\r
-\r
- switch (FormId) {\r
- case FORM_SET_FD_ORDER_ID:\r
+ if (QuestionId >= LEGACY_FD_QUESTION_ID && QuestionId < LEGACY_FD_QUESTION_ID + MAX_MENU_NUMBER) {\r
Number = (UINT16) LegacyFDMenu.MenuNumber;\r
OldLegacyDev = Private->BmmOldFakeNVData.LegacyFD;\r
NewLegacyDev = CurrentFakeNVMap->LegacyFD;\r
- break;\r
-\r
- case FORM_SET_HD_ORDER_ID:\r
+ } else if (QuestionId >= LEGACY_HD_QUESTION_ID && QuestionId < LEGACY_HD_QUESTION_ID + MAX_MENU_NUMBER) {\r
Number = (UINT16) LegacyHDMenu.MenuNumber;\r
OldLegacyDev = Private->BmmOldFakeNVData.LegacyHD;\r
NewLegacyDev = CurrentFakeNVMap->LegacyHD;\r
- break;\r
-\r
- case FORM_SET_CD_ORDER_ID:\r
+ } else if (QuestionId >= LEGACY_CD_QUESTION_ID && QuestionId < LEGACY_CD_QUESTION_ID + MAX_MENU_NUMBER) {\r
Number = (UINT16) LegacyCDMenu.MenuNumber;\r
OldLegacyDev = Private->BmmOldFakeNVData.LegacyCD;\r
NewLegacyDev = CurrentFakeNVMap->LegacyCD;\r
- break;\r
-\r
- case FORM_SET_NET_ORDER_ID:\r
+ } else if (QuestionId >= LEGACY_NET_QUESTION_ID && QuestionId < LEGACY_NET_QUESTION_ID + MAX_MENU_NUMBER) {\r
Number = (UINT16) LegacyNETMenu.MenuNumber;\r
OldLegacyDev = Private->BmmOldFakeNVData.LegacyNET;\r
NewLegacyDev = CurrentFakeNVMap->LegacyNET;\r
- break;\r
-\r
- case FORM_SET_BEV_ORDER_ID:\r
+ } else if (QuestionId >= LEGACY_BEV_QUESTION_ID && QuestionId < LEGACY_BEV_QUESTION_ID + MAX_MENU_NUMBER) {\r
Number = (UINT16) LegacyBEVMenu.MenuNumber;\r
OldLegacyDev = Private->BmmOldFakeNVData.LegacyBEV;\r
NewLegacyDev = CurrentFakeNVMap->LegacyBEV;\r
- break;\r
-\r
- default:\r
- break;\r
}\r
//\r
// First, find the different position\r
// To prevent DISABLE appears in the middle of the list\r
// we should perform a re-ordering\r
//\r
+ Index3 = Index;\r
Index = 0;\r
while (Index < Number) {\r
if (0xFF != NewLegacyDev[Index]) {\r
NewLegacyDev,\r
Number\r
);\r
- }\r
- }\r
-\r
- if (QuestionId < FILE_OPTION_OFFSET) {\r
- if (QuestionId < CONFIG_OPTION_OFFSET) {\r
- switch (QuestionId) {\r
- case KEY_VALUE_BOOT_FROM_FILE:\r
- Private->FeCurrentState = FileExplorerStateBootFromFile;\r
-\r
- //\r
- // Exit Bmm main formset to send File Explorer formset.\r
- //\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
- break;\r
\r
- case FORM_BOOT_ADD_ID:\r
- Private->FeCurrentState = FileExplorerStateAddBootOption;\r
-\r
- //\r
- // Exit Bmm main formset to send File Explorer formset.\r
- //\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
- break;\r
-\r
- case FORM_DRV_ADD_FILE_ID:\r
- Private->FeCurrentState = FileExplorerStateAddDriverOptionState;\r
-\r
- //\r
- // Exit Bmm main formset to send File Explorer formset.\r
- //\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
- break;\r
-\r
- case FORM_DRV_ADD_HANDLE_ID:\r
- CleanUpPage (FORM_DRV_ADD_HANDLE_ID, Private);\r
- UpdateDrvAddHandlePage (Private);\r
- break;\r
-\r
- case FORM_BOOT_DEL_ID:\r
- CleanUpPage (FORM_BOOT_DEL_ID, Private);\r
- UpdateBootDelPage (Private);\r
- break;\r
-\r
- case FORM_BOOT_CHG_ID:\r
- case FORM_DRV_CHG_ID:\r
- UpdatePageBody (QuestionId, Private);\r
- break;\r
-\r
- case FORM_DRV_DEL_ID:\r
- CleanUpPage (FORM_DRV_DEL_ID, Private);\r
- UpdateDrvDelPage (Private);\r
- break;\r
-\r
- case FORM_BOOT_NEXT_ID:\r
- CleanUpPage (FORM_BOOT_NEXT_ID, Private);\r
- UpdateBootNextPage (Private);\r
- break;\r
-\r
- case FORM_TIME_OUT_ID:\r
- CleanUpPage (FORM_TIME_OUT_ID, Private);\r
- UpdateTimeOutPage (Private);\r
- break;\r
-\r
- case FORM_RESET:\r
- gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);\r
- return EFI_UNSUPPORTED;\r
-\r
- case FORM_CON_IN_ID:\r
- case FORM_CON_OUT_ID:\r
- case FORM_CON_ERR_ID:\r
- UpdatePageBody (QuestionId, Private);\r
- break;\r
-\r
- case FORM_CON_MODE_ID:\r
- CleanUpPage (FORM_CON_MODE_ID, Private);\r
- UpdateConModePage (Private);\r
- break;\r
-\r
- case FORM_CON_COM_ID:\r
- CleanUpPage (FORM_CON_COM_ID, Private);\r
- UpdateConCOMPage (Private);\r
- break;\r
-\r
- case FORM_SET_FD_ORDER_ID:\r
- case FORM_SET_HD_ORDER_ID:\r
- case FORM_SET_CD_ORDER_ID:\r
- case FORM_SET_NET_ORDER_ID:\r
- case FORM_SET_BEV_ORDER_ID:\r
- CleanUpPage (QuestionId, Private);\r
- UpdateSetLegacyDeviceOrderPage (QuestionId, Private);\r
- break;\r
-\r
- case KEY_VALUE_SAVE_AND_EXIT:\r
- case KEY_VALUE_NO_SAVE_AND_EXIT:\r
-\r
- if (QuestionId == KEY_VALUE_SAVE_AND_EXIT) {\r
- Status = ApplyChangeHandler (Private, CurrentFakeNVMap, Private->BmmPreviousPageId);\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
- } else if (QuestionId == KEY_VALUE_NO_SAVE_AND_EXIT) {\r
- DiscardChangeHandler (Private, CurrentFakeNVMap);\r
+ //\r
+ // Return correct question value.\r
+ //\r
+ Value->u8 = NewLegacyDev[Index3];\r
+ }\r
+ } else {\r
+ switch (QuestionId) {\r
+ case KEY_VALUE_SAVE_AND_EXIT:\r
+ case KEY_VALUE_NO_SAVE_AND_EXIT:\r
+ if (QuestionId == KEY_VALUE_SAVE_AND_EXIT) {\r
+ Status = ApplyChangeHandler (Private, CurrentFakeNVMap, Private->BmmPreviousPageId);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
}\r
-\r
- //\r
- // Tell browser not to ask for confirmation of changes,\r
- // since we have already applied or discarded.\r
- //\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
- break;\r
-\r
- default:\r
- break;\r
+ } else if (QuestionId == KEY_VALUE_NO_SAVE_AND_EXIT) {\r
+ DiscardChangeHandler (Private, CurrentFakeNVMap);\r
}\r
- } else if ((QuestionId >= TERMINAL_OPTION_OFFSET) && (QuestionId < CONSOLE_OPTION_OFFSET)) {\r
- Index2 = (UINT16) (QuestionId - TERMINAL_OPTION_OFFSET);\r
- Private->CurrentTerminal = Index2;\r
\r
- CleanUpPage (FORM_CON_COM_SETUP_ID, Private);\r
- UpdateTerminalPage (Private);\r
-\r
- } else if (QuestionId >= HANDLE_OPTION_OFFSET) {\r
- Index2 = (UINT16) (QuestionId - HANDLE_OPTION_OFFSET);\r
-\r
- NewMenuEntry = BOpt_GetMenuEntry (&DriverMenu, Index2);\r
- ASSERT (NewMenuEntry != NULL);\r
- Private->HandleContext = (BM_HANDLE_CONTEXT *) NewMenuEntry->VariableContext;\r
-\r
- CleanUpPage (FORM_DRV_ADD_HANDLE_DESC_ID, Private);\r
+ //\r
+ // Tell browser not to ask for confirmation of changes,\r
+ // since we have already applied or discarded.\r
+ //\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
+ break; \r
\r
- Private->MenuEntry = NewMenuEntry;\r
- Private->LoadContext->FilePathList = Private->HandleContext->DevicePath;\r
+ case FORM_RESET:\r
+ gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);\r
+ return EFI_UNSUPPORTED;\r
\r
- UpdateDriverAddHandleDescPage (Private);\r
+ default:\r
+ break;\r
}\r
}\r
-\r
- //\r
- // Pass changed uncommitted data back to Form Browser\r
- //\r
- Status = HiiSetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap, NULL);\r
- return Status;\r
}\r
\r
//\r
- // All other action return unsupported.\r
+ // Pass changed uncommitted data back to Form Browser\r
//\r
- return EFI_UNSUPPORTED;\r
+ HiiSetBrowserData (&gBootMaintFormSetGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap, NULL);\r
+ return EFI_SUCCESS;\r
}\r
\r
/**\r
break;\r
\r
case FORM_TIME_OUT_ID:\r
- PcdSet16 (PcdPlatformBootTimeOut, CurrentFakeNVMap->BootTimeOut);\r
+ BdsDxeSetVariableAndReportStatusCodeOnError (\r
+ L"Timeout",\r
+ &gEfiGlobalVariableGuid,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
+ sizeof (UINT16),\r
+ &(CurrentFakeNVMap->BootTimeOut)\r
+ );\r
\r
Private->BmmOldFakeNVData.BootTimeOut = CurrentFakeNVMap->BootTimeOut;\r
break;\r
// Post our Boot Maint VFR binary to the HII database.\r
//\r
BmmCallbackInfo->BmmHiiHandle = HiiAddPackages (\r
- &mBootMaintGuid,\r
+ &gBootMaintFormSetGuid,\r
BmmCallbackInfo->BmmDriverHandle,\r
BmBin,\r
BdsDxeStrings,\r
// Post our File Explorer VFR binary to the HII database.\r
//\r
BmmCallbackInfo->FeHiiHandle = HiiAddPackages (\r
- &mFileExplorerGuid,\r
+ &gFileExploreFormSetGuid,\r
BmmCallbackInfo->FeDriverHandle,\r
FEBin,\r
BdsDxeStrings,\r
UpdateTerminalPage (BmmCallbackInfo);\r
}\r
\r
- Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID **) &LegacyBios);\r
+ Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **) &LegacyBios);\r
if (!EFI_ERROR (Status)) {\r
RefreshUpdateData ();\r
mStartLabel->Number = FORM_BOOT_LEGACY_DEVICE_ID;\r
\r
HiiUpdateForm (\r
BmmCallbackInfo->BmmHiiHandle,\r
- &mBootMaintGuid,\r
+ &gBootMaintFormSetGuid,\r
FORM_BOOT_SETUP_ID,\r
mStartOpCodeHandle, // Label FORM_BOOT_LEGACY_DEVICE_ID\r
mEndOpCodeHandle // LABEL_END\r
//\r
BdsLibEnumerateAllBootOption (&BdsBootOptionList);\r
\r
+ //\r
+ // Group the legacy boot options for the same device type\r
+ //\r
+ GroupMultipleLegacyBootOption4SameType ();\r
+\r
//\r
// Init the BMM\r
//\r
gFormBrowser2,\r
&CallbackData->BmmHiiHandle,\r
1,\r
- &mBootMaintGuid,\r
+ &gBootMaintFormSetGuid,\r
0,\r
NULL,\r
&ActionRequest\r
gFormBrowser2,\r
&CallbackData->FeHiiHandle,\r
1,\r
- &mFileExplorerGuid,\r
+ &gFileExploreFormSetGuid,\r
0,\r
NULL,\r
&ActionRequest\r
return Status;\r
}\r
\r
-\r
-/**\r
- Deletete the Boot Option from EFI Variable. The Boot Order Arrray\r
- is also updated.\r
-\r
- @param OptionNumber The number of Boot option want to be deleted.\r
- @param BootOrder The Boot Order array.\r
- @param BootOrderSize The size of the Boot Order Array.\r
-\r
- @retval EFI_SUCCESS The Boot Option Variable was found and removed\r
- @retval EFI_UNSUPPORTED The Boot Option Variable store was inaccessible\r
- @retval EFI_NOT_FOUND The Boot Option Variable was not found\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-BdsDeleteBootOption (\r
- IN UINTN OptionNumber,\r
- IN OUT UINT16 *BootOrder,\r
- IN OUT UINTN *BootOrderSize\r
- )\r
-{\r
- UINT16 BootOption[100];\r
- UINTN Index;\r
- EFI_STATUS Status;\r
- UINTN Index2Del;\r
-\r
- Status = EFI_SUCCESS;\r
- Index2Del = 0;\r
-\r
- UnicodeSPrint (BootOption, sizeof (BootOption), L"Boot%04x", OptionNumber);\r
- Status = EfiLibDeleteVariable (BootOption, &gEfiGlobalVariableGuid);\r
- \r
- //\r
- // adjust boot order array\r
- //\r
- for (Index = 0; Index < *BootOrderSize / sizeof (UINT16); Index++) {\r
- if (BootOrder[Index] == OptionNumber) {\r
- Index2Del = Index;\r
- break;\r
- }\r
- }\r
-\r
- if (Index != *BootOrderSize / sizeof (UINT16)) {\r
- for (Index = 0; Index < *BootOrderSize / sizeof (UINT16) - 1; Index++) {\r
- if (Index >= Index2Del) {\r
- BootOrder[Index] = BootOrder[Index + 1];\r
- }\r
- }\r
-\r
- *BootOrderSize -= sizeof (UINT16);\r
- }\r
-\r
- return Status;\r
-\r
-}\r
-\r
-\r