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

4 files changed, 30 insertions, 29 deletions

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
index 56ce433..db83da2 100644
--- 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"?>

+<?xml version="1.0" encoding="UTF-8"?>

 <!--

 Copyright (c) 2006, Intel Corporation

 All rights reserved. This program and the accompanying materials

@@ -98,47 +98,47 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Extern>

   </Externs>

   <PCDs>

-    <PcdData ItemType="FIXED_AT_BUILD">

+    <PcdData ItemType="DYNAMIC">

       <C_Name>PcdWinNtConsole</C_Name>

       <Token>0x0000100a</Token>

       <DatumType>VOID*</DatumType>

     </PcdData>

-    <PcdData ItemType="FIXED_AT_BUILD">

+    <PcdData ItemType="DYNAMIC">

       <C_Name>PcdWinNtUga</C_Name>

       <Token>0x00001003</Token>

       <DatumType>VOID*</DatumType>

     </PcdData>

-    <PcdData ItemType="FIXED_AT_BUILD">

+    <PcdData ItemType="DYNAMIC">

       <C_Name>PcdWinNtSerialPort</C_Name>

       <Token>0x00001002</Token>

       <DatumType>VOID*</DatumType>

     </PcdData>

-    <PcdData ItemType="FIXED_AT_BUILD">

+    <PcdData ItemType="DYNAMIC">

       <C_Name>PcdWinNtFileSystem</C_Name>

       <Token>0x00001004</Token>

       <DatumType>VOID*</DatumType>

     </PcdData>

-    <PcdData ItemType="FIXED_AT_BUILD">

+    <PcdData ItemType="DYNAMIC">

       <C_Name>PcdWinNtVirtualDisk</C_Name>

       <Token>0x00001001</Token>

       <DatumType>VOID*</DatumType>

     </PcdData>

-    <PcdData ItemType="FIXED_AT_BUILD">

+    <PcdData ItemType="DYNAMIC">

       <C_Name>PcdWinNtPhysicalDisk</C_Name>

       <Token>0x00001000</Token>

       <DatumType>VOID*</DatumType>

     </PcdData>

-    <PcdData ItemType="FIXED_AT_BUILD">

+    <PcdData ItemType="DYNAMIC">

       <C_Name>PcdWinNtCpuModel</C_Name>

       <Token>0x00001007</Token>

       <DatumType>VOID*</DatumType>

     </PcdData>

-    <PcdData ItemType="FIXED_AT_BUILD">

+    <PcdData ItemType="DYNAMIC">

       <C_Name>PcdWinNtCpuSpeed</C_Name>

       <Token>0x00001008</Token>

       <DatumType>VOID*</DatumType>

     </PcdData>

-    <PcdData ItemType="FIXED_AT_BUILD">

+    <PcdData ItemType="DYNAMIC">

       <C_Name>PcdWinNtMemorySize</C_Name>

       <Token>0x00001005</Token>

       <DatumType>VOID*</DatumType>

diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index 1667af2..0840560 100644
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>

+<?xml version="1.0" encoding="UTF-8"?>

 <!--

 Copyright (c) 2006, Intel Corporation

 All rights reserved. This program and the accompanying materials

@@ -283,55 +283,61 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DatumType>UINT8</DatumType>

       <DefaultValue>0</DefaultValue>

     </PcdEntry>

-    <PcdEntry ItemType="FIXED_AT_BUILD">

+    <PcdEntry ItemType="DYNAMIC">

       <C_Name>PcdWinNtPhysicalDisk</C_Name>

       <Token>0x00001000</Token>

       <DatumType>VOID*</DatumType>

       <DefaultValue>L"FW;40960;512"</DefaultValue>

     </PcdEntry>

-    <PcdEntry ItemType="FIXED_AT_BUILD">

+    <PcdEntry ItemType="DYNAMIC">

       <C_Name>PcdWinNtVirtualDisk</C_Name>

       <Token>0x00001001</Token>

       <DatumType>VOID*</DatumType>

       <DefaultValue>L"FW;40960;512"</DefaultValue>

     </PcdEntry>

-    <PcdEntry ItemType="FIXED_AT_BUILD">

+    <PcdEntry ItemType="DYNAMIC">

       <C_Name>PcdWinNtSerialPort</C_Name>

       <Token>0x00001002</Token>

       <DatumType>VOID*</DatumType>

       <DefaultValue>L"COM1!COM2"</DefaultValue>

     </PcdEntry>

-    <PcdEntry ItemType="FIXED_AT_BUILD">

