Perfected MSA files.

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

diff --git a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
index 088ac95603f561c5a08c0846a87c66909addf071..981acf4575e1398dc5572d7aab99377c1f1f2799 100644 (file)
--- a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
+++ b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
@@ -9,10 +9,10 @@
     <Description>\r
       Parses the MiscSubclassDataTable and reports any generated data to the DataHub.\r
       All .uni file who tagged with "ToolCode="DUMMY"" in following file list is included by\r
-      MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file \r
+      MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file\r
       and parse all .uni file.\r
     </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
@@ -22,7 +22,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>MiscSubclass</OutputFileBasename>\r
   </ModuleDefinitions>\r
@@ -136,9 +136,6 @@
     <DataHubRecord Usage="ALWAYS_PRODUCED">\r
       <DataHubCName>SystemOptionString</DataHubCName>\r
     </DataHubRecord>\r
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">\r
-      <DataHubCName>ProcessorSubClassData</DataHubCName>\r
-    </DataHubRecord>\r
     <DataHubRecord Usage="SOMETIMES_PRODUCED">\r
       <DataHubCName>MemorySubClassData</DataHubCName>\r
     </DataHubRecord>\r

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
index d1ee0ff3c215f3c9675d8f277067219f58c8ef2d..052b1d8ca977223126737e65f566fb19d0f3e773 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
+++ b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
@@ -154,34 +154,36 @@
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r
       <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r
       <ProtocolCName>gEfiLoadFileProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r
       <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r
       <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiGenericMemTestProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
     <Protocol Usage="SOMETIMES_CONSUMED">\r
-      <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>\r
+      <ProtocolCName>gEfiGenericMemTestProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="SOMETIMES_CONSUMED">\r
-      <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>\r
+      <ProtocolCName>gEfiGraphicsOutputProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
+  <Hobs>\r
+    <HobTypes HobGuidCName="gEfiFlashMapHobGuid" Usage="ALWAYS_CONSUMED">\r
+      <HobType>GUID_EXTENSION</HobType>\r
+    </HobTypes>\r
+  </Hobs>\r
   <DataHubs>\r
     <DataHubRecord Usage="SOMETIMES_CONSUMED">\r
       <DataHubCName>BiosVendor</DataHubCName>\r
@@ -198,12 +200,6 @@
     <DataHubRecord Usage="SOMETIMES_CONSUMED">\r
       <DataHubCName>MemoryArray</DataHubCName>\r
     </DataHubRecord>\r
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">\r
-      <DataHubCName>SerialIoDevice</DataHubCName>\r
-    </DataHubRecord>\r
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">\r
-      <DataHubCName>SerialIoPort</DataHubCName>\r
-    </DataHubRecord>\r
   </DataHubs>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
@@ -215,16 +211,13 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiGenericPlatformVariableGuid</GuidCName>\r
     </GuidCNames>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiFlashMapHobGuid</GuidCName>\r
-    </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiFileSystemVolumeLabelInfoIdGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiFileInfoGuid</GuidCName>\r
     </GuidCNames>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
+    <GuidCNames Usage="SOMETIMES_CONSUMED">\r
       <GuidCName>gEfiDefaultBmpLogoGuid</GuidCName>\r
     </GuidCNames>\r
   </Guids>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa
index e6ba0f0bb72083a5de0b976a7e681a56bb8709bf..afbf8de6d4fa7a4abf882ee1df831240707db322 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa
@@ -20,7 +20,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtBlockIo</OutputFileBasename>\r
   </ModuleDefinitions>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa
index f60a5d1a66ee2df110ba40e695efa96c4a1c5866..595213eacf4ca909a8cf372e4806c102935dd9a2 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtConsole</OutputFileBasename>\r
   </ModuleDefinitions>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa
index e2cf66e2d1a60bcf7b39b89b632be3b22d80003e..b7e5107722cdbe729b0083086992f36a2085e388 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa
@@ -18,7 +18,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtSerialIo</OutputFileBasename>\r
   </ModuleDefinitions>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa
index 6c0ef4867f27a7684c689a1c79c23ec5aafd9008..c60e293be1d3e258494fa72739b632285fc4a07d 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa
@@ -20,7 +20,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtSimpleFileSystem</OutputFileBasename>\r
   </ModuleDefinitions>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa
