Update Protocol for backward-compatible with EFI1.1.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2696 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Protocol/BlockIo.h b/MdePkg/Include/Protocol/BlockIo.h
index 4c7e8b42704accbef43b8518703a013d18701500..a3077b5ecab3c77c49343d2c6abd7db9cbfc548b 100644 (file)
--- 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 } \\r
   }\r
 \r
     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
 //\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
 //\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
 \r
 /**\r
   Reset the Block Device.\r


@@ -155,6 +162,10 @@ typedef struct {
 } EFI_BLOCK_IO_MEDIA;\r
 \r
 #define EFI_BLOCK_IO_PROTOCOL_REVISION  0x00010000\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
 struct _EFI_BLOCK_IO_PROTOCOL {\r
   UINT64              Revision;\r

diff --git a/MdePkg/Include/Protocol/DeviceIo.h b/MdePkg/Include/Protocol/DeviceIo.h
index 643c810a3483c3abe24d5d8c8b5352216815d7d8..1e52548ac05e0f67ccfebc932bd935452227710f 100644 (file)
--- a/MdePkg/Include/Protocol/DeviceIo.h
+++ b/MdePkg/Include/Protocol/DeviceIo.h
@@ -27,6 +27,16 @@
 \r
 typedef struct _EFI_DEVICE_IO_PROTOCOL EFI_DEVICE_IO_PROTOCOL;\r
 \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
 typedef enum {\r
   IO_UINT8,\r
   IO_UINT16,\r

diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h
index 6ff0050437177645fe1081bfcf0e01ad86cccea6..77b79a0c6f78de2a854eef393c49c363308eb28e 100644 (file)
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/MdePkg/Include/Protocol/DevicePath.h
@@ -29,9 +29,14 @@
     0x9576e91, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \\r
   }\r
 \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
 //\r
 // Device Path information\r
 //\r

+#define DEVICE_PATH_PROTOCOL  EFI_DEVICE_PATH_PROTOCOL_GUID\r

 \r
 #pragma pack(1)\r
 \r
 \r
 #pragma pack(1)\r
 \r


@@ -41,6 +46,11 @@ typedef struct {
   UINT8 Length[2];\r
 } EFI_DEVICE_PATH_PROTOCOL;\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
 //\r
 // Hardware Device Paths\r
 //\r

diff --git a/MdePkg/Include/Protocol/DiskIo.h b/MdePkg/Include/Protocol/DiskIo.h
index e36792c7cd8b5b117c2d9a1d42f1b3400961808f..20b899056a061de115ed2f0f1ae1ed9c9592900e 100644 (file)
--- 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 } \\r
   }\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
 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
   Read BufferSize bytes from Offset into Buffer.\r
 \r


@@ -87,6 +97,11 @@ EFI_STATUS
 \r
 #define EFI_DISK_IO_PROTOCOL_REVISION 0x00010000\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
 struct _EFI_DISK_IO_PROTOCOL {\r
   UINT64          Revision;\r
   EFI_DISK_READ   ReadDisk;\r

diff --git a/MdePkg/Include/Protocol/LoadFile.h b/MdePkg/Include/Protocol/LoadFile.h
index 346039fb6150e8945d9e61966572e26115d225c6..d8034194dfd60596398fd5efeb2f867a60e9ad71 100644 (file)
--- a/MdePkg/Include/Protocol/LoadFile.h
+++ b/MdePkg/Include/Protocol/LoadFile.h
@@ -23,18 +23,23 @@
 #ifndef __EFI_LOAD_FILE_PROTOCOL_H__\r
 #define __EFI_LOAD_FILE_PROTOCOL_H__\r
 \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
   { \\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
 //\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
 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
 /**\r
   Causes the driver to load a specified file.\r
 \r

diff --git a/MdePkg/Include/Protocol/LoadedImage.h b/MdePkg/Include/Protocol/LoadedImage.h
index 2a0a2363628fa687a27077831aaeba5b7853cd68..a8185636ba17edc71aea8409951e418cbaaf5474 100644 (file)
--- a/MdePkg/Include/Protocol/LoadedImage.h
+++ b/MdePkg/Include/Protocol/LoadedImage.h
@@ -27,11 +27,21 @@
     0x5B1B31A1, 0x9562, 0x11d2, {0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B } \\r
   }\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
 //\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
 typedef struct {\r
   UINT32                    Revision;\r


@@ -66,6 +76,11 @@ typedef struct {
 \r
 } EFI_LOADED_IMAGE_PROTOCOL;\r
 \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
 extern EFI_GUID gEfiLoadedImageProtocolGuid;\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h b/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h
index 98f1c597a447a1a01f8be72b21104f1234e370cc..031db3c6b57effa277e8d7cd455dee49ce9e7f85 100644 (file)
--- a/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h
+++ b/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h
@@ -27,11 +27,21 @@
 \r
 #define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION    0x00010000\r
 \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
 // 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
 typedef enum {\r
   EfiNetworkInterfaceUndi = 1\r
 } EFI_NETWORK_PROTOCOL_TYPE;\r

diff --git a/MdePkg/Include/Protocol/PxeBaseCode.h b/MdePkg/Include/Protocol/PxeBaseCode.h
index 7fb2a80c4233a10d46f179f5309079aa5aaeb5f0..fb0c3b1ddb341b9c3e8ea3d218d5b18d0488c425 100644 (file)
--- 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 } \\r
   }\r
 \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
 //\r
 // Default IP TTL and ToS.\r


@@ -597,8 +602,12 @@ EFI_STATUS
 //\r
 // PXE Base Code Protocol structure\r
 //\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
 struct _EFI_PXE_BASE_CODE_PROTOCOL {\r
   UINT64                            Revision;\r

diff --git a/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h b/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h
index 7f1670136707eba90293ef50ea2a35b7cf818d77..267144db8993ca0056715c64e215d7e415f7fe1f 100644 (file)
--- a/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h
+++ b/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h
@@ -28,15 +28,20 @@
 //\r
 // Revision Number\r
 //\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
 //\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
 typedef enum {\r
   EFI_PXE_BASE_CODE_FUNCTION_FIRST,\r
   EFI_PXE_BASE_CODE_FUNCTION_DHCP,\r

diff --git a/MdePkg/Include/Protocol/SerialIo.h b/MdePkg/Include/Protocol/SerialIo.h
index 89a73409d9a0e9acccb4f32de645905667420a6a..d7458e0eaa1f0ae4c12683651cdfcf4b12c7622e 100644 (file)
--- 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 } \\r
   }\r
 \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
 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
 //\r
 // Serial IO Data structures\r
 //\r


@@ -246,8 +257,8 @@ typedef struct {
   UINT32  StopBits;\r
 } EFI_SERIAL_IO_MODE;\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
 struct _EFI_SERIAL_IO_PROTOCOL {\r
   UINT32                      Revision;\r

diff --git a/MdePkg/Include/Protocol/SimpleFileSystem.h b/MdePkg/Include/Protocol/SimpleFileSystem.h
index add8ad6eeb7c1e935b13f9039f1d1806722ee6d7..f6095c7c165ce854b7e86a32cf52b3ad1fc5bba2 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleFileSystem.h
+++ b/MdePkg/Include/Protocol/SimpleFileSystem.h
@@ -29,9 +29,21 @@
   }\r
 \r
 typedef struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL;\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
 \r
 /**\r
   Open the root directory on a volume.\r


@@ -52,11 +64,15 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME) (\r
   IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL    *This,\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
 ;\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
 \r
 struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL {\r
   UINT64                                      Revision;\r


@@ -86,8 +102,8 @@ struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_OPEN) (\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
   IN CHAR16                   *FileName,\r
   IN UINT64                   OpenMode,\r
   IN UINT64                   Attributes\r


@@ -160,7 +176,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_READ) (\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
   IN OUT UINTN                *BufferSize,\r
   OUT VOID                    *Buffer\r
   )\r


@@ -186,7 +202,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_WRITE) (\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
   IN OUT UINTN                *BufferSize,\r
   IN VOID                     *Buffer\r
   )\r


@@ -205,7 +221,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_SET_POSITION) (\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
   IN UINT64                   Position\r
   )\r
 ;\r


@@ -223,7 +239,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_GET_POSITION) (\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
   OUT UINT64                  *Position\r
   )\r
 ;\r


@@ -249,7 +265,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_GET_INFO) (\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
   IN EFI_GUID                 *InformationType,\r
   IN OUT UINTN                *BufferSize,\r
   OUT VOID                    *Buffer\r


@@ -276,7 +292,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_SET_INFO) (\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
   IN EFI_GUID                 *InformationType,\r
   IN UINTN                    BufferSize,\r
   IN VOID                     *Buffer\r


@@ -305,10 +321,13 @@ EFI_STATUS
   )\r
 ;\r
 \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
 \r

-struct _EFI_FILE {\r
+struct _EFI_FILE_PROTOCOL {\r

   UINT64                Revision;\r
   EFI_FILE_OPEN         Open;\r
   EFI_FILE_CLOSE        Close;\r
   UINT64                Revision;\r
   EFI_FILE_OPEN         Open;\r
   EFI_FILE_CLOSE        Close;\r

diff --git a/MdePkg/Include/Protocol/SimpleNetwork.h b/MdePkg/Include/Protocol/SimpleNetwork.h
index 0da64bbe530445159f0727a4f772d95b4a587707..ece9d3966d0c57fb530179ea16e6da4b57613873 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleNetwork.h
+++ b/MdePkg/Include/Protocol/SimpleNetwork.h
@@ -31,6 +31,12 @@
 \r
 typedef struct _EFI_SIMPLE_NETWORK_PROTOCOL  EFI_SIMPLE_NETWORK_PROTOCOL;\r
 \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
 // Simple Network Protocol data structures\r
 //\r


@@ -556,6 +562,11 @@ EFI_STATUS
 \r
 #define EFI_SIMPLE_NETWORK_PROTOCOL_REVISION  0x00010000\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
 struct _EFI_SIMPLE_NETWORK_PROTOCOL {\r
   UINT64                              Revision;\r
   EFI_SIMPLE_NETWORK_START            Start;\r

diff --git a/MdePkg/Include/Protocol/SimpleTextIn.h b/MdePkg/Include/Protocol/SimpleTextIn.h
index 3e7f016f4cd53bd9d3b75046c9caa27f6791f66a..d2e65eface173d11209766304209d08dfcafdb7a 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleTextIn.h
+++ b/MdePkg/Include/Protocol/SimpleTextIn.h
@@ -20,16 +20,22 @@
 #ifndef __SIMPLE_TEXT_IN_PROTOCOL_H__\r
 #define __SIMPLE_TEXT_IN_PROTOCOL_H__\r
 \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
   { \\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
 \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

+//\r
+// Backward-compatible with EFI1.1.\r
+// \r
+typedef struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL  SIMPLE_INPUT_INTERFACE;\r

 //\r
 // Data structures\r
 //\r
 //\r
 // Data structures\r
 //\r


@@ -88,7 +94,7 @@ typedef struct {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_INPUT_RESET) (\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
   IN BOOLEAN                              ExtendedVerification\r
   )\r
 ;\r


@@ -109,12 +115,12 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_INPUT_READ_KEY) (\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
   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
   EFI_INPUT_RESET     Reset;\r
   EFI_INPUT_READ_KEY  ReadKeyStroke;\r
   EFI_EVENT           WaitForKey;\r

diff --git a/MdePkg/Include/Protocol/SimpleTextOut.h b/MdePkg/Include/Protocol/SimpleTextOut.h
index b568865f18f23015308657556165d4c08446d902..feff9a13dc21d71c673339143fcb8bf713d8e392 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleTextOut.h
+++ b/MdePkg/Include/Protocol/SimpleTextOut.h
@@ -22,15 +22,22 @@
 #ifndef __SIMPLE_TEXT_OUT_H__\r
 #define __SIMPLE_TEXT_OUT_H__\r
 \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
   { \\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
 \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
 \r
 //\r
 // Define's for required EFI Unicode Box Draw characters\r


@@ -155,7 +162,7 @@ typedef struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL;
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_TEXT_RESET) (\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
   IN BOOLEAN                                ExtendedVerification\r
   )\r
 ;\r


@@ -181,7 +188,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_TEXT_STRING) (\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
   IN CHAR16                                 *String\r
   )\r
 ;\r


@@ -203,7 +210,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_TEXT_TEST_STRING) (\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
   IN CHAR16                                 *String\r
   )\r
 ;\r


@@ -227,7 +234,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_TEXT_QUERY_MODE) (\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
   IN UINTN                                  ModeNumber,\r
   OUT UINTN                                 *Columns,\r
   OUT UINTN                                 *Rows\r


@@ -248,7 +255,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_TEXT_SET_MODE) (\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
   IN UINTN                                  ModeNumber\r
   )\r
 ;\r


@@ -270,7 +277,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_TEXT_SET_ATTRIBUTE) (\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
   IN UINTN                                  Attribute\r
   )\r
 ;\r


@@ -289,7 +296,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_TEXT_CLEAR_SCREEN) (\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
   )\r
 ;\r
 \r


@@ -313,7 +320,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_TEXT_SET_CURSOR_POSITION) (\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
   IN UINTN                                  Column,\r
   IN UINTN                                  Row\r
   )\r


@@ -336,7 +343,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_TEXT_ENABLE_CURSOR) (\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
   IN BOOLEAN                                Visible\r
   )\r
 ;\r


@@ -365,7 +372,7 @@ typedef struct {
   BOOLEAN CursorVisible;\r
 } EFI_SIMPLE_TEXT_OUTPUT_MODE;\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_TEXT_RESET                Reset;\r
 \r
   EFI_TEXT_STRING               OutputString;\r


@@ -385,6 +392,6 @@ struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL {
   EFI_SIMPLE_TEXT_OUTPUT_MODE   *Mode;\r
 };\r
 \r
   EFI_SIMPLE_TEXT_OUTPUT_MODE   *Mode;\r
 };\r
 \r

-extern EFI_GUID gEfiSimpleTextOutProtocolGuid;\r
+extern EFI_GUID gEfiSimpleTextOutputProtocolGuid;\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Protocol/UnicodeCollation.h b/MdePkg/Include/Protocol/UnicodeCollation.h
index e0278038f776ad1717017b635c5e89a8aecd09e6..bc527e88d45dadbf6f38d6688332e5629af7eaba 100644 (file)
--- 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 } \\r
   }\r
 \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
 \r
 //\r
 // Protocol data structures and defines\r