From: qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 19 Nov 2007 08:02:39 +0000 (+0000)
Subject: 1) Make PEI PI File system service to skip PAD file
X-Git-Tag: edk2-stable201903~21760
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7e181f2f37c33ce73411ba4752093f603a6ff0bf;p=mirror_edk2.git

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