#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