OvmfPkg/PlatformBootManagerLib: Remove PlatformBdsGetDriverOption()

[mirror_edk2.git] / OvmfPkg / Library / PlatformBootManagerLib / BdsPlatform.h

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
index 84f5b6f9b90f1d902b23cea61f66ffe125cfcb6d..5e46300e4489e8505dee8f7911753b856c921ec4 100644 (file)
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
@@ -39,7 +39,7 @@ Abstract:
 #include <Library/BaseLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/PciLib.h>\r
-#include <Library/GenericBdsLib.h>\r
+#include <Library/UefiBootManagerLib.h>\r
 #include <Library/HobLib.h>\r
 #include <Library/UefiLib.h>\r
 #include <Library/DxeServicesTableLib.h>\r
@@ -47,6 +47,7 @@ Abstract:
 #include <Library/IoLib.h>\r
 #include <Library/NvVarsFileLib.h>\r
 #include <Library/QemuFwCfgLib.h>\r
+#include <Library/QemuBootOrderLib.h>\r
 \r
 #include <Protocol/Decompress.h>\r
 #include <Protocol/PciIo.h>\r
@@ -55,6 +56,7 @@ Abstract:
 #include <Protocol/PciRootBridgeIo.h>\r
 #include <Protocol/S3SaveState.h>\r
 #include <Protocol/DxeSmmReadyToLock.h>\r
+#include <Protocol/LoadedImage.h>\r
 \r
 #include <Guid/Acpi.h>\r
 #include <Guid/SmBios.h>\r
@@ -65,22 +67,12 @@ Abstract:
 \r
 #include <OvmfPlatforms.h>\r
 \r
-extern BDS_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];\r
 extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformConnectSequence[];\r
 extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformDriverOption[];\r
 extern ACPI_HID_DEVICE_PATH       gPnpPs2KeyboardDeviceNode;\r
 extern ACPI_HID_DEVICE_PATH       gPnp16550ComPortDeviceNode;\r
 extern UART_DEVICE_PATH           gUartDeviceNode;\r
 extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;\r
-//\r
-//\r
-//\r
-#define VarConsoleInpDev        L"ConInDev"\r
-#define VarConsoleInp           L"ConIn"\r
-#define VarConsoleOutDev        L"ConOutDev"\r
-#define VarConsoleOut           L"ConOut"\r
-#define VarErrorOutDev          L"ErrOutDev"\r
-#define VarErrorOut             L"ErrOut"\r
 \r
 #define PCI_DEVICE_PATH_NODE(Func, Dev) \\r
   { \\r
@@ -205,15 +197,19 @@ typedef struct {
   EFI_DEVICE_PATH_PROTOCOL        End;\r
 } USB_CLASS_FORMAT_DEVICE_PATH;\r
 \r
+typedef struct {\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
+  UINTN                     ConnectType;\r
+} PLATFORM_CONSOLE_CONNECT_ENTRY;\r
+\r
+#define CONSOLE_OUT BIT0\r
+#define CONSOLE_IN  BIT1\r
+#define STD_ERROR   BIT2\r
+extern PLATFORM_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];\r
+\r
 //\r
 // Platform BDS Functions\r
 //\r
-\r
-VOID\r
-PlatformBdsGetDriverOption (\r
-  IN LIST_ENTRY               *BdsDriverLists\r
-  );\r
-\r
 EFI_STATUS\r
 BdsMemoryTest (\r
   EXTENDMEM_COVERAGE_LEVEL Level\r
@@ -239,14 +235,9 @@ ProcessCapsules (
   EFI_BOOT_MODE BootMode\r
   );\r
 \r
-EFI_STATUS\r
-PlatformBdsConnectConsole (\r
-  IN BDS_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r
-  );\r
-\r
-EFI_STATUS\r
-PlatformBdsNoConsoleAction (\r
-  VOID\r
+VOID\r
+PlatformInitializeConsole (\r
+  IN PLATFORM_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r
   );\r
 \r
 EFI_STATUS\r
@@ -271,12 +262,6 @@ ConvertSystemTable (
  IN OUT VOID       **Table\r
   );\r
 \r
-VOID\r
-PlatformBdsEnterFrontPage (\r
-  IN UINT16                 TimeoutDefault,\r
-  IN BOOLEAN                ConnectAllHappened\r
-  );\r
-\r
 /**\r
   Loads and boots UEFI Linux via the FwCfg interface.\r
 \r