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

diff --git a/MdeModulePkg/Include/Guid/PcdPeiCallbackFnTableHobGuid.h b/MdeModulePkg/Include/Guid/PcdPeiCallbackFnTableHobGuid.h
deleted file mode 100644 (file)
index c7b37e9..0000000
--- a/MdeModulePkg/Include/Guid/PcdPeiCallbackFnTableHobGuid.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/** @file\r
-  Hob guid for Pcd Pei Callback Function Table\r
-\r
-  Copyright (c) 2009, 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 _PCD_PEI_CALLBACK_FNTABLE_HOB_GUID_H_\r
-#define _PCD_PEI_CALLBACK_FNTABLE_HOB_GUID_H_\r
-\r
-#define PCD_PEI_CALLBACK_FNTABLE_HOB_GUID \\r
-  { \\r
-    0xC625F4B2, 0xEA09, 0x4675, { 0x82, 0xD7, 0xBA, 0x36, 0x82, 0x15, 0x7A, 0x14 } \\r
-  }\r
-\r
-extern EFI_GUID gPcdPeiCallbackFnTableHobGuid;\r
-\r
-#endif\r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index a9b209607cd4ea9cbf781d3a0104b8db85ede5ef..51b716fb0c062a10b6c79c124907c947759e141f 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -92,10 +92,6 @@
   ## Include/Guid/PcdDataBaseHobGuid.h\r
   gPcdDataBaseHobGuid            = { 0xEA296D92, 0x0B69, 0x423C, { 0x8C, 0x28, 0x33, 0xB4, 0xE0, 0xA9, 0x12, 0x68 }}\r
   \r
-  ## Hob guid for Pcd Pei Callback Function Table\r
-  ## Include/Guid/PcdPeiCallbackFnTableHobGuid.h\r
-  gPcdPeiCallbackFnTableHobGuid  = { 0xC625F4B2, 0xEA09, 0x4675, { 0x82, 0xD7, 0xBA, 0x36, 0x82, 0x15, 0x7A, 0x14 }}\r
-\r
   ## Guid for EDKII implementation GUIDed opcodes\r
   gEfiIfrTianoGuid      = { 0xf0b1735, 0x87a0, 0x4193, {0xb2, 0x66, 0x53, 0x8c, 0x38, 0xaf, 0x48, 0xce }}\r
   \r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index 3770df8ba1e35a3860c99c96f55370471df3cd69..c00cbbeddff6f56b34ecb0d6d4eb535569d7cc1d 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -47,7 +47,6 @@
   DebugLib\r
 \r
 [Guids]\r
-  gPcdPeiCallbackFnTableHobGuid                 ## RPIVATE   ## Hob\r
   gPcdDataBaseHobGuid                           ## PRODUCES  ## Hob\r
   gPcdDataBaseHobGuid                           ## CONSUMES  ## Hob\r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index 4bd3c6150a856502e8f4162424a973ec33c2a0e7..10cc2284335a20cb0b9e710eb1d955e442f3f50f 100644 (file)
--- 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);\r
   ASSERT ((LocalTokenNumber & PCD_TYPE_VPD) == 0);\r
 \r
-  GuidHob = GetFirstGuidHob (&gPcdPeiCallbackFnTableHobGuid);\r
+  GuidHob = GetFirstGuidHob (&gEfiCallerIdGuid);\r
   ASSERT (GuidHob != NULL);\r
   \r
   CallbackTable = GET_GUID_HOB_DATA (GuidHob);\r
@@ -125,7 +125,7 @@ BuildPcdDatabase (
 \r
   SizeOfCallbackFnTable = PEI_LOCAL_TOKEN_NUMBER * sizeof (PCD_PPI_CALLBACK) * FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry);\r
 \r
-  CallbackFnTable = BuildGuidHob (&gPcdPeiCallbackFnTableHobGuid, SizeOfCallbackFnTable);\r
+  CallbackFnTable = BuildGuidHob (&gEfiCallerIdGuid, SizeOfCallbackFnTable);\r
   \r
   ZeroMem (CallbackFnTable, SizeOfCallbackFnTable);\r
 }\r
@@ -292,7 +292,7 @@ InvokeCallbackOnSet (
     ASSERT (TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1);\r
   }\r
 \r
-  GuidHob = GetFirstGuidHob (&gPcdPeiCallbackFnTableHobGuid);\r
+  GuidHob = GetFirstGuidHob (&gEfiCallerIdGuid);\r
   ASSERT (GuidHob != NULL);\r
   \r
   CallbackTable = GET_GUID_HOB_DATA (GuidHob);\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h
index f76b4a4872cb0d917c597f55631c716ac585dc34..be0d5023a55fbd3bccbd0455119d4aa0caeeabe1 100644 (file)
--- 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>\r
 #include <Ppi/Pcd.h>\r
 #include <Guid/PcdDataBaseHobGuid.h>\r
-#include <Guid/PcdPeiCallbackFnTableHobGuid.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/PeimEntryPoint.h>\r
 #include <Library/BaseLib.h>\r