MdeModulePkg UefiBootManagerLib: Rename BootMenuApp to BootManagerMenu

Rename local function name BootMenuApp to BootManagerMenu to align to
other public function name.

In V2, use "BootManagerMenu" instead of "BootMenuApp".

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Sunny Wang <sunnywang@hpe.com>
This commit is contained in:
Liming Gao 2016-09-01 13:30:13 +08:00
parent 4a2aaff2fc
commit 7c69fbf20d
1 changed files with 10 additions and 10 deletions

View File

@ -1530,15 +1530,15 @@ EfiBootManagerGetLoadOptionBuffer (
} }
/** /**
Check if it's a Device Path pointing to BootMenuApp. Check if it's a Device Path pointing to BootManagerMenu.
@param DevicePath Input device path. @param DevicePath Input device path.
@retval TRUE The device path is BootMenuApp File Device Path. @retval TRUE The device path is BootManagerMenu File Device Path.
@retval FALSE The device path is NOT BootMenuApp File Device Path. @retval FALSE The device path is NOT BootManagerMenu File Device Path.
**/ **/
BOOLEAN BOOLEAN
BmIsBootMenuAppFilePath ( BmIsBootManagerMenuFilePath (
EFI_DEVICE_PATH_PROTOCOL *DevicePath EFI_DEVICE_PATH_PROTOCOL *DevicePath
) )
{ {
@ -1645,7 +1645,7 @@ EfiBootManagerBoot (
// 3. Signal the EVT_SIGNAL_READY_TO_BOOT event when we are about to load and execute // 3. Signal the EVT_SIGNAL_READY_TO_BOOT event when we are about to load and execute
// the boot option. // the boot option.
// //
if (BmIsBootMenuAppFilePath (BootOption->FilePath)) { if (BmIsBootManagerMenuFilePath (BootOption->FilePath)) {
DEBUG ((EFI_D_INFO, "[Bds] Booting Boot Manager Menu.\n")); DEBUG ((EFI_D_INFO, "[Bds] Booting Boot Manager Menu.\n"));
BmStopHotkeyService (NULL, NULL); BmStopHotkeyService (NULL, NULL);
} else { } else {
@ -2080,10 +2080,10 @@ BmEnumerateBootOptions (
ASSERT (BootOptions != NULL); ASSERT (BootOptions != NULL);
// //
// If LoadFile includes BootMenuApp, its boot attribue will be set to APP and HIDDEN. // If LoadFile includes BootManagerMenu, its boot attribue will be set to APP and HIDDEN.
// //
BootAttributes = LOAD_OPTION_ACTIVE; BootAttributes = LOAD_OPTION_ACTIVE;
if (BmIsBootMenuAppFilePath (DevicePathFromHandle (Handles[Index]))) { if (BmIsBootManagerMenuFilePath (DevicePathFromHandle (Handles[Index]))) {
BootAttributes = LOAD_OPTION_CATEGORY_APP | LOAD_OPTION_ACTIVE | LOAD_OPTION_HIDDEN; BootAttributes = LOAD_OPTION_CATEGORY_APP | LOAD_OPTION_ACTIVE | LOAD_OPTION_HIDDEN;
} }
@ -2215,7 +2215,7 @@ BmRegisterBootManagerMenu (
DevicePath = NULL; DevicePath = NULL;
Description = NULL; Description = NULL;
// //
// Try to find BootMenuApp from LoadFile protocol // Try to find BootManagerMenu from LoadFile protocol
// //
gBS->LocateHandleBuffer ( gBS->LocateHandleBuffer (
ByProtocol, ByProtocol,
@ -2225,7 +2225,7 @@ BmRegisterBootManagerMenu (
&Handles &Handles
); );
for (Index = 0; Index < HandleCount; Index++) { for (Index = 0; Index < HandleCount; Index++) {
if (BmIsBootMenuAppFilePath (DevicePathFromHandle (Handles[Index]))) { if (BmIsBootManagerMenuFilePath (DevicePathFromHandle (Handles[Index]))) {
DevicePath = DuplicateDevicePath (DevicePathFromHandle (Handles[Index])); DevicePath = DuplicateDevicePath (DevicePathFromHandle (Handles[Index]));
Description = BmGetBootDescription (Handles[Index]); Description = BmGetBootDescription (Handles[Index]);
break; break;
@ -2334,7 +2334,7 @@ EfiBootManagerGetBootManagerMenu (
BootOptions = EfiBootManagerGetLoadOptions (&BootOptionCount, LoadOptionTypeBoot); BootOptions = EfiBootManagerGetLoadOptions (&BootOptionCount, LoadOptionTypeBoot);
for (Index = 0; Index < BootOptionCount; Index++) { for (Index = 0; Index < BootOptionCount; Index++) {
if (BmIsBootMenuAppFilePath (BootOptions[Index].FilePath)) { if (BmIsBootManagerMenuFilePath (BootOptions[Index].FilePath)) {
Status = EfiBootManagerInitializeLoadOption ( Status = EfiBootManagerInitializeLoadOption (
BootOption, BootOption,
BootOptions[Index].OptionNumber, BootOptions[Index].OptionNumber,