Make PcdPeim/PcdDxe driver also produce EFI_PCD_PPI/EFI_PCD_PROTOCOL defined in PI 1.2 vol3. The EFI_PCD_PPI/EFI_PCD_PROTOCOL only support dynamic-ex type PCD, but original PCD_PPI/PCD_PROTOCOL in MdePkg support dynamic and dynamic-ex type PCDs.

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

6 files changed, 71 insertions, 6 deletions

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
index 288e7f785b..0bb44ff81c 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -2,7 +2,7 @@
   PCD DXE driver manage all PCD entry initialized in PEI phase and DXE phase, and

   produce the implementation of PCD protocol.

 

-Copyright (c) 2006 - 2007, Intel Corporation

+Copyright (c) 2006 - 2009, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -66,6 +66,26 @@ PCD_PROTOCOL mPcdInstance = {
   DxePcdGetNextTokenSpace

 };

 

+EFI_PCD_PROTOCOL mEfiPcdInstance = {

+  DxePcdSetSku,

+  DxePcdGet8Ex,

+  DxePcdGet16Ex,

+  DxePcdGet32Ex,

+  DxePcdGet64Ex,

+  DxePcdGetPtrEx,

+  DxePcdGetBoolEx,

+  DxePcdGetSizeEx,

+  DxePcdSet8Ex,

+  DxePcdSet16Ex,

+  DxePcdSet32Ex,

+  DxePcdSet64Ex,

+  DxePcdSetPtrEx,

+  DxePcdSetBoolEx,

+  (EFI_PCD_PROTOCOL_CALLBACK_ON_SET) DxeRegisterCallBackOnSet,

+  (EFI_PCD_PROTOCOL_CANCEL_CALLBACK) DxeUnRegisterCallBackOnSet,

+  DxePcdGetNextToken,

+  DxePcdGetNextTokenSpace

+};

 

 //

 // Static global to reduce the code size

@@ -107,6 +127,19 @@ PcdDxeInit (
                   &mPcdInstance

                   );

 

+  

+  //

+  // Also install gEfiPcdProtocolGuid which is only support dynamic-ex type 

+  // PCD.

+  //

+  mNewHandle = NULL;

+  Status = gBS->InstallProtocolInterface (

+                  &mNewHandle,

+                  &gEfiPcdProtocolGuid,

+                  EFI_NATIVE_INTERFACE,

+                  &mEfiPcdInstance

+                  );

+                  

   ASSERT_EFI_ERROR (Status);

 

   return EFI_SUCCESS;

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index 13b1859174..0b0486737e 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -318,7 +318,8 @@
 

 [Protocols]

   gPcdProtocolGuid                              ## PRODUCES

-

+  gEfiPcdProtocolGuid                           ## PRODUCES

+  

 [FixedPcd.common]

   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress

 

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index 8978aa8203..583b0d657d 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.h
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h
@@ -18,6 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <PiDxe.h>

 #include <Guid/PcdDataBaseHobGuid.h>

 #include <Protocol/Pcd.h>

+#include <Protocol/PiPcd.h>

 #include <Library/BaseLib.h>

 #include <Library/DebugLib.h>

 #include <Library/UefiLib.h>

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
index a998109fb9..08a18c111e 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
@@ -1,7 +1,7 @@
 /** @file 

   All Pcd Ppi services are implemented here.

   

-Copyright (c) 2006 - 2008, Intel Corporation                                                         

+Copyright (c) 2006 - 2009, Intel Corporation                                                         

 All rights reserved. This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -53,12 +53,40 @@ PCD_PPI mPcdPpiInstance = {
   PeiPcdGetNextTokenSpace

 };

 

+EFI_PEI_PCD_PPI  mEfiPcdPpiInstance = {

+  PeiPcdSetSku,

+  

+  PeiPcdGet8Ex,

+  PeiPcdGet16Ex,

+  PeiPcdGet32Ex,

+  PeiPcdGet64Ex,

+  PeiPcdGetPtrEx,

+  PeiPcdGetBoolEx,

+  PeiPcdGetSizeEx,

+  PeiPcdSet8Ex,

+  PeiPcdSet16Ex,

+  PeiPcdSet32Ex,

+  PeiPcdSet64Ex,

+  PeiPcdSetPtrEx,

+  PeiPcdSetBoolEx,

+  (EFI_PEI_PCD_PPI_CALLBACK_ON_SET) PeiRegisterCallBackOnSet,

+  (EFI_PEI_PCD_PPI_CANCEL_CALLBACK) PcdUnRegisterCallBackOnSet,

+  PeiPcdGetNextToken,

+  PeiPcdGetNextTokenSpace

+};

+

 EFI_PEI_PPI_DESCRIPTOR  mPpiPCD = {

   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

   &gPcdPpiGuid,

   &mPcdPpiInstance

 };

 

+EFI_PEI_PPI_DESCRIPTOR  mEfiPpiPCD = {

+  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

+  &gEfiPeiPcdPpiGuid,

+  &mEfiPcdPpiInstance

+};

+

 /**

   Main entry for PCD PEIM driver.

   

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index baaa30164d..075e16aeb4 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -263,7 +263,7 @@
 #            - Variable GUID for HII type PCD

 #            - Token space GUID for dynamicex type PCD 

 #    

-# Copyright (c) 2006 - 2008, Intel Corporation

+# Copyright (c) 2006 - 2009, Intel Corporation

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -315,7 +315,8 @@
 [Ppis]

   gEfiPeiReadOnlyVariable2PpiGuid               ## CONSUMES

   gPcdPpiGuid                                   ## PRODUCES

-

+  gEfiPeiPcdPpiGuid                             ## PRODUCES

+  

 [FeaturePcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiFullPcdDatabaseEnable

 

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h
index 20362fa206..b5c2a872a8 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.h
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.h
@@ -1,7 +1,7 @@
 /** @file

   The internal header file declares the private functions used by PeiPcd driver.

 

-Copyright (c) 2006 - 2008, Intel Corporation

+Copyright (c) 2006 - 2009, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -18,6 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <PiPei.h>

 #include <Ppi/ReadOnlyVariable2.h>

 #include <Ppi/Pcd.h>

+#include <Ppi/PiPcd.h>

 #include <Guid/PcdDataBaseHobGuid.h>

 #include <Library/DebugLib.h>

 #include <Library/PeimEntryPoint.h>