diff mbox

[edk2,03/13] ArmVirtPkg/PlatformBootManagerLib: use EfiBootManagerUpdateConsoleVariable

Message ID 1462476147-10404-4-git-send-email-lersek@redhat.com
State Accepted
Commit b7a33aff2630bedab7e8102ba8fcd7eee12d39f9
Headers show

Commit Message

Laszlo Ersek May 5, 2016, 7:22 p.m. UTC 
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 <ard.biesheuvel@linaro.org>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>

---
 ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

-- 
1.8.3.1


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
diff mbox

Patch

diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
index 4920621e5d19..56f0ea8ff77a 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);
 
   //