Update the return status to comply to PI spec.

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / FwVol / FwVolRead.c

diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVolRead.c b/MdeModulePkg/Core/Dxe/FwVol/FwVolRead.c
index ff2fcb8023edbe614c3a8f9dac934f413114edca..94ba5018969c4542bfbbc9d75f933ce4573edf91 100644 (file)
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVolRead.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVolRead.c
@@ -70,12 +70,12 @@ FfsAttributes2FvFileAttributes (
 EFI_STATUS\r
 EFIAPI\r
 FvGetNextFile (\r
-  IN         EFI_FIRMWARE_VOLUME_PROTOCOL   *This,\r
-  IN OUT     VOID                            *Key,\r
-  IN OUT     EFI_FV_FILETYPE                *FileType,\r
+  IN CONST   EFI_FIRMWARE_VOLUME2_PROTOCOL *This,\r
+  IN OUT     VOID                          *Key,\r
+  IN OUT     EFI_FV_FILETYPE               *FileType,\r
   OUT        EFI_GUID                      *NameGuid,\r
   OUT        EFI_FV_FILE_ATTRIBUTES        *Attributes,\r
-  OUT        UINTN                           *Size\r
+  OUT        UINTN                          *Size\r
   )\r
 /*++\r
 \r
@@ -140,7 +140,7 @@ Returns:
   //\r
   // Check if read operation is enabled\r
   //\r
-  if ((FvAttributes & EFI_FV_READ_STATUS) == 0) {\r
+  if ((FvAttributes & EFI_FV2_READ_STATUS) == 0) {\r
     return EFI_ACCESS_DENIED;\r
   }\r
 \r
@@ -148,7 +148,7 @@ Returns:
     //\r
     // File type needs to be in 0 - 0x0B\r
     //\r
-    return EFI_INVALID_PARAMETER;\r
+    return EFI_NOT_FOUND;\r
   }\r
 \r
   KeyValue = (UINTN *)Key;\r
@@ -220,13 +220,6 @@ Returns:
   //\r
   *Size = FileLength - sizeof(EFI_FFS_FILE_HEADER);\r
 \r
-  if (FfsFileHeader->Attributes & FFS_ATTRIB_TAIL_PRESENT) {\r
-    //\r
-    // If tail is present substract it's size;\r
-    //\r
-    *Size -= sizeof(EFI_FFS_FILE_TAIL);\r
-  }\r
-\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -234,13 +227,13 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FvReadFile (\r
-  IN     EFI_FIRMWARE_VOLUME_PROTOCOL   *This,\r
-  IN     EFI_GUID                       *NameGuid,\r
-  IN OUT VOID                           **Buffer,\r
-  IN OUT UINTN                          *BufferSize,\r
-  OUT    EFI_FV_FILETYPE               *FoundType,\r
-  OUT    EFI_FV_FILE_ATTRIBUTES        *FileAttributes,\r
-  OUT    UINT32                        *AuthenticationStatus\r
+  IN CONST EFI_FIRMWARE_VOLUME2_PROTOCOL *This,\r
+  IN CONST EFI_GUID                      *NameGuid,\r
+  IN OUT   VOID                          **Buffer,\r
+  IN OUT   UINTN                         *BufferSize,\r
+  OUT      EFI_FV_FILETYPE               *FoundType,\r
+  OUT      EFI_FV_FILE_ATTRIBUTES        *FileAttributes,\r
+  OUT      UINT32                        *AuthenticationStatus\r
   )\r
 /*++\r
 \r
@@ -377,13 +370,13 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 FvReadFileSection (\r
-  IN     EFI_FIRMWARE_VOLUME_PROTOCOL   *This,\r
-  IN     EFI_GUID                       *NameGuid,\r
-  IN     EFI_SECTION_TYPE               SectionType,\r
-  IN     UINTN                          SectionInstance,\r
-  IN OUT VOID                           **Buffer,\r
-  IN OUT UINTN                          *BufferSize,\r
-  OUT    UINT32                         *AuthenticationStatus\r
+  IN CONST  EFI_FIRMWARE_VOLUME2_PROTOCOL  *This,\r
+  IN CONST  EFI_GUID                       *NameGuid,\r
+  IN        EFI_SECTION_TYPE               SectionType,\r
+  IN        UINTN                          SectionInstance,\r
+  IN OUT    VOID                           **Buffer,\r
+  IN OUT    UINTN                          *BufferSize,\r
+  OUT       UINT32                         *AuthenticationStatus\r
   )\r
 /*++\r
 \r