Remove DiskIoPartition and old Emu, adjust MonoStatusCode in EdkNt32Pkg

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

diff --git a/EdkModulePkg/EdkModulePkg-All-Archs.fpd b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
index c318283e28cb2323ff4951ac0cb1c579c594c7ab..eb48bd19fe562f35a83a4768acdb40e3bae8e324 100644 (file)
--- a/EdkModulePkg/EdkModulePkg-All-Archs.fpd
+++ b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
@@ -45,7 +45,6 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Partition" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="English" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIo" />\r
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIoPartition" />\r
       \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecurityStub" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeMain" />\r
@@ -102,7 +101,6 @@
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Partition" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="English" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DiskIo" />\r
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DiskIoPartition" />\r
       \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="SecurityStub" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeMain" />\r
@@ -162,7 +160,6 @@
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Partition" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="English" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DiskIo" />\r
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DiskIoPartition" />\r
       \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="SecurityStub" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeMain" />\r
@@ -224,7 +221,6 @@
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Partition" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="English" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DiskIo" />\r
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DiskIoPartition" />\r
       \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="SecurityStub" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeMain" />\r
@@ -946,75 +942,7 @@
             <Value>0xAF</Value>\r
           </PcdData>\r
         </PcdBuildDefinition>\r
-      </ModuleSA>      \r
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIoPartition" >\r
-        <PcdBuildDefinition>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-            <Token>0x00000001</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-            <Token>0x00000002</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugPropertyMask</C_Name>\r
-            <Token>0x00000005</Token>\r
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x0f</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdSpinLockTimeout</C_Name>\r
-            <Token>0x00000004</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>10000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-            <Token>0x00000006</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>0x80000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
-            <Token>0x00000007</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x07</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-            <Token>0x00000003</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-            <Token>0x00000008</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0xAF</Value>\r
-          </PcdData>\r
-        </PcdBuildDefinition>\r
-      </ModuleSA>      \r
+      </ModuleSA>  \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecurityStub" >\r
         <PcdBuildDefinition>\r
           <PcdData ItemType="FIXED_AT_BUILD">\r
@@ -4244,75 +4172,7 @@
             <Value>0xAF</Value>\r
           </PcdData>\r
         </PcdBuildDefinition>\r
-      </ModuleSA>      \r
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DiskIoPartition" >\r
-        <PcdBuildDefinition>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-            <Token>0x00000001</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-            <Token>0x00000002</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugPropertyMask</C_Name>\r
-            <Token>0x00000005</Token>\r
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x0f</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdSpinLockTimeout</C_Name>\r
-            <Token>0x00000004</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>10000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-            <Token>0x00000006</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>0x80000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
-            <Token>0x00000007</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x07</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-            <Token>0x00000003</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-            <Token>0x00000008</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0xAF</Value>\r
-          </PcdData>\r
-        </PcdBuildDefinition>\r
-      </ModuleSA>      \r
+      </ModuleSA> \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="SecurityStub" >\r
         <PcdBuildDefinition>\r
           <PcdData ItemType="FIXED_AT_BUILD">\r
@@ -7544,75 +7404,7 @@
             <Value>0xAF</Value>\r
           </PcdData>\r
         </PcdBuildDefinition>\r
-      </ModuleSA>      \r
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DiskIoPartition" >\r
-        <PcdBuildDefinition>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-            <Token>0x00000001</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-            <Token>0x00000002</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugPropertyMask</C_Name>\r
-            <Token>0x00000005</Token>\r
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x0f</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdSpinLockTimeout</C_Name>\r
-            <Token>0x00000004</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>10000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-            <Token>0x00000006</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>0x80000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
-            <Token>0x00000007</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x07</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-            <Token>0x00000003</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-            <Token>0x00000008</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0xAF</Value>\r
-          </PcdData>\r
-        </PcdBuildDefinition>\r
-      </ModuleSA>      \r
+      </ModuleSA>\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="SecurityStub" >\r
         <PcdBuildDefinition>\r
           <PcdData ItemType="FIXED_AT_BUILD">\r
@@ -10844,75 +10636,7 @@
             <Value>0xAF</Value>\r
           </PcdData>\r
         </PcdBuildDefinition>\r
