On 04/29/16 09:00, Ruiyu Ni wrote:
> Change the function name to follow new library class
> PlatformBootManagerLib interfaces.
>
> NOTE: There is no progress bar during BDS timeout waiting.
> In order to show the progress bar, PlatformBootManagerWaitCallback ()
> needs to change to draw it.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ruiyu Ni <ruiyu...@intel.com>
> Cc: Jordan Justen <jordan.l.jus...@intel.com>
> Cc: Laszlo Ersek <ler...@redhat.com>
> ---
> .../Library/PlatformBootManagerLib/BdsPlatform.c | 42
> ++++++++++------------
> .../Library/PlatformBootManagerLib/BdsPlatform.h | 3 +-
> ...atformBdsLib.inf => PlatformBootManagerLib.inf} | 4 +--
> 3 files changed, 22 insertions(+), 27 deletions(-)
> rename OvmfPkg/Library/PlatformBootManagerLib/{PlatformBdsLib.inf =>
> PlatformBootManagerLib.inf} (90%)
Reviewed-by: Laszlo Ersek <ler...@redhat.com>
Thanks!
Laszlo
> diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
> b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
> index 8354f31..1988b3e 100644
> --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
> +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
> @@ -1,7 +1,7 @@
> /** @file
> Platform BDS customizations.
>
> - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
> This program and the accompanying materials
> are licensed and made available under the terms and conditions of the BSD
> License
> which accompanies this distribution. The full text of the license may be
> found at
> @@ -107,7 +107,7 @@ SaveS3BootScript (
> //
> VOID
> EFIAPI
> -PlatformBdsInit (
> +PlatformBootManagerBeforeConsole (
> VOID
> )
> /*++
> @@ -128,7 +128,7 @@ Returns:
> EFI_HANDLE Handle;
> EFI_STATUS Status;
>
> - DEBUG ((EFI_D_INFO, "PlatformBdsInit\n"));
> + DEBUG ((EFI_D_INFO, "PlatformBootManagerBeforeConsole\n"));
> InstallDevicePathCallback ();
>
> VisitAllInstancesOfProtocol (&gEfiPciRootBridgeIoProtocolGuid,
> @@ -1249,11 +1249,8 @@ SaveS3BootScript (
>
> VOID
> EFIAPI
> -PlatformBdsPolicyBehavior (
> - IN OUT LIST_ENTRY *DriverOptionList,
> - IN OUT LIST_ENTRY *BootOptionList,
> - IN PROCESS_CAPSULES ProcessCapsules,
> - IN BASEM_MEMORY_TEST BaseMemoryTest
> +PlatformBootManagerAfterConsole (
> + VOID
> )
> /*++
>
> @@ -1263,26 +1260,12 @@ Routine Description:
> is driven by boot mode. IBV/OEM can customize this code for their specific
> policy action.
>
> -Arguments:
> -
> - DriverOptionList - The header of the driver option link list
> -
> - BootOptionList - The header of the boot option link list
> -
> - ProcessCapsules - A pointer to ProcessCapsules()
> -
> - BaseMemoryTest - A pointer to BaseMemoryTest()
> -
> -Returns:
> -
> - None.
> -
> --*/
> {
> EFI_STATUS Status;
> EFI_BOOT_MODE BootMode;
>
> - DEBUG ((EFI_D_INFO, "PlatformBdsPolicyBehavior\n"));
> + DEBUG ((EFI_D_INFO, "PlatformBootManagerAfterConsole\n"));
>
> if (PcdGetBool (PcdOvmfFlashVariablesEnable)) {
> DEBUG ((EFI_D_INFO, "PlatformBdsPolicyBehavior: not restoring NvVars "
> @@ -1571,6 +1554,19 @@ InstallDevicePathCallback (
> }
>
> /**
> + This function is called each second during the boot manager waits the
> timeout.
> +
> + @param TimeoutRemain The remaining timeout.
> +**/
> +VOID
> +EFIAPI
> +PlatformBootManagerWaitCallback (
> + UINT16 TimeoutRemain
> + )
> +{
> +}
> +
> +/**
> Lock the ConsoleIn device in system table. All key
> presses will be ignored until the Password is typed in. The only way to
> disable the password is to type it in to a ConIn device.
> diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
> b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
> index d6ff316..84f5b6f 100644
> --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
> +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
> @@ -1,7 +1,7 @@
> /** @file
> Platform BDS customizations include file.
>
> - Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
> This program and the accompanying materials
> are licensed and made available under the terms and conditions of the BSD
> License
> which accompanies this distribution. The full text of the license may be
> found at
> @@ -40,7 +40,6 @@ Abstract:
> #include <Library/PcdLib.h>
> #include <Library/PciLib.h>
> #include <Library/GenericBdsLib.h>
> -#include <Library/PlatformBdsLib.h>
> #include <Library/HobLib.h>
> #include <Library/UefiLib.h>
> #include <Library/DxeServicesTableLib.h>
> diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBdsLib.inf
> b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> similarity index 90%
> rename from OvmfPkg/Library/PlatformBootManagerLib/PlatformBdsLib.inf
> rename to OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> index 239d50f..abac516 100644
> --- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBdsLib.inf
> +++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> @@ -14,11 +14,11 @@
>
> [Defines]
> INF_VERSION = 0x00010005
> - BASE_NAME = PlatformBdsLib
> + BASE_NAME = PlatformBootManagerLib
> FILE_GUID = FB65006C-AC9F-4992-AD80-184B2BDBBD83
> MODULE_TYPE = DXE_DRIVER
> VERSION_STRING = 1.0
> - LIBRARY_CLASS = PlatformBdsLib|DXE_DRIVER
> + LIBRARY_CLASS = PlatformBootManagerLib|DXE_DRIVER
>
> #
> # The following information is for reference only and not required by the
> build tools.
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
