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>
This commit is contained in:
parent
a13db3692f
commit
dba03ba1ef
@ -1,6 +1,6 @@
|
|||||||
/*++
|
/*++
|
||||||
|
|
||||||
Copyright (c) 2005, Intel Corporation
|
Copyright (c) 2005 - 2009, Intel Corporation
|
||||||
All rights reserved. This program and the accompanying materials are licensed and made available
|
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
|
under the terms and conditions of the BSD License which accompanies this
|
||||||
distribution. The full text of the license may be found at
|
distribution. The full text of the license may be found at
|
||||||
@ -35,7 +35,7 @@ EFI_LOCK FatFsLock = EFI_INITIALIZE_LOCK_VARIABLE(TPL_CALLBACK);
|
|||||||
//
|
//
|
||||||
// Filesystem interface functions
|
// Filesystem interface functions
|
||||||
//
|
//
|
||||||
EFI_FILE FatFileInterface = {
|
EFI_FILE_PROTOCOL FatFileInterface = {
|
||||||
EFI_FILE_PROTOCOL_REVISION,
|
EFI_FILE_PROTOCOL_REVISION,
|
||||||
FatOpen,
|
FatOpen,
|
||||||
FatClose,
|
FatClose,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*++
|
/*++
|
||||||
|
|
||||||
Copyright (c) 2005, Intel Corporation
|
Copyright (c) 2005 - 2009, Intel Corporation
|
||||||
All rights reserved. This program and the accompanying materials are licensed and made available
|
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
|
under the terms and conditions of the BSD License which accompanies this
|
||||||
distribution. The full text of the license may be found at
|
distribution. The full text of the license may be found at
|
||||||
@ -27,7 +27,7 @@ Revision History
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatDelete (
|
FatDelete (
|
||||||
IN EFI_FILE *FHand
|
IN EFI_FILE_PROTOCOL *FHand
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*++
|
/*++
|
||||||
|
|
||||||
Copyright (c) 2005 - 2007, Intel Corporation
|
Copyright (c) 2005 - 2009, Intel Corporation
|
||||||
All rights reserved. This program and the accompanying materials are licensed and made available
|
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
|
under the terms and conditions of the BSD License which accompanies this
|
||||||
distribution. The full text of the license may be found at
|
distribution. The full text of the license may be found at
|
||||||
@ -209,7 +209,7 @@ typedef struct _FAT_ODIR {
|
|||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
UINTN Signature;
|
UINTN Signature;
|
||||||
EFI_FILE Handle;
|
EFI_FILE_PROTOCOL Handle;
|
||||||
UINT64 Position;
|
UINT64 Position;
|
||||||
BOOLEAN ReadOnly;
|
BOOLEAN ReadOnly;
|
||||||
struct _FAT_OFILE *OFile;
|
struct _FAT_OFILE *OFile;
|
||||||
@ -369,8 +369,8 @@ typedef struct _FAT_VOLUME {
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatOpen (
|
FatOpen (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
OUT EFI_FILE **NewHandle,
|
OUT EFI_FILE_PROTOCOL **NewHandle,
|
||||||
IN CHAR16 *FileName,
|
IN CHAR16 *FileName,
|
||||||
IN UINT64 OpenMode,
|
IN UINT64 OpenMode,
|
||||||
IN UINT64 Attributes
|
IN UINT64 Attributes
|
||||||
@ -403,7 +403,7 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatGetPosition (
|
FatGetPosition (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
OUT UINT64 *Position
|
OUT UINT64 *Position
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
@ -429,10 +429,10 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatGetInfo (
|
FatGetInfo (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
IN EFI_GUID *Type,
|
IN EFI_GUID *Type,
|
||||||
IN OUT UINTN *BufferSize,
|
IN OUT UINTN *BufferSize,
|
||||||
OUT VOID *Buffer
|
OUT VOID *Buffer
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
@ -458,7 +458,7 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatSetInfo (
|
FatSetInfo (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
IN EFI_GUID *Type,
|
IN EFI_GUID *Type,
|
||||||
IN UINTN BufferSize,
|
IN UINTN BufferSize,
|
||||||
IN VOID *Buffer
|
IN VOID *Buffer
|
||||||
@ -487,7 +487,7 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatFlush (
|
FatFlush (
|
||||||
IN EFI_FILE *FHand
|
IN EFI_FILE_PROTOCOL *FHand
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
@ -513,7 +513,7 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatClose (
|
FatClose (
|
||||||
IN EFI_FILE *FHand
|
IN EFI_FILE_PROTOCOL *FHand
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
@ -535,7 +535,7 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatDelete (
|
FatDelete (
|
||||||
IN EFI_FILE *FHand
|
IN EFI_FILE_PROTOCOL *FHand
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
@ -558,7 +558,7 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatSetPosition (
|
FatSetPosition (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
IN UINT64 Position
|
IN UINT64 Position
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
@ -584,9 +584,9 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatRead (
|
FatRead (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
IN OUT UINTN *BufferSize,
|
IN OUT UINTN *BufferSize,
|
||||||
OUT VOID *Buffer
|
OUT VOID *Buffer
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
@ -613,9 +613,9 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatWrite (
|
FatWrite (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
IN OUT UINTN *BufferSize,
|
IN OUT UINTN *BufferSize,
|
||||||
IN VOID *Buffer
|
IN VOID *Buffer
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
@ -883,7 +883,7 @@ EFI_STATUS
|
|||||||
EFIAPI
|
EFIAPI
|
||||||
FatOpenVolume (
|
FatOpenVolume (
|
||||||
IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,
|
IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,
|
||||||
OUT EFI_FILE **File
|
OUT EFI_FILE_PROTOCOL **File
|
||||||
);
|
);
|
||||||
|
|
||||||
//
|
//
|
||||||
@ -1113,6 +1113,6 @@ extern EFI_DRIVER_BINDING_PROTOCOL gFatDriverBinding;
|
|||||||
extern EFI_COMPONENT_NAME_PROTOCOL gFatComponentName;
|
extern EFI_COMPONENT_NAME_PROTOCOL gFatComponentName;
|
||||||
extern EFI_COMPONENT_NAME2_PROTOCOL gFatComponentName2;
|
extern EFI_COMPONENT_NAME2_PROTOCOL gFatComponentName2;
|
||||||
extern EFI_LOCK FatFsLock;
|
extern EFI_LOCK FatFsLock;
|
||||||
extern EFI_FILE FatFileInterface;
|
extern EFI_FILE_PROTOCOL FatFileInterface;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*++
|
/*++
|
||||||
|
|
||||||
Copyright (c) 2005 - 2007, Intel Corporation
|
Copyright (c) 2005 - 2009, Intel Corporation
|
||||||
All rights reserved. This program and the accompanying materials are licensed and made available
|
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
|
under the terms and conditions of the BSD License which accompanies this
|
||||||
distribution. The full text of the license may be found at
|
distribution. The full text of the license may be found at
|
||||||
@ -27,7 +27,7 @@ Revision History
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatFlush (
|
FatFlush (
|
||||||
IN EFI_FILE *FHand
|
IN EFI_FILE_PROTOCOL *FHand
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
@ -86,7 +86,7 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatClose (
|
FatClose (
|
||||||
IN EFI_FILE *FHand
|
IN EFI_FILE_PROTOCOL *FHand
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*++
|
/*++
|
||||||
|
|
||||||
Copyright (c) 2005 - 2007, Intel Corporation
|
Copyright (c) 2005 - 2009, Intel Corporation
|
||||||
All rights reserved. This program and the accompanying materials are licensed and made available
|
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
|
under the terms and conditions of the BSD License which accompanies this
|
||||||
distribution. The full text of the license may be found at
|
distribution. The full text of the license may be found at
|
||||||
@ -40,11 +40,11 @@ FatSetVolumeInfo (
|
|||||||
|
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
FatSetOrGetInfo (
|
FatSetOrGetInfo (
|
||||||
IN BOOLEAN IsSet,
|
IN BOOLEAN IsSet,
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
IN EFI_GUID *Type,
|
IN EFI_GUID *Type,
|
||||||
IN OUT UINTN *BufferSize,
|
IN OUT UINTN *BufferSize,
|
||||||
IN OUT VOID *Buffer
|
IN OUT VOID *Buffer
|
||||||
);
|
);
|
||||||
|
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
@ -474,11 +474,11 @@ Returns:
|
|||||||
|
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
FatSetOrGetInfo (
|
FatSetOrGetInfo (
|
||||||
IN BOOLEAN IsSet,
|
IN BOOLEAN IsSet,
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
IN EFI_GUID *Type,
|
IN EFI_GUID *Type,
|
||||||
IN OUT UINTN *BufferSize,
|
IN OUT UINTN *BufferSize,
|
||||||
IN OUT VOID *Buffer
|
IN OUT VOID *Buffer
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
@ -565,10 +565,10 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatGetInfo (
|
FatGetInfo (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
IN EFI_GUID *Type,
|
IN EFI_GUID *Type,
|
||||||
IN OUT UINTN *BufferSize,
|
IN OUT UINTN *BufferSize,
|
||||||
OUT VOID *Buffer
|
OUT VOID *Buffer
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
@ -596,10 +596,10 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatSetInfo (
|
FatSetInfo (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
IN EFI_GUID *Type,
|
IN EFI_GUID *Type,
|
||||||
IN UINTN BufferSize,
|
IN UINTN BufferSize,
|
||||||
IN VOID *Buffer
|
IN VOID *Buffer
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*++
|
/*++
|
||||||
|
|
||||||
Copyright (c) 2005 - 2007, Intel Corporation
|
Copyright (c) 2005 - 2009, Intel Corporation
|
||||||
All rights reserved. This program and the accompanying materials are licensed and made available
|
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
|
under the terms and conditions of the BSD License which accompanies this
|
||||||
distribution. The full text of the license may be found at
|
distribution. The full text of the license may be found at
|
||||||
@ -62,7 +62,7 @@ Returns:
|
|||||||
|
|
||||||
IFile->Signature = FAT_IFILE_SIGNATURE;
|
IFile->Signature = FAT_IFILE_SIGNATURE;
|
||||||
|
|
||||||
CopyMem (&(IFile->Handle), &FatFileInterface, sizeof (EFI_FILE));
|
CopyMem (&(IFile->Handle), &FatFileInterface, sizeof (EFI_FILE_PROTOCOL));
|
||||||
|
|
||||||
IFile->OFile = OFile;
|
IFile->OFile = OFile;
|
||||||
InsertTailList (&OFile->Opens, &IFile->Link);
|
InsertTailList (&OFile->Opens, &IFile->Link);
|
||||||
@ -190,11 +190,11 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatOpen (
|
FatOpen (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
OUT EFI_FILE **NewHandle,
|
OUT EFI_FILE_PROTOCOL **NewHandle,
|
||||||
IN CHAR16 *FileName,
|
IN CHAR16 *FileName,
|
||||||
IN UINT64 OpenMode,
|
IN UINT64 OpenMode,
|
||||||
IN UINT64 Attributes
|
IN UINT64 Attributes
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
Routine Description:
|
Routine Description:
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*++
|
/*++
|
||||||
|
|
||||||
Copyright (c) 2005, Intel Corporation
|
Copyright (c) 2005 - 2009, Intel Corporation
|
||||||
All rights reserved. This program and the accompanying materials are licensed and made available
|
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
|
under the terms and conditions of the BSD License which accompanies this
|
||||||
distribution. The full text of the license may be found at
|
distribution. The full text of the license may be found at
|
||||||
@ -28,7 +28,7 @@ EFI_STATUS
|
|||||||
EFIAPI
|
EFIAPI
|
||||||
FatOpenVolume (
|
FatOpenVolume (
|
||||||
IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,
|
IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,
|
||||||
OUT EFI_FILE **File
|
OUT EFI_FILE_PROTOCOL **File
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*++
|
/*++
|
||||||
|
|
||||||
Copyright (c) 2005, Intel Corporation
|
Copyright (c) 2005 - 2009, Intel Corporation
|
||||||
All rights reserved. This program and the accompanying materials are licensed and made available
|
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
|
under the terms and conditions of the BSD License which accompanies this
|
||||||
distribution. The full text of the license may be found at
|
distribution. The full text of the license may be found at
|
||||||
@ -27,7 +27,7 @@ Revision History
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatGetPosition (
|
FatGetPosition (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
OUT UINT64 *Position
|
OUT UINT64 *Position
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
@ -70,8 +70,8 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatSetPosition (
|
FatSetPosition (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
IN UINT64 Position
|
IN UINT64 Position
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
@ -204,7 +204,7 @@ Done:
|
|||||||
|
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
FatIFileAccess (
|
FatIFileAccess (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
IN IO_MODE IoMode,
|
IN IO_MODE IoMode,
|
||||||
IN OUT UINTN *BufferSize,
|
IN OUT UINTN *BufferSize,
|
||||||
IN OUT VOID *Buffer
|
IN OUT VOID *Buffer
|
||||||
@ -343,9 +343,9 @@ Done:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatRead (
|
FatRead (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
IN OUT UINTN *BufferSize,
|
IN OUT UINTN *BufferSize,
|
||||||
OUT VOID *Buffer
|
OUT VOID *Buffer
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
@ -374,9 +374,9 @@ Returns:
|
|||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FatWrite (
|
FatWrite (
|
||||||
IN EFI_FILE *FHand,
|
IN EFI_FILE_PROTOCOL *FHand,
|
||||||
IN OUT UINTN *BufferSize,
|
IN OUT UINTN *BufferSize,
|
||||||
IN VOID *Buffer
|
IN VOID *Buffer
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user