OvmfPkg/PlatformBootManagerLib: rebase boot logo display to BootLogoLib

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

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
index 922744f68a29984cdd2c617854467e3acdd9a7a4..00a1d22eeaafcee1d296a41b3216a73a79f6b9f8 100644 (file)
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
@@ -40,6 +40,7 @@ Abstract:
 #include <Library/PcdLib.h>\r
 #include <Library/PciLib.h>\r
 #include <Library/UefiBootManagerLib.h>\r
+#include <Library/BootLogoLib.h>\r
 #include <Library/HobLib.h>\r
 #include <Library/UefiLib.h>\r
 #include <Library/DxeServicesTableLib.h>\r
@@ -47,6 +48,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 +57,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 +68,11 @@ 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
@@ -156,125 +148,25 @@ extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;
 #define PCI_SUBCLASS_SERIAL    0x00\r
 #define PCI_IF_16550           0x02\r
 #define IS_PCI_16550SERIAL(_p)           IS_CLASS3 (_p, PCI_CLASS_SCC, PCI_SUBCLASS_SERIAL, PCI_IF_16550)\r
-\r
-#define EFI_SYSTEM_TABLE_MAX_ADDRESS 0xFFFFFFFF\r
-#define SYS_TABLE_PAD(ptr) (((~ptr) +1) & 0x07 )\r
-\r
 #define IS_PCI_ISA_PDECODE(_p)        IS_CLASS3 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_ISA_PDECODE, 0)\r
 \r
 typedef struct {\r
-  ACPI_HID_DEVICE_PATH      PciRootBridge;\r
-  PCI_DEVICE_PATH           IsaBridge;\r
-  ACPI_HID_DEVICE_PATH      Keyboard;\r
-  EFI_DEVICE_PATH_PROTOCOL  End;\r
-} PLATFORM_DUMMY_ISA_KEYBOARD_DEVICE_PATH;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
+  UINTN                     ConnectType;\r
+} PLATFORM_CONSOLE_CONNECT_ENTRY;\r
 \r
-typedef struct {\r
-  ACPI_HID_DEVICE_PATH      PciRootBridge;\r
-  PCI_DEVICE_PATH           IsaBridge;\r
-  ACPI_HID_DEVICE_PATH      IsaSerial;\r
-  UART_DEVICE_PATH          Uart;\r
-  VENDOR_DEVICE_PATH        TerminalType;\r
-  EFI_DEVICE_PATH_PROTOCOL  End;\r
-} PLATFORM_DUMMY_ISA_SERIAL_DEVICE_PATH;\r
-\r
-typedef struct {\r
-  ACPI_HID_DEVICE_PATH      PciRootBridge;\r
-  PCI_DEVICE_PATH           VgaDevice;\r
-  EFI_DEVICE_PATH_PROTOCOL  End;\r
-} PLATFORM_DUMMY_PCI_VGA_DEVICE_PATH;\r
-\r
-typedef struct {\r
-  ACPI_HID_DEVICE_PATH      PciRootBridge;\r
-  PCI_DEVICE_PATH           PciBridge;\r
-  PCI_DEVICE_PATH           SerialDevice;\r
-  UART_DEVICE_PATH          Uart;\r
-  VENDOR_DEVICE_PATH        TerminalType;\r
-  EFI_DEVICE_PATH_PROTOCOL  End;\r
-} PLATFORM_DUMMY_PCI_SERIAL_DEVICE_PATH;\r
-\r
-//\r
-// the short form device path for Usb keyboard\r
-//\r
-#define CLASS_HID           3\r
-#define SUBCLASS_BOOT       1\r
-#define PROTOCOL_KEYBOARD   1\r
-\r
-typedef struct {\r
-  USB_CLASS_DEVICE_PATH           UsbClass;\r
-  EFI_DEVICE_PATH_PROTOCOL        End;\r
-} USB_CLASS_FORMAT_DEVICE_PATH;\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
-  );\r
-\r
-EFI_STATUS\r
-PlatformBdsShowProgress (\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL TitleForeground,\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL TitleBackground,\r
-  CHAR16                        *Title,\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL ProgressColor,\r
-  UINTN                         Progress,\r
-  UINTN                         PreviousValue\r
-  );\r
-\r
-VOID\r
-PlatformBdsConnectSequence (\r
-  VOID\r
-  );\r
-\r
-EFI_STATUS\r
-ProcessCapsules (\r
-  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
-  );\r
-\r
-EFI_STATUS\r
-ConvertMpsTable (\r
-  IN OUT  VOID     **Table\r
-  );\r
-\r
-EFI_STATUS\r
-ConvertSmbiosTable (\r
-  IN OUT VOID       **Table\r
-  );\r
-\r
-EFI_STATUS\r
-ConvertAcpiTable (\r
- IN      UINTN      TableLen,\r
- IN OUT  VOID       **Table\r
-  );\r
-\r
-EFI_STATUS\r
-ConvertSystemTable (\r
- IN     EFI_GUID   *TableGuid,\r
- IN OUT VOID       **Table\r
-  );\r
-\r
-VOID\r
-PlatformBdsEnterFrontPage (\r
-  IN UINT16                 TimeoutDefault,\r
-  IN BOOLEAN                ConnectAllHappened\r
+PlatformInitializeConsole (\r
+  IN PLATFORM_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r
   );\r
 \r
 /**\r