Merge the PI enabling works from the branch

[mirror_edk2.git] / MdeModulePkg / Core / Pei / FwVol / FwVol.c

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index d144fb85ec68df2e76d42b98c9826f9affd39499..a5065632c3c7bf695ddfeea2ea920863eba9f125 100644 (file)
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -251,9 +251,9 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFindSectionData (\r
-  IN     EFI_PEI_SERVICES      **PeiServices,\r
+  IN CONST EFI_PEI_SERVICES      **PeiServices,\r
   IN     EFI_SECTION_TYPE      SectionType,\r
-  IN     EFI_FFS_FILE_HEADER   *FfsFileHeader,\r
+  IN     EFI_PEI_FILE_HANDLE   FileHandle,\r
   IN OUT VOID                  **SectionData\r
   )\r
 /*++\r
@@ -279,8 +279,10 @@ Returns:
   EFI_COMMON_SECTION_HEADER     *Section;\r
   UINT32                        SectionLength;\r
   UINT32                        ParsedLength;\r
-  \r
+  EFI_FFS_FILE_HEADER           *FfsFileHeader;\r
 \r
+  FfsFileHeader = (EFI_FFS_FILE_HEADER *) FileHandle;\r
+  \r
   //\r
   // Size is 24 bits wide so mask upper 8 bits. \r
   //    Does not include FfsFileHeader header size\r
@@ -355,10 +357,10 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFindNextFile (\r
-  IN     EFI_PEI_SERVICES            **PeiServices,\r
-  IN     EFI_FV_FILETYPE             SearchType,\r
-  IN     EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader,\r
-  IN OUT EFI_FFS_FILE_HEADER         **FileHeader\r
+  IN CONST EFI_PEI_SERVICES      **PeiServices,\r
+  IN UINT8                       SearchType,\r
+  IN EFI_PEI_FV_HANDLE           VolumeHandle,\r
+  IN OUT EFI_PEI_FILE_HANDLE     *FileHandle\r
   )\r
 /*++\r
 \r
@@ -385,6 +387,12 @@ Returns:
 \r
 --*/\r
 {\r
+  EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader;\r
+  EFI_FFS_FILE_HEADER         **FileHeader;\r
+\r
+  FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER  *)VolumeHandle;\r
+  FileHeader = (EFI_FFS_FILE_HEADER **) FileHandle;\r
+\r
   return PeiFfsFindNextFileEx ( \r
            SearchType,\r
            FwVolHeader,\r
@@ -396,9 +404,9 @@ Returns:
 EFI_STATUS \r
 EFIAPI\r
 PeiFvFindNextVolume (\r
-  IN     EFI_PEI_SERVICES           **PeiServices,\r
+  IN CONST EFI_PEI_SERVICES           **PeiServices,\r
   IN     UINTN                      Instance,\r
-  IN OUT EFI_FIRMWARE_VOLUME_HEADER **FwVolHeader\r
+  IN OUT EFI_PEI_FV_HANDLE          *VolumeHandle\r
   )\r
 /*++\r
 \r
@@ -429,7 +437,9 @@ Returns:
   EFI_STATUS              Status;\r
   EFI_PEI_FIND_FV_PPI     *FindFvPpi;\r
   UINT8                   LocalInstance;\r
+  EFI_FIRMWARE_VOLUME_HEADER **FwVolHeader;\r
 \r
+  FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER **) VolumeHandle;\r
 \r
   LocalInstance = (UINT8) Instance;\r
 \r
@@ -463,7 +473,7 @@ Returns:
     } else {\r
       Status = FindFvPpi->FindFv (\r
                             FindFvPpi,\r
-                            PeiServices,\r
+                            (EFI_PEI_SERVICES **)PeiServices,\r
                             &LocalInstance,\r
                             FwVolHeader\r
                             );  \r