-      </ModuleSA>      \r
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DiskIoPartition" >\r
-        <PcdBuildDefinition>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-            <Token>0x00000001</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-            <Token>0x00000002</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugPropertyMask</C_Name>\r
-            <Token>0x00000005</Token>\r
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x0f</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdSpinLockTimeout</C_Name>\r
-            <Token>0x00000004</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>10000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-            <Token>0x00000006</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>0x80000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
-            <Token>0x00000007</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x07</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-            <Token>0x00000003</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-            <Token>0x00000008</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0xAF</Value>\r
-          </PcdData>\r
-        </PcdBuildDefinition>\r
-      </ModuleSA>      \r
+      </ModuleSA>    \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="SecurityStub" >\r
         <PcdBuildDefinition>\r
           <PcdData ItemType="FIXED_AT_BUILD">\r

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 69f3b76c1ce7f4f5311eec855da5a929333edff5..c0f6dbc66d5e332eb9a3eabfc79fb3b07933905d 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -46,7 +46,6 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Partition" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="English" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIo" />\r
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIoPartition" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecurityStub" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeMain" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMain" />\r
@@ -751,75 +750,7 @@
             <Value>0xAF</Value>\r
           </PcdData>\r
         </PcdBuildDefinition>\r
-      </ModuleSA>      \r
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIoPartition" >\r
-        <PcdBuildDefinition>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-            <Token>0x00000001</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-            <Token>0x00000002</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugPropertyMask</C_Name>\r
-            <Token>0x00000005</Token>\r
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x0f</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdSpinLockTimeout</C_Name>\r
-            <Token>0x00000004</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>10000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-            <Token>0x00000006</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>0x80000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
-            <Token>0x00000007</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x07</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-            <Token>0x00000003</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-            <Token>0x00000008</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0xAF</Value>\r
-          </PcdData>\r
-        </PcdBuildDefinition>\r
-      </ModuleSA>      \r
+      </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecurityStub" >\r
         <PcdBuildDefinition>\r
           <PcdData ItemType="FIXED_AT_BUILD">\r

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 9c722a88381cf071546965ed65eebcf6f75d3c43..18d87045a62cade6b21a829452cdde03925a88ed 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -255,9 +255,6 @@
     <MsaFile>
       <Filename>Universal/Disk/DiskIo/Dxe/DiskIo.msa</Filename>
     </MsaFile>
-    <MsaFile>
-      <Filename>Universal/Disk/DiskIoPartition/Dxe/DiskIoPartition.msa</Filename>
-    </MsaFile>
     <MsaFile>
       <Filename>Universal/Disk/Partition/Dxe/Partition.msa</Filename>
     </MsaFile>

diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index 3965c5064a091e153215e407e60c13ecc539d232..3ec3a12584d223ac49f352c0992136b3200c6bbf 100644 (file)
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -108,7 +108,7 @@
       <Filename>Pei/FlashMap/FlashMap.msa</Filename>\r
     </MsaFile>\r
     <MsaFile>\r
-      <Filename>Pei/MonoStatusCode/Nt32/MonoStatusCode.msa</Filename>\r
+      <Filename>Pei/MonoStatusCode/MonoStatusCode.msa</Filename>\r
     </MsaFile>\r
     <MsaFile>\r
       <Filename>Pei/WinNtStuff/WinNtStuff.msa</Filename>\r

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 5fb363ccfd8cf8948cad1da497d8799d2ee15cac..ed7a5e6d76e17153c21638f8d34458a4a0b71b7c 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -186,7 +186,6 @@
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHub"/>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHubStdErr"/>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIo"/>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIoPartition"/>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Ebc"/>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="NullMemoryTest"/>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HiiDatabase"/>\r
@@ -2943,74 +2942,6 @@
           </PcdData>\r
         </PcdBuildDefinition>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIoPartition">\r
-        <PcdBuildDefinition>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-            <Token>0x00000001</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-            <Token>0x00000002</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugPropertyMask</C_Name>\r
-            <Token>0x00000005</Token>\r
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x1f</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdSpinLockTimeout</C_Name>\r
-            <Token>0x00000004</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>10000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-            <Token>0x00000006</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>0x80000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
-            <Token>0x00000007</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x07</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-            <Token>0x00000003</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-            <Token>0x00000008</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0xAF</Value>\r
-          </PcdData>\r
-        </PcdBuildDefinition>\r
-      </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Ebc">\r
         <PcdBuildDefinition>\r
           <PcdData ItemType="FIXED_AT_BUILD">\r