0x964e5b21, 0x6459, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \\r
}\r
\r
+typedef struct _EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL;\r
+\r
//\r
-// Forward reference for pure ANSI compatability\r
+// Protocol GUID name defined in EFI1.1.\r
+// \r
+#define BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL_GUID\r
+\r
//\r
-typedef struct _EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL;\r
+// Protocol defined in EFI1.1.\r
+// \r
+typedef EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO;\r
\r
/**\r
Reset the Block Device.\r
} EFI_BLOCK_IO_MEDIA;\r
\r
#define EFI_BLOCK_IO_PROTOCOL_REVISION 0x00010000\r
+//\r
+// Revision defined in EFI1.1.\r
+// \r
+#define EFI_BLOCK_IO_INTERFACE_REVISION EFI_BLOCK_IO_PROTOCOL_REVISION\r
\r
struct _EFI_BLOCK_IO_PROTOCOL {\r
UINT64 Revision;\r
\r
typedef struct _EFI_DEVICE_IO_PROTOCOL EFI_DEVICE_IO_PROTOCOL;\r
\r
+//\r
+// Protocol GUID name defined in EFI1.1.\r
+// \r
+#define DEVICE_IO_PROTOCOL EFI_DEVICE_IO_PROTOCOL_GUID\r
+\r
+//\r
+// Protocol defined in EFI1.1.\r
+// \r
+typedef EFI_DEVICE_IO_PROTOCOL EFI_DEVICE_IO_INTERFACE;\r
+\r
typedef enum {\r
IO_UINT8,\r
IO_UINT16,\r
0x9576e91, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \\r
}\r
\r
+//\r
+// Protocol GUID defined in EFI1.1.\r
+// \r
+\r
//\r
// Device Path information\r
//\r
+#define DEVICE_PATH_PROTOCOL EFI_DEVICE_PATH_PROTOCOL_GUID\r
\r
#pragma pack(1)\r
\r
UINT8 Length[2];\r
} EFI_DEVICE_PATH_PROTOCOL;\r
\r
+//\r
+// For backward-compatible with EFI1.1.\r
+// \r
+typedef EFI_DEVICE_PATH_PROTOCOL EFI_DEVICE_PATH;\r
+\r
//\r
// Hardware Device Paths\r
//\r
0xce345171, 0xba0b, 0x11d2, {0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \\r
}\r
\r
+//\r
+// Protocol GUID name defined in EFI1.1.\r
+// \r
+#define DISK_IO_PROTOCOL EFI_DISK_IO_PROTOCOL_GUID\r
+\r
typedef struct _EFI_DISK_IO_PROTOCOL EFI_DISK_IO_PROTOCOL;\r
\r
+//\r
+// Protocol defined in EFI1.1.\r
+// \r
+typedef EFI_DISK_IO_PROTOCOL EFI_DISK_IO;\r
+\r
/**\r
Read BufferSize bytes from Offset into Buffer.\r
\r
\r
#define EFI_DISK_IO_PROTOCOL_REVISION 0x00010000\r
\r
+//\r
+// Revision defined in EFI1.1\r
+// \r
+#define EFI_DISK_IO_INTERFACE_REVISION EFI_DISK_IO_PROTOCOL_REVISION\r
+\r
struct _EFI_DISK_IO_PROTOCOL {\r
UINT64 Revision;\r
EFI_DISK_READ ReadDisk;\r
#ifndef __EFI_LOAD_FILE_PROTOCOL_H__\r
#define __EFI_LOAD_FILE_PROTOCOL_H__\r
\r
-#define LOAD_FILE_PROTOCOL_GUID \\r
+#define EFI_LOAD_FILE_PROTOCOL_GUID \\r
{ \\r
0x56EC3091, 0x954C, 0x11d2, {0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B } \\r
}\r
\r
//\r
-// Protocol Guid Name defined by UEFI 2.0 spec.\r
+// Protocol Guid defined by EFI1.1.\r
//\r
-#define EFI_LOAD_FILE_PROTOCOL_GUID LOAD_FILE_PROTOCOL_GUID\r
+#define LOAD_FILE_PROTOCOL EFI_LOAD_FILE_PROTOCOL_GUID\r
\r
typedef struct _EFI_LOAD_FILE_PROTOCOL EFI_LOAD_FILE_PROTOCOL;\r
\r
+//\r
+// Backward-compatible with EFI1.1\r
+// \r
+typedef EFI_LOAD_FILE_PROTOCOL EFI_LOAD_FILE_INTERFACE;\r
+\r
/**\r
Causes the driver to load a specified file.\r
\r
0x5B1B31A1, 0x9562, 0x11d2, {0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B } \\r
}\r
\r
+//\r
+// Protocol GUID defined in EFI1.1.\r
+// \r
+#define LOADED_IMAGE_PROTOCOL EFI_LOADED_IMAGE_PROTOCOL_GUID\r
+\r
//\r
// EFI_SYSTEM_TABLE & EFI_IMAGE_UNLOAD are defined in EfiApi.h\r
//\r
-#define EFI_LOADED_IMAGE_INFORMATION_REVISION 0x1000\r
-#define EFI_LOADED_IMAGE_PROTOCOL_REVISION EFI_LOADED_IMAGE_INFORMATION_REVISION\r
+#define EFI_LOADED_IMAGE_PROTOCOL_REVISION 0x1000\r
+\r
+//\r
+// Revision defined in EFI1.1.\r
+// \r
+#define EFI_LOADED_IMAGE_INFORMATION_REVISION EFI_LOADED_IMAGE_PROTOCOL_REVISION\r
+\r
\r
typedef struct {\r
UINT32 Revision;\r
\r
} EFI_LOADED_IMAGE_PROTOCOL;\r
\r
+//\r
+// For backward-compatible with EFI1.1.\r
+// \r
+typedef EFI_LOADED_IMAGE_PROTOCOL EFI_LOADED_IMAGE;\r
+\r
extern EFI_GUID gEfiLoadedImageProtocolGuid;\r
\r
#endif\r
\r
#define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION 0x00010000\r
\r
+//\r
+// Revision defined in EFI1.1.\r
+// \r
+#define EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE_REVISION EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION\r
+\r
//\r
// Forward reference for pure ANSI compatability\r
//\r
typedef struct _EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL;\r
\r
+//\r
+// Protocol defined in EFI1.1.\r
+// \r
+typedef EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE;\r
+\r
typedef enum {\r
EfiNetworkInterfaceUndi = 1\r
} EFI_NETWORK_PROTOCOL_TYPE;\r
0x03c4e603, 0xac28, 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\r
}\r
\r
-typedef struct _EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE_PROTOCOL;\r
+typedef struct _EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE_PROTOCOL;\r
+\r
+//\r
+// Protocol defined in EFI1.1.\r
+// \r
+typedef EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE;\r
\r
//\r
// Default IP TTL and ToS.\r
//\r
// PXE Base Code Protocol structure\r
//\r
-#define EFI_PXE_BASE_CODE_INTERFACE_REVISION 0x00010000\r
-#define EFI_PXE_BASE_CODE_PROTOCOL_REVISION EFI_PXE_BASE_CODE_INTERFACE_REVISION\r
+#define EFI_PXE_BASE_CODE_PROTOCOL_REVISION 0x00010000\r
+\r
+//\r
+// Revision defined in EFI1.1\r
+// \r
+#define EFI_PXE_BASE_CODE_INTERFACE_REVISION EFI_PXE_BASE_CODE_PROTOCOL_REVISION\r
\r
struct _EFI_PXE_BASE_CODE_PROTOCOL {\r
UINT64 Revision;\r
//\r
// Revision Number\r
//\r
-#define EFI_PXE_BASE_CODE_CALLBACK_INTERFACE_REVISION 0x00010000\r
-#define EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION \\r
- EFI_PXE_BASE_CODE_CALLBACK_INTERFACE_REVISION\r
+#define EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION 0x00010000\r
+#define EFI_PXE_BASE_CODE_CALLBACK_INTERFACE_REVISION \\r
+ EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION\r
\r
//\r
// Protocol definition\r
//\r
typedef struct _EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL;\r
\r
+//\r
+// Protocol defined in EFI1.1.\r
+// \r
+typedef EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL EFI_PXE_BASE_CODE_CALLBACK;\r
+\r
typedef enum {\r
EFI_PXE_BASE_CODE_FUNCTION_FIRST,\r
EFI_PXE_BASE_CODE_FUNCTION_DHCP,\r
0xBB25CF6F, 0xF1D4, 0x11D2, {0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD } \\r
}\r
\r
+//\r
+// Protocol GUID defined in EFI1.1.\r
+// \r
+#define SERIAL_IO_PROTOCOL EFI_SERIAL_IO_PROTOCOL_GUID\r
+\r
typedef struct _EFI_SERIAL_IO_PROTOCOL EFI_SERIAL_IO_PROTOCOL;\r
\r
+\r
+//\r
+// Backward-compatible with EFI1.1.\r
+// \r
+typedef EFI_SERIAL_IO_PROTOCOL SERIAL_IO_INTERFACE;\r
+\r
//\r
// Serial IO Data structures\r
//\r
UINT32 StopBits;\r
} EFI_SERIAL_IO_MODE;\r
\r
-#define SERIAL_IO_INTERFACE_REVISION 0x00010000\r
-#define EFI_SERIAL_IO_PROTOCOL_REVISION SERIAL_IO_INTERFACE_REVISION\r
+#define EFI_SERIAL_IO_PROTOCOL_REVISION 0x00010000\r
+#define SERIAL_IO_INTERFACE_REVISION EFI_SERIAL_IO_PROTOCOL_REVISION\r
\r
struct _EFI_SERIAL_IO_PROTOCOL {\r
UINT32 Revision;\r
}\r
\r
typedef struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL EFI_SIMPLE_FILE_SYSTEM_PROTOCOL;\r
-typedef struct _EFI_FILE EFI_FILE;\r
-typedef struct _EFI_FILE *EFI_FILE_HANDLE;\r
-typedef struct _EFI_FILE EFI_FILE_PROTOCOL;\r
+\r
+typedef struct _EFI_FILE_PROTOCOL EFI_FILE_PROTOCOL;\r
+typedef struct _EFI_FILE_PROTOCOL *EFI_FILE_HANDLE;\r
+\r
+\r
+//\r
+// Protocol GUID defined in EFI1.1.\r
+// \r
+#define SIMPLE_FILE_SYSTEM_PROTOCOL EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID\r
+\r
+//\r
+// Protocol defined in EFI1.1.\r
+// \r
+typedef EFI_SIMPLE_FILE_SYSTEM_PROTOCOL EFI_FILE_IO_INTERFACE;\r
+typedef struct _EFI_FILE_PROTOCOL EFI_FILE;\r
\r
/**\r
Open the root directory on a volume.\r
EFI_STATUS\r
(EFIAPI *EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME) (\r
IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
- OUT EFI_FILE **Root\r
+ OUT EFI_FILE_PROTOCOL **Root\r
)\r
;\r
\r
#define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION 0x00010000\r
+//\r
+// Revision defined in EFI1.1\r
+// \r
+#define EFI_FILE_IO_INTERFACE_REVISION EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION\r
\r
struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL {\r
UINT64 Revision;\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_FILE_OPEN) (\r
- IN EFI_FILE *This,\r
- OUT EFI_FILE **NewHandle,\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ OUT EFI_FILE_PROTOCOL **NewHandle,\r
IN CHAR16 *FileName,\r
IN UINT64 OpenMode,\r
IN UINT64 Attributes\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_FILE_READ) (\r
- IN EFI_FILE *This,\r
+ IN EFI_FILE_PROTOCOL *This,\r
IN OUT UINTN *BufferSize,\r
OUT VOID *Buffer\r
)\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_FILE_WRITE) (\r
- IN EFI_FILE *This,\r
+ IN EFI_FILE_PROTOCOL *This,\r
IN OUT UINTN *BufferSize,\r
IN VOID *Buffer\r
)\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_FILE_SET_POSITION) (\r
- IN EFI_FILE *This,\r
+ IN EFI_FILE_PROTOCOL *This,\r
IN UINT64 Position\r
)\r
;\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_FILE_GET_POSITION) (\r
- IN EFI_FILE *This,\r
+ IN EFI_FILE_PROTOCOL *This,\r
OUT UINT64 *Position\r
)\r
;\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_FILE_GET_INFO) (\r
- IN EFI_FILE *This,\r
+ IN EFI_FILE_PROTOCOL *This,\r
IN EFI_GUID *InformationType,\r
IN OUT UINTN *BufferSize,\r
OUT VOID *Buffer\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_FILE_SET_INFO) (\r
- IN EFI_FILE *This,\r
+ IN EFI_FILE_PROTOCOL *This,\r
IN EFI_GUID *InformationType,\r
IN UINTN BufferSize,\r
IN VOID *Buffer\r
)\r
;\r
\r
-#define EFI_FILE_HANDLE_REVISION 0x00010000\r
-#define EFI_FILE_PROTOCOL_REVISION EFI_FILE_HANDLE_REVISION\r
+#define EFI_FILE_PROTOCOL_REVISION 0x00010000\r
+//\r
+// Revision defined in EFI1.1.\r
+// \r
+#define EFI_FILE_REVISION EFI_FILE_PROTOCOL_REVISION\r
\r
-struct _EFI_FILE {\r
+struct _EFI_FILE_PROTOCOL {\r
UINT64 Revision;\r
EFI_FILE_OPEN Open;\r
EFI_FILE_CLOSE Close;\r
\r
typedef struct _EFI_SIMPLE_NETWORK_PROTOCOL EFI_SIMPLE_NETWORK_PROTOCOL;\r
\r
+\r
+//\r
+// Protocol defined in EFI1.1.\r
+// \r
+typedef EFI_SIMPLE_NETWORK_PROTOCOL EFI_SIMPLE_NETWORK;\r
+\r
//\r
// Simple Network Protocol data structures\r
//\r
\r
#define EFI_SIMPLE_NETWORK_PROTOCOL_REVISION 0x00010000\r
\r
+//\r
+// Revision defined in EFI1.1\r
+// \r
+#define EFI_SIMPLE_NETWORK_INTERFACE_REVISION EFI_SIMPLE_NETWORK_PROTOCOL_REVISION\r
+\r
struct _EFI_SIMPLE_NETWORK_PROTOCOL {\r
UINT64 Revision;\r
EFI_SIMPLE_NETWORK_START Start;\r
#ifndef __SIMPLE_TEXT_IN_PROTOCOL_H__\r
#define __SIMPLE_TEXT_IN_PROTOCOL_H__\r
\r
-#define EFI_SIMPLE_TEXT_IN_PROTOCOL_GUID \\r
+#define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID \\r
{ \\r
0x387477c1, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \\r
}\r
\r
-#define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID EFI_SIMPLE_TEXT_IN_PROTOCOL_GUID\r
+//\r
+// Protocol GUID defined in EFI1.1.\r
+// \r
+#define SIMPLE_INPUT_PROTOCOL EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID\r
\r
-typedef struct _EFI_SIMPLE_TEXT_IN_PROTOCOL EFI_SIMPLE_TEXT_IN_PROTOCOL;\r
-typedef struct _EFI_SIMPLE_TEXT_IN_PROTOCOL EFI_SIMPLE_TEXT_INPUT_PROTOCOL;\r
+typedef struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL EFI_SIMPLE_TEXT_INPUT_PROTOCOL;\r
\r
+//\r
+// Backward-compatible with EFI1.1.\r
+// \r
+typedef struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL SIMPLE_INPUT_INTERFACE;\r
//\r
// Data structures\r
//\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_INPUT_RESET) (\r
- IN EFI_SIMPLE_TEXT_IN_PROTOCOL *This,\r
+ IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *This,\r
IN BOOLEAN ExtendedVerification\r
)\r
;\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_INPUT_READ_KEY) (\r
- IN EFI_SIMPLE_TEXT_IN_PROTOCOL *This,\r
+ IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *This,\r
OUT EFI_INPUT_KEY *Key\r
)\r
;\r
\r
-struct _EFI_SIMPLE_TEXT_IN_PROTOCOL {\r
+struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL {\r
EFI_INPUT_RESET Reset;\r
EFI_INPUT_READ_KEY ReadKeyStroke;\r
EFI_EVENT WaitForKey;\r
#ifndef __SIMPLE_TEXT_OUT_H__\r
#define __SIMPLE_TEXT_OUT_H__\r
\r
-#define EFI_SIMPLE_TEXT_OUT_PROTOCOL_GUID \\r
+#define EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID \\r
{ \\r
0x387477c2, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \\r
}\r
\r
-#define EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID EFI_SIMPLE_TEXT_OUT_PROTOCOL_GUID\r
+//\r
+// Protocol GUID defined in EFI1.1.\r
+// \r
+#define SIMPLE_TEXT_OUTPUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID\r
+\r
+typedef struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL;\r
\r
-typedef struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL EFI_SIMPLE_TEXT_OUT_PROTOCOL;\r
-typedef struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL;\r
+//\r
+// Backward-compatible with EFI1.1.\r
+// \r
+typedef EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL SIMPLE_TEXT_OUTPUT_INTERFACE;\r
\r
//\r
// Define's for required EFI Unicode Box Draw characters\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_TEXT_RESET) (\r
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,\r
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN BOOLEAN ExtendedVerification\r
)\r
;\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_TEXT_STRING) (\r
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,\r
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN CHAR16 *String\r
)\r
;\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_TEXT_TEST_STRING) (\r
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,\r
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN CHAR16 *String\r
)\r
;\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_TEXT_QUERY_MODE) (\r
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,\r
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN UINTN ModeNumber,\r
OUT UINTN *Columns,\r
OUT UINTN *Rows\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_TEXT_SET_MODE) (\r
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,\r
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN UINTN ModeNumber\r
)\r
;\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_TEXT_SET_ATTRIBUTE) (\r
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,\r
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN UINTN Attribute\r
)\r
;\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_TEXT_CLEAR_SCREEN) (\r
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This\r
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This\r
)\r
;\r
\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_TEXT_SET_CURSOR_POSITION) (\r
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,\r
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN UINTN Column,\r
IN UINTN Row\r
)\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_TEXT_ENABLE_CURSOR) (\r
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,\r
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN BOOLEAN Visible\r
)\r
;\r
BOOLEAN CursorVisible;\r
} EFI_SIMPLE_TEXT_OUTPUT_MODE;\r
\r
-struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL {\r
+struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL {\r
EFI_TEXT_RESET Reset;\r
\r
EFI_TEXT_STRING OutputString;\r
EFI_SIMPLE_TEXT_OUTPUT_MODE *Mode;\r
};\r
\r
-extern EFI_GUID gEfiSimpleTextOutProtocolGuid;\r
+extern EFI_GUID gEfiSimpleTextOutputProtocolGuid;\r
\r
#endif\r
0x1d85cd7f, 0xf43d, 0x11d2, {0x9a, 0xc, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\r
}\r
\r
-typedef struct _EFI_UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL;\r
+typedef struct _EFI_UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL;\r
+\r
+\r
+//\r
+// Protocol GUID name defined in EFI1.1.\r
+// \r
+#define UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL_GUID\r
+\r
+//\r
+// Protocol defined in EFI1.1.\r
+// \r
+typedef EFI_UNICODE_COLLATION_PROTOCOL UNICODE_COLLATION_INTERFACE;\r
\r
//\r
// Protocol data structures and defines\r