From a09dd5c03d0356e82c1e3fe46b9f09ead2d0b268 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Thu, 27 Aug 2015 01:28:37 +0100
Subject: [efi] Add definitions of GUIDs observed when booting shim.efi and
 grub.efi

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/interface/efi/efi_debug.c |  8 ++++++++
 src/interface/efi/efi_guid.c  | 20 ++++++++++++++++++++
 2 files changed, 28 insertions(+)

(limited to 'src/interface')

diff --git a/src/interface/efi/efi_debug.c b/src/interface/efi/efi_debug.c
index 473803951..7cfaabfd5 100644
--- a/src/interface/efi/efi_debug.c
+++ b/src/interface/efi/efi_debug.c
@@ -80,6 +80,8 @@ static struct efi_well_known_guid efi_well_known_guids[] = {
 	  "ComponentName" },
 	{ &efi_component_name2_protocol_guid,
 	  "ComponentName2" },
+	{ &efi_console_control_protocol_guid,
+	  "ConsoleControl" },
 	{ &efi_device_path_protocol_guid,
 	  "DevicePath" },
 	{ &efi_driver_binding_protocol_guid,
@@ -128,6 +130,8 @@ static struct efi_well_known_guid efi_well_known_guids[] = {
 	  "PciRootBridgeIo" },
 	{ &efi_pxe_base_code_protocol_guid,
 	  "PxeBaseCode" },
+	{ &efi_serial_io_protocol_guid,
+	  "SerialIo" },
 	{ &efi_simple_file_system_protocol_guid,
 	  "SimpleFileSystem" },
 	{ &efi_simple_network_protocol_guid,
@@ -142,6 +146,10 @@ static struct efi_well_known_guid efi_well_known_guids[] = {
 	  "Udp4" },
 	{ &efi_udp4_service_binding_protocol_guid,
 	  "Udp4Sb" },
+	{ &efi_uga_draw_protocol_guid,
+	  "UgaDraw" },
+	{ &efi_unicode_collation_protocol_guid,
+	  "UnicodeCollation" },
 	{ &efi_vlan_config_protocol_guid,
 	  "VlanConfig" },
 	{ &efi_vlan_config_dxe_guid,
diff --git a/src/interface/efi/efi_guid.c b/src/interface/efi/efi_guid.c
index ab1c91e9f..1025621e7 100644
--- a/src/interface/efi/efi_guid.c
+++ b/src/interface/efi/efi_guid.c
@@ -29,6 +29,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/efi/Protocol/BusSpecificDriverOverride.h>
 #include <ipxe/efi/Protocol/ComponentName.h>
 #include <ipxe/efi/Protocol/ComponentName2.h>
+#include <ipxe/efi/Protocol/ConsoleControl/ConsoleControl.h>
 #include <ipxe/efi/Protocol/DevicePath.h>
 #include <ipxe/efi/Protocol/DevicePathToText.h>
 #include <ipxe/efi/Protocol/Dhcp4.h>
@@ -47,11 +48,14 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/efi/Protocol/PciIo.h>
 #include <ipxe/efi/Protocol/PciRootBridgeIo.h>
 #include <ipxe/efi/Protocol/PxeBaseCode.h>
+#include <ipxe/efi/Protocol/SerialIo.h>
 #include <ipxe/efi/Protocol/SimpleFileSystem.h>
 #include <ipxe/efi/Protocol/SimpleNetwork.h>
 #include <ipxe/efi/Protocol/TcgService.h>
 #include <ipxe/efi/Protocol/Tcp4.h>
 #include <ipxe/efi/Protocol/Udp4.h>
+#include <ipxe/efi/Protocol/UgaDraw.h>
+#include <ipxe/efi/Protocol/UnicodeCollation.h>
 #include <ipxe/efi/Protocol/VlanConfig.h>
 
 /** @file
@@ -84,6 +88,10 @@ EFI_GUID efi_component_name_protocol_guid
 EFI_GUID efi_component_name2_protocol_guid
 	= EFI_COMPONENT_NAME2_PROTOCOL_GUID;
 
+/** Console control protocol GUID */
+EFI_GUID efi_console_control_protocol_guid
+	= EFI_CONSOLE_CONTROL_PROTOCOL_GUID;
+
 /** Device path protocol GUID */
 EFI_GUID efi_device_path_protocol_guid
 	= EFI_DEVICE_PATH_PROTOCOL_GUID;
@@ -176,6 +184,10 @@ EFI_GUID efi_pci_root_bridge_io_protocol_guid
 EFI_GUID efi_pxe_base_code_protocol_guid
 	= EFI_PXE_BASE_CODE_PROTOCOL_GUID;
 
+/** Serial I/O protocol GUID */
+EFI_GUID efi_serial_io_protocol_guid
+	= EFI_SERIAL_IO_PROTOCOL_GUID;
+
 /** Simple file system protocol GUID */
 EFI_GUID efi_simple_file_system_protocol_guid
 	= EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID;
@@ -204,6 +216,14 @@ EFI_GUID efi_udp4_protocol_guid
 EFI_GUID efi_udp4_service_binding_protocol_guid
 	= EFI_UDP4_SERVICE_BINDING_PROTOCOL_GUID;
 
+/** UGA draw protocol GUID */
+EFI_GUID efi_uga_draw_protocol_guid
+	= EFI_UGA_DRAW_PROTOCOL_GUID;
+
+/** Unicode collation protocol GUID */
+EFI_GUID efi_unicode_collation_protocol_guid
+	= EFI_UNICODE_COLLATION_PROTOCOL_GUID;
+
 /** VLAN configuration protocol GUID */
 EFI_GUID efi_vlan_config_protocol_guid
 	= EFI_VLAN_CONFIG_PROTOCOL_GUID;
-- 
cgit v1.2.3-55-g7522