Use UEFI EFI_FILE_PROTOCOL to replace EFI_FILE

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

diff --git a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
index d01fd4e7510b3d4b7b3384410a75f477211943b3..e39a18978fbfd05b71be55ee3b3e875511fb976a 100644 (file)
--- a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
+++ b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
@@ -457,7 +457,7 @@ EFI_STATUS
 EFIAPI\r
 UnixSimpleFileSystemOpenVolume (\r
   IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *This,\r
-  OUT EFI_FILE                        **Root\r
+  OUT EFI_FILE_PROTOCOL               **Root\r
   )\r
 /*++\r
 \r
@@ -578,11 +578,11 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemOpen (\r
-  IN  EFI_FILE  *This,\r
-  OUT EFI_FILE  **NewHandle,\r
-  IN  CHAR16    *FileName,\r
-  IN  UINT64    OpenMode,\r
-  IN  UINT64    Attributes\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
   )\r
 /*++\r
 \r
@@ -630,7 +630,7 @@ Returns:
 // TODO:    EFI_INVALID_PARAMETER - add return value to function comment\r
 // TODO:    EFI_INVALID_PARAMETER - add return value to function comment\r
 {\r
-  EFI_FILE                          *Root;\r
+  EFI_FILE_PROTOCOL                 *Root;\r
   UNIX_EFI_FILE_PRIVATE           *PrivateFile;\r
   UNIX_EFI_FILE_PRIVATE           *NewPrivateFile;\r
   UNIX_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
@@ -963,7 +963,7 @@ Done: ;
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemClose (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r
@@ -1017,7 +1017,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemDelete (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r
@@ -1221,9 +1221,9 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemRead (\r
-  IN     EFI_FILE  *This,\r
-  IN OUT UINTN     *BufferSize,\r
-  OUT    VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT    VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -1357,9 +1357,9 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemWrite (\r
-  IN     EFI_FILE  *This,\r
-  IN OUT UINTN     *BufferSize,\r
-  IN     VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  IN     VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -1445,8 +1445,8 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemSetPosition (\r
-  IN EFI_FILE  *This,\r
-  IN UINT64    Position\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN UINT64             Position\r
   )\r
 /*++\r
 \r
@@ -1512,8 +1512,8 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemGetPosition (\r
-  IN  EFI_FILE  *This,\r
-  OUT UINT64    *Position\r
+  IN  EFI_FILE_PROTOCOL   *This,\r
+  OUT UINT64              *Position\r
   )\r
 /*++\r
 \r
@@ -1562,10 +1562,10 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemGetInfo (\r
-  IN     EFI_FILE  *This,\r
-  IN     EFI_GUID  *InformationType,\r
-  IN OUT UINTN     *BufferSize,\r
-  OUT    VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN     EFI_GUID           *InformationType,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT    VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -1671,7 +1671,7 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemSetInfo (\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
@@ -2117,7 +2117,7 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemFlush (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r

diff --git a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h
index 1b6395540d82d8e3648eb0dd2cf18c3ece697c6e..29aa91418256cb7b40d08c7867766adbac67e62b 100644 (file)
--- a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h
+++ b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006 - 2008, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -67,7 +67,7 @@ typedef struct {
   UINTN                           Signature;\r
   EFI_UNIX_THUNK_PROTOCOL        *UnixThunk;\r
   EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;\r
-  EFI_FILE                        EfiFile;\r
+  EFI_FILE_PROTOCOL               EfiFile;\r
   INTN                            fd;\r
   DIR                             *Dir;\r
   BOOLEAN                         IsRootDirectory;\r
@@ -203,7 +203,7 @@ EFI_STATUS
 EFIAPI\r
 UnixSimpleFileSystemOpenVolume (\r
   IN  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
-  OUT EFI_FILE                        **Root\r
+  OUT EFI_FILE_PROTOCOL               **Root\r
   )\r
 /*++\r
 \r
@@ -241,11 +241,11 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemOpen (\r
-  IN  EFI_FILE  *This,\r
-  OUT EFI_FILE  **NewHandle,\r
-  IN  CHAR16    *FileName,\r
-  IN  UINT64    OpenMode,\r
-  IN  UINT64    Attributes\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
   )\r
 /*++\r
 \r
@@ -293,7 +293,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemClose (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r
@@ -315,7 +315,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemDelete (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r
@@ -339,9 +339,9 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemRead (\r
-  IN     EFI_FILE  *This,\r
-  IN OUT UINTN     *BufferSize,\r
-  OUT    VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT    VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -376,9 +376,9 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemWrite (\r
-  IN     EFI_FILE  *This,\r
-  IN OUT UINTN     *BufferSize,\r
-  IN     VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  IN     VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -419,8 +419,8 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemSetPosition (\r
-  IN EFI_FILE  *This,\r
-  IN UINT64    Position\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN UINT64             Position\r
   )\r
 /*++\r
 \r
@@ -446,8 +446,8 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemGetPosition (\r
-  IN  EFI_FILE  *This,\r
-  OUT UINT64    *Position\r
+  IN  EFI_FILE_PROTOCOL   *This,\r
+  OUT UINT64              *Position\r
   )\r
 /*++\r
 \r
@@ -473,10 +473,10 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemGetInfo (\r
-  IN     EFI_FILE  *This,\r
-  IN     EFI_GUID  *InformationType,\r
-  IN OUT UINTN     *BufferSize,\r
-  OUT    VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN     EFI_GUID           *InformationType,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT    VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -516,10 +516,10 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemSetInfo (\r
-  IN EFI_FILE  *This,\r
-  IN EFI_GUID  *InformationType,\r
-  IN UINTN     BufferSize,\r
-  IN VOID      *Buffer\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN EFI_GUID           *InformationType,\r
+  IN UINTN              BufferSize,\r
+  IN VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -563,7 +563,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemFlush (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r