1. Merge the API of PiLibInstallFvInfoPpi() to PeiServicesLib and rename it to PeiSer...

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

diff --git a/MdePkg/Include/Library/PeiPiLib.h b/MdePkg/Include/Library/PeiPiLib.h
deleted file mode 100644 (file)
index 42f6bce..0000000
--- a/MdePkg/Include/Library/PeiPiLib.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/** @file\r
-  MDE PI library functions and macros for PEI phase\r
-\r
-  Copyright (c) 2007, Intel Corporation                                                         \r
-  All rights reserved. This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-**/\r
-\r
-#ifndef __PEI_PI_LIB_H__\r
-#define __PEI_PI_LIB_H__\r
-\r
-/**\r
-  Install a EFI_PEI_FIRMWARE_VOLUME_INFO PPI to inform PEI core about the existence of a new Firmware Volume.\r
-  \r
-  The function allocate the EFI_PEI_PPI_DESCRIPTOR structure and update the fields accordingly to parameter passed\r
-  in and install the PPI.\r
-  \r
-  @param  FvFormat             Unique identifier of the format of the memory-mapped firmware volume. \r
-                               If NULL is specified, EFI_FIRMWARE_FILE_SYSTEM2_GUID is used as the Format GUID.\r
-  @param  FvInfo               Points to a buffer which allows the EFI_PEI_FIRMWARE_VOLUME_PPI to\r
-                               process the volume. The format of this buffer is specific to the FvFormat. For\r
-                               memory-mapped firmware volumes, this typically points to the first byte of the\r
-                               firmware volume.\r
-  @param  FvInfoSize           Size of the data provided by FvInfo. For memory-mapped firmware volumes, this is\r
-                               typically the size of the firmware volume.\r
-  @param  ParentFvName         If the firmware volume originally came from a firmware file, then these point to the\r
-                               parent firmware volume name. If it did not originally come from a firmware file, \r
-                               these should be NULL.\r
-  @param  ParentFileName       If the firmware volume originally came from a firmware file, then these point to the\r
-                               firmware volume file. If it did not originally come from a firmware file, \r
-                               these should be NULL.\r
-   \r
-**/\r
-VOID\r
-EFIAPI\r
-PiLibInstallFvInfoPpi (\r
-  IN CONST EFI_GUID                *FvFormat, OPTIONAL\r
-  IN CONST VOID                    *FvInfo,\r
-  IN       UINT32                  FvInfoSize,\r
-  IN CONST EFI_GUID                *ParentFvName, OPTIONAL\r
-  IN CONST EFI_GUID                *ParentFileName OPTIONAL\r
-  );\r
-\r
-#endif\r
-\r

diff --git a/MdePkg/Include/Library/PeiServicesLib.h b/MdePkg/Include/Library/PeiServicesLib.h
index 220ac9671864b2f2cbd9849677a6f9bd71b9427a..2bfe7106f42bd1493b1449b71d0aa433b9ff28a8 100644 (file)
--- a/MdePkg/Include/Library/PeiServicesLib.h
+++ b/MdePkg/Include/Library/PeiServicesLib.h
@@ -397,5 +397,36 @@ PeiServicesRegisterForShadow (
   IN  EFI_PEI_FILE_HANDLE FileHandle\r
   );\r
 \r
+/**\r
+  Install a EFI_PEI_FIRMWARE_VOLUME_INFO PPI to inform PEI core about the existence of a new Firmware Volume.\r
+  \r
+  The function allocate the EFI_PEI_PPI_DESCRIPTOR structure and update the fields accordingly to parameter passed\r
+  in and install the PPI.\r
+  \r
+  @param  FvFormat             Unique identifier of the format of the memory-mapped firmware volume. \r
+                               If NULL is specified, EFI_FIRMWARE_FILE_SYSTEM2_GUID is used as the Format GUID.\r
+  @param  FvInfo               Points to a buffer which allows the EFI_PEI_FIRMWARE_VOLUME_PPI to\r
+                               process the volume. The format of this buffer is specific to the FvFormat. For\r
+                               memory-mapped firmware volumes, this typically points to the first byte of the\r
+                               firmware volume.\r
+  @param  FvInfoSize           Size of the data provided by FvInfo. For memory-mapped firmware volumes, this is\r
+                               typically the size of the firmware volume.\r
+  @param  ParentFvName         If the firmware volume originally came from a firmware file, then these point to the\r
+                               parent firmware volume name. If it did not originally come from a firmware file, \r
+                               these should be NULL.\r
+  @param  ParentFileName       If the firmware volume originally came from a firmware file, then these point to the\r
+                               firmware volume file. If it did not originally come from a firmware file, \r
+                               these should be NULL.\r
+   \r
+**/\r
+VOID\r
+EFIAPI\r
+PeiServicesInstallFvInfoPpi (\r
+  IN CONST EFI_GUID                *FvFormat, OPTIONAL\r
+  IN CONST VOID                    *FvInfo,\r
+  IN       UINT32                  FvInfoSize,\r
+  IN CONST EFI_GUID                *ParentFvName, OPTIONAL\r
+  IN CONST EFI_GUID                *ParentFileName OPTIONAL\r
+  );\r
 \r
 #endif\r