+    <PcdEntry ItemType="DYNAMIC">

       <C_Name>PcdWinNtUga</C_Name>

       <Token>0x00001003</Token>

       <DatumType>VOID*</DatumType>

       <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>

     </PcdEntry>

-    <PcdEntry ItemType="FIXED_AT_BUILD">

+    <PcdEntry ItemType="DYNAMIC">

       <C_Name>PcdWinNtFileSystem</C_Name>

       <Token>0x00001004</Token>

       <DatumType>VOID*</DatumType>

       <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>

     </PcdEntry>

-    <PcdEntry ItemType="FIXED_AT_BUILD">

+    <PcdEntry ItemType="DYNAMIC">

       <C_Name>PcdWinNtMemorySize</C_Name>

       <Token>0x00001005</Token>

       <DatumType>VOID*</DatumType>

       <DefaultValue>L"64!64"</DefaultValue>

     </PcdEntry>

     <PcdEntry ItemType="FIXED_AT_BUILD">

+      <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>

+      <Token>0x00001005</Token>

+      <DatumType>VOID*</DatumType>

+      <DefaultValue>L"64!64"</DefaultValue>

+    </PcdEntry>

+    <PcdEntry ItemType="FIXED_AT_BUILD">

       <C_Name>PcdWinNtBootMode</C_Name>

       <Token>0x00001006</Token>

       <DatumType>UINT32</DatumType>

       <DefaultValue>1</DefaultValue>

     </PcdEntry>

-    <PcdEntry ItemType="FIXED_AT_BUILD">

+    <PcdEntry ItemType="DYNAMIC">

       <C_Name>PcdWinNtCpuModel</C_Name>

       <Token>0x00001007</Token>

       <DatumType>VOID*</DatumType>

       <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>

     </PcdEntry>

-    <PcdEntry ItemType="FIXED_AT_BUILD">

+    <PcdEntry ItemType="DYNAMIC">

       <C_Name>PcdWinNtCpuSpeed</C_Name>

       <Token>0x00001008</Token>

       <DatumType>VOID*</DatumType>

@@ -343,7 +349,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DatumType>VOID*</DatumType>

       <DefaultValue>L"..\\..\\Fv\\Fv_Recovery.fd"</DefaultValue>

     </PcdEntry>

-    <PcdEntry ItemType="FIXED_AT_BUILD">

+    <PcdEntry ItemType="DYNAMIC">

       <C_Name>PcdWinNtConsole</C_Name>

       <Token>0x0000100a</Token>

       <DatumType>VOID*</DatumType>

diff --git a/EdkNt32Pkg/Sec/SecMain.c b/EdkNt32Pkg/Sec/SecMain.c
index 2c3d08e..fbd05c5 100644
--- a/EdkNt32Pkg/Sec/SecMain.c
+++ b/EdkNt32Pkg/Sec/SecMain.c
@@ -159,8 +159,8 @@ Returns:
   CHAR16                *MemorySizeStr;

   CHAR16                *FirmwareVolumesStr;

 

-  MemorySizeStr      = (CHAR16 *)FixedPcdGetPtr (PcdWinNtMemorySize);

-  FirmwareVolumesStr = (CHAR16 *)FixedPcdGetPtr (PcdWinNtFirmwareVolume);

+  MemorySizeStr      = (CHAR16 *)PcdGetPtr (PcdWinNtMemorySizeForSecMain);

+  FirmwareVolumesStr = (CHAR16 *)PcdGetPtr (PcdWinNtFirmwareVolume);

 

   printf ("\nEDK SEC Main NT Emulation Environment from www.TianoCore.org\n");

 

diff --git a/EdkNt32Pkg/Sec/SecMain.msa b/EdkNt32Pkg/Sec/SecMain.msa
index fd46656..7bae9fe 100644
--- a/EdkNt32Pkg/Sec/SecMain.msa
+++ b/EdkNt32Pkg/Sec/SecMain.msa
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>

+<?xml version="1.0" encoding="UTF-8"?>

 <!--

 Copyright (c) 2006, Intel Corporation

 All rights reserved. This program and the accompanying materials

@@ -70,12 +70,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </Externs>

   <PCDs>

     <PcdData ItemType="FIXED_AT_BUILD">

-      <C_Name>PcdWinNtCpuSpeed</C_Name>

-      <Token>0x00001008</Token>

-      <DatumType>VOID*</DatumType>

-    </PcdData>

-    <PcdData ItemType="FIXED_AT_BUILD">

-      <C_Name>PcdWinNtMemorySize</C_Name>

+      <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>

       <Token>0x00001005</Token>

       <DatumType>VOID*</DatumType>

     </PcdData>