Use EFI_FILE_PROTOCOL naming in place of EFI_FILE

(based on FatPkg commit 9f5ac6912eb71e9037fe05b8bd6bf02b5cee5ac6)

[jordan.l.justen@intel.com: Use script to relicense to 2-clause BSD]
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Acked-by: Mark Doran <mark.doran@intel.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/FatPkg/EnhancedFatDxe/Data.c b/FatPkg/EnhancedFatDxe/Data.c
index 2f8faa819b70d967b81547ad42db73e953ef11d2..c34f51d79c3c29abf37d193204c59abb1b21769d 100644 (file)
--- a/FatPkg/EnhancedFatDxe/Data.c
+++ b/FatPkg/EnhancedFatDxe/Data.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2005, Intel Corporation\r
+Copyright (c) 2005 - 2009, Intel Corporation\r
 All rights reserved. This program and the accompanying materials are licensed and made available\r
 under the terms and conditions of the BSD License which accompanies this\r
 distribution. The full text of the license may be found at\r
@@ -35,7 +35,7 @@ EFI_LOCK FatFsLock = EFI_INITIALIZE_LOCK_VARIABLE(TPL_CALLBACK);
 //\r
 // Filesystem interface functions\r
 //\r
-EFI_FILE                        FatFileInterface = {\r
+EFI_FILE_PROTOCOL               FatFileInterface = {\r
   EFI_FILE_PROTOCOL_REVISION,\r
   FatOpen,\r
   FatClose,\r

diff --git a/FatPkg/EnhancedFatDxe/Delete.c b/FatPkg/EnhancedFatDxe/Delete.c
index b76fe45ecae53079f6ceacb115e2f4a0d5ca3aee..d39b8b765bbe74ee4668e1d7d5833d02f2a32722 100644 (file)
--- a/FatPkg/EnhancedFatDxe/Delete.c
+++ b/FatPkg/EnhancedFatDxe/Delete.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2005, Intel Corporation\r
+Copyright (c) 2005 - 2009, Intel Corporation\r
 All rights reserved. This program and the accompanying materials are licensed and made available\r
 under the terms and conditions of the BSD License which accompanies this\r
 distribution. The full text of the license may be found at\r
@@ -27,7 +27,7 @@ Revision History
 EFI_STATUS\r
 EFIAPI\r
 FatDelete (\r
-  IN EFI_FILE  *FHand\r
+  IN EFI_FILE_PROTOCOL  *FHand\r
   )\r
 /*++\r
 \r

diff --git a/FatPkg/EnhancedFatDxe/Fat.h b/FatPkg/EnhancedFatDxe/Fat.h
index 3a782cb0266993e68638effd25257724e98e2536..56822f723a56b023183458f7a6122cd1a7e9e913 100644 (file)
--- a/FatPkg/EnhancedFatDxe/Fat.h
+++ b/FatPkg/EnhancedFatDxe/Fat.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2005 - 2007, Intel Corporation\r
+Copyright (c) 2005 - 2009, Intel Corporation\r
 All rights reserved. This program and the accompanying materials are licensed and made available\r
 under the terms and conditions of the BSD License which accompanies this\r
 distribution. The full text of the license may be found at\r
@@ -209,7 +209,7 @@ typedef struct _FAT_ODIR {
 \r
 typedef struct {\r
   UINTN               Signature;\r
-  EFI_FILE            Handle;\r
+  EFI_FILE_PROTOCOL   Handle;\r
   UINT64              Position;\r
   BOOLEAN             ReadOnly;\r
   struct _FAT_OFILE   *OFile;\r
@@ -369,8 +369,8 @@ typedef struct _FAT_VOLUME {
 EFI_STATUS\r
 EFIAPI\r
 FatOpen (\r
-  IN  EFI_FILE          *FHand,\r
-  OUT EFI_FILE          **NewHandle,\r
+  IN  EFI_FILE_PROTOCOL *FHand,\r
+  OUT EFI_FILE_PROTOCOL **NewHandle,\r
   IN  CHAR16            *FileName,\r
   IN  UINT64            OpenMode,\r
   IN  UINT64            Attributes\r
@@ -403,7 +403,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatGetPosition (\r
-  IN  EFI_FILE          *FHand,\r
+  IN  EFI_FILE_PROTOCOL *FHand,\r
   OUT UINT64            *Position\r
   )\r
 /*++\r
@@ -429,10 +429,10 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatGetInfo (\r
-  IN     EFI_FILE      *FHand,\r
-  IN     EFI_GUID      *Type,\r
-  IN OUT UINTN         *BufferSize,\r
-     OUT VOID          *Buffer\r
+  IN     EFI_FILE_PROTOCOL      *FHand,\r
+  IN     EFI_GUID               *Type,\r
+  IN OUT UINTN                  *BufferSize,\r
+     OUT VOID                   *Buffer\r
   )\r
 /*++\r
 \r
@@ -458,7 +458,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatSetInfo (\r
-  IN EFI_FILE           *FHand,\r
+  IN EFI_FILE_PROTOCOL  *FHand,\r
   IN EFI_GUID           *Type,\r
   IN UINTN              BufferSize,\r
   IN VOID               *Buffer\r
@@ -487,7 +487,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatFlush (\r
-  IN EFI_FILE           *FHand\r
+  IN EFI_FILE_PROTOCOL  *FHand\r
   )\r
 /*++\r
 \r
@@ -513,7 +513,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatClose (\r
-  IN EFI_FILE  *FHand\r
+  IN EFI_FILE_PROTOCOL  *FHand\r
   )\r
 /*++\r
 \r
@@ -535,7 +535,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatDelete (\r
-  IN EFI_FILE           *FHand\r
+  IN EFI_FILE_PROTOCOL  *FHand\r
   )\r
 /*++\r
 \r
@@ -558,7 +558,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatSetPosition (\r
-  IN EFI_FILE           *FHand,\r
+  IN EFI_FILE_PROTOCOL  *FHand,\r
   IN UINT64             Position\r
   )\r
 /*++\r
@@ -584,9 +584,9 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatRead (\r
-  IN     EFI_FILE   *FHand,\r
-  IN OUT UINTN      *BufferSize,\r
-     OUT VOID       *Buffer\r
+  IN     EFI_FILE_PROTOCOL    *FHand,\r
+  IN OUT UINTN                *BufferSize,\r
+     OUT VOID                 *Buffer\r
   )\r
 /*++\r
 \r
@@ -613,9 +613,9 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatWrite (\r
-  IN     EFI_FILE      *FHand,\r
-  IN OUT UINTN         *BufferSize,\r
-  IN     VOID          *Buffer\r
+  IN     EFI_FILE_PROTOCOL      *FHand,\r
+  IN OUT UINTN                  *BufferSize,\r
+  IN     VOID                   *Buffer\r
   )\r
 /*++\r
 \r
@@ -883,7 +883,7 @@ EFI_STATUS
 EFIAPI\r
 FatOpenVolume (\r
   IN  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
-  OUT EFI_FILE                        **File\r
+  OUT EFI_FILE_PROTOCOL               **File\r
   );\r
 \r
 //\r
@@ -1113,6 +1113,6 @@ extern EFI_DRIVER_BINDING_PROTOCOL     gFatDriverBinding;
 extern EFI_COMPONENT_NAME_PROTOCOL     gFatComponentName;\r
 extern EFI_COMPONENT_NAME2_PROTOCOL    gFatComponentName2;\r
 extern EFI_LOCK                        FatFsLock;\r
-extern EFI_FILE                        FatFileInterface;\r
+extern EFI_FILE_PROTOCOL               FatFileInterface;\r
 \r
 #endif\r

diff --git a/FatPkg/EnhancedFatDxe/Flush.c b/FatPkg/EnhancedFatDxe/Flush.c
index e058fa4cf876d48aa1d53e3f65c1fdc2b0c44ef2..8228cda60d37b94b24d2b52b841e5cdae5a91045 100644 (file)
--- a/FatPkg/EnhancedFatDxe/Flush.c
+++ b/FatPkg/EnhancedFatDxe/Flush.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2005 - 2007, Intel Corporation\r
+Copyright (c) 2005 - 2009, Intel Corporation\r
 All rights reserved. This program and the accompanying materials are licensed and made available\r
 under the terms and conditions of the BSD License which accompanies this\r
 distribution. The full text of the license may be found at\r
@@ -27,7 +27,7 @@ Revision History
 EFI_STATUS\r
 EFIAPI\r
 FatFlush (\r
-  IN EFI_FILE  *FHand\r
+  IN EFI_FILE_PROTOCOL  *FHand\r
   )\r
 /*++\r
 \r
@@ -86,7 +86,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatClose (\r
-  IN EFI_FILE  *FHand\r
+  IN EFI_FILE_PROTOCOL  *FHand\r
   )\r
 /*++\r
 \r

diff --git a/FatPkg/EnhancedFatDxe/Info.c b/FatPkg/EnhancedFatDxe/Info.c
index 740a0df5e443ca84b44bfbf0460bf953a1b5aae5..a71d671adac09c151d1b852be854f16ecaa069ec 100644 (file)
--- a/FatPkg/EnhancedFatDxe/Info.c
+++ b/FatPkg/EnhancedFatDxe/Info.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2005 - 2007, Intel Corporation\r
+Copyright (c) 2005 - 2009, Intel Corporation\r
 All rights reserved. This program and the accompanying materials are licensed and made available\r
 under the terms and conditions of the BSD License which accompanies this\r
 distribution. The full text of the license may be found at\r
@@ -40,11 +40,11 @@ FatSetVolumeInfo (
 \r
 EFI_STATUS\r
 FatSetOrGetInfo (\r
-  IN BOOLEAN    IsSet,\r
-  IN EFI_FILE   *FHand,\r
-  IN EFI_GUID   *Type,\r
-  IN OUT UINTN  *BufferSize,\r
-  IN OUT VOID   *Buffer\r
+  IN BOOLEAN              IsSet,\r
+  IN EFI_FILE_PROTOCOL    *FHand,\r
+  IN EFI_GUID             *Type,\r
+  IN OUT UINTN            *BufferSize,\r
+  IN OUT VOID             *Buffer\r
   );\r
 \r
 EFI_STATUS\r
@@ -474,11 +474,11 @@ Returns:
 \r
 EFI_STATUS\r
 FatSetOrGetInfo (\r
-  IN     BOOLEAN        IsSet,\r
-  IN     EFI_FILE       *FHand,\r
-  IN     EFI_GUID       *Type,\r
-  IN OUT UINTN          *BufferSize,\r
-  IN OUT VOID           *Buffer\r
+  IN     BOOLEAN            IsSet,\r
+  IN     EFI_FILE_PROTOCOL  *FHand,\r
+  IN     EFI_GUID           *Type,\r
+  IN OUT UINTN              *BufferSize,\r
+  IN OUT VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -565,10 +565,10 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatGetInfo (\r
-  IN     EFI_FILE       *FHand,\r
-  IN     EFI_GUID       *Type,\r
-  IN OUT UINTN          *BufferSize,\r
-     OUT VOID           *Buffer\r
+  IN     EFI_FILE_PROTOCOL   *FHand,\r
+  IN     EFI_GUID            *Type,\r
+  IN OUT UINTN               *BufferSize,\r
+     OUT VOID                *Buffer\r
   )\r
 /*++\r
 \r
@@ -596,10 +596,10 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatSetInfo (\r
-  IN EFI_FILE  *FHand,\r
-  IN EFI_GUID  *Type,\r
-  IN UINTN     BufferSize,\r
-  IN VOID      *Buffer\r
+  IN EFI_FILE_PROTOCOL  *FHand,\r
+  IN EFI_GUID           *Type,\r
+  IN UINTN              BufferSize,\r
+  IN VOID               *Buffer\r
   )\r
 /*++\r
 \r

diff --git a/FatPkg/EnhancedFatDxe/Open.c b/FatPkg/EnhancedFatDxe/Open.c
index ae2aae530d9e39efda6bfca236d38ffc074793c9..8fc7bd08b7dbf34022dd43959ab81f7a160b1fea 100644 (file)
--- a/FatPkg/EnhancedFatDxe/Open.c
+++ b/FatPkg/EnhancedFatDxe/Open.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2005 - 2007, Intel Corporation\r
+Copyright (c) 2005 - 2009, Intel Corporation\r
 All rights reserved. This program and the accompanying materials are licensed and made available\r
 under the terms and conditions of the BSD License which accompanies this\r
 distribution. The full text of the license may be found at\r
@@ -62,7 +62,7 @@ Returns:
 \r
   IFile->Signature = FAT_IFILE_SIGNATURE;\r
 \r
-  CopyMem (&(IFile->Handle), &FatFileInterface, sizeof (EFI_FILE));\r
+  CopyMem (&(IFile->Handle), &FatFileInterface, sizeof (EFI_FILE_PROTOCOL));\r
 \r
   IFile->OFile = OFile;\r
   InsertTailList (&OFile->Opens, &IFile->Link);\r
@@ -190,11 +190,11 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatOpen (\r
-  IN  EFI_FILE   *FHand,\r
-  OUT EFI_FILE   **NewHandle,\r
-  IN  CHAR16     *FileName,\r
-  IN  UINT64     OpenMode,\r
-  IN  UINT64     Attributes\r
+  IN  EFI_FILE_PROTOCOL   *FHand,\r
+  OUT EFI_FILE_PROTOCOL   **NewHandle,\r
+  IN  CHAR16              *FileName,\r
+  IN  UINT64              OpenMode,\r
+  IN  UINT64              Attributes\r
   )\r
 /*++\r
 Routine Description:\r

diff --git a/FatPkg/EnhancedFatDxe/OpenVolume.c b/FatPkg/EnhancedFatDxe/OpenVolume.c
index 723ee127cde471db649046ff9ec874831ad3fe58..82f6e29adc67cf1777b3b52b06dbd32c9f0a2bfc 100644 (file)
--- a/FatPkg/EnhancedFatDxe/OpenVolume.c
+++ b/FatPkg/EnhancedFatDxe/OpenVolume.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2005, Intel Corporation\r
+Copyright (c) 2005 - 2009, Intel Corporation\r
 All rights reserved. This program and the accompanying materials are licensed and made available\r
 under the terms and conditions of the BSD License which accompanies this\r
 distribution. The full text of the license may be found at\r
@@ -28,7 +28,7 @@ EFI_STATUS
 EFIAPI\r
 FatOpenVolume (\r
   IN  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *This,\r
-  OUT EFI_FILE                         **File\r
+  OUT EFI_FILE_PROTOCOL                **File\r
   )\r
 /*++\r
 \r

diff --git a/FatPkg/EnhancedFatDxe/ReadWrite.c b/FatPkg/EnhancedFatDxe/ReadWrite.c
index 7ccf517bf15950b9711520bf77c4757cd15b726e..956db27a8677d39416db30e091a8c58abbef3ef7 100644 (file)
--- a/FatPkg/EnhancedFatDxe/ReadWrite.c
+++ b/FatPkg/EnhancedFatDxe/ReadWrite.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2005, Intel Corporation\r
+Copyright (c) 2005 - 2009, Intel Corporation\r
 All rights reserved. This program and the accompanying materials are licensed and made available\r
 under the terms and conditions of the BSD License which accompanies this\r
 distribution. The full text of the license may be found at\r
@@ -27,7 +27,7 @@ Revision History
 EFI_STATUS\r
 EFIAPI\r
 FatGetPosition (\r
-  IN  EFI_FILE          *FHand,\r
+  IN  EFI_FILE_PROTOCOL *FHand,\r
   OUT UINT64            *Position\r
   )\r
 /*++\r
@@ -70,8 +70,8 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatSetPosition (\r
-  IN EFI_FILE  *FHand,\r
-  IN UINT64    Position\r
+  IN EFI_FILE_PROTOCOL  *FHand,\r
+  IN UINT64             Position\r
   )\r
 /*++\r
 \r
@@ -204,7 +204,7 @@ Done:
 \r
 EFI_STATUS\r
 FatIFileAccess (\r
-  IN     EFI_FILE              *FHand,\r
+  IN     EFI_FILE_PROTOCOL     *FHand,\r
   IN     IO_MODE               IoMode,\r
   IN OUT UINTN                 *BufferSize,\r
   IN OUT VOID                  *Buffer\r
@@ -343,9 +343,9 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 FatRead (\r
-  IN     EFI_FILE       *FHand,\r
-  IN OUT UINTN          *BufferSize,\r
-     OUT VOID           *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *FHand,\r
+  IN OUT UINTN              *BufferSize,\r
+     OUT VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -374,9 +374,9 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FatWrite (\r
-  IN     EFI_FILE       *FHand,\r
-  IN OUT UINTN          *BufferSize,\r
-  IN     VOID           *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *FHand,\r
+  IN OUT UINTN              *BufferSize,\r
+  IN     VOID               *Buffer\r
   )\r
 /*++\r
 \r