OvmfPkg/PlatformBootManagerLib: use EfiBootManagerUpdateConsoleVariable

Call EfiBootManagerUpdateConsoleVariable in UefiBootManagerLib
instead of BdsLibUpdateConsoleVariable in GenericBdsLib.

Still cannot pass build.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index 1988b3e04c3034f7f78971f9565fddac563728b0..ea0ae1ecd70ff02ed09bf65b6b599f331b30b581 100644 (file)
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -236,7 +236,7 @@ Returns:
   //\r
   DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *)&gPnpPs2KeyboardDeviceNode);\r
 \r
-  BdsLibUpdateConsoleVariable (VarConsoleInp, DevicePath, NULL);\r
+  EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);\r
 \r
   //\r
   // Register COM1\r
@@ -263,9 +263,9 @@ Returns:
     FreePool(DevPathStr);\r
   }\r
 \r
-  BdsLibUpdateConsoleVariable (VarConsoleOut, DevicePath, NULL);\r
-  BdsLibUpdateConsoleVariable (VarConsoleInp, DevicePath, NULL);\r
-  BdsLibUpdateConsoleVariable (VarErrorOut, DevicePath, NULL);\r
+  EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);\r
+  EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);\r
+  EfiBootManagerUpdateConsoleVariable (ErrOut, DevicePath, NULL);\r
 \r
   //\r
   // Register COM2\r
@@ -292,9 +292,9 @@ Returns:
     FreePool(DevPathStr);\r
   }\r
 \r
-  BdsLibUpdateConsoleVariable (VarConsoleOut, DevicePath, NULL);\r
-  BdsLibUpdateConsoleVariable (VarConsoleInp, DevicePath, NULL);\r
-  BdsLibUpdateConsoleVariable (VarErrorOut, DevicePath, NULL);\r
+  EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);\r
+  EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);\r
+  EfiBootManagerUpdateConsoleVariable (ErrOut, DevicePath, NULL);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -374,8 +374,8 @@ GetGopDevicePath (
         // Delete the PCI device's path that added by GetPlugInPciVgaDevicePath()\r
         // Add the integrity GOP device path.\r
         //\r
-        BdsLibUpdateConsoleVariable (VarConsoleOutDev, NULL, PciDevicePath);\r
-        BdsLibUpdateConsoleVariable (VarConsoleOutDev, TempDevicePath, NULL);\r
+        EfiBootManagerUpdateConsoleVariable (ConOutDev, NULL, PciDevicePath);\r
+        EfiBootManagerUpdateConsoleVariable (ConOutDev, TempDevicePath, NULL);\r
       }\r
     }\r
     gBS->FreePool (GopHandleBuffer);\r
@@ -424,7 +424,7 @@ Returns:
   GetGopDevicePath (DevicePath, &GopDevicePath);\r
   DevicePath = GopDevicePath;\r
 \r
-  BdsLibUpdateConsoleVariable (VarConsoleOut, DevicePath, NULL);\r
+  EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -467,9 +467,9 @@ Returns:
   DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode);\r
   DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode);\r
 \r
-  BdsLibUpdateConsoleVariable (VarConsoleOut, DevicePath, NULL);\r
-  BdsLibUpdateConsoleVariable (VarConsoleInp, DevicePath, NULL);\r
-  BdsLibUpdateConsoleVariable (VarErrorOut, DevicePath, NULL);\r
+  EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);\r
+  EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);\r
+  EfiBootManagerUpdateConsoleVariable (ErrOut, DevicePath, NULL);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -731,13 +731,13 @@ Returns:
       // Update the console variable with the connect type\r
       //\r
       if ((PlatformConsole[Index].ConnectType & CONSOLE_IN) == CONSOLE_IN) {\r
-        BdsLibUpdateConsoleVariable (VarConsoleInp, PlatformConsole[Index].DevicePath, NULL);\r
+        EfiBootManagerUpdateConsoleVariable (ConIn, PlatformConsole[Index].DevicePath, NULL);\r
       }\r
       if ((PlatformConsole[Index].ConnectType & CONSOLE_OUT) == CONSOLE_OUT) {\r
-        BdsLibUpdateConsoleVariable (VarConsoleOut, PlatformConsole[Index].DevicePath, NULL);\r
+        EfiBootManagerUpdateConsoleVariable (ConOut, PlatformConsole[Index].DevicePath, NULL);\r
       }\r
       if ((PlatformConsole[Index].ConnectType & STD_ERROR) == STD_ERROR) {\r
-        BdsLibUpdateConsoleVariable (VarErrorOut, PlatformConsole[Index].DevicePath, NULL);\r
+        EfiBootManagerUpdateConsoleVariable (ErrOut, PlatformConsole[Index].DevicePath, NULL);\r
       }\r
     }\r
   } else {\r