/** @file\r
The functions for Boot Maintainence Main menu.\r
\r
-Copyright (c) 2004 - 2008, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\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
http://opensource.org/licenses/bsd-license.php\r
}\r
};\r
\r
+HII_VENDOR_DEVICE_PATH mBmmHiiVendorDevicePath = {\r
+ {\r
+ {\r
+ HARDWARE_DEVICE_PATH,\r
+ HW_VENDOR_DP,\r
+ {\r
+ (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+ (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+ }\r
+ },\r
+ BOOT_MAINT_FORMSET_GUID\r
+ },\r
+ {\r
+ END_DEVICE_PATH_TYPE,\r
+ END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
+ { \r
+ (UINT8) (END_DEVICE_PATH_LENGTH),\r
+ (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
+ }\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
+HII_VENDOR_DEVICE_PATH mFeHiiVendorDevicePath = {\r
+ {\r
+ {\r
+ HARDWARE_DEVICE_PATH,\r
+ HW_VENDOR_DP,\r
+ {\r
+ (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+ (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+ }\r
+ },\r
+ FILE_EXPLORE_FORMSET_GUID\r
+ },\r
+ {\r
+ END_DEVICE_PATH_TYPE,\r
+ END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
+ { \r
+ (UINT8) (END_DEVICE_PATH_LENGTH),\r
+ (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
+ }\r
+ }\r
+};\r
\r
-CHAR16 mBootMaintStorageName[] = L"BmData";\r
+CHAR16 mBootMaintStorageName[] = L"BmmData";\r
CHAR16 mFileExplorerStorageName[] = L"FeData";\r
\r
/**\r
for (Index = 0; Index < MenuOption->MenuNumber; Index++) {\r
NewMenuEntry = BOpt_GetMenuEntry (MenuOption, Index);\r
\r
- HiiLibNewString (\r
- HiiHandle,\r
- &NewMenuEntry->DisplayStringToken,\r
- NewMenuEntry->DisplayString\r
- );\r
+ NewMenuEntry->DisplayStringToken = HiiSetString (\r
+ HiiHandle,\r
+ 0,\r
+ NewMenuEntry->DisplayString,\r
+ NULL\r
+ );\r
\r
if (NULL == NewMenuEntry->HelpString) {\r
NewMenuEntry->HelpStringToken = NewMenuEntry->DisplayStringToken;\r
} else {\r
- HiiLibNewString (\r
- HiiHandle,\r
- &NewMenuEntry->HelpStringToken,\r
- NewMenuEntry->HelpString\r
- );\r
+ NewMenuEntry->HelpStringToken = HiiSetString (\r
+ HiiHandle,\r
+ 0,\r
+ NewMenuEntry->HelpString,\r
+ NULL\r
+ );\r
}\r
}\r
\r
EFI_STATUS Status;\r
UINTN BufferSize;\r
BMM_CALLBACK_DATA *Private;\r
+ EFI_STRING ConfigRequestHdr;\r
+ EFI_STRING ConfigRequest;\r
+ BOOLEAN AllocatedRequest;\r
+ UINTN Size;\r
\r
- if (Request == NULL) {\r
+ if (Progress == NULL || Results == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- Private = BMM_CALLBACK_DATA_FROM_THIS (This);\r
+ *Progress = Request;\r
+ if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gBootMaintFormSetGuid, mBootMaintStorageName)) {\r
+ return EFI_NOT_FOUND;\r
+ }\r
+\r
+ ConfigRequestHdr = NULL;\r
+ ConfigRequest = NULL;\r
+ AllocatedRequest = FALSE;\r
+ Size = 0;\r
\r
+ Private = BMM_CALLBACK_DATA_FROM_THIS (This);\r
//\r
// Convert buffer data to <ConfigResp> by helper function BlockToConfig()\r
//\r
BufferSize = sizeof (BMM_FAKE_NV_DATA);\r
+ ConfigRequest = Request;\r
+ if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {\r
+ //\r
+ // Request has no request element, construct full request string.\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 (&gBootMaintFormSetGuid, mBootMaintStorageName, Private->BmmDriverHandle);\r
+ Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
+ ConfigRequest = AllocateZeroPool (Size);\r
+ ASSERT (ConfigRequest != NULL);\r
+ AllocatedRequest = TRUE;\r
+ UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);\r
+ FreePool (ConfigRequestHdr);\r
+ }\r
+\r
Status = gHiiConfigRouting->BlockToConfig (\r
gHiiConfigRouting,\r
- Request,\r
+ ConfigRequest,\r
(UINT8 *) &Private->BmmFakeNvData,\r
BufferSize,\r
Results,\r
Progress\r
);\r
+ //\r
+ // Free the allocated config request string.\r
+ //\r
+ if (AllocatedRequest) {\r
+ FreePool (ConfigRequest);\r
+ ConfigRequest = NULL;\r
+ }\r
+ //\r
+ // Set Progress string to the original request string.\r
+ //\r
+ if (Request == NULL) {\r
+ *Progress = NULL;\r
+ } else if (StrStr (Request, L"OFFSET") == NULL) {\r
+ *Progress = Request + StrLen (Request);\r
+ }\r
+\r
return Status;\r
}\r
\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
- UINTN BufferSize;\r
\r
- if ((Value == NULL) || (ActionRequest == NULL)) {\r
- return EFI_INVALID_PARAMETER;\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
- 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
-\r
- Private = BMM_CALLBACK_DATA_FROM_THIS (This);\r
- UpdatePageId (Private, QuestionId);\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
- BufferSize = sizeof (BMM_FAKE_NV_DATA);\r
- Status = GetBrowserData (NULL, NULL, &BufferSize, (UINT8 *) CurrentFakeNVMap);\r
- if (EFI_ERROR (Status)) {\r
- return Status;\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
-\r
- DisMap = Private->BmmOldFakeNVData.DisableMap;\r
-\r
- FormId = Private->BmmPreviousPageId;\r
- if (FormId == FORM_BOOT_SETUP_ID) {\r
- FormId = Private->BmmCurrentPageId;\r
+ HiiGetBrowserData (&gBootMaintFormSetGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap);\r
+ if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
+ if (Value == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
}\r
+ \r
+ UpdatePageId (Private, QuestionId);\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
+ break;\r
+\r
+ case FORM_BOOT_ADD_ID:\r
+ Private->FeCurrentState = FileExplorerStateAddBootOption;\r
+ break;\r
+\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
- switch (FormId) {\r
- case FORM_SET_FD_ORDER_ID:\r
- Number = (UINT16) LegacyFDMenu.MenuNumber;\r
- OldLegacyDev = Private->BmmOldFakeNVData.LegacyFD;\r
- NewLegacyDev = CurrentFakeNVMap->LegacyFD;\r
- break;\r
+ CleanUpPage (FORM_CON_COM_SETUP_ID, Private);\r
+ UpdateTerminalPage (Private);\r
\r
- case FORM_SET_HD_ORDER_ID:\r
- Number = (UINT16) LegacyHDMenu.MenuNumber;\r
- OldLegacyDev = Private->BmmOldFakeNVData.LegacyHD;\r
- NewLegacyDev = CurrentFakeNVMap->LegacyHD;\r
- break;\r
+ } else if (QuestionId >= HANDLE_OPTION_OFFSET) {\r
+ Index2 = (UINT16) (QuestionId - HANDLE_OPTION_OFFSET);\r
\r
- case FORM_SET_CD_ORDER_ID:\r
- Number = (UINT16) LegacyCDMenu.MenuNumber;\r
- OldLegacyDev = Private->BmmOldFakeNVData.LegacyCD;\r
- NewLegacyDev = CurrentFakeNVMap->LegacyCD;\r
- break;\r
+ NewMenuEntry = BOpt_GetMenuEntry (&DriverMenu, Index2);\r
+ ASSERT (NewMenuEntry != NULL);\r
+ Private->HandleContext = (BM_HANDLE_CONTEXT *) NewMenuEntry->VariableContext;\r
\r
- case FORM_SET_NET_ORDER_ID:\r
- Number = (UINT16) LegacyNETMenu.MenuNumber;\r
- OldLegacyDev = Private->BmmOldFakeNVData.LegacyNET;\r
- NewLegacyDev = CurrentFakeNVMap->LegacyNET;\r
- break;\r
+ CleanUpPage (FORM_DRV_ADD_HANDLE_DESC_ID, Private);\r
\r
- case FORM_SET_BEV_ORDER_ID:\r
- Number = (UINT16) LegacyBEVMenu.MenuNumber;\r
- OldLegacyDev = Private->BmmOldFakeNVData.LegacyBEV;\r
- NewLegacyDev = CurrentFakeNVMap->LegacyBEV;\r
- break;\r
+ Private->MenuEntry = NewMenuEntry;\r
+ Private->LoadContext->FilePathList = Private->HandleContext->DevicePath;\r
\r
- default:\r
- break;\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
- // First, find the different position\r
- // if there is change, it should be only one\r
+ // need to be subtituded.\r
//\r
- for (Index = 0; Index < Number; Index++) {\r
- if (OldLegacyDev[Index] != NewLegacyDev[Index]) {\r
- OldValue = OldLegacyDev[Index];\r
- NewValue = NewLegacyDev[Index];\r
- break;\r
+ // Update Select FD/HD/CD/NET/BEV Order Form\r
+ //\r
+ if ((QuestionId >= LEGACY_FD_QUESTION_ID) && (QuestionId < LEGACY_BEV_QUESTION_ID + MAX_MENU_NUMBER)) {\r
+\r
+ DisMap = Private->BmmOldFakeNVData.DisableMap;\r
+\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
+ } 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
+ } 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
+ } 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
+ } 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
}\r
- }\r
-\r
- if (Index != Number) {\r
//\r
- // there is change, now process\r
+ // First, find the different position\r
+ // if there is change, it should be only one\r
//\r
- if (0xFF == NewValue) {\r
+ for (Index = 0; Index < Number; Index++) {\r
+ if (OldLegacyDev[Index] != NewLegacyDev[Index]) {\r
+ OldValue = OldLegacyDev[Index];\r
+ NewValue = NewLegacyDev[Index];\r
+ break;\r
+ }\r
+ }\r
+\r
+ if (Index != Number) {\r
//\r
- // This item will be disable\r
- // Just move the items behind this forward to overlap it\r
+ // there is change, now process\r
//\r
- Pos = OldValue / 8;\r
- Bit = 7 - (OldValue % 8);\r
- DisMap[Pos] = (UINT8) (DisMap[Pos] | (UINT8) (1 << Bit));\r
- for (Index2 = Index; Index2 < Number - 1; Index2++) {\r
- NewLegacyDev[Index2] = NewLegacyDev[Index2 + 1];\r
- }\r
+ if (0xFF == NewValue) {\r
+ //\r
+ // This item will be disable\r
+ // Just move the items behind this forward to overlap it\r
+ //\r
+ Pos = OldValue / 8;\r
+ Bit = 7 - (OldValue % 8);\r
+ DisMap[Pos] = (UINT8) (DisMap[Pos] | (UINT8) (1 << Bit));\r
+ for (Index2 = Index; Index2 < Number - 1; Index2++) {\r
+ NewLegacyDev[Index2] = NewLegacyDev[Index2 + 1];\r
+ }\r
\r
- NewLegacyDev[Index2] = 0xFF;\r
- } else {\r
- for (Index2 = 0; Index2 < Number; Index2++) {\r
- if (Index2 == Index) {\r
- continue;\r
+ NewLegacyDev[Index2] = 0xFF;\r
+ } else {\r
+ for (Index2 = 0; Index2 < Number; Index2++) {\r
+ if (Index2 == Index) {\r
+ continue;\r
+ }\r
+\r
+ if (OldLegacyDev[Index2] == NewValue) {\r
+ //\r
+ // If NewValue is in OldLegacyDev array\r
+ // remember its old position\r
+ //\r
+ NewValuePos = Index2;\r
+ break;\r
+ }\r
}\r
\r
- if (OldLegacyDev[Index2] == NewValue) {\r
+ if (Index2 != Number) {\r
//\r
- // If NewValue is in OldLegacyDev array\r
- // remember its old position\r
+ // We will change current item to an existing item\r
+ // (It's hard to describe here, please read code, it's like a cycle-moving)\r
//\r
- NewValuePos = Index2;\r
- break;\r
- }\r
- }\r
-\r
- if (Index2 != Number) {\r
- //\r
- // We will change current item to an existing item\r
- // (It's hard to describe here, please read code, it's like a cycle-moving)\r
- //\r
- for (Index2 = NewValuePos; Index2 != Index;) {\r
- if (NewValuePos < Index) {\r
- NewLegacyDev[Index2] = OldLegacyDev[Index2 + 1];\r
- Index2++;\r
- } else {\r
- NewLegacyDev[Index2] = OldLegacyDev[Index2 - 1];\r
- Index2--;\r
+ for (Index2 = NewValuePos; Index2 != Index;) {\r
+ if (NewValuePos < Index) {\r
+ NewLegacyDev[Index2] = OldLegacyDev[Index2 + 1];\r
+ Index2++;\r
+ } else {\r
+ NewLegacyDev[Index2] = OldLegacyDev[Index2 - 1];\r
+ Index2--;\r
+ }\r
}\r
- }\r
- } else {\r
- //\r
- // If NewValue is not in OldlegacyDev array, we are changing to a disabled item\r
- // so we should modify DisMap to reflect the change\r
- //\r
- Pos = NewValue / 8;\r
- Bit = 7 - (NewValue % 8);\r
- DisMap[Pos] = (UINT8) (DisMap[Pos] & (~ (UINT8) (1 << Bit)));\r
- if (0xFF != OldValue) {\r
+ } else {\r
//\r
- // Because NewValue is a item that was disabled before\r
- // so after changing the OldValue should be disabled\r
- // actually we are doing a swap of enable-disable states of two items\r
+ // If NewValue is not in OldlegacyDev array, we are changing to a disabled item\r
+ // so we should modify DisMap to reflect the change\r
//\r
- Pos = OldValue / 8;\r
- Bit = 7 - (OldValue % 8);\r
- DisMap[Pos] = (UINT8) (DisMap[Pos] | (UINT8) (1 << Bit));\r
+ Pos = NewValue / 8;\r
+ Bit = 7 - (NewValue % 8);\r
+ DisMap[Pos] = (UINT8) (DisMap[Pos] & (~ (UINT8) (1 << Bit)));\r
+ if (0xFF != OldValue) {\r
+ //\r
+ // Because NewValue is a item that was disabled before\r
+ // so after changing the OldValue should be disabled\r
+ // actually we are doing a swap of enable-disable states of two items\r
+ //\r
+ Pos = OldValue / 8;\r
+ Bit = 7 - (OldValue % 8);\r
+ DisMap[Pos] = (UINT8) (DisMap[Pos] | (UINT8) (1 << Bit));\r
+ }\r
}\r
}\r
- }\r
- //\r
- // To prevent DISABLE appears in the middle of the list\r
- // we should perform a re-ordering\r
- //\r
- Index = 0;\r
- while (Index < Number) {\r
- if (0xFF != NewLegacyDev[Index]) {\r
- Index++;\r
- continue;\r
- }\r
-\r
- Index2 = Index;\r
- Index2++;\r
- while (Index2 < Number) {\r
- if (0xFF != NewLegacyDev[Index2]) {\r
- break;\r
+ //\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
+ Index++;\r
+ continue;\r
}\r
\r
+ Index2 = Index;\r
Index2++;\r
- }\r
-\r
- if (Index2 < Number) {\r
- NewLegacyDev[Index] = NewLegacyDev[Index2];\r
- NewLegacyDev[Index2] = 0xFF;\r
- }\r
-\r
- Index++;\r
- }\r
-\r
- CopyMem (\r
- OldLegacyDev,\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 = BOOT_FROM_FILE_STATE;\r
+ while (Index2 < Number) {\r
+ if (0xFF != NewLegacyDev[Index2]) {\r
+ break;\r
+ }\r
\r
- //\r
- // Exit Bmm main formset to send File Explorer formset.\r
- //\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
- break;\r
+ Index2++;\r
+ }\r
\r
- case FORM_BOOT_ADD_ID:\r
- Private->FeCurrentState = ADD_BOOT_OPTION_STATE;\r
+ if (Index2 < Number) {\r
+ NewLegacyDev[Index] = NewLegacyDev[Index2];\r
+ NewLegacyDev[Index2] = 0xFF;\r
+ }\r
\r
- //\r
- // Exit Bmm main formset to send File Explorer formset.\r
- //\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
- break;\r
+ Index++;\r
+ }\r
\r
- case FORM_DRV_ADD_FILE_ID:\r
- Private->FeCurrentState = ADD_DRIVER_OPTION_STATE;\r
+ CopyMem (\r
+ OldLegacyDev,\r
+ NewLegacyDev,\r
+ Number\r
+ );\r
\r
//\r
- // Exit Bmm main formset to send File Explorer formset.\r
+ // Return correct question value.\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
+ 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
-\r
if (QuestionId == KEY_VALUE_SAVE_AND_EXIT) {\r
Status = ApplyChangeHandler (Private, CurrentFakeNVMap, Private->BmmPreviousPageId);\r
if (EFI_ERROR (Status)) {\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
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
+ break; \r
+\r
+ case FORM_RESET:\r
+ gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);\r
+ return EFI_UNSUPPORTED;\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
\r
//\r
// Pass changed uncommitted data back to Form Browser\r
//\r
- BufferSize = sizeof (BMM_FAKE_NV_DATA);\r
- Status = SetBrowserData (NULL, NULL, BufferSize, (UINT8 *) CurrentFakeNVMap, NULL);\r
-\r
- return Status;\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_BOOT_DEL_ID:\r
- ASSERT (BootOptionMenu.MenuNumber <= (sizeof (CurrentFakeNVMap->BootOptionDel) / sizeof (UINT8)));\r
- for (Index = 0; Index < BootOptionMenu.MenuNumber; Index++) {\r
+ for (Index = 0; \r
+ ((Index < BootOptionMenu.MenuNumber) && (Index < (sizeof (CurrentFakeNVMap->OptionDel) / sizeof (CurrentFakeNVMap->OptionDel[0])))); \r
+ Index ++) {\r
NewMenuEntry = BOpt_GetMenuEntry (&BootOptionMenu, Index);\r
NewLoadContext = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;\r
- NewLoadContext->Deleted = CurrentFakeNVMap->BootOptionDel[Index];\r
+ NewLoadContext->Deleted = CurrentFakeNVMap->OptionDel[Index];\r
}\r
\r
Var_DelBootOption ();\r
break;\r
\r
case FORM_DRV_DEL_ID:\r
- ASSERT (DriverOptionMenu.MenuNumber <= (sizeof (CurrentFakeNVMap->DriverOptionDel) / sizeof (UINT8)));\r
- for (Index = 0; Index < DriverOptionMenu.MenuNumber; Index++) {\r
+ for (Index = 0; \r
+ ((Index < DriverOptionMenu.MenuNumber) && (Index < (sizeof (CurrentFakeNVMap->OptionDel) / sizeof (CurrentFakeNVMap->OptionDel[0])))); \r
+ Index++) {\r
NewMenuEntry = BOpt_GetMenuEntry (&DriverOptionMenu, Index);\r
NewLoadContext = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;\r
- NewLoadContext->Deleted = CurrentFakeNVMap->DriverOptionDel[Index];\r
+ NewLoadContext->Deleted = CurrentFakeNVMap->OptionDel[Index];\r
}\r
\r
Var_DelDriverOption ();\r
break;\r
\r
case FORM_TIME_OUT_ID:\r
- Status = gRT->SetVariable (\r
- L"Timeout",\r
- &gEfiGlobalVariableGuid,\r
- VAR_FLAG,\r
- sizeof (UINT16),\r
- &(CurrentFakeNVMap->BootTimeOut)\r
- );\r
- if (EFI_ERROR (Status)) {\r
- goto Error;\r
- }\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
ASSERT (CurrentFakeNVMap->COMParity < (sizeof (ParityList) / sizeof (ParityList[0])));\r
NewTerminalContext->Parity = (UINT8) ParityList[CurrentFakeNVMap->COMParity].Value;\r
NewTerminalContext->TerminalType = CurrentFakeNVMap->COMTerminalType;\r
+ NewTerminalContext->FlowControl = CurrentFakeNVMap->COMFlowControl;\r
\r
ChangeTerminalDevicePath (\r
- NewTerminalContext->DevicePath,\r
+ &(NewTerminalContext->DevicePath),\r
FALSE\r
);\r
\r
break;\r
\r
case FORM_CON_IN_ID:\r
- ASSERT ((ConsoleInpMenu.MenuNumber + TerminalMenu.MenuNumber) <= (sizeof (CurrentFakeNVMap->ConsoleCheck) / sizeof (UINT8)));\r
for (Index = 0; Index < ConsoleInpMenu.MenuNumber; Index++) {\r
NewMenuEntry = BOpt_GetMenuEntry (&ConsoleInpMenu, Index);\r
NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;\r
+ ASSERT (Index < MAX_MENU_NUMBER);\r
NewConsoleContext->IsActive = CurrentFakeNVMap->ConsoleCheck[Index];\r
}\r
\r
for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {\r
NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, Index);\r
NewTerminalContext = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
+ ASSERT (Index + ConsoleInpMenu.MenuNumber < MAX_MENU_NUMBER);\r
NewTerminalContext->IsConIn = CurrentFakeNVMap->ConsoleCheck[Index + ConsoleInpMenu.MenuNumber];\r
}\r
\r
break;\r
\r
case FORM_CON_OUT_ID:\r
- ASSERT ((ConsoleOutMenu.MenuNumber + TerminalMenu.MenuNumber) <= (sizeof (CurrentFakeNVMap->ConsoleCheck) / sizeof (UINT8)));\r
for (Index = 0; Index < ConsoleOutMenu.MenuNumber; Index++) {\r
NewMenuEntry = BOpt_GetMenuEntry (&ConsoleOutMenu, Index);\r
NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;\r
+ ASSERT (Index < MAX_MENU_NUMBER);\r
NewConsoleContext->IsActive = CurrentFakeNVMap->ConsoleCheck[Index];\r
}\r
\r
for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {\r
NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, Index);\r
NewTerminalContext = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
+ ASSERT (Index + ConsoleOutMenu.MenuNumber < MAX_MENU_NUMBER);\r
NewTerminalContext->IsConOut = CurrentFakeNVMap->ConsoleCheck[Index + ConsoleOutMenu.MenuNumber];\r
}\r
\r
break;\r
\r
case FORM_CON_ERR_ID:\r
- ASSERT ((ConsoleErrMenu.MenuNumber + TerminalMenu.MenuNumber) <= (sizeof (CurrentFakeNVMap->ConsoleCheck) / sizeof (UINT8)));\r
for (Index = 0; Index < ConsoleErrMenu.MenuNumber; Index++) {\r
NewMenuEntry = BOpt_GetMenuEntry (&ConsoleErrMenu, Index);\r
NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;\r
+ ASSERT (Index < MAX_MENU_NUMBER);\r
NewConsoleContext->IsActive = CurrentFakeNVMap->ConsoleCheck[Index];\r
}\r
\r
for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {\r
NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, Index);\r
NewTerminalContext = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
+ ASSERT (Index + ConsoleErrMenu.MenuNumber < MAX_MENU_NUMBER);\r
NewTerminalContext->IsStdErr = CurrentFakeNVMap->ConsoleCheck[Index + ConsoleErrMenu.MenuNumber];\r
}\r
\r
switch (Private->BmmPreviousPageId) {\r
case FORM_BOOT_CHG_ID:\r
case FORM_DRV_CHG_ID:\r
- CopyMem (CurrentFakeNVMap->OptionOrder, Private->BmmOldFakeNVData.OptionOrder, 100);\r
+ CopyMem (CurrentFakeNVMap->OptionOrder, Private->BmmOldFakeNVData.OptionOrder, sizeof (CurrentFakeNVMap->OptionOrder));\r
break;\r
\r
case FORM_BOOT_DEL_ID:\r
- ASSERT (BootOptionMenu.MenuNumber <= (sizeof (CurrentFakeNVMap->BootOptionDel) / sizeof (CurrentFakeNVMap->BootOptionDel[0])));\r
+ ASSERT (BootOptionMenu.MenuNumber <= (sizeof (CurrentFakeNVMap->OptionDel) / sizeof (CurrentFakeNVMap->OptionDel[0])));\r
for (Index = 0; Index < BootOptionMenu.MenuNumber; Index++) {\r
- CurrentFakeNVMap->BootOptionDel[Index] = 0x00;\r
+ CurrentFakeNVMap->OptionDel[Index] = FALSE;\r
}\r
break;\r
\r
case FORM_DRV_DEL_ID:\r
- ASSERT (DriverOptionMenu.MenuNumber <= (sizeof (CurrentFakeNVMap->DriverOptionDel) / sizeof (CurrentFakeNVMap->DriverOptionDel[0])));\r
+ ASSERT (DriverOptionMenu.MenuNumber <= (sizeof (CurrentFakeNVMap->OptionDel) / sizeof (CurrentFakeNVMap->OptionDel[0])));\r
for (Index = 0; Index < DriverOptionMenu.MenuNumber; Index++) {\r
- CurrentFakeNVMap->DriverOptionDel[Index] = 0x00;\r
+ CurrentFakeNVMap->OptionDel[Index] = FALSE;\r
}\r
break;\r
\r
)\r
{\r
EFI_LEGACY_BIOS_PROTOCOL *LegacyBios;\r
- EFI_HII_PACKAGE_LIST_HEADER *PackageList;\r
BMM_CALLBACK_DATA *BmmCallbackInfo;\r
EFI_STATUS Status;\r
UINT8 *Ptr;\r
BmmCallbackInfo->FeConfigAccess.ExtractConfig = FakeExtractConfig;\r
BmmCallbackInfo->FeConfigAccess.RouteConfig = FakeRouteConfig;\r
BmmCallbackInfo->FeConfigAccess.Callback = FileExplorerCallback;\r
- BmmCallbackInfo->FeCurrentState = INACTIVE_STATE;\r
- BmmCallbackInfo->FeDisplayContext = UNKNOWN_CONTEXT;\r
+ BmmCallbackInfo->FeCurrentState = FileExplorerStateInActive;\r
+ BmmCallbackInfo->FeDisplayContext = FileExplorerDisplayUnknown;\r
\r
//\r
- // Create driver handle used by HII database\r
+ // Install Device Path Protocol and Config Access protocol to driver handle\r
//\r
- Status = HiiLibCreateHiiDriverHandle (&BmmCallbackInfo->BmmDriverHandle);\r
+ Status = gBS->InstallMultipleProtocolInterfaces (\r
+ &BmmCallbackInfo->BmmDriverHandle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ &mBmmHiiVendorDevicePath,\r
+ &gEfiHiiConfigAccessProtocolGuid,\r
+ &BmmCallbackInfo->BmmConfigAccess,\r
+ NULL\r
+ );\r
if (EFI_ERROR (Status)) {\r
- return Status;\r
+ goto Exit;\r
}\r
\r
//\r
- // Install Config Access protocol to driver handle\r
+ // Install Device Path Protocol and Config Access protocol to driver handle\r
//\r
- Status = gBS->InstallProtocolInterface (\r
- &BmmCallbackInfo->BmmDriverHandle,\r
+ Status = gBS->InstallMultipleProtocolInterfaces (\r
+ &BmmCallbackInfo->FeDriverHandle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ &mFeHiiVendorDevicePath,\r
&gEfiHiiConfigAccessProtocolGuid,\r
- EFI_NATIVE_INTERFACE,\r
- &BmmCallbackInfo->BmmConfigAccess\r
+ &BmmCallbackInfo->FeConfigAccess,\r
+ NULL\r
);\r
if (EFI_ERROR (Status)) {\r
- return Status;\r
+ goto Exit;\r
}\r
\r
//\r
- // Create driver handle used by HII database\r
+ // Post our Boot Maint VFR binary to the HII database.\r
//\r
- Status = HiiLibCreateHiiDriverHandle (&BmmCallbackInfo->FeDriverHandle);\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
+ BmmCallbackInfo->BmmHiiHandle = HiiAddPackages (\r
+ &gBootMaintFormSetGuid,\r
+ BmmCallbackInfo->BmmDriverHandle,\r
+ BmBin,\r
+ BdsDxeStrings,\r
+ NULL\r
+ );\r
+ ASSERT (BmmCallbackInfo->BmmHiiHandle != NULL);\r
\r
//\r
- // Install Config Access protocol to driver handle\r
+ // Post our File Explorer VFR binary to the HII database.\r
//\r
- Status = gBS->InstallProtocolInterface (\r
- &BmmCallbackInfo->FeDriverHandle,\r
- &gEfiHiiConfigAccessProtocolGuid,\r
- EFI_NATIVE_INTERFACE,\r
- &BmmCallbackInfo->FeConfigAccess\r
- );\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
+ BmmCallbackInfo->FeHiiHandle = HiiAddPackages (\r
+ &gFileExploreFormSetGuid,\r
+ BmmCallbackInfo->FeDriverHandle,\r
+ FEBin,\r
+ BdsDxeStrings,\r
+ NULL\r
+ );\r
+ ASSERT (BmmCallbackInfo->FeHiiHandle != NULL);\r
\r
//\r
- // Post our Boot Maint VFR binnary to the HII database.\r
+ // Init OpCode Handle and Allocate space for creation of Buffer\r
//\r
- PackageList = HiiLibPreparePackageList (2, &mBootMaintGuid, BmBin, BdsDxeStrings);\r
- ASSERT (PackageList != NULL);\r
+ mStartOpCodeHandle = HiiAllocateOpCodeHandle ();\r
+ if (mStartOpCodeHandle == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ goto Exit;\r
+ }\r
\r
- Status = gHiiDatabase->NewPackageList (\r
- gHiiDatabase,\r
- PackageList,\r
- BmmCallbackInfo->BmmDriverHandle,\r
- &BmmCallbackInfo->BmmHiiHandle\r
- );\r
- FreePool (PackageList);\r
+ mEndOpCodeHandle = HiiAllocateOpCodeHandle ();\r
+ if (mEndOpCodeHandle == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ goto Exit;\r
+ }\r
\r
//\r
- // Post our File Explorer VFR binary to the HII database.\r
+ // Create Hii Extend Label OpCode as the start opcode\r
//\r
- PackageList = HiiLibPreparePackageList (2, &mFileExplorerGuid, FEBin, BdsDxeStrings);\r
- ASSERT (PackageList != NULL);\r
-\r
- Status = gHiiDatabase->NewPackageList (\r
- gHiiDatabase,\r
- PackageList,\r
- BmmCallbackInfo->FeDriverHandle,\r
- &BmmCallbackInfo->FeHiiHandle\r
- );\r
- FreePool (PackageList);\r
+ mStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (mStartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
+ mStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
\r
//\r
- // Allocate space for creation of Buffer\r
+ // Create Hii Extend Label OpCode as the end opcode\r
//\r
- gUpdateData.BufferSize = UPDATE_DATA_SIZE;\r
- gUpdateData.Data = AllocateZeroPool (UPDATE_DATA_SIZE);\r
- if (gUpdateData.Data == NULL) {\r
- FreePool (BmmCallbackInfo->LoadContext);\r
- FreePool (BmmCallbackInfo);\r
- return EFI_OUT_OF_RESOURCES;\r
- }\r
+ mEndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (mEndOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
+ mEndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
+ mEndLabel->Number = LABEL_END;\r
\r
InitializeStringDepository ();\r
\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
//\r
// If LegacyBios Protocol is installed, add 3 tags about legacy boot option\r
// in BootOption form: legacy FD/HD/CD/NET/BEV\r
//\r
- CreateGotoOpCode (\r
+ HiiCreateGotoOpCode (\r
+ mStartOpCodeHandle,\r
FORM_SET_FD_ORDER_ID,\r
STRING_TOKEN (STR_FORM_SET_FD_ORDER_TITLE),\r
STRING_TOKEN (STR_FORM_SET_FD_ORDER_TITLE),\r
EFI_IFR_FLAG_CALLBACK,\r
- FORM_SET_FD_ORDER_ID,\r
- &gUpdateData\r
+ FORM_SET_FD_ORDER_ID\r
);\r
\r
- CreateGotoOpCode (\r
+ HiiCreateGotoOpCode (\r
+ mStartOpCodeHandle,\r
FORM_SET_HD_ORDER_ID,\r
STRING_TOKEN (STR_FORM_SET_HD_ORDER_TITLE),\r
STRING_TOKEN (STR_FORM_SET_HD_ORDER_TITLE),\r
EFI_IFR_FLAG_CALLBACK,\r
- FORM_SET_HD_ORDER_ID,\r
- &gUpdateData\r
+ FORM_SET_HD_ORDER_ID\r
);\r
\r
- CreateGotoOpCode (\r
+ HiiCreateGotoOpCode (\r
+ mStartOpCodeHandle,\r
FORM_SET_CD_ORDER_ID,\r
STRING_TOKEN (STR_FORM_SET_CD_ORDER_TITLE),\r
STRING_TOKEN (STR_FORM_SET_CD_ORDER_TITLE),\r
EFI_IFR_FLAG_CALLBACK,\r
- FORM_SET_CD_ORDER_ID,\r
- &gUpdateData\r
+ FORM_SET_CD_ORDER_ID\r
);\r
\r
- CreateGotoOpCode (\r
+ HiiCreateGotoOpCode (\r
+ mStartOpCodeHandle,\r
FORM_SET_NET_ORDER_ID,\r
STRING_TOKEN (STR_FORM_SET_NET_ORDER_TITLE),\r
STRING_TOKEN (STR_FORM_SET_NET_ORDER_TITLE),\r
EFI_IFR_FLAG_CALLBACK,\r
- FORM_SET_NET_ORDER_ID,\r
- &gUpdateData\r
+ FORM_SET_NET_ORDER_ID\r
);\r
\r
- CreateGotoOpCode (\r
+ HiiCreateGotoOpCode (\r
+ mStartOpCodeHandle,\r
FORM_SET_BEV_ORDER_ID,\r
STRING_TOKEN (STR_FORM_SET_BEV_ORDER_TITLE),\r
STRING_TOKEN (STR_FORM_SET_BEV_ORDER_TITLE),\r
EFI_IFR_FLAG_CALLBACK,\r
- FORM_SET_BEV_ORDER_ID,\r
- &gUpdateData\r
+ FORM_SET_BEV_ORDER_ID\r
);\r
-\r
- IfrLibUpdateForm (\r
+ \r
+ HiiUpdateForm (\r
BmmCallbackInfo->BmmHiiHandle,\r
- &mBootMaintGuid,\r
- FORM_MAIN_ID,\r
- FORM_BOOT_LEGACY_DEVICE_ID,\r
- FALSE,\r
- &gUpdateData\r
+ &gBootMaintFormSetGuid,\r
+ FORM_BOOT_SETUP_ID,\r
+ mStartOpCodeHandle, // Label FORM_BOOT_LEGACY_DEVICE_ID\r
+ mEndOpCodeHandle // LABEL_END\r
);\r
}\r
\r
//\r
// Remove our IFR data from HII database\r
//\r
- gHiiDatabase->RemovePackageList (gHiiDatabase, BmmCallbackInfo->BmmHiiHandle);\r
- gHiiDatabase->RemovePackageList (gHiiDatabase, BmmCallbackInfo->FeHiiHandle);\r
+ HiiRemovePackages (BmmCallbackInfo->BmmHiiHandle);\r
+ HiiRemovePackages (BmmCallbackInfo->FeHiiHandle);\r
\r
CleanUpStringDepository ();\r
\r
FreeAllMenu ();\r
\r
+Exit:\r
+ if (mStartOpCodeHandle != NULL) {\r
+ HiiFreeOpCodeHandle (mStartOpCodeHandle);\r
+ }\r
+\r
+ if (mEndOpCodeHandle != NULL) {\r
+ HiiFreeOpCodeHandle (mEndOpCodeHandle);\r
+ }\r
+\r
+ if (BmmCallbackInfo->FeDriverHandle != NULL) {\r
+ gBS->UninstallMultipleProtocolInterfaces (\r
+ BmmCallbackInfo->FeDriverHandle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ &mFeHiiVendorDevicePath,\r
+ &gEfiHiiConfigAccessProtocolGuid,\r
+ &BmmCallbackInfo->FeConfigAccess,\r
+ NULL\r
+ );\r
+ }\r
+\r
+ if (BmmCallbackInfo->BmmDriverHandle != NULL) {\r
+ gBS->UninstallMultipleProtocolInterfaces (\r
+ BmmCallbackInfo->BmmDriverHandle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ &mBmmHiiVendorDevicePath,\r
+ &gEfiHiiConfigAccessProtocolGuid,\r
+ &BmmCallbackInfo->BmmConfigAccess,\r
+ NULL\r
+ );\r
+ }\r
+\r
FreePool (BmmCallbackInfo->LoadContext);\r
FreePool (BmmCallbackInfo);\r
- FreePool (gUpdateData.Data);\r
- gUpdateData.Data = NULL;\r
\r
return Status;\r
}\r
}\r
\r
/**\r
- Intialize all the string depositories.\r
+ Initialize all the string depositories.\r
\r
**/\r
VOID\r
//\r
NextListNode = AllocateZeroPool (sizeof (STRING_LIST_NODE));\r
ASSERT (NextListNode != NULL);\r
- HiiLibNewString (CallbackData->BmmHiiHandle, &(NextListNode->StringToken), L" ");\r
+ NextListNode->StringToken = HiiSetString (CallbackData->BmmHiiHandle, 0, L" ", NULL);\r
ASSERT (NextListNode->StringToken != 0);\r
\r
StringDepository->TotalNodeNumber++;\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
- NULL,\r
+ &gBootMaintFormSetGuid,\r
0,\r
NULL,\r
&ActionRequest\r
//\r
// When this Formset returns, check if we are going to explore files.\r
//\r
- if (INACTIVE_STATE != CallbackData->FeCurrentState) {\r
+ if (FileExplorerStateInActive != CallbackData->FeCurrentState) {\r
UpdateFileExplorer (CallbackData, 0);\r
\r
ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
gFormBrowser2,\r
&CallbackData->FeHiiHandle,\r
1,\r
- NULL,\r
+ &gFileExploreFormSetGuid,\r
0,\r
NULL,\r
&ActionRequest\r
EnableResetRequired ();\r
}\r
\r
- CallbackData->FeCurrentState = INACTIVE_STATE;\r
- CallbackData->FeDisplayContext = UNKNOWN_CONTEXT;\r
+ CallbackData->FeCurrentState = FileExplorerStateInActive;\r
+ CallbackData->FeDisplayContext = FileExplorerDisplayUnknown;\r
ReclaimStringDepository ();\r
} else {\r
break;\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
- @return Other value if the Boot Option specified by OptionNumber is not deleteed succesfully.\r
- @retval EFI_SUCCESS If function return successfully.\r
-\r
-**/\r
-EFI_STATUS\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
projects / mirror_edk2.git / blobdiff