From b0b961c8f9aad0c82a94123947048d2ed6610133 Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Tue, 22 Sep 2009 02:47:41 +0000 Subject: 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 --- DuetPkg/FSVariable/FileStorage.c | 14 +++++++------- DuetPkg/FvbRuntimeService/FWBlockService.c | 24 ++++++++++++------------ DuetPkg/FvbRuntimeService/FileIo.c | 14 +++++++------- DuetPkg/FvbRuntimeService/FileIo.h | 14 +++++++------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/DuetPkg/FSVariable/FileStorage.c b/DuetPkg/FSVariable/FileStorage.c index 400f9ff..1792767 100644 --- a/DuetPkg/FSVariable/FileStorage.c +++ b/DuetPkg/FSVariable/FileStorage.c @@ -1,6 +1,6 @@ /*++ -Copyright (c) 2006 - 2007, 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 @@ -55,7 +55,7 @@ OpenStore ( IN EFI_DEVICE_PATH_PROTOCOL *Device, IN CHAR16 *FilePathName, IN UINT64 OpenMode, - OUT EFI_FILE **File + OUT EFI_FILE_PROTOCOL **File ); // @@ -63,7 +63,7 @@ OpenStore ( // VOID FileClose ( - IN EFI_FILE *File + IN EFI_FILE_PROTOCOL *File ) { EFI_STATUS Status; @@ -180,7 +180,7 @@ OnSimpleFileSystemInstall ( EFI_HANDLE Handle; EFI_DEVICE_PATH_PROTOCOL *Device; VS_DEV *Dev; - EFI_FILE *File; + EFI_FILE_PROTOCOL *File; UINTN NumBytes; Dev = (VS_DEV *) Context; @@ -288,7 +288,7 @@ FileEraseStore( { EFI_STATUS Status; VS_DEV *Dev; - EFI_FILE *File; + EFI_FILE_PROTOCOL *File; UINTN NumBytes; Status = EFI_SUCCESS; @@ -324,7 +324,7 @@ FileWriteStore ( { EFI_STATUS Status; VS_DEV *Dev; - EFI_FILE *File; + EFI_FILE_PROTOCOL *File; Status = EFI_SUCCESS; Dev = DEV_FROM_THIS(This); @@ -371,7 +371,7 @@ OpenStore ( IN EFI_DEVICE_PATH_PROTOCOL *Device, IN CHAR16 *FilePathName, IN UINT64 OpenMode, - OUT EFI_FILE **File + OUT EFI_FILE_PROTOCOL **File ) { EFI_HANDLE Handle; diff --git a/DuetPkg/FvbRuntimeService/FWBlockService.c b/DuetPkg/FvbRuntimeService/FWBlockService.c index 664a4cf..1b81a18 100644 --- a/DuetPkg/FvbRuntimeService/FWBlockService.c +++ b/DuetPkg/FvbRuntimeService/FWBlockService.c @@ -1,5 +1,5 @@ /**@file -Copyright (c) 2007, Intel Corporation +Copyright (c) 2007 - 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 @@ -83,11 +83,11 @@ Returns: --*/ { - EFI_STATUS Status; - EFI_FILE *File; - UINTN FileOffset; - UINTN BufferForFile; - UINTN Length; + EFI_STATUS Status; + EFI_FILE_PROTOCOL *File; + UINTN FileOffset; + UINTN BufferForFile; + UINTN Length; Status = EFI_SUCCESS; CopyMem ((VOID *) Address, Buffer, *NumBytes); @@ -131,11 +131,11 @@ Returns: --*/ { - EFI_STATUS Status; - EFI_FILE *File; - UINTN FileOffset; - UINTN BufferForFile; - UINTN Length; + EFI_STATUS Status; + EFI_FILE_PROTOCOL *File; + UINTN FileOffset; + UINTN BufferForFile; + UINTN Length; Status = EFI_SUCCESS; @@ -1272,7 +1272,7 @@ OnSimpleFileSystemInstall ( EFI_HANDLE Handle; UINTN Instance; EFI_DEVICE_PATH_PROTOCOL *Device; - EFI_FILE *File; + EFI_FILE_PROTOCOL *File; EFI_FW_VOL_INSTANCE *FwhInstance; while (TRUE) { HandleSize = sizeof (EFI_HANDLE); diff --git a/DuetPkg/FvbRuntimeService/FileIo.c b/DuetPkg/FvbRuntimeService/FileIo.c index 0162b15..b5145e4 100644 --- a/DuetPkg/FvbRuntimeService/FileIo.c +++ b/DuetPkg/FvbRuntimeService/FileIo.c @@ -1,5 +1,5 @@ /**@file -Copyright (c) 2007, Intel Corporation +Copyright (c) 2007 - 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 @@ -29,10 +29,10 @@ Abstract: EFI_STATUS FileWrite ( - IN EFI_FILE *File, - IN UINTN Offset, - IN UINTN Buffer, - IN UINTN Size + IN EFI_FILE_PROTOCOL *File, + IN UINTN Offset, + IN UINTN Buffer, + IN UINTN Size ) { EFI_STATUS Status; @@ -136,7 +136,7 @@ CheckStoreExists ( VOID FileClose ( - IN EFI_FILE *File + IN EFI_FILE_PROTOCOL *File ) { File->Flush (File); @@ -146,7 +146,7 @@ EFI_STATUS FileOpen ( IN EFI_DEVICE_PATH_PROTOCOL *Device, IN CHAR16 *MappedFile, - OUT EFI_FILE **File, + OUT EFI_FILE_PROTOCOL **File, IN UINT64 OpenMode ) { diff --git a/DuetPkg/FvbRuntimeService/FileIo.h b/DuetPkg/FvbRuntimeService/FileIo.h index 67068bf..b6c5040 100644 --- a/DuetPkg/FvbRuntimeService/FileIo.h +++ b/DuetPkg/FvbRuntimeService/FileIo.h @@ -1,5 +1,5 @@ /**@file -Copyright (c) 2007, Intel Corporation +Copyright (c) 2007 - 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 @@ -24,10 +24,10 @@ Abstract: EFI_STATUS FileWrite ( - IN EFI_FILE *File, - IN UINTN Offset, - IN UINTN Buffer, - IN UINTN Size + IN EFI_FILE_PROTOCOL *File, + IN UINTN Offset, + IN UINTN Buffer, + IN UINTN Size ); EFI_STATUS @@ -46,13 +46,13 @@ EFI_STATUS FileOpen ( IN EFI_DEVICE_PATH_PROTOCOL *Device, IN CHAR16 *MappedFile, - OUT EFI_FILE **File, + OUT EFI_FILE_PROTOCOL **File, IN UINT64 OpenMode ); VOID FileClose ( - IN EFI_FILE *File + IN EFI_FILE_PROTOCOL *File ); #endif // _FW_BLOCK_SERVICE_FILE_IO_H -- cgit v1.1