Update Protocol for backward-compatible with EFI1.1.

[mirror_edk2.git] / MdePkg / Include / Protocol / SimpleFileSystem.h

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
-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
@@ -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
-  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
@@ -86,8 +102,8 @@ struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL {
 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
@@ -160,7 +176,7 @@ EFI_STATUS
 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
@@ -186,7 +202,7 @@ EFI_STATUS
 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
@@ -205,7 +221,7 @@ EFI_STATUS
 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
@@ -223,7 +239,7 @@ EFI_STATUS
 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
@@ -249,7 +265,7 @@ EFI_STATUS
 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
@@ -276,7 +292,7 @@ EFI_STATUS
 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
@@ -305,10 +321,13 @@ EFI_STATUS
   )\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