From b7a33aff2630bedab7e8102ba8fcd7eee12d39f9 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 5 May 2016 15:58:56 +0200 Subject: ArmVirtPkg/PlatformBootManagerLib: use EfiBootManagerUpdateConsoleVariable In this rather mechanical patch, we replace the calls to GenericBdsLib's BdsLibUpdateConsoleVariable() with calls to UefiBootManagerLib's EfiBootManagerUpdateConsoleVariable(), which has the same purpose. The latter uses CONSOLE_TYPE enum constants from "MdeModulePkg/Include/Library/UefiBootManagerLib.h", for identifying the console type / underlying UEFI variable in the first parameter. This patch parallels OvmfPkg commit 9dc08ec6574b. Cc: Ard Biesheuvel Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel Tested-by: Ard Biesheuvel Reviewed-by: Ruiyu Ni --- ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ArmVirtPkg') diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c index 4920621e5d..56f0ea8ff7 100644 --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -329,14 +329,14 @@ AddOutput ( return; } - Status = BdsLibUpdateConsoleVariable (L"ConOut", DevicePath, NULL); + Status = EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL); if (EFI_ERROR (Status)) { DEBUG ((EFI_D_ERROR, "%a: %s: adding to ConOut: %r\n", __FUNCTION__, ReportText, Status)); return; } - Status = BdsLibUpdateConsoleVariable (L"ErrOut", DevicePath, NULL); + Status = EfiBootManagerUpdateConsoleVariable (ErrOut, DevicePath, NULL); if (EFI_ERROR (Status)) { DEBUG ((EFI_D_ERROR, "%a: %s: adding to ErrOut: %r\n", __FUNCTION__, ReportText, Status)); @@ -393,7 +393,7 @@ PlatformBootManagerAfterConsole ( // // Add the hardcoded short-form USB keyboard device path to ConIn. // - BdsLibUpdateConsoleVariable (L"ConIn", + EfiBootManagerUpdateConsoleVariable (ConIn, (EFI_DEVICE_PATH_PROTOCOL *)&mUsbKeyboard, NULL); // @@ -401,11 +401,11 @@ PlatformBootManagerAfterConsole ( // CopyGuid (&mSerialConsole.TermType.Guid, PcdGetPtr (PcdTerminalTypeGuidBuffer)); - BdsLibUpdateConsoleVariable (L"ConIn", + EfiBootManagerUpdateConsoleVariable (ConIn, (EFI_DEVICE_PATH_PROTOCOL *)&mSerialConsole, NULL); - BdsLibUpdateConsoleVariable (L"ConOut", + EfiBootManagerUpdateConsoleVariable (ConOut, (EFI_DEVICE_PATH_PROTOCOL *)&mSerialConsole, NULL); - BdsLibUpdateConsoleVariable (L"ErrOut", + EfiBootManagerUpdateConsoleVariable (ErrOut, (EFI_DEVICE_PATH_PROTOCOL *)&mSerialConsole, NULL); // -- cgit v1.2.3