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

2 files changed, 54 insertions, 54 deletions

diff --git a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
index d01fd4e751..e39a18978f 100644
--- a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
+++ b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
@@ -457,7 +457,7 @@ EFI_STATUS
 EFIAPI

 UnixSimpleFileSystemOpenVolume (

   IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *This,

-  OUT EFI_FILE                        **Root

+  OUT EFI_FILE_PROTOCOL               **Root

   )

 /*++

 

@@ -578,11 +578,11 @@ Done:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemOpen (

-  IN  EFI_FILE  *This,

-  OUT EFI_FILE  **NewHandle,

-  IN  CHAR16    *FileName,

-  IN  UINT64    OpenMode,

-  IN  UINT64    Attributes

+  IN  EFI_FILE_PROTOCOL   *This,

+  OUT EFI_FILE_PROTOCOL   **NewHandle,

+  IN  CHAR16              *FileName,

+  IN  UINT64              OpenMode,

+  IN  UINT64              Attributes

   )

 /*++

 

@@ -630,7 +630,7 @@ Returns:
 // TODO:    EFI_INVALID_PARAMETER - add return value to function comment

 // TODO:    EFI_INVALID_PARAMETER - add return value to function comment

 {

-  EFI_FILE                          *Root;

+  EFI_FILE_PROTOCOL                 *Root;

   UNIX_EFI_FILE_PRIVATE           *PrivateFile;

   UNIX_EFI_FILE_PRIVATE           *NewPrivateFile;

   UNIX_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;

@@ -963,7 +963,7 @@ Done: ;
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemClose (

-  IN EFI_FILE  *This

+  IN EFI_FILE_PROTOCOL  *This

   )

 /*++

 

@@ -1017,7 +1017,7 @@ Returns:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemDelete (

-  IN EFI_FILE  *This

+  IN EFI_FILE_PROTOCOL  *This

   )

 /*++

 

@@ -1221,9 +1221,9 @@ Returns:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemRead (

-  IN     EFI_FILE  *This,

-  IN OUT UINTN     *BufferSize,

-  OUT    VOID      *Buffer

+  IN     EFI_FILE_PROTOCOL  *This,

+  IN OUT UINTN              *BufferSize,

+  OUT    VOID               *Buffer

   )

 /*++

 

@@ -1357,9 +1357,9 @@ Done:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemWrite (

-  IN     EFI_FILE  *This,

-  IN OUT UINTN     *BufferSize,

-  IN     VOID      *Buffer

+  IN     EFI_FILE_PROTOCOL  *This,

+  IN OUT UINTN              *BufferSize,

+  IN     VOID               *Buffer

   )

 /*++

 

@@ -1445,8 +1445,8 @@ Done:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemSetPosition (

-  IN EFI_FILE  *This,

-  IN UINT64    Position

+  IN EFI_FILE_PROTOCOL  *This,

+  IN UINT64             Position

   )

 /*++

 

@@ -1512,8 +1512,8 @@ Done:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemGetPosition (

-  IN  EFI_FILE  *This,

-  OUT UINT64    *Position

+  IN  EFI_FILE_PROTOCOL   *This,

+  OUT UINT64              *Position

   )

 /*++

 

@@ -1562,10 +1562,10 @@ Returns:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemGetInfo (

-  IN     EFI_FILE  *This,

-  IN     EFI_GUID  *InformationType,

-  IN OUT UINTN     *BufferSize,

-  OUT    VOID      *Buffer

+  IN     EFI_FILE_PROTOCOL  *This,

+  IN     EFI_GUID           *InformationType,

+  IN OUT UINTN              *BufferSize,

+  OUT    VOID               *Buffer

   )

 /*++

 

@@ -1671,7 +1671,7 @@ Done:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemSetInfo (

-  IN EFI_FILE         *This,

+  IN EFI_FILE_PROTOCOL*This,

   IN EFI_GUID         *InformationType,

   IN UINTN            BufferSize,

   IN VOID             *Buffer

@@ -2117,7 +2117,7 @@ Done:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemFlush (

-  IN EFI_FILE  *This

+  IN EFI_FILE_PROTOCOL  *This

   )

 /*++

 

diff --git a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h
index 1b6395540d..29aa914182 100644
--- a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h
+++ b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006 - 2008, Intel Corporation                                                         

+Copyright (c) 2006 - 2009, Intel Corporation                                                         

 All rights reserved. This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -67,7 +67,7 @@ typedef struct {
   UINTN                           Signature;

   EFI_UNIX_THUNK_PROTOCOL        *UnixThunk;

   EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;

-  EFI_FILE                        EfiFile;

+  EFI_FILE_PROTOCOL               EfiFile;

   INTN                            fd;

   DIR                             *Dir;

   BOOLEAN                         IsRootDirectory;

@@ -203,7 +203,7 @@ EFI_STATUS
 EFIAPI

 UnixSimpleFileSystemOpenVolume (

   IN  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,

-  OUT EFI_FILE                        **Root

+  OUT EFI_FILE_PROTOCOL               **Root

   )

 /*++

 

@@ -241,11 +241,11 @@ Returns:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemOpen (

-  IN  EFI_FILE  *This,

-  OUT EFI_FILE  **NewHandle,

-  IN  CHAR16    *FileName,

-  IN  UINT64    OpenMode,

-  IN  UINT64    Attributes

+  IN  EFI_FILE_PROTOCOL   *This,

+  OUT EFI_FILE_PROTOCOL   **NewHandle,

+  IN  CHAR16              *FileName,

+  IN  UINT64              OpenMode,

+  IN  UINT64              Attributes

   )

 /*++

 

@@ -293,7 +293,7 @@ Returns:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemClose (

-  IN EFI_FILE  *This

+  IN EFI_FILE_PROTOCOL  *This

   )

 /*++

 

@@ -315,7 +315,7 @@ Returns:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemDelete (

-  IN EFI_FILE  *This

+  IN EFI_FILE_PROTOCOL  *This

   )

 /*++

 

@@ -339,9 +339,9 @@ Returns:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemRead (

-  IN     EFI_FILE  *This,

-  IN OUT UINTN     *BufferSize,

-  OUT    VOID      *Buffer

+  IN     EFI_FILE_PROTOCOL  *This,

+  IN OUT UINTN              *BufferSize,

+  OUT    VOID               *Buffer

   )

 /*++

 

@@ -376,9 +376,9 @@ Returns:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemWrite (

-  IN     EFI_FILE  *This,

-  IN OUT UINTN     *BufferSize,

-  IN     VOID      *Buffer

+  IN     EFI_FILE_PROTOCOL  *This,

+  IN OUT UINTN              *BufferSize,

+  IN     VOID               *Buffer

   )

 /*++

 

@@ -419,8 +419,8 @@ Returns:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemSetPosition (

-  IN EFI_FILE  *This,

-  IN UINT64    Position

+  IN EFI_FILE_PROTOCOL  *This,

+  IN UINT64             Position

   )

 /*++

 

@@ -446,8 +446,8 @@ Returns:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemGetPosition (

-  IN  EFI_FILE  *This,

-  OUT UINT64    *Position

+  IN  EFI_FILE_PROTOCOL   *This,

+  OUT UINT64              *Position

   )

 /*++

 

@@ -473,10 +473,10 @@ Returns:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemGetInfo (

-  IN     EFI_FILE  *This,

-  IN     EFI_GUID  *InformationType,

-  IN OUT UINTN     *BufferSize,

-  OUT    VOID      *Buffer

+  IN     EFI_FILE_PROTOCOL  *This,

+  IN     EFI_GUID           *InformationType,

+  IN OUT UINTN              *BufferSize,

+  OUT    VOID               *Buffer

   )

 /*++

 

@@ -516,10 +516,10 @@ Returns:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemSetInfo (

-  IN EFI_FILE  *This,

-  IN EFI_GUID  *InformationType,

-  IN UINTN     BufferSize,

-  IN VOID      *Buffer

+  IN EFI_FILE_PROTOCOL  *This,

+  IN EFI_GUID           *InformationType,

+  IN UINTN              BufferSize,

+  IN VOID               *Buffer

   )

 /*++

 

@@ -563,7 +563,7 @@ Returns:
 EFI_STATUS

 EFIAPI

 UnixSimpleFileSystemFlush (

-  IN EFI_FILE  *This

+  IN EFI_FILE_PROTOCOL  *This

   )

 /*++