diff options
| author | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-06-10 12:03:36 +0000 |
|---|---|---|
| committer | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-06-10 12:03:36 +0000 |
| commit | 2a505eac6181d99d6a33770b7c6517f0b1e14b19 (patch) | |
| tree | 0bb8186fc02f07bee046987efc016a66f052a606 /EdkModulePkg | |
| parent | e65e8d103dbadc85c3fe3cce50cd98069a75e72f (diff) | |
| download | edk2-2a505eac6181d99d6a33770b7c6517f0b1e14b19.tar.gz edk2-2a505eac6181d99d6a33770b7c6517f0b1e14b19.tar.bz2 edk2-2a505eac6181d99d6a33770b7c6517f0b1e14b19.zip | |
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
Diffstat (limited to 'EdkModulePkg')
| -rw-r--r-- | EdkModulePkg/Universal/PCD/Dxe/Pcd.c | 2 | ||||
| -rw-r--r-- | EdkModulePkg/Universal/PCD/Dxe/Pcd.msa | 3 | ||||
| -rw-r--r-- | EdkModulePkg/Universal/PCD/Dxe/Service.c | 4 | ||||
| -rw-r--r-- | EdkModulePkg/Universal/PCD/Pei/Pcd.msa | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c index d0f85d242e..45a6c5932a 100644 --- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c +++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c @@ -76,7 +76,7 @@ PcdDxeInit ( //
ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gPcdProtocolGuid);
-
+
BuildPcdDxeDataBase ();
//
diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa b/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa index b29d83923e..ee84d830cd 100644 --- 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>
<Filename>Service.c</Filename>
<Filename>Pcd.c</Filename>
+ <Filename>Pcd.dxs</Filename>
</SourceFiles>
<Includes>
<PackageName>MdePkg</PackageName>
<PackageName>EdkModulePkg</PackageName>
</Includes>
<Protocols>
- <Protocol Usage="ALWAYS_PRODUCED">Pcd</Protocol>
+ <Protocol Usage="ALWAYS_PRODUCED">PcdProtocol</Protocol>
<Protocol Usage="ALWAYS_CONSUMED">Variable</Protocol>
</Protocols>
<Hobs>
diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c index 4b86cd7795..84bfae7bf0 100644 --- a/EdkModulePkg/Universal/PCD/Dxe/Service.c +++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c @@ -57,7 +57,7 @@ GetWorker ( ASSERT (GetSize == Size || GetSize == 0);
- IsPeiDb = (TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;
+ IsPeiDb = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;
LocalTokenNumberTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable :
mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;
@@ -484,7 +484,7 @@ SetWorker ( ASSERT (Size == DxePcdGetSize (TokenNumber));
}
- IsPeiDb = (TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;
+ IsPeiDb = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;
LocalTokenNumberTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable :
mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;
diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.msa b/EdkModulePkg/Universal/PCD/Pei/Pcd.msa index f08a2fa072..d9d1baee36 100644 --- 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>
</Hobs>
<PPIs>
- <Ppi Usage="ALWAYS_PRODUCED">Pcd</Ppi>
+ <Ppi Usage="ALWAYS_PRODUCED">PcdPpi</Ppi>
<Ppi Usage="ALWAYS_CONSUMED">ReadOnlyVariable</Ppi>
</PPIs>
<Guids>
|