Use to use UEFI EFI_FILE_PROTOCOL to replace EFI_FILE

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

diff --git a/DuetPkg/FSVariable/FileStorage.c b/DuetPkg/FSVariable/FileStorage.c
index 400f9ffaab9a0f2c34c89a33746d1d0d5476524d..1792767b076e536d04ff99ac74412b2db87d1fb0 100644 (file)
--- a/DuetPkg/FSVariable/FileStorage.c
+++ b/DuetPkg/FSVariable/FileStorage.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006 - 2007, 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
@@ -55,7 +55,7 @@ OpenStore (
   IN  EFI_DEVICE_PATH_PROTOCOL  *Device,\r
   IN  CHAR16                    *FilePathName,\r
   IN  UINT64                    OpenMode,\r
-  OUT EFI_FILE                  **File\r
+  OUT EFI_FILE_PROTOCOL         **File\r
   );\r
 \r
 //\r
@@ -63,7 +63,7 @@ OpenStore (
 //\r
 VOID\r
 FileClose (\r
-  IN  EFI_FILE                   *File\r
+  IN  EFI_FILE_PROTOCOL          *File\r
   )\r
 {\r
   EFI_STATUS Status;\r
@@ -180,7 +180,7 @@ OnSimpleFileSystemInstall (
   EFI_HANDLE                Handle;\r
   EFI_DEVICE_PATH_PROTOCOL  *Device;\r
   VS_DEV                    *Dev;\r
-  EFI_FILE                  *File;\r
+  EFI_FILE_PROTOCOL         *File;\r
   UINTN                     NumBytes;\r
 \r
   Dev = (VS_DEV *) Context;\r
@@ -288,7 +288,7 @@ FileEraseStore(
 {\r
   EFI_STATUS              Status;\r
   VS_DEV                  *Dev;\r
-  EFI_FILE                *File;\r
+  EFI_FILE_PROTOCOL       *File;\r
   UINTN                   NumBytes;\r
 \r
   Status = EFI_SUCCESS;\r
@@ -324,7 +324,7 @@ FileWriteStore (
 {\r
   EFI_STATUS              Status;\r
   VS_DEV                  *Dev;\r
-  EFI_FILE                *File;\r
+  EFI_FILE_PROTOCOL       *File;\r
 \r
   Status = EFI_SUCCESS;\r
   Dev    = DEV_FROM_THIS(This);\r
@@ -371,7 +371,7 @@ OpenStore (
   IN  EFI_DEVICE_PATH_PROTOCOL  *Device,\r
   IN  CHAR16                    *FilePathName,\r
   IN  UINT64                    OpenMode,\r
-  OUT EFI_FILE                  **File\r
+  OUT EFI_FILE_PROTOCOL         **File\r
   )\r
 {\r
   EFI_HANDLE                        Handle;\r

diff --git a/DuetPkg/FvbRuntimeService/FWBlockService.c b/DuetPkg/FvbRuntimeService/FWBlockService.c
index 664a4cffc6e9b38253012c05e661f5de07bd3c4f..1b81a18cc433fdba63e4773d40fa0440f2ff10bb 100644 (file)
--- a/DuetPkg/FvbRuntimeService/FWBlockService.c
+++ b/DuetPkg/FvbRuntimeService/FWBlockService.c
@@ -1,5 +1,5 @@
 /**@file\r
-Copyright (c) 2007, Intel Corporation                                                         \r
+Copyright (c) 2007 - 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
@@ -83,11 +83,11 @@ Returns:
 \r
 --*/\r
 {\r
-  EFI_STATUS  Status;\r
-  EFI_FILE    *File;\r
-  UINTN       FileOffset;\r
-  UINTN       BufferForFile;\r
-  UINTN       Length;\r
+  EFI_STATUS          Status;\r
+  EFI_FILE_PROTOCOL   *File;\r
+  UINTN               FileOffset;\r
+  UINTN               BufferForFile;\r
+  UINTN               Length;\r
 \r
   Status = EFI_SUCCESS;\r
   CopyMem ((VOID *) Address, Buffer, *NumBytes);\r
@@ -131,11 +131,11 @@ Returns:
 \r
 --*/\r
 {\r
-  EFI_STATUS  Status;\r
-  EFI_FILE    *File;\r
-  UINTN       FileOffset;\r
-  UINTN       BufferForFile;\r
-  UINTN       Length;\r
+  EFI_STATUS           Status;\r
+  EFI_FILE_PROTOCOL    *File;\r
+  UINTN                FileOffset;\r
+  UINTN                BufferForFile;\r
+  UINTN                Length;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
@@ -1272,7 +1272,7 @@ OnSimpleFileSystemInstall (
   EFI_HANDLE                Handle;\r
   UINTN                     Instance;\r
   EFI_DEVICE_PATH_PROTOCOL  *Device;\r
-  EFI_FILE                  *File;\r
+  EFI_FILE_PROTOCOL         *File;\r
   EFI_FW_VOL_INSTANCE       *FwhInstance;\r
   while (TRUE) {\r
     HandleSize = sizeof (EFI_HANDLE);\r

diff --git a/DuetPkg/FvbRuntimeService/FileIo.c b/DuetPkg/FvbRuntimeService/FileIo.c
index 0162b15b1963d5f8de0e137ab209e85323049619..b5145e40b86613d338850910fb4bd137fec4f1e7 100644 (file)
--- a/DuetPkg/FvbRuntimeService/FileIo.c
+++ b/DuetPkg/FvbRuntimeService/FileIo.c
@@ -1,5 +1,5 @@
 /**@file\r
-Copyright (c) 2007, Intel Corporation\r
+Copyright (c) 2007 - 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
@@ -29,10 +29,10 @@ Abstract:
 \r
 EFI_STATUS\r
 FileWrite (\r
-  IN EFI_FILE  *File,\r
-  IN UINTN     Offset,\r
-  IN UINTN     Buffer,\r
-  IN UINTN     Size\r
+  IN EFI_FILE_PROTOCOL  *File,\r
+  IN UINTN              Offset,\r
+  IN UINTN              Buffer,\r
+  IN UINTN              Size\r
   )\r
 {\r
   EFI_STATUS Status;\r
@@ -136,7 +136,7 @@ CheckStoreExists (
 \r
 VOID\r
 FileClose (\r
-  IN  EFI_FILE                   *File\r
+  IN  EFI_FILE_PROTOCOL          *File\r
   )\r
 {\r
   File->Flush (File);\r
@@ -146,7 +146,7 @@ EFI_STATUS
 FileOpen (\r
   IN  EFI_DEVICE_PATH_PROTOCOL   *Device,\r
   IN  CHAR16                     *MappedFile,\r
-  OUT EFI_FILE                   **File,\r
+  OUT EFI_FILE_PROTOCOL          **File,\r
   IN  UINT64                     OpenMode\r
   )\r
 {  \r

diff --git a/DuetPkg/FvbRuntimeService/FileIo.h b/DuetPkg/FvbRuntimeService/FileIo.h
index 67068bfee2760c0cea051fd437c0dc8ef7bcc989..b6c5040e4c97e7fc483b3044c0d7297ecd199aeb 100644 (file)
--- a/DuetPkg/FvbRuntimeService/FileIo.h
+++ b/DuetPkg/FvbRuntimeService/FileIo.h
@@ -1,5 +1,5 @@
 /**@file\r
-Copyright (c) 2007, Intel Corporation                                                         \r
+Copyright (c) 2007 - 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
@@ -24,10 +24,10 @@ Abstract:
 \r
 EFI_STATUS\r
 FileWrite (\r
-  IN EFI_FILE  *File,\r
-  IN UINTN     Offset,\r
-  IN UINTN     Buffer,\r
-  IN UINTN     Size\r
+  IN EFI_FILE_PROTOCOL  *File,\r
+  IN UINTN              Offset,\r
+  IN UINTN              Buffer,\r
+  IN UINTN              Size\r
   );\r
 \r
 EFI_STATUS\r
@@ -46,13 +46,13 @@ EFI_STATUS
 FileOpen (\r
   IN  EFI_DEVICE_PATH_PROTOCOL   *Device,\r
   IN  CHAR16                     *MappedFile,\r
-  OUT EFI_FILE                   **File,\r
+  OUT EFI_FILE_PROTOCOL          **File,\r
   IN  UINT64                     OpenMode\r
   );\r
 \r
 VOID\r
 FileClose (\r
-  IN  EFI_FILE                   *File\r
+  IN  EFI_FILE_PROTOCOL          *File\r
   );\r
 \r
 #endif // _FW_BLOCK_SERVICE_FILE_IO_H\r