Add necessary files (such as *.h) in module msa and remove unused msa files.

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

15 files changed, 49 insertions, 5 deletions

diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
index efa9173c4c..57a57fa017 100644
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
@@ -62,6 +62,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>GraphicsConsole.h</Filename>

     <Filename>GraphicsConsole.c</Filename>

     <Filename>LaffStd.c</Filename>

+    <Filename>ComponentName.h</Filename>

     <Filename>ComponentName.c</Filename>

   </SourceFiles>

   <PackageDependencies>

diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
index 55b2f6f8b9..a922c0aeb4 100644
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
@@ -50,6 +50,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>DebugSupport.c</Filename>

     <Filename>DebugSupport.dxs</Filename>

     <Filename SupArchList="IA32">Ia32/AsmFuncs.asm</Filename>

+    <Filename SupArchList="IA32">Ia32/plDebugSupport.h</Filename>

     <Filename SupArchList="IA32">Ia32/plDebugSupport.c</Filename>

     <Filename SupArchList="IPF">ipf/AsmFuncs.s</Filename>

     <Filename SupArchList="IPF">ipf/common.i</Filename>

diff --git a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.msa b/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.msa
index c87e198dac..abd5246ce3 100644
--- a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.msa
+++ b/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.msa
@@ -41,6 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

+    <Filename>UnicodeCollationEng.h</Filename>

     <Filename>UnicodeCollationEng.c</Filename>

   </SourceFiles>

   <PackageDependencies>

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
index 12f070c301..b874f593b7 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
@@ -56,6 +56,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

+    <Filename>Variable.h</Filename>

     <Filename>EmuVariable.c</Filename>

     <Filename>EmuVariable.dxs</Filename>

     <Filename SupArchList="IA32">InitVariable.c</Filename>

diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
index c98455f3ef..cfb4c831e1 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
@@ -56,6 +56,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

+    <Filename>FtwLite.h</Filename>

     <Filename>FtwLite.c</Filename>

     <Filename>FtwMisc.c</Filename>

     <Filename>FtwWorkSpace.c</Filename>

diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa
index 94530998bf..3e9fa81711 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa
@@ -54,6 +54,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>Crc32SectionExtract.h</Filename>

     <Filename>GuidedSection.c</Filename>

     <Filename>GuidedSection.h</Filename>

+    <Filename>Crc32SectionExtract.dxs</Filename>

   </SourceFiles>

   <PackageDependencies>

     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
index a1282a27aa..27d47a16ae 100644
--- a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
+++ b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
@@ -41,6 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

+    <Filename>BaseMemoryTest.h</Filename>

     <Filename>BaseMemoryTest.c</Filename>

   </SourceFiles>

   <PackageDependencies>

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
index 8557cc494e..66290569f9 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
@@ -67,6 +67,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>pxe_bc_mtftp.c</Filename>

     <Filename>pxe_bc_udp.c</Filename>

     <Filename>pxe_loadfile.c</Filename>

+    <Filename>hton.h</Filename>

+    <Filename>tftp.h</Filename>

     <Filename>dhcp.h</Filename>

     <Filename>bc.h</Filename>

     <Filename>ip.h</Filename>

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa
index 322abc8843..1b99a17ee6 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa
@@ -73,6 +73,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>VfrStrings.uni</Filename>

     <Filename>Vfr.vfr</Filename>

     <Filename>DriverSample.c</Filename>

+    <Filename>NVDataStruc.h</Filename>

     <Filename>DriverSample.h</Filename>

   </SourceFiles>

   <PackageDependencies>

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa
index d2d3c42cc2..beb4f81d65 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa
@@ -76,6 +76,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>ProcessOptions.c</Filename>

     <Filename>Ui.c</Filename>

     <Filename>Ui.h</Filename>

+    <Filename>Colors.h</Filename>

   </SourceFiles>

   <PackageDependencies>

     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

diff --git a/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h b/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h
new file mode 100644
index 0000000000..83031e9788
--- /dev/null
+++ b/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h
@@ -0,0 +1,27 @@
+/*++

+

+Copyright (c) 2006, Intel Corporation                                                         

+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        

+http://opensource.org/licenses/bsd-license.php                                            

+                                                                                          

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+

+Module Name:

+

+  VarMachine.h

+  

+Abstract:

+

+  Variable Machine Type

+

+--*/

+

+#ifndef _VAR_MACHINE_H

+#define _VAR_MACHINE_H

+

+#define ALIGNMENT 1

+

+#endif

diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.c b/EdkModulePkg/Universal/Variable/Pei/Variable.c
index b2286c1860..9561ad13d6 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.c
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.c
@@ -19,10 +19,7 @@ Abstract:
 

 --*/

 

-

-#include <Ppi/ReadOnlyVariable.h>

 #include <Variable.h>

-#include <Library/BaseLib.h>

 

 //

 // Module globals

diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.h b/EdkModulePkg/Universal/Variable/Pei/Variable.h
index 2a6f861def..ac7c579029 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.h
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.h
@@ -26,8 +26,7 @@ Abstract:
 // BugBug: We need relcate the head file.

 // 

 #include <Common/Variable.h>

-

-#define ALIGNMENT 1

+#include <VarMachine.h>

 

 //

 // Define GET_PAD_SIZE to optimize compiler

diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.msa b/EdkModulePkg/Universal/Variable/Pei/Variable.msa
index 3889f0deaf..88adcda4a9 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.msa
@@ -31,6 +31,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </ModuleDefinitions>

   <LibraryClassDefinitions>

     <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>DebugLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

@@ -44,8 +47,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

+    <Filename>Variable.h</Filename>

     <Filename>Variable.c</Filename>

     <Filename>Variable.dxs</Filename>

+    <Filename SupArchList="IA32">Ia32/VarMachine.h</Filename>

+    <Filename SupArchList="EBC">Ebc/VarMachine.h</Filename>

+    <Filename SupArchList="X64">x64/VarMachine.h</Filename>

+    <Filename SupArchList="IPF">Ipf/VarMachine.h</Filename>

   </SourceFiles>

   <PackageDependencies>

     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
index 99691f4943..12248a5b3f 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
@@ -65,7 +65,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

+    <Filename>Variable.h</Filename>

     <Filename>Variable.c</Filename>

+    <Filename>reclaim.h</Filename>

     <Filename>reclaim.c</Filename>

     <Filename SupArchList="IA32">InitVariable.c</Filename>

     <Filename SupArchList="IA32">Ia32Variable.dxs</Filename>