From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 960871A1E5F for ; Wed, 31 Aug 2016 23:04:52 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP; 31 Aug 2016 23:04:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,265,1470726000"; d="scan'208";a="873957483" Received: from shwde7172.ccr.corp.intel.com ([10.239.9.23]) by orsmga003.jf.intel.com with ESMTP; 31 Aug 2016 23:04:50 -0700 From: Liming Gao To: edk2-devel@lists.01.org Date: Thu, 1 Sep 2016 14:04:46 +0800 Message-Id: <1472709886-58924-1-git-send-email-liming.gao@intel.com> X-Mailer: git-send-email 2.8.0.windows.1 Subject: [PATCH v2] MdeModulePkg UefiBootManagerLib: Rename BootMenuApp to BootManagerMenu X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Sep 2016 06:04:52 -0000 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 Reviewed-by: Ruiyu Ni --- MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c index ecd0ae3..fe09a04 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c @@ -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. - @retval TRUE The device path is BootMenuApp File Device Path. - @retval FALSE The device path is NOT BootMenuApp File Device Path. + @retval TRUE The device path is BootManagerMenu File Device Path. + @retval FALSE The device path is NOT BootManagerMenu File Device Path. **/ BOOLEAN -BmIsBootMenuAppFilePath ( +BmIsBootManagerMenuFilePath ( 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 // the boot option. // - if (BmIsBootMenuAppFilePath (BootOption->FilePath)) { + if (BmIsBootManagerMenuFilePath (BootOption->FilePath)) { DEBUG ((EFI_D_INFO, "[Bds] Booting Boot Manager Menu.\n")); BmStopHotkeyService (NULL, NULL); } else { @@ -2080,10 +2080,10 @@ BmEnumerateBootOptions ( 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; - if (BmIsBootMenuAppFilePath (DevicePathFromHandle (Handles[Index]))) { + if (BmIsBootManagerMenuFilePath (DevicePathFromHandle (Handles[Index]))) { BootAttributes = LOAD_OPTION_CATEGORY_APP | LOAD_OPTION_ACTIVE | LOAD_OPTION_HIDDEN; } @@ -2215,7 +2215,7 @@ BmRegisterBootManagerMenu ( DevicePath = NULL; Description = NULL; // - // Try to find BootMenuApp from LoadFile protocol + // Try to find BootManagerMenu from LoadFile protocol // gBS->LocateHandleBuffer ( ByProtocol, @@ -2225,7 +2225,7 @@ BmRegisterBootManagerMenu ( &Handles ); for (Index = 0; Index < HandleCount; Index++) { - if (BmIsBootMenuAppFilePath (DevicePathFromHandle (Handles[Index]))) { + if (BmIsBootManagerMenuFilePath (DevicePathFromHandle (Handles[Index]))) { DevicePath = DuplicateDevicePath (DevicePathFromHandle (Handles[Index])); Description = BmGetBootDescription (Handles[Index]); break; @@ -2334,7 +2334,7 @@ EfiBootManagerGetBootManagerMenu ( BootOptions = EfiBootManagerGetLoadOptions (&BootOptionCount, LoadOptionTypeBoot); for (Index = 0; Index < BootOptionCount; Index++) { - if (BmIsBootMenuAppFilePath (BootOptions[Index].FilePath)) { + if (BmIsBootManagerMenuFilePath (BootOptions[Index].FilePath)) { Status = EfiBootManagerInitializeLoadOption ( BootOption, BootOptions[Index].OptionNumber, -- 2.8.0.windows.1