clean up MSA file and sync FPD file

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

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
index 2e24262547713fd817190c715bfcc0d6a2aa021a..61da7b0cf399a742096095fedcb52d4d16abcb44 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
@@ -115,4 +115,69 @@
       <ComponentName>gWinNtBusDriverComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r
       <ComponentName>gWinNtBusDriverComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r

+  <PcdCoded>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtConsole</C_Name>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>This PCD declares the title string of the text console window.\r
+        such as "My EFI Console".\r
+        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtUga</C_Name>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>This PCD declares the resolutions for the UGA windows.\r
+        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtGop</C_Name>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>This PCD declares the resolutions for the GOP windows.\r
+        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtSerialPort</C_Name>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>This Pcd declares two serial port for simulated environment.\r
+        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtFileSystem</C_Name>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>This PCD defines the windows directory who will be mounted as\r
+        harddisk in simulator.\r
+        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtVirtualDisk</C_Name>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>This PCD defines the devices which use a file to emulate a hard disk or\r
+        removable media device\r
+        The item type if this PCD can only be "DYNAMIC".</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>This PCD defines physical disk which will be simualted as a\r
+        harddisk in simulator.\r
+        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtCpuModel</C_Name>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>This PCD defines simulated CPU model string.\r
+        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtCpuSpeed</C_Name>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>This PCD defines simulated CPU speed string.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtMemorySize</C_Name>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>This PCD defines the size of simulated memory size.\r
+        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </ModuleSurfaceArea>
\ No newline at end of file
 </ModuleSurfaceArea>
\ No newline at end of file

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 82e628090169c0696918acb40e09c034c06c0f4b..be98fbc5258476cc91bdae014b3acec053f607b4 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -6863,86 +6863,6 @@
         <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
       </Libraries>\r
       <PcdBuildDefinition>\r
         <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
       </Libraries>\r
       <PcdBuildDefinition>\r

-        <PcdData ItemType="DYNAMIC">\r
-          <C_Name>PcdWinNtConsole</C_Name>\r
-          <Token>0x0000100a</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>VOID*</DatumType>\r
-          <MaxDatumSize>50</MaxDatumSize>\r
-          <Value>L"Bus Driver Console Window"</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="DYNAMIC">\r
-          <C_Name>PcdWinNtUga</C_Name>\r
-          <Token>0x00001003</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>VOID*</DatumType>\r
-          <MaxDatumSize>50</MaxDatumSize>\r
-          <Value>L"UGA Window 1!UGA Window 2"</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="DYNAMIC">\r
-          <C_Name>PcdWinNtGop</C_Name>\r
-          <Token>0x0000100d</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>VOID*</DatumType>\r
-          <MaxDatumSize>50</MaxDatumSize>\r
-          <Value>L"GOP Window 1!GOP Window 2"</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="DYNAMIC">\r
-          <C_Name>PcdWinNtSerialPort</C_Name>\r
-          <Token>0x00001002</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>VOID*</DatumType>\r
-          <MaxDatumSize>18</MaxDatumSize>\r
-          <Value>L"COM1!COM2"</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="DYNAMIC">\r
-          <C_Name>PcdWinNtFileSystem</C_Name>\r
-          <Token>0x00001004</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>VOID*</DatumType>\r
-          <MaxDatumSize>106</MaxDatumSize>\r
-          <Value>L".!..\\..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="DYNAMIC">\r
-          <C_Name>PcdWinNtVirtualDisk</C_Name>\r
-          <Token>0x00001001</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>VOID*</DatumType>\r
-          <MaxDatumSize>24</MaxDatumSize>\r
-          <Value>L"FW;40960;512"</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="DYNAMIC">\r
-          <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
-          <Token>0x00001000</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>VOID*</DatumType>\r
-          <MaxDatumSize>30</MaxDatumSize>\r
-          <Value>L"E:RW;245760;512"</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="DYNAMIC">\r
-          <C_Name>PcdWinNtCpuModel</C_Name>\r
-          <Token>0x00001007</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>VOID*</DatumType>\r
-          <MaxDatumSize>48</MaxDatumSize>\r
-          <Value>L"Intel(R) Processor Model"</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="DYNAMIC">\r
-          <C_Name>PcdWinNtCpuSpeed</C_Name>\r
-          <Token>0x00001008</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>VOID*</DatumType>\r
-          <MaxDatumSize>8</MaxDatumSize>\r
-          <Value>L"3000"</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="DYNAMIC">\r
-          <C_Name>PcdWinNtMemorySize</C_Name>\r
-          <Token>0x00001005</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>VOID*</DatumType>\r
-          <MaxDatumSize>10</MaxDatumSize>\r
-          <Value>L"64!64"</Value>\r
-        </PcdData>\r

         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r