index 86b667bfc4aa7911f5d7a8acc065588a4aa784a1..002426211653d14221ff37991a5e7df94490e770 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa
@@ -20,7 +20,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtUga</OutputFileBasename>\r
   </ModuleDefinitions>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
index 39d6c7b2aae170af17b573b7a67c08cb91b081b9..2fb7d61aeb9b7a93d4809cecdffa41a4310aab8f 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
@@ -19,7 +19,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtBusDriver</OutputFileBasename>\r
   </ModuleDefinitions>\r
@@ -71,9 +71,12 @@
     <Protocol Usage="TO_START">\r
       <ProtocolCName>gEfiWinNtThunkProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="TO_START">\r
+    <Protocol Usage="BY_START">\r
       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
     </Protocol>\r
+    <Protocol Usage="BY_START">\r
+      <ProtocolCName>gWinNtBusDriverGuid</ProtocolCName>\r
+    </Protocol>\r
   </Protocols>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
@@ -106,9 +109,6 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiWinNtCPUSpeedGuid</GuidCName>\r
     </GuidCNames>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gWinNtBusDriverGuid</GuidCName>\r
-    </GuidCNames>\r
   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa
index b0b3d81830422d993c09f55d3c202d4ddd6870cc..e4dc0b144bb00a1fe2f54ab9d154af1d2dfb4437 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>Metronome</OutputFileBasename>\r
   </ModuleDefinitions>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa
index 45d0e6dba8d6d2006924096f51e5ec34d5e0a436..0fe3cd09bf761c214059295347f83d37d75f0ab9 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>RealTimeClock</OutputFileBasename>\r
   </ModuleDefinitions>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa
index 6c03ec37639d77289e57a7990b5b0b9176539537..404da8d6ea8f7f8e9da1146c076ff9db6f92283f 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>Reset</OutputFileBasename>\r
   </ModuleDefinitions>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa
index f163548f4ed1209c7aed9476cd65ef29bc2a06d1..b0227416bb388dd2f61617cb697c6545ded4364d 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>NT Emulation Timer Architectural Protocol Driver as defined in DXE CIS</Abstract>\r
     <Description>This Timer module uses an NT Thread to simulate the timer-tick driven\r
-      timer service.  In the future, the Thread creation should possibly be \r
+      timer service.  In the future, the Thread creation should possibly be\r
       abstracted by the CPU architectural protocol</Description>\r
     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
     <License>All rights reserved. This program and the accompanying materials\r
@@ -19,7 +19,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>Timer</OutputFileBasename>\r
   </ModuleDefinitions>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
index b96caa2cf35d95457b649f3ea532f1d78a869ff4..f0f22f9540cfa26e246794e0341a18ea94b5b6cd 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>Cpu</OutputFileBasename>\r
   </ModuleDefinitions>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa b/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa
index 5f79138e799a01445d102c1005284cb9a1f4f200..223f4e69d854b3dafdf19400f140e446de5c2cb9 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtThunk</OutputFileBasename>\r
   </ModuleDefinitions>\r

diff --git a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
index dc3e7c1499737a8873312304e1edcb5c7b06eee6..8a0beea1cac80277bf482adca02e5c3bae6fd48c 100644 (file)
--- a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
+++ b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtAutoScan</OutputFileBasename>\r
   </ModuleDefinitions>\r

diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
index 5a0503e5cc527b22653fe8c72087d22f7a46514c..3bf00a08bca013a5de5481f2355ebf9738db775b 100644 (file)
--- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
+++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
@@ -55,6 +55,11 @@
       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
+  <Hobs>\r
+    <HobTypes HobGuidCName="gEfiFlashMapHobGuid" Usage="ALWAYS_CONSUMED">\r
+      <HobType>GUID_EXTENSION</HobType>\r
+    </HobTypes>\r
+  </Hobs>\r
   <PPIs>\r
     <Ppi Usage="ALWAYS_PRODUCED">\r
       <PpiCName>gPeiFlashMapPpiGuid</PpiCName>\r
@@ -64,9 +69,6 @@
     </Ppi>\r
   </PPIs>\r
   <Guids>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiFlashMapHobGuid</GuidCName>\r
