1) Make PEI PI File system service to skip PAD file

2) Remove some unused code

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4302 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index e649223ef1c6337c971be130d09b77325a2c5281..57b45d0fe082be24e5e0b2c3c11fe940cfbd326a 100644 (file)
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -269,7 +269,8 @@ Returns:
             }           \r
           } \r
         }\r
-      } else if ((SearchType == FfsFileHeader->Type) || (SearchType == EFI_FV_FILETYPE_ALL)) { \r
+      } else if (((SearchType == FfsFileHeader->Type) || (SearchType == EFI_FV_FILETYPE_ALL)) && \r
+                 (FfsFileHeader->Type != EFI_FV_FILETYPE_FFS_PAD)) { \r
         *FileHeader = FfsFileHeader;\r
         return EFI_SUCCESS;\r
       }\r
@@ -552,43 +553,6 @@ Returns:
 }\r
 \r
 \r
-EFI_STATUS\r
-FindNextPeim (\r
-  IN     EFI_PEI_SERVICES            **PeiServices,\r
-  IN     EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader,\r
-  IN OUT EFI_FFS_FILE_HEADER         **PeimFileHeader\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-    Given the input file pointer, search for the next matching file in the\r
-    FFS volume. The search starts from FileHeader inside\r
-    the Firmware Volume defined by FwVolHeader.\r
-\r
-Arguments:\r
-    PeiServices - Pointer to the PEI Core Services Table.\r
-\r
-    FwVolHeader - Pointer to the FV header of the volume to search.\r
-                     This parameter must point to a valid FFS volume.\r
-                     \r
-    PeimFileHeader  - Pointer to the current file from which to begin searching.\r
-                  This pointer will be updated upon return to reflect the file found.\r
-\r
-Returns:\r
-    EFI_NOT_FOUND - No files matching the search criteria were found\r
-    EFI_SUCCESS\r
-\r
---*/\r
-{\r
-  return PeiFindFileEx (\r
-           (EFI_PEI_FV_HANDLE) FwVolHeader, \r
-           NULL, \r
-           EFI_FV_FILETYPE_PEIM, \r
-           (EFI_PEI_FILE_HANDLE *)PeimFileHeader, \r
-           NULL\r
-           );\r
-}\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFindNextFile (\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index 37aca731ee1de205effe7cc9acea37fe90b434cd..08cb0c459f6fd036c547ac19767c07e376533df2 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -299,35 +299,6 @@ Returns:
 ;\r
 \r
 \r
-EFI_STATUS\r
-FindNextPeim (\r
-  IN EFI_PEI_SERVICES            **PeiServices,\r
-  IN EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader,\r
-  IN OUT EFI_FFS_FILE_HEADER     **PeimFileHeader\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-    Given the input file pointer, search for the next matching file in the\r
-    FFS volume. The search starts from FileHeader inside\r
-    the Firmware Volume defined by FwVolHeader.\r
-\r
-Arguments:\r
-    PeiServices - Pointer to the PEI Core Services Table.\r
-\r
-    FwVolHeader - Pointer to the FV header of the volume to search.\r
-                     This parameter must point to a valid FFS volume.\r
-\r
-    PeimFileHeader  - Pointer to the current file from which to begin searching.\r
-                  This pointer will be updated upon return to reflect the file found.\r
-\r
-Returns:\r
-    EFI_NOT_FOUND - No files matching the search criteria were found\r
-    EFI_SUCCESS\r
-\r
---*/\r
-;\r
-\r
 BOOLEAN\r
 Dispatched (\r
   IN UINT8  CurrentPeim,\r