@@ -7031,6 +6951,86 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r

+        <PcdData ItemType="DYNAMIC">\r
+          <C_Name>PcdWinNtConsole</C_Name>\r
+          <Token>0x0000100a</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>VOID*</DatumType>\r
+          <MaxDatumSize>50</MaxDatumSize>\r
+          <Value>L"Bus Driver Console Window"</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="DYNAMIC">\r
+          <C_Name>PcdWinNtUga</C_Name>\r
+          <Token>0x00001003</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>VOID*</DatumType>\r
+          <MaxDatumSize>50</MaxDatumSize>\r
+          <Value>L"UGA Window 1!UGA Window 2"</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="DYNAMIC">\r
+          <C_Name>PcdWinNtGop</C_Name>\r
+          <Token>0x0000100d</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>VOID*</DatumType>\r
+          <MaxDatumSize>50</MaxDatumSize>\r
+          <Value>L"UGA Window 1!UGA Window 2"</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="DYNAMIC">\r
+          <C_Name>PcdWinNtSerialPort</C_Name>\r
+          <Token>0x00001002</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>VOID*</DatumType>\r
+          <MaxDatumSize>18</MaxDatumSize>\r
+          <Value>L"COM1!COM2"</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="DYNAMIC">\r
+          <C_Name>PcdWinNtFileSystem</C_Name>\r
+          <Token>0x00001004</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>VOID*</DatumType>\r
+          <MaxDatumSize>106</MaxDatumSize>\r
+          <Value>L".!..\\..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="DYNAMIC">\r
+          <C_Name>PcdWinNtVirtualDisk</C_Name>\r
+          <Token>0x00001001</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>VOID*</DatumType>\r
+          <MaxDatumSize>24</MaxDatumSize>\r
+          <Value>L"FW;40960;512"</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="DYNAMIC">\r
+          <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
+          <Token>0x00001000</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>VOID*</DatumType>\r
+          <MaxDatumSize>30</MaxDatumSize>\r
+          <Value>L"E:RW;245760;512"</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="DYNAMIC">\r
+          <C_Name>PcdWinNtCpuModel</C_Name>\r
+          <Token>0x00001007</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>VOID*</DatumType>\r
+          <MaxDatumSize>48</MaxDatumSize>\r
+          <Value>L"Intel(R) Processor Model"</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="DYNAMIC">\r
+          <C_Name>PcdWinNtCpuSpeed</C_Name>\r
+          <Token>0x00001008</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>VOID*</DatumType>\r
+          <MaxDatumSize>8</MaxDatumSize>\r
+          <Value>L"3000"</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="DYNAMIC">\r
+          <C_Name>PcdWinNtMemorySize</C_Name>\r
+          <Token>0x00001005</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>VOID*</DatumType>\r
+          <MaxDatumSize>10</MaxDatumSize>\r
+          <Value>L"64!64"</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r


@@ -7909,7 +7909,7 @@
       <MaxDatumSize>50</MaxDatumSize>\r
       <SkuInfo>\r
         <SkuId>0</SkuId>\r
       <MaxDatumSize>50</MaxDatumSize>\r
       <SkuInfo>\r
         <SkuId>0</SkuId>\r

-        <Value>L"GOP Window 1!GOP Window 2"</Value>\r
+        <Value>L"UGA Window 1!UGA Window 2"</Value>\r

       </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r