-    </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiFirmwareFileSystemGuid</GuidCName>\r
     </GuidCNames>\r
@@ -82,10 +84,10 @@
     <PcdEntry PcdItemType="DYNAMIC">\r
       <C_Name>PcdFlashNvStorageVariableBase</C_Name>\r
       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>The driver sets the NV Storage FV base address defined by this PCD.  \r
+      <HelpText>The driver sets the NV Storage FV base address defined by this PCD.\r
         This base address point to an EFI_FIRMWARE_VOLUMN_HEADER struct. Variable PEIM\r
         will get the base address from this PCD. In NT emulator, this PCD is a DYNAMIC\r
-        type, as FD is mapped to process space by WinNT OS. On real platform, it is \r
+        type, as FD is mapped to process space by WinNT OS. On real platform, it is\r
         normally a FIXED_AT_BUILD type as system memory map is fixed to BIOS.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="DYNAMIC">\r

diff --git a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
index d0b5bb2e12f888d87e97a9b04fdd484cfe760c80..9b4faf13c82f90ca013da0ad376205c5f552069a 100644 (file)
--- a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
+++ b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtStuff</OutputFileBasename>\r
   </ModuleDefinitions>\r

diff --git a/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.msa b/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.msa
index 1eec75e9fd6a0de614859cf5387d65e7ba247eeb..0586c28d1850c5bf765dc2f1495fdce35aaa729c 100644 (file)
--- a/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.msa
+++ b/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.msa
@@ -6,10 +6,10 @@
     <GuidValue>BDFE5FAA-2A35-44bb-B17A-8084D4E2B9E9</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for Nt32 Fimware Volume Block DXE driver module.</Abstract>\r
-    <Description>This DXE runtime driver implements and produces the Fimware Volue Block Protocol on \r
+    <Description>This DXE runtime driver implements and produces the Fimware Volue Block Protocol on\r
     NT32 emulator.\r
     </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
@@ -19,7 +19,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>FwBlockService</OutputFileBasename>\r
   </ModuleDefinitions>\r
@@ -57,9 +57,9 @@
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>Nt32Fwh.dxs</Filename>\r
-    <Filename SupArchList="IA32">FWBlockService.c</Filename>\r
-    <Filename SupArchList="IA32">FwBlockService.h</Filename>\r
-    <Filename SupArchList="IA32">FvbInfo.c</Filename>\r
+    <Filename>FWBlockService.c</Filename>\r
+    <Filename>FwBlockService.h</Filename>\r
+    <Filename>FvbInfo.c</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
@@ -76,6 +76,9 @@
     <Protocol Usage="ALWAYS_PRODUCED">\r
       <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>\r
     </Protocol>\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r
+      <ProtocolCName>gEfiAlternateFvBlockGuid</ProtocolCName>\r
+    </Protocol>\r
   </Protocols>\r
   <Events>\r
     <CreateEvents>\r

diff --git a/EdkNt32Pkg/Sec/SecMain.msa b/EdkNt32Pkg/Sec/SecMain.msa
index e276e3f5b02608aa6d93de91fd88d4243c30f8ab..28e8d15e2f99244354b282fe478b99a3999dbfba 100644 (file)
--- a/EdkNt32Pkg/Sec/SecMain.msa
+++ b/EdkNt32Pkg/Sec/SecMain.msa
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>SecMain</OutputFileBasename>\r
   </ModuleDefinitions>\r
@@ -94,7 +94,7 @@
     <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
       <C_Name>PcdWinNtBootMode</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>This PCD defines the boot mode for simualtor. \r
+      <HelpText>This PCD defines the boot mode for simualtor.\r
         The boot mode can be set as following value:\r
           0x0: Boot with full configuration.\r
           0x1: Boot with minimal configuration.\r
@@ -103,7 +103,7 @@
           0x4: Boot with default settings.\r
           0x5: Boot on S4 resume.\r
           0x6: Boot on S5 resume.\r
-          0x10: Boot on S2 resume. \r
+          0x10: Boot on S2 resume.\r
           0x11: Boot on S3 resume.\r
           0x12: Boot on flash update.\r
           0x20: Boot in reovery mode.</HelpText>\r