1) Sync PcdPpi guid with PCD arch spec.

2) Correct macro PatchPcdSetPtr

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

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
index d0f85d242e70e1f9e6213925043c26095c5399b4..45a6c5932affbaf3cb25ecb819f29eb30f3168a1 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -76,7 +76,7 @@ PcdDxeInit (
   //\r
 \r
   ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gPcdProtocolGuid);\r
-  \r
+\r
   BuildPcdDxeDataBase ();\r
 \r
   //\r

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa b/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa
index b29d83923eaf78e0ee628db96a01e08f1c216ff0..ee84d830cd0f6283cf07b52b09ded5d344a10549 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa
@@ -47,13 +47,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <SourceFiles>\r
     <Filename>Service.c</Filename>\r
     <Filename>Pcd.c</Filename>\r
+    <Filename>Pcd.dxs</Filename>\r
   </SourceFiles>\r
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
     <PackageName>EdkModulePkg</PackageName>\r
   </Includes>\r
   <Protocols>\r
-    <Protocol Usage="ALWAYS_PRODUCED">Pcd</Protocol>\r
+    <Protocol Usage="ALWAYS_PRODUCED">PcdProtocol</Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">Variable</Protocol>\r
   </Protocols>\r
   <Hobs>\r

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index 4b86cd7795ca38eab1f7871d58e2955bc4a97916..84bfae7bf0841cc8044c4052f3c8dca5a13473b1 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -57,7 +57,7 @@ GetWorker (
   ASSERT (GetSize == Size || GetSize == 0);\r
 \r
   \r
-  IsPeiDb = (TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
+  IsPeiDb = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
 \r
   LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
                                      mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
@@ -484,7 +484,7 @@ SetWorker (
     ASSERT (Size == DxePcdGetSize (TokenNumber));\r
   }\r
   \r
-  IsPeiDb = (TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
+  IsPeiDb = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
 \r
   LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
                                      mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.msa b/EdkModulePkg/Universal/PCD/Pei/Pcd.msa
index f08a2fa0729486c2bfcea6ff1a781ef1f57a918f..d9d1baee36ffe24f8a2b50fad6c8a6ad1148414c 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.msa
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.msa
@@ -64,7 +64,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Hob>\r
   </Hobs>\r
   <PPIs>\r
-    <Ppi Usage="ALWAYS_PRODUCED">Pcd</Ppi>\r
+    <Ppi Usage="ALWAYS_PRODUCED">PcdPpi</Ppi>\r
     <Ppi Usage="ALWAYS_CONSUMED">ReadOnlyVariable</Ppi>\r
   </PPIs>\r
   <Guids>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
index 9bc94bfc1078b02c4b2953d0c779a0a0afedf0dd..093a18c3a6b1f2927df40c3786f8bbc0a9287ca6 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
@@ -57,7 +57,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Protocol Usage="BY_START">WinNtIo</Protocol>\r
     <Protocol Usage="TO_START">WinNtThunk</Protocol>\r
     <Protocol Usage="TO_START">DevicePath</Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">Pcd</Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">PcdProtocol</Protocol>\r
   </Protocols>\r
   <Guids>\r
     <GuidEntry Usage="ALWAYS_CONSUMED">\r

diff --git a/MdePkg/Include/Library/PcdLib.h b/MdePkg/Include/Library/PcdLib.h
index 03493e210a18b5042f35dda7c104ec8fc57fa1f7..c4e5502a0d065fff9c328aabd7a5c2430fa1dfb3 100644 (file)
--- a/MdePkg/Include/Library/PcdLib.h
+++ b/MdePkg/Include/Library/PcdLib.h
@@ -60,7 +60,7 @@ Module Name: PcdLib.h
 #define PatchPcdSet32(TokenName, Value)    (_gPcd_BinaryPatch_##TokenName = Value)\r
 #define PatchPcdSet64(TokenName, Value)    (_gPcd_BinaryPatch_##TokenName = Value)\r
 #define PatchPcdSetBool(TokenName, Value)  (_gPcd_BinaryPatch_##TokenName = Value)\r
-#define PatchPcdSetPtr(TokenName, Value, Size)   CopyMem (_gPcd_BinaryPatch_##TokenName, Value, Size)\r
+#define PatchPcdSetPtr(TokenName, Size, Buffer)   CopyMem (_gPcd_BinaryPatch_##TokenName, Buffer, Size)\r
 \r
 //\r
 // Dynamic is via the protocol with only the TokenNumber as argument\r

diff --git a/MdePkg/Include/Ppi/Pcd.h b/MdePkg/Include/Ppi/Pcd.h
index 2841f54425b401a8edffbfc0e04f1a74dd56da9b..13b56406dc4f80267ef53a03d8638244baf235df 100644 (file)
--- a/MdePkg/Include/Ppi/Pcd.h
+++ b/MdePkg/Include/Ppi/Pcd.h
@@ -20,7 +20,7 @@
 extern EFI_GUID gPcdPpiGuid;\r
 \r
 #define PCD_PPI_GUID \\r
-  { 0x632df884, 0x8023, 0x4872, { 0xb6, 0x70, 0xb7, 0x4a, 0x30, 0x19, 0x16, 0xe9 } }\r
+  { 0x6e81c58, 0x4ad7, 0x44bc, { 0x83, 0x90, 0xf1, 0x2, 0x65, 0xf7, 0x24, 0x80 } }\r
 \r
 #define PCD_INVALID_TOKEN_NUMBER ((UINTN) -1)\r
 \r

diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.msa b/MdePkg/Library/DxePcdLib/DxePcdLib.msa
index 163b751d20bf6a58361d823dd04342899b802b2a..8622305116e475fab243cc607535f1294454ab6a 100644 (file)
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.msa
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.msa
@@ -43,7 +43,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r
   <Protocols>\r
-    <Protocol Usage="ALWAYS_CONSUMED">Pcd</Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">PcdProtocol</Protocol>\r
   </Protocols>\r
   <Externs>\r
     <Extern>\r

diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 28e90eebb0f765cc6291d3bebfa1b6a60d5fc9e0..9b060d82bbcf9e2b4cae7f5f2302c76b81f24815 100644 (file)
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -710,7 +710,7 @@
       <C_Name>gEfiHiiProtocolGuid</C_Name>\r
       <Guid>0xea816d2c, 0xcee5, 0x4f02, 0x99, 0xb5, 0xd3, 0x90, 0x5c, 0xbb, 0xd0, 0x77</Guid>\r
     </Entry>\r
-    <Entry Name="Pcd">\r
+    <Entry Name="PcdProtocol">\r
       <C_Name>gPcdProtocolGuid</C_Name>\r
       <Guid>0x11b34006, 0xd85b, 0x4d0a, 0xa2, 0x90, 0xd5, 0xa5, 0x71, 0x31, 0x0e, 0xf7</Guid>\r
     </Entry>\r
@@ -1160,9 +1160,9 @@
       <C_Name>gEfiPeiStatusCodePpiGuid</C_Name>\r
       <Guid>0x229832d3, 0x7a30, 0x4b36, 0xb8, 0x27, 0xf4, 0x0c, 0xb7, 0xd4, 0x54, 0x36</Guid>\r
     </Entry>\r
-    <Entry Name="Pcd">\r
+    <Entry Name="PcdPpi">\r
       <C_Name>gPcdPpiGuid</C_Name>\r
-      <Guid>0x5d5c0e21, 0x749c, 0x4063, 0x81, 0xaf, 0xbc, 0x74, 0xfc, 0x79, 0xab, 0x5c</Guid>\r
+      <Guid>0x6e81c58, 0x4ad7, 0x44bc, 0x83, 0x90, 0xf1, 0x2, 0x65, 0xf7, 0x24, 0x80</Guid>\r
     </Entry>\r
     <Entry Name="BootScriptExecuter">\r
       <C_Name>gEfiPeiBootScriptExecuterPpiGuid</C_Name>\r