summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MdePkg/Include/Protocol/BlockIo.h15
-rw-r--r--MdePkg/Include/Protocol/DeviceIo.h10
-rw-r--r--MdePkg/Include/Protocol/DevicePath.h10
-rw-r--r--MdePkg/Include/Protocol/DiskIo.h15
-rw-r--r--MdePkg/Include/Protocol/LoadFile.h11
-rw-r--r--MdePkg/Include/Protocol/LoadedImage.h19
-rw-r--r--MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h10
-rw-r--r--MdePkg/Include/Protocol/PxeBaseCode.h15
-rw-r--r--MdePkg/Include/Protocol/PxeBaseCodeCallBack.h11
-rw-r--r--MdePkg/Include/Protocol/SerialIo.h15
-rw-r--r--MdePkg/Include/Protocol/SimpleFileSystem.h49
-rw-r--r--MdePkg/Include/Protocol/SimpleNetwork.h11
-rw-r--r--MdePkg/Include/Protocol/SimpleTextIn.h20
-rw-r--r--MdePkg/Include/Protocol/SimpleTextOut.h37
-rw-r--r--MdePkg/Include/Protocol/UnicodeCollation.h13
15 files changed, 208 insertions, 53 deletions
diff --git a/MdePkg/Include/Protocol/BlockIo.h b/MdePkg/Include/Protocol/BlockIo.h
index 4c7e8b4270..a3077b5eca 100644
--- a/MdePkg/Include/Protocol/BlockIo.h
+++ b/MdePkg/Include/Protocol/BlockIo.h
@@ -25,10 +25,17 @@
0x964e5b21, 0x6459, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
}
+typedef struct _EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL;
+
//
-// Forward reference for pure ANSI compatability
+// Protocol GUID name defined in EFI1.1.
+//
+#define BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL_GUID
+
//
-typedef struct _EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL;
+// Protocol defined in EFI1.1.
+//
+typedef EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO;
/**
Reset the Block Device.
@@ -155,6 +162,10 @@ typedef struct {
} EFI_BLOCK_IO_MEDIA;
#define EFI_BLOCK_IO_PROTOCOL_REVISION 0x00010000
+//
+// Revision defined in EFI1.1.
+//
+#define EFI_BLOCK_IO_INTERFACE_REVISION EFI_BLOCK_IO_PROTOCOL_REVISION
struct _EFI_BLOCK_IO_PROTOCOL {
UINT64 Revision;
diff --git a/MdePkg/Include/Protocol/DeviceIo.h b/MdePkg/Include/Protocol/DeviceIo.h
index 643c810a34..1e52548ac0 100644
--- a/MdePkg/Include/Protocol/DeviceIo.h
+++ b/MdePkg/Include/Protocol/DeviceIo.h
@@ -27,6 +27,16 @@
typedef struct _EFI_DEVICE_IO_PROTOCOL EFI_DEVICE_IO_PROTOCOL;
+//
+// Protocol GUID name defined in EFI1.1.
+//
+#define DEVICE_IO_PROTOCOL EFI_DEVICE_IO_PROTOCOL_GUID
+
+//
+// Protocol defined in EFI1.1.
+//
+typedef EFI_DEVICE_IO_PROTOCOL EFI_DEVICE_IO_INTERFACE;
+
typedef enum {
IO_UINT8,
IO_UINT16,
diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h
index 6ff0050437..77b79a0c6f 100644
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/MdePkg/Include/Protocol/DevicePath.h
@@ -30,8 +30,13 @@
}
//
+// Protocol GUID defined in EFI1.1.
+//
+
+//
// Device Path information
//
+#define DEVICE_PATH_PROTOCOL EFI_DEVICE_PATH_PROTOCOL_GUID
#pragma pack(1)
@@ -42,6 +47,11 @@ typedef struct {
} EFI_DEVICE_PATH_PROTOCOL;
//
+// For backward-compatible with EFI1.1.
+//
+typedef EFI_DEVICE_PATH_PROTOCOL EFI_DEVICE_PATH;
+
+//
// Hardware Device Paths
//
#define HARDWARE_DEVICE_PATH 0x01
diff --git a/MdePkg/Include/Protocol/DiskIo.h b/MdePkg/Include/Protocol/DiskIo.h
index e36792c7cd..20b899056a 100644
--- a/MdePkg/Include/Protocol/DiskIo.h
+++ b/MdePkg/Include/Protocol/DiskIo.h
@@ -26,8 +26,18 @@
0xce345171, 0xba0b, 0x11d2, {0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
}
+//
+// Protocol GUID name defined in EFI1.1.
+//
+#define DISK_IO_PROTOCOL EFI_DISK_IO_PROTOCOL_GUID
+
typedef struct _EFI_DISK_IO_PROTOCOL EFI_DISK_IO_PROTOCOL;
+//
+// Protocol defined in EFI1.1.
+//
+typedef EFI_DISK_IO_PROTOCOL EFI_DISK_IO;
+
/**
Read BufferSize bytes from Offset into Buffer.
@@ -87,6 +97,11 @@ EFI_STATUS
#define EFI_DISK_IO_PROTOCOL_REVISION 0x00010000
+//
+// Revision defined in EFI1.1
+//
+#define EFI_DISK_IO_INTERFACE_REVISION EFI_DISK_IO_PROTOCOL_REVISION
+
struct _EFI_DISK_IO_PROTOCOL {
UINT64 Revision;
EFI_DISK_READ ReadDisk;
diff --git a/MdePkg/Include/Protocol/LoadFile.h b/MdePkg/Include/Protocol/LoadFile.h
index 346039fb61..d8034194df 100644
--- a/MdePkg/Include/Protocol/LoadFile.h
+++ b/MdePkg/Include/Protocol/LoadFile.h
@@ -23,18 +23,23 @@
#ifndef __EFI_LOAD_FILE_PROTOCOL_H__
#define __EFI_LOAD_FILE_PROTOCOL_H__
-#define LOAD_FILE_PROTOCOL_GUID \
+#define EFI_LOAD_FILE_PROTOCOL_GUID \
{ \
0x56EC3091, 0x954C, 0x11d2, {0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B } \
}
//
-// Protocol Guid Name defined by UEFI 2.0 spec.
+// Protocol Guid defined by EFI1.1.
//
-#define EFI_LOAD_FILE_PROTOCOL_GUID LOAD_FILE_PROTOCOL_GUID
+#define LOAD_FILE_PROTOCOL EFI_LOAD_FILE_PROTOCOL_GUID
typedef struct _EFI_LOAD_FILE_PROTOCOL EFI_LOAD_FILE_PROTOCOL;
+//
+// Backward-compatible with EFI1.1
+//
+typedef EFI_LOAD_FILE_PROTOCOL EFI_LOAD_FILE_INTERFACE;
+
/**
Causes the driver to load a specified file.
diff --git a/MdePkg/Include/Protocol/LoadedImage.h b/MdePkg/Include/Protocol/LoadedImage.h
index 2a0a236362..a8185636ba 100644
--- a/MdePkg/Include/Protocol/LoadedImage.h
+++ b/MdePkg/Include/Protocol/LoadedImage.h
@@ -28,10 +28,20 @@
}
//
+// Protocol GUID defined in EFI1.1.
+//
+#define LOADED_IMAGE_PROTOCOL EFI_LOADED_IMAGE_PROTOCOL_GUID
+
+//
// EFI_SYSTEM_TABLE & EFI_IMAGE_UNLOAD are defined in EfiApi.h
//
-#define EFI_LOADED_IMAGE_INFORMATION_REVISION 0x1000
-#define EFI_LOADED_IMAGE_PROTOCOL_REVISION EFI_LOADED_IMAGE_INFORMATION_REVISION
+#define EFI_LOADED_IMAGE_PROTOCOL_REVISION 0x1000
+
+//
+// Revision defined in EFI1.1.
+//
+#define EFI_LOADED_IMAGE_INFORMATION_REVISION EFI_LOADED_IMAGE_PROTOCOL_REVISION
+
typedef struct {
UINT32 Revision;
@@ -66,6 +76,11 @@ typedef struct {
} EFI_LOADED_IMAGE_PROTOCOL;
+//
+// For backward-compatible with EFI1.1.
+//
+typedef EFI_LOADED_IMAGE_PROTOCOL EFI_LOADED_IMAGE;
+
extern EFI_GUID gEfiLoadedImageProtocolGuid;
#endif
diff --git a/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h b/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h
index 98f1c597a4..031db3c6b5 100644
--- a/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h
+++ b/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h
@@ -28,10 +28,20 @@
#define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION 0x00010000
//
+// Revision defined in EFI1.1.
+//
+#define EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE_REVISION EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION
+
+//
// Forward reference for pure ANSI compatability
//
typedef struct _EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL;
+//
+// Protocol defined in EFI1.1.
+//
+typedef EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE;
+
typedef enum {
EfiNetworkInterfaceUndi = 1
} EFI_NETWORK_PROTOCOL_TYPE;
diff --git a/MdePkg/Include/Protocol/PxeBaseCode.h b/MdePkg/Include/Protocol/PxeBaseCode.h
index 7fb2a80c42..fb0c3b1ddb 100644
--- a/MdePkg/Include/Protocol/PxeBaseCode.h
+++ b/MdePkg/Include/Protocol/PxeBaseCode.h
@@ -24,7 +24,12 @@
0x03c4e603, 0xac28, 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
}
-typedef struct _EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE_PROTOCOL;
+typedef struct _EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE_PROTOCOL;
+
+//
+// Protocol defined in EFI1.1.
+//
+typedef EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE;
//
// Default IP TTL and ToS.
@@ -597,8 +602,12 @@ EFI_STATUS
//
// PXE Base Code Protocol structure
//
-#define EFI_PXE_BASE_CODE_INTERFACE_REVISION 0x00010000
-#define EFI_PXE_BASE_CODE_PROTOCOL_REVISION EFI_PXE_BASE_CODE_INTERFACE_REVISION
+#define EFI_PXE_BASE_CODE_PROTOCOL_REVISION 0x00010000
+
+//
+// Revision defined in EFI1.1
+//
+#define EFI_PXE_BASE_CODE_INTERFACE_REVISION EFI_PXE_BASE_CODE_PROTOCOL_REVISION
struct _EFI_PXE_BASE_CODE_PROTOCOL {
UINT64 Revision;
diff --git a/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h b/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h
index 7f16701367..267144db89 100644
--- a/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h
+++ b/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h
@@ -28,15 +28,20 @@
//
// Revision Number
//
-#define EFI_PXE_BASE_CODE_CALLBACK_INTERFACE_REVISION 0x00010000
-#define EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION \
- EFI_PXE_BASE_CODE_CALLBACK_INTERFACE_REVISION
+#define EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION 0x00010000
+#define EFI_PXE_BASE_CODE_CALLBACK_INTERFACE_REVISION \
+ EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION
//
// Protocol definition
//
typedef struct _EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL;
+//
+// Protocol defined in EFI1.1.
+//
+typedef EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL EFI_PXE_BASE_CODE_CALLBACK;
+
typedef enum {
EFI_PXE_BASE_CODE_FUNCTION_FIRST,
EFI_PXE_BASE_CODE_FUNCTION_DHCP,
diff --git a/MdePkg/Include/Protocol/SerialIo.h b/MdePkg/Include/Protocol/SerialIo.h
index 89a73409d9..d7458e0eaa 100644
--- a/MdePkg/Include/Protocol/SerialIo.h
+++ b/MdePkg/Include/Protocol/SerialIo.h
@@ -25,8 +25,19 @@
0xBB25CF6F, 0xF1D4, 0x11D2, {0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD } \
}
+//
+// Protocol GUID defined in EFI1.1.
+//
+#define SERIAL_IO_PROTOCOL EFI_SERIAL_IO_PROTOCOL_GUID
+
typedef struct _EFI_SERIAL_IO_PROTOCOL EFI_SERIAL_IO_PROTOCOL;
+
+//
+// Backward-compatible with EFI1.1.
+//
+typedef EFI_SERIAL_IO_PROTOCOL SERIAL_IO_INTERFACE;
+
//
// Serial IO Data structures
//
@@ -246,8 +257,8 @@ typedef struct {
UINT32 StopBits;
} EFI_SERIAL_IO_MODE;
-#define SERIAL_IO_INTERFACE_REVISION 0x00010000
-#define EFI_SERIAL_IO_PROTOCOL_REVISION SERIAL_IO_INTERFACE_REVISION
+#define EFI_SERIAL_IO_PROTOCOL_REVISION 0x00010000
+#define SERIAL_IO_INTERFACE_REVISION EFI_SERIAL_IO_PROTOCOL_REVISION
struct _EFI_SERIAL_IO_PROTOCOL {
UINT32 Revision;
diff --git a/MdePkg/Include/Protocol/SimpleFileSystem.h b/MdePkg/Include/Protocol/SimpleFileSystem.h
index add8ad6eeb..f6095c7c16 100644
--- a/MdePkg/Include/Protocol/SimpleFileSystem.h
+++ b/MdePkg/Include/Protocol/SimpleFileSystem.h
@@ -29,9 +29,21 @@
}
typedef struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL EFI_SIMPLE_FILE_SYSTEM_PROTOCOL;
-typedef struct _EFI_FILE EFI_FILE;
-typedef struct _EFI_FILE *EFI_FILE_HANDLE;
-typedef struct _EFI_FILE EFI_FILE_PROTOCOL;
+
+typedef struct _EFI_FILE_PROTOCOL EFI_FILE_PROTOCOL;
+typedef struct _EFI_FILE_PROTOCOL *EFI_FILE_HANDLE;
+
+
+//
+// Protocol GUID defined in EFI1.1.
+//
+#define SIMPLE_FILE_SYSTEM_PROTOCOL EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID
+
+//
+// Protocol defined in EFI1.1.
+//
+typedef EFI_SIMPLE_FILE_SYSTEM_PROTOCOL EFI_FILE_IO_INTERFACE;
+typedef struct _EFI_FILE_PROTOCOL EFI_FILE;
/**
Open the root directory on a volume.
@@ -52,11 +64,15 @@ typedef
EFI_STATUS
(EFIAPI *EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME) (
IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,
- OUT EFI_FILE **Root
+ OUT EFI_FILE_PROTOCOL **Root
)
;
#define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION 0x00010000
+//
+// Revision defined in EFI1.1
+//
+#define EFI_FILE_IO_INTERFACE_REVISION EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION
struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL {
UINT64 Revision;
@@ -86,8 +102,8 @@ struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL {
typedef
EFI_STATUS
(EFIAPI *EFI_FILE_OPEN) (
- IN EFI_FILE *This,
- OUT EFI_FILE **NewHandle,
+ IN EFI_FILE_PROTOCOL *This,
+ OUT EFI_FILE_PROTOCOL **NewHandle,
IN CHAR16 *FileName,
IN UINT64 OpenMode,
IN UINT64 Attributes
@@ -160,7 +176,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_FILE_READ) (
- IN EFI_FILE *This,
+ IN EFI_FILE_PROTOCOL *This,
IN OUT UINTN *BufferSize,
OUT VOID *Buffer
)
@@ -186,7 +202,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_FILE_WRITE) (
- IN EFI_FILE *This,
+ IN EFI_FILE_PROTOCOL *This,
IN OUT UINTN *BufferSize,
IN VOID *Buffer
)
@@ -205,7 +221,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_FILE_SET_POSITION) (
- IN EFI_FILE *This,
+ IN EFI_FILE_PROTOCOL *This,
IN UINT64 Position
)
;
@@ -223,7 +239,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_FILE_GET_POSITION) (
- IN EFI_FILE *This,
+ IN EFI_FILE_PROTOCOL *This,
OUT UINT64 *Position
)
;
@@ -249,7 +265,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_FILE_GET_INFO) (
- IN EFI_FILE *This,
+ IN EFI_FILE_PROTOCOL *This,
IN EFI_GUID *InformationType,
IN OUT UINTN *BufferSize,
OUT VOID *Buffer
@@ -276,7 +292,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_FILE_SET_INFO) (
- IN EFI_FILE *This,
+ IN EFI_FILE_PROTOCOL *This,
IN EFI_GUID *InformationType,
IN UINTN BufferSize,
IN VOID *Buffer
@@ -305,10 +321,13 @@ EFI_STATUS
)
;
-#define EFI_FILE_HANDLE_REVISION 0x00010000
-#define EFI_FILE_PROTOCOL_REVISION EFI_FILE_HANDLE_REVISION
+#define EFI_FILE_PROTOCOL_REVISION 0x00010000
+//
+// Revision defined in EFI1.1.
+//
+#define EFI_FILE_REVISION EFI_FILE_PROTOCOL_REVISION
-struct _EFI_FILE {
+struct _EFI_FILE_PROTOCOL {
UINT64 Revision;
EFI_FILE_OPEN Open;
EFI_FILE_CLOSE Close;
diff --git a/MdePkg/Include/Protocol/SimpleNetwork.h b/MdePkg/Include/Protocol/SimpleNetwork.h
index 0da64bbe53..ece9d3966d 100644
--- a/MdePkg/Include/Protocol/SimpleNetwork.h
+++ b/MdePkg/Include/Protocol/SimpleNetwork.h
@@ -31,6 +31,12 @@
typedef struct _EFI_SIMPLE_NETWORK_PROTOCOL EFI_SIMPLE_NETWORK_PROTOCOL;
+
+//
+// Protocol defined in EFI1.1.
+//
+typedef EFI_SIMPLE_NETWORK_PROTOCOL EFI_SIMPLE_NETWORK;
+
//
// Simple Network Protocol data structures
//
@@ -556,6 +562,11 @@ EFI_STATUS
#define EFI_SIMPLE_NETWORK_PROTOCOL_REVISION 0x00010000
+//
+// Revision defined in EFI1.1
+//
+#define EFI_SIMPLE_NETWORK_INTERFACE_REVISION EFI_SIMPLE_NETWORK_PROTOCOL_REVISION
+
struct _EFI_SIMPLE_NETWORK_PROTOCOL {
UINT64 Revision;
EFI_SIMPLE_NETWORK_START Start;
diff --git a/MdePkg/Include/Protocol/SimpleTextIn.h b/MdePkg/Include/Protocol/SimpleTextIn.h
index 3e7f016f4c..d2e65eface 100644
--- a/MdePkg/Include/Protocol/SimpleTextIn.h
+++ b/MdePkg/Include/Protocol/SimpleTextIn.h
@@ -20,17 +20,23 @@
#ifndef __SIMPLE_TEXT_IN_PROTOCOL_H__
#define __SIMPLE_TEXT_IN_PROTOCOL_H__
-#define EFI_SIMPLE_TEXT_IN_PROTOCOL_GUID \
+#define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID \
{ \
0x387477c1, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
}
-#define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID EFI_SIMPLE_TEXT_IN_PROTOCOL_GUID
+//
+// Protocol GUID defined in EFI1.1.
+//
+#define SIMPLE_INPUT_PROTOCOL EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID
-typedef struct _EFI_SIMPLE_TEXT_IN_PROTOCOL EFI_SIMPLE_TEXT_IN_PROTOCOL;
-typedef struct _EFI_SIMPLE_TEXT_IN_PROTOCOL EFI_SIMPLE_TEXT_INPUT_PROTOCOL;
+typedef struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL EFI_SIMPLE_TEXT_INPUT_PROTOCOL;
//
+// Backward-compatible with EFI1.1.
+//
+typedef struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL SIMPLE_INPUT_INTERFACE;
+//
// Data structures
//
typedef struct {
@@ -88,7 +94,7 @@ typedef struct {
typedef
EFI_STATUS
(EFIAPI *EFI_INPUT_RESET) (
- IN EFI_SIMPLE_TEXT_IN_PROTOCOL *This,
+ IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *This,
IN BOOLEAN ExtendedVerification
)
;
@@ -109,12 +115,12 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_INPUT_READ_KEY) (
- IN EFI_SIMPLE_TEXT_IN_PROTOCOL *This,
+ IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *This,
OUT EFI_INPUT_KEY *Key
)
;
-struct _EFI_SIMPLE_TEXT_IN_PROTOCOL {
+struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL {
EFI_INPUT_RESET Reset;
EFI_INPUT_READ_KEY ReadKeyStroke;
EFI_EVENT WaitForKey;
diff --git a/MdePkg/Include/Protocol/SimpleTextOut.h b/MdePkg/Include/Protocol/SimpleTextOut.h
index b568865f18..feff9a13dc 100644
--- a/MdePkg/Include/Protocol/SimpleTextOut.h
+++ b/MdePkg/Include/Protocol/SimpleTextOut.h
@@ -22,15 +22,22 @@
#ifndef __SIMPLE_TEXT_OUT_H__
#define __SIMPLE_TEXT_OUT_H__
-#define EFI_SIMPLE_TEXT_OUT_PROTOCOL_GUID \
+#define EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID \
{ \
0x387477c2, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
}
-#define EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID EFI_SIMPLE_TEXT_OUT_PROTOCOL_GUID
+//
+// Protocol GUID defined in EFI1.1.
+//
+#define SIMPLE_TEXT_OUTPUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID
+
+typedef struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL;
-typedef struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL EFI_SIMPLE_TEXT_OUT_PROTOCOL;
-typedef struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL;
+//
+// Backward-compatible with EFI1.1.
+//
+typedef EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL SIMPLE_TEXT_OUTPUT_INTERFACE;
//
// Define's for required EFI Unicode Box Draw characters
@@ -155,7 +162,7 @@ typedef struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL;
typedef
EFI_STATUS
(EFIAPI *EFI_TEXT_RESET) (
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN BOOLEAN ExtendedVerification
)
;
@@ -181,7 +188,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_TEXT_STRING) (
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN CHAR16 *String
)
;
@@ -203,7 +210,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_TEXT_TEST_STRING) (
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN CHAR16 *String
)
;
@@ -227,7 +234,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_TEXT_QUERY_MODE) (
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN UINTN ModeNumber,
OUT UINTN *Columns,
OUT UINTN *Rows
@@ -248,7 +255,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_TEXT_SET_MODE) (
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN UINTN ModeNumber
)
;
@@ -270,7 +277,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_TEXT_SET_ATTRIBUTE) (
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN UINTN Attribute
)
;
@@ -289,7 +296,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_TEXT_CLEAR_SCREEN) (
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This
)
;
@@ -313,7 +320,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_TEXT_SET_CURSOR_POSITION) (
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN UINTN Column,
IN UINTN Row
)
@@ -336,7 +343,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *EFI_TEXT_ENABLE_CURSOR) (
- IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This,
+ IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN BOOLEAN Visible
)
;
@@ -365,7 +372,7 @@ typedef struct {
BOOLEAN CursorVisible;
} EFI_SIMPLE_TEXT_OUTPUT_MODE;
-struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL {
+struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL {
EFI_TEXT_RESET Reset;
EFI_TEXT_STRING OutputString;
@@ -385,6 +392,6 @@ struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL {
EFI_SIMPLE_TEXT_OUTPUT_MODE *Mode;
};
-extern EFI_GUID gEfiSimpleTextOutProtocolGuid;
+extern EFI_GUID gEfiSimpleTextOutputProtocolGuid;
#endif
diff --git a/MdePkg/Include/Protocol/UnicodeCollation.h b/MdePkg/Include/Protocol/UnicodeCollation.h
index e0278038f7..bc527e88d4 100644
--- a/MdePkg/Include/Protocol/UnicodeCollation.h
+++ b/MdePkg/Include/Protocol/UnicodeCollation.h
@@ -22,7 +22,18 @@
0x1d85cd7f, 0xf43d, 0x11d2, {0x9a, 0xc, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
}
-typedef struct _EFI_UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL;
+typedef struct _EFI_UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL;
+
+
+//
+// Protocol GUID name defined in EFI1.1.
+//
+#define UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL_GUID
+
+//
+// Protocol defined in EFI1.1.
+//
+typedef EFI_UNICODE_COLLATION_PROTOCOL UNICODE_COLLATION_INTERFACE;
//
// Protocol data structures and defines
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 15:53:05 +0000