MdeModulePkg/UefiBootManagerLib: Refine the debug message

[mirror_edk2.git] / FatPkg / EnhancedFatDxe / Info.c

diff --git a/FatPkg/EnhancedFatDxe/Info.c b/FatPkg/EnhancedFatDxe/Info.c
index 740a0df5e443ca84b44bfbf0460bf953a1b5aae5..858b3f4a3e00a12b8a48ac7aff7f42f3e0ce4f88 100644 (file)
--- a/FatPkg/EnhancedFatDxe/Info.c
+++ b/FatPkg/EnhancedFatDxe/Info.c
@@ -1,7 +1,7 @@
 /*++\r
 \r
-Copyright (c) 2005 - 2007, Intel Corporation\r
-All rights reserved. This program and the accompanying materials are licensed and made available\r
+Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>\r
+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
 http://opensource.org/licenses/bsd-license.php\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
@@ -515,6 +515,8 @@ Returns:
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
+  FatWaitNonblockingTask (IFile);\r
+\r
   FatAcquireLock ();\r
 \r
   //\r
@@ -526,20 +528,16 @@ Returns:
     //\r
     Status = EFI_UNSUPPORTED;\r
     if (IsSet) {\r
-      if (Volume->ReadOnly) {\r
-        Status = EFI_WRITE_PROTECTED;\r
-      } else {\r
-        if (CompareGuid (Type, &gEfiFileInfoGuid)) {\r
-          Status = FatSetFileInfo (Volume, IFile, OFile, *BufferSize, Buffer);\r
-        }\r
+      if (CompareGuid (Type, &gEfiFileInfoGuid)) {\r
+        Status = Volume->ReadOnly ? EFI_WRITE_PROTECTED : FatSetFileInfo (Volume, IFile, OFile, *BufferSize, Buffer);\r
+      }\r
 \r
-        if (CompareGuid (Type, &gEfiFileSystemInfoGuid)) {\r
-          Status = FatSetVolumeInfo (Volume, *BufferSize, Buffer);\r
-        }\r
+      if (CompareGuid (Type, &gEfiFileSystemInfoGuid)) {\r
+        Status = Volume->ReadOnly ? EFI_WRITE_PROTECTED : FatSetVolumeInfo (Volume, *BufferSize, Buffer);\r
+      }\r
 \r
-        if (CompareGuid (Type, &gEfiFileSystemVolumeLabelInfoIdGuid)) {\r
-          Status = FatSetVolumeLabelInfo (Volume, *BufferSize, Buffer);\r
-        }\r
+      if (CompareGuid (Type, &gEfiFileSystemVolumeLabelInfoIdGuid)) {\r
+        Status = Volume->ReadOnly ? EFI_WRITE_PROTECTED : FatSetVolumeLabelInfo (Volume, *BufferSize, Buffer);\r
       }\r
     } else {\r
       if (CompareGuid (Type, &gEfiFileInfoGuid)) {\r
@@ -556,7 +554,7 @@ Returns:
     }\r
   }\r
 \r
-  Status = FatCleanupVolume (Volume, NULL, Status);\r
+  Status = FatCleanupVolume (Volume, NULL, Status, NULL);\r
 \r
   FatReleaseLock ();\r
   return Status;\r
@@ -565,10 +563,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 +594,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