X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Nt32Pkg%2FWinNtSimpleFileSystemDxe%2FWinNtSimpleFileSystem.h;h=4381e1f1fe4153898fca0edc3e08c12737158425;hb=30a3e833ea8543f9b9d6957852c02d970b81cfec;hp=cde6ad5c36a079a2b8312b0b6c113c35314555f4;hpb=068eac814d7f1a391d28505289b640bcab675004;p=mirror_edk2.git

diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h
index cde6ad5c36..4381e1f1fe 100644
--- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h
+++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h
@@ -1,7 +1,7 @@
-/*++
+/**@file
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+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        
 http://opensource.org/licenses/bsd-license.php                                            
@@ -22,13 +22,13 @@ Abstract:
 
   * Other names and brands may be claimed as the property of others.
 
---*/
+**/
 
 #ifndef _WIN_NT_SIMPLE_FILE_SYSTEM_H_
 #define _WIN_NT_SIMPLE_FILE_SYSTEM_H_
 
 
-#define WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('N', 'T', 'f', 's')
+#define WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE SIGNATURE_32 ('N', 'T', 'f', 's')
 
 typedef struct {
   UINTN                           Signature;
@@ -46,7 +46,7 @@ typedef struct {
       WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE \
       )
 
-#define WIN_NT_EFI_FILE_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('l', 'o', 'f', 's')
+#define WIN_NT_EFI_FILE_PRIVATE_SIGNATURE SIGNATURE_32 ('l', 'o', 'f', 's')
 
 //
 // Bit definitions for EFI_TIME.Daylight
@@ -58,7 +58,7 @@ typedef struct {
   UINTN                           Signature;
   EFI_WIN_NT_THUNK_PROTOCOL       *WinNtThunk;
   EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;
-  EFI_FILE                        EfiFile;
+  EFI_FILE_PROTOCOL               EfiFile;
   HANDLE                          LHandle;
   HANDLE                          DirHandle;
   BOOLEAN                         IsRootDirectory;
@@ -80,8 +80,9 @@ typedef struct {
 //
 // Global Protocol Variables
 //
-extern EFI_DRIVER_BINDING_PROTOCOL  gWinNtSimpleFileSystemDriverBinding;
-extern EFI_COMPONENT_NAME_PROTOCOL  gWinNtSimpleFileSystemComponentName;
+extern EFI_DRIVER_BINDING_PROTOCOL   gWinNtSimpleFileSystemDriverBinding;
+extern EFI_COMPONENT_NAME_PROTOCOL   gWinNtSimpleFileSystemComponentName;
+extern EFI_COMPONENT_NAME2_PROTOCOL  gWinNtSimpleFileSystemComponentName2;
 
 //
 // Driver Binding protocol member functions
@@ -196,7 +197,7 @@ EFI_STATUS
 EFIAPI
 WinNtSimpleFileSystemOpenVolume (
   IN  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,
-  OUT EFI_FILE                        **Root
+  OUT EFI_FILE_PROTOCOL               **Root
   )
 /*++
 
@@ -234,11 +235,11 @@ Returns:
 EFI_STATUS
 EFIAPI
 WinNtSimpleFileSystemOpen (
-  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
   )
 /*++
 
@@ -286,7 +287,7 @@ Returns:
 EFI_STATUS
 EFIAPI
 WinNtSimpleFileSystemClose (
-  IN EFI_FILE  *This
+  IN EFI_FILE_PROTOCOL  *This
   )
 /*++
 
@@ -308,7 +309,7 @@ Returns:
 EFI_STATUS
 EFIAPI
 WinNtSimpleFileSystemDelete (
-  IN EFI_FILE  *This
+  IN EFI_FILE_PROTOCOL  *This
   )
 /*++
 
@@ -332,9 +333,9 @@ Returns:
 EFI_STATUS
 EFIAPI
 WinNtSimpleFileSystemRead (
-  IN     EFI_FILE  *This,
-  IN OUT UINTN     *BufferSize,
-  OUT    VOID      *Buffer
+  IN     EFI_FILE_PROTOCOL  *This,
+  IN OUT UINTN              *BufferSize,
+  OUT    VOID               *Buffer
   )
 /*++
 
@@ -369,9 +370,9 @@ Returns:
 EFI_STATUS
 EFIAPI
 WinNtSimpleFileSystemWrite (
-  IN     EFI_FILE  *This,
-  IN OUT UINTN     *BufferSize,
-  IN     VOID      *Buffer
+  IN     EFI_FILE_PROTOCOL  *This,
+  IN OUT UINTN              *BufferSize,
+  IN     VOID               *Buffer
   )
 /*++
 
@@ -412,8 +413,8 @@ Returns:
 EFI_STATUS
 EFIAPI
 WinNtSimpleFileSystemSetPosition (
-  IN EFI_FILE  *This,
-  IN UINT64    Position
+  IN EFI_FILE_PROTOCOL  *This,
+  IN UINT64             Position
   )
 /*++
 
@@ -439,8 +440,8 @@ Returns:
 EFI_STATUS
 EFIAPI
 WinNtSimpleFileSystemGetPosition (
-  IN  EFI_FILE  *This,
-  OUT UINT64    *Position
+  IN  EFI_FILE_PROTOCOL   *This,
+  OUT UINT64              *Position
   )
 /*++
 
@@ -466,10 +467,10 @@ Returns:
 EFI_STATUS
 EFIAPI
 WinNtSimpleFileSystemGetInfo (
-  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
   )
 /*++
 
@@ -509,10 +510,10 @@ Returns:
 EFI_STATUS
 EFIAPI
 WinNtSimpleFileSystemSetInfo (
-  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
   )
 /*++
 
@@ -556,7 +557,7 @@ Returns:
 EFI_STATUS
 EFIAPI
 WinNtSimpleFileSystemFlush (
-  IN EFI_FILE  *This
+  IN EFI_FILE_PROTOCOL  *This
   )
 /*++