Check in the Pcd service Driver/PEIM according to the new way of generating PCD Database

LIMITATION:

1) ONLY dynamic type PCD is supported for now. DynamicEx is not supported.
2) HII enable and VPD is not tested.

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

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
index 56ce4337bb41f6552f3eabc2fb50bf10ad64632b..db83da2925af2f71d305ee6a9b972a5ee0b649df 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r
 <!--\r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
@@ -98,47 +98,47 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Extern>\r
   </Externs>\r
   <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    <PcdData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtConsole</C_Name>\r
       <Token>0x0000100a</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    <PcdData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtUga</C_Name>\r
       <Token>0x00001003</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    <PcdData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtSerialPort</C_Name>\r
       <Token>0x00001002</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    <PcdData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtFileSystem</C_Name>\r
       <Token>0x00001004</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    <PcdData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtVirtualDisk</C_Name>\r
       <Token>0x00001001</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    <PcdData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
       <Token>0x00001000</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    <PcdData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtCpuModel</C_Name>\r
       <Token>0x00001007</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    <PcdData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtCpuSpeed</C_Name>\r
       <Token>0x00001008</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    <PcdData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtMemorySize</C_Name>\r
       <Token>0x00001005</Token>\r
       <DatumType>VOID*</DatumType>\r

diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index 1667af21f73aa3ae52c34c36ddbdfd40f0f41f4e..08405602c409b7acae7417059a558c397a290854 100644 (file)
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r
 <!--\r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
@@ -283,55 +283,61 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DatumType>UINT8</DatumType>\r
       <DefaultValue>0</DefaultValue>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
       <Token>0x00001000</Token>\r
       <DatumType>VOID*</DatumType>\r
       <DefaultValue>L"FW;40960;512"</DefaultValue>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtVirtualDisk</C_Name>\r
       <Token>0x00001001</Token>\r
       <DatumType>VOID*</DatumType>\r
       <DefaultValue>L"FW;40960;512"</DefaultValue>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtSerialPort</C_Name>\r
       <Token>0x00001002</Token>\r
       <DatumType>VOID*</DatumType>\r
       <DefaultValue>L"COM1!COM2"</DefaultValue>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtUga</C_Name>\r
       <Token>0x00001003</Token>\r
       <DatumType>VOID*</DatumType>\r
       <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtFileSystem</C_Name>\r
       <Token>0x00001004</Token>\r
       <DatumType>VOID*</DatumType>\r
       <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtMemorySize</C_Name>\r
       <Token>0x00001005</Token>\r
       <DatumType>VOID*</DatumType>\r
       <DefaultValue>L"64!64"</DefaultValue>\r
     </PcdEntry>\r
+    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+      <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r
+      <Token>0x00001005</Token>\r
+      <DatumType>VOID*</DatumType>\r
+      <DefaultValue>L"64!64"</DefaultValue>\r
+    </PcdEntry>\r
     <PcdEntry ItemType="FIXED_AT_BUILD">\r
       <C_Name>PcdWinNtBootMode</C_Name>\r
       <Token>0x00001006</Token>\r
       <DatumType>UINT32</DatumType>\r
       <DefaultValue>1</DefaultValue>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtCpuModel</C_Name>\r
       <Token>0x00001007</Token>\r
       <DatumType>VOID*</DatumType>\r
       <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtCpuSpeed</C_Name>\r
       <Token>0x00001008</Token>\r
       <DatumType>VOID*</DatumType>\r
@@ -343,7 +349,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DatumType>VOID*</DatumType>\r
       <DefaultValue>L"..\\..\\Fv\\Fv_Recovery.fd"</DefaultValue>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtConsole</C_Name>\r
       <Token>0x0000100a</Token>\r
       <DatumType>VOID*</DatumType>\r

diff --git a/EdkNt32Pkg/Sec/SecMain.c b/EdkNt32Pkg/Sec/SecMain.c
index 2c3d08e06280030c510ff2ad0455124e73665eb1..fbd05c5173ad56b26bdbde58a93815964d13043e 100644 (file)
--- a/EdkNt32Pkg/Sec/SecMain.c
+++ b/EdkNt32Pkg/Sec/SecMain.c
@@ -159,8 +159,8 @@ Returns:
   CHAR16                *MemorySizeStr;\r
   CHAR16                *FirmwareVolumesStr;\r
 \r
-  MemorySizeStr      = (CHAR16 *)FixedPcdGetPtr (PcdWinNtMemorySize);\r
-  FirmwareVolumesStr = (CHAR16 *)FixedPcdGetPtr (PcdWinNtFirmwareVolume);\r
+  MemorySizeStr      = (CHAR16 *)PcdGetPtr (PcdWinNtMemorySizeForSecMain);\r
+  FirmwareVolumesStr = (CHAR16 *)PcdGetPtr (PcdWinNtFirmwareVolume);\r
 \r
   printf ("\nEDK SEC Main NT Emulation Environment from www.TianoCore.org\n");\r
 \r

diff --git a/EdkNt32Pkg/Sec/SecMain.msa b/EdkNt32Pkg/Sec/SecMain.msa
index fd4665613863f75ae64ed9d785b189b4a1e40b1a..7bae9feb75bbd65c1202e268fac43b08f30da34c 100644 (file)
--- a/EdkNt32Pkg/Sec/SecMain.msa
+++ b/EdkNt32Pkg/Sec/SecMain.msa
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r
 <!--\r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
@@ -70,12 +70,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </Externs>\r
   <PCDs>\r
     <PcdData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdWinNtCpuSpeed</C_Name>\r
-      <Token>0x00001008</Token>\r
-      <DatumType>VOID*</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdWinNtMemorySize</C_Name>\r
+      <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r
       <Token>0x00001005</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdData>\r