Perfected MSA files.

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

14 files changed, 32 insertions, 42 deletions

diff --git a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
index 088ac95..981acf4 100644
--- a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
+++ b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
@@ -9,10 +9,10 @@
     <Description>

       Parses the MiscSubclassDataTable and reports any generated data to the DataHub.

       All .uni file who tagged with "ToolCode="DUMMY"" in following file list is included by

-      MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file 

+      MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file

       and parse all .uni file.

     </Description>

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

     <License>All rights reserved. This program and the accompanying materials

       are licensed and made available under the terms and conditions of the BSD License

       which accompanies this distribution.  The full text of the license may be found at

@@ -22,7 +22,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>MiscSubclass</OutputFileBasename>

   </ModuleDefinitions>

@@ -136,9 +136,6 @@
     <DataHubRecord Usage="ALWAYS_PRODUCED">

       <DataHubCName>SystemOptionString</DataHubCName>

     </DataHubRecord>

-    <DataHubRecord Usage="SOMETIMES_CONSUMED">

-      <DataHubCName>ProcessorSubClassData</DataHubCName>

-    </DataHubRecord>

     <DataHubRecord Usage="SOMETIMES_PRODUCED">

       <DataHubCName>MemorySubClassData</DataHubCName>

     </DataHubRecord>

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
index d1ee0ff..052b1d8 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
+++ b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
@@ -154,34 +154,36 @@
     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiLoadFileProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiGenericMemTestProtocolGuid</ProtocolCName>

-    </Protocol>

     <Protocol Usage="SOMETIMES_CONSUMED">

-      <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>

+      <ProtocolCName>gEfiGenericMemTestProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="SOMETIMES_CONSUMED">

-      <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>

+      <ProtocolCName>gEfiGraphicsOutputProtocolGuid</ProtocolCName>

     </Protocol>

   </Protocols>

+  <Hobs>

+    <HobTypes HobGuidCName="gEfiFlashMapHobGuid" Usage="ALWAYS_CONSUMED">

+      <HobType>GUID_EXTENSION</HobType>

+    </HobTypes>

+  </Hobs>

   <DataHubs>

     <DataHubRecord Usage="SOMETIMES_CONSUMED">

       <DataHubCName>BiosVendor</DataHubCName>

@@ -198,12 +200,6 @@
     <DataHubRecord Usage="SOMETIMES_CONSUMED">

       <DataHubCName>MemoryArray</DataHubCName>

     </DataHubRecord>

-    <DataHubRecord Usage="SOMETIMES_CONSUMED">

-      <DataHubCName>SerialIoDevice</DataHubCName>

-    </DataHubRecord>

-    <DataHubRecord Usage="SOMETIMES_CONSUMED">

-      <DataHubCName>SerialIoPort</DataHubCName>

-    </DataHubRecord>

   </DataHubs>

   <Guids>

     <GuidCNames Usage="ALWAYS_CONSUMED">

@@ -216,15 +212,12 @@
       <GuidCName>gEfiGenericPlatformVariableGuid</GuidCName>

     </GuidCNames>

     <GuidCNames Usage="ALWAYS_CONSUMED">

-      <GuidCName>gEfiFlashMapHobGuid</GuidCName>

-    </GuidCNames>

-    <GuidCNames Usage="ALWAYS_CONSUMED">

       <GuidCName>gEfiFileSystemVolumeLabelInfoIdGuid</GuidCName>

     </GuidCNames>

     <GuidCNames Usage="ALWAYS_CONSUMED">

       <GuidCName>gEfiFileInfoGuid</GuidCName>

     </GuidCNames>

-    <GuidCNames Usage="ALWAYS_CONSUMED">

+    <GuidCNames Usage="SOMETIMES_CONSUMED">

       <GuidCName>gEfiDefaultBmpLogoGuid</GuidCName>

     </GuidCNames>

   </Guids>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa
index e6ba0f0..afbf8de 100644
--- 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>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>WinNtBlockIo</OutputFileBasename>

   </ModuleDefinitions>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa
index f60a5d1..595213e 100644
--- 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>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>WinNtConsole</OutputFileBasename>

   </ModuleDefinitions>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa
index e2cf66e..b7e5107 100644
--- 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>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>WinNtSerialIo</OutputFileBasename>

   </ModuleDefinitions>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa
index 6c0ef48..c60e293 100644
--- 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>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>WinNtSimpleFileSystem</OutputFileBasename>

   </ModuleDefinitions>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa
index 86b667b..0024262 100644
--- 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>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>WinNtUga</OutputFileBasename>

   </ModuleDefinitions>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
index 39d6c7b..2fb7d61 100644
--- 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>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>WinNtBusDriver</OutputFileBasename>

   </ModuleDefinitions>

@@ -71,9 +71,12 @@
     <Protocol Usage="TO_START">

       <ProtocolCName>gEfiWinNtThunkProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="TO_START">

+    <Protocol Usage="BY_START">

       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>

     </Protocol>

+    <Protocol Usage="BY_START">

+      <ProtocolCName>gWinNtBusDriverGuid</ProtocolCName>

+    </Protocol>

   </Protocols>

   <Guids>

     <GuidCNames Usage="ALWAYS_CONSUMED">

@@ -106,9 +109,6 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">

       <GuidCName>gEfiWinNtCPUSpeedGuid</GuidCName>

     </GuidCNames>

-    <GuidCNames Usage="ALWAYS_CONSUMED">

-      <GuidCName>gWinNtBusDriverGuid</GuidCName>

-    </GuidCNames>

   </Guids>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa
index b0b3d81..e4dc0b1 100644
--- 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>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>Metronome</OutputFileBasename>

   </ModuleDefinitions>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa
index 45d0e6d..0fe3cd0 100644
--- 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>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>RealTimeClock</OutputFileBasename>

   </ModuleDefinitions>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa
index 6c03ec3..404da8d 100644
--- 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>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>Reset</OutputFileBasename>

   </ModuleDefinitions>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa
index f163548..b022741 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>NT Emulation Timer Architectural Protocol Driver as defined in DXE CIS</Abstract>

     <Description>This Timer module uses an NT Thread to simulate the timer-tick driven

-      timer service.  In the future, the Thread creation should possibly be 

+      timer service.  In the future, the Thread creation should possibly be

       abstracted by the CPU architectural protocol</Description>

     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

     <License>All rights reserved. This program and the accompanying materials

@@ -19,7 +19,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>Timer</OutputFileBasename>

   </ModuleDefinitions>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
index b96caa2..f0f22f9 100644
--- 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>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>Cpu</OutputFileBasename>

   </ModuleDefinitions>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa b/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa
index 5f79138..223f4e6 100644
--- 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>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>WinNtThunk</OutputFileBasename>

   </ModuleDefinitions>