Use gEfiCallerIdGuid as the private guid for PcdPeim module.

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

5 files changed, 3 insertions, 34 deletions

diff --git a/MdeModulePkg/Include/Guid/PcdPeiCallbackFnTableHobGuid.h b/MdeModulePkg/Include/Guid/PcdPeiCallbackFnTableHobGuid.h
deleted file mode 100644
index c7b37e9..0000000
--- a/MdeModulePkg/Include/Guid/PcdPeiCallbackFnTableHobGuid.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/** @file

-  Hob guid for Pcd Pei Callback Function Table

-

-  Copyright (c) 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

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-**/

-

-#ifndef _PCD_PEI_CALLBACK_FNTABLE_HOB_GUID_H_

-#define _PCD_PEI_CALLBACK_FNTABLE_HOB_GUID_H_

-

-#define PCD_PEI_CALLBACK_FNTABLE_HOB_GUID \

-  { \

-    0xC625F4B2, 0xEA09, 0x4675, { 0x82, 0xD7, 0xBA, 0x36, 0x82, 0x15, 0x7A, 0x14 } \

-  }

-

-extern EFI_GUID gPcdPeiCallbackFnTableHobGuid;

-

-#endif

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index a9b2096..51b716f 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -92,10 +92,6 @@
   ## Include/Guid/PcdDataBaseHobGuid.h

   gPcdDataBaseHobGuid            = { 0xEA296D92, 0x0B69, 0x423C, { 0x8C, 0x28, 0x33, 0xB4, 0xE0, 0xA9, 0x12, 0x68 }}

   

-  ## Hob guid for Pcd Pei Callback Function Table

-  ## Include/Guid/PcdPeiCallbackFnTableHobGuid.h

-  gPcdPeiCallbackFnTableHobGuid  = { 0xC625F4B2, 0xEA09, 0x4675, { 0x82, 0xD7, 0xBA, 0x36, 0x82, 0x15, 0x7A, 0x14 }}

-

   ## Guid for EDKII implementation GUIDed opcodes

   gEfiIfrTianoGuid      = { 0xf0b1735, 0x87a0, 0x4193, {0xb2, 0x66, 0x53, 0x8c, 0x38, 0xaf, 0x48, 0xce }}

   

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index 3770df8..c00cbbe 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -47,7 +47,6 @@
   DebugLib

 

 [Guids]

-  gPcdPeiCallbackFnTableHobGuid                 ## RPIVATE   ## Hob

   gPcdDataBaseHobGuid                           ## PRODUCES  ## Hob

   gPcdDataBaseHobGuid                           ## CONSUMES  ## Hob

 

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index 4bd3c61..10cc228 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.c
@@ -80,7 +80,7 @@ PeiRegisterCallBackWorker (
   ASSERT ((LocalTokenNumber & PCD_TYPE_HII) == 0);

   ASSERT ((LocalTokenNumber & PCD_TYPE_VPD) == 0);

 

-  GuidHob = GetFirstGuidHob (&gPcdPeiCallbackFnTableHobGuid);

+  GuidHob = GetFirstGuidHob (&gEfiCallerIdGuid);

   ASSERT (GuidHob != NULL);

   

   CallbackTable = GET_GUID_HOB_DATA (GuidHob);

@@ -125,7 +125,7 @@ BuildPcdDatabase (
 

   SizeOfCallbackFnTable = PEI_LOCAL_TOKEN_NUMBER * sizeof (PCD_PPI_CALLBACK) * FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry);

 

-  CallbackFnTable = BuildGuidHob (&gPcdPeiCallbackFnTableHobGuid, SizeOfCallbackFnTable);

+  CallbackFnTable = BuildGuidHob (&gEfiCallerIdGuid, SizeOfCallbackFnTable);

   

   ZeroMem (CallbackFnTable, SizeOfCallbackFnTable);

 }

@@ -292,7 +292,7 @@ InvokeCallbackOnSet (
     ASSERT (TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1);

   }

 

-  GuidHob = GetFirstGuidHob (&gPcdPeiCallbackFnTableHobGuid);

+  GuidHob = GetFirstGuidHob (&gEfiCallerIdGuid);

   ASSERT (GuidHob != NULL);

   

   CallbackTable = GET_GUID_HOB_DATA (GuidHob);

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h
index f76b4a4..be0d502 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.h
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.h
@@ -19,7 +19,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Ppi/ReadOnlyVariable2.h>

 #include <Ppi/Pcd.h>

 #include <Guid/PcdDataBaseHobGuid.h>

-#include <Guid/PcdPeiCallbackFnTableHobGuid.h>

 #include <Library/DebugLib.h>

 #include <Library/PeimEntryPoint.h>

 #include <Library/BaseLib.h>