1, Correct the PCD PEIM to produce gEfiPcdPpi and gPcdPpi at same time;

2, Combine two action of InstallProtocolInstance for gEfiPcdProtocol and gPcdProtocol into InstallMultipleProtocolInstances.

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

MdeModulePkg/Universal/PCD/Pei/Pcd.c

@@ -14,6 +14,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "Service.h"
 
+//
+// Instance of PCD_PPI protocol is native implementation by MdePkg.
+// This protocol instance support dynamic and dynamicEx type PCDs.
+//
 PCD_PPI mPcdPpiInstance = {
   PeiPcdSetSku,
 
@@ -53,6 +57,10 @@ PCD_PPI mPcdPpiInstance = {
   PeiPcdGetNextTokenSpace
 };
 
+//
+// Instance of EFI_PEI_PCD_PPI which is defined in PI 1.2 Vol 3.
+// This PPI instance only support dyanmicEx type PCD.
+//
 EFI_PEI_PCD_PPI  mEfiPcdPpiInstance = {
   PeiPcdSetSku,
   
@@ -90,7 +98,7 @@ EFI_PEI_PPI_DESCRIPTOR  mEfiPpiPCD = {
 /**
   Main entry for PCD PEIM driver.
   
-  This routine initialize the PCD database for PEI phase and install PCD_PPI.
+  This routine initialize the PCD database for PEI phase and install PCD_PPI/EFI_PEI_PCD_PPI.
 
   @param  FileHandle  Handle of the file being invoked.
   @param  PeiServices Describes the list of possible PEI Services.
@@ -105,9 +113,24 @@ PcdPeimInit (
   IN CONST EFI_PEI_SERVICES     **PeiServices
   )
 {
+  EFI_STATUS Status;
+  
   BuildPcdDatabase ();
 
-  return PeiServicesInstallPpi (&mPpiPCD);
+  //
+  // Install PCD_PPI which produce support for dynamic and dynamicEx PCD
+  //
+  Status = PeiServicesInstallPpi (&mPpiPCD);
+  ASSERT_EFI_ERROR (Status);
+  
+  //
+  // Install EFI_PCD_PPI which produce support for dynamicEx PCD which is defined
+  // in PI 1.2 Vol 3 specification.
+  //
+  Status = PeiServicesInstallPpi (&mEfiPpiPCD);
+  ASSERT_EFI_ERROR (Status);
+  
+  return Status;
 }
 
 /**