1. Removed the unnecessary #include statements and include files

2. Removed the unnecessary library and include path from MSA files git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@541 6f19259b-4bc3-4df7-8a09-765794883524
2006-06-16 11:42:42 +00:00
parent 5a96e3e3fe
commit ce53a8c3b2
93 changed files with 434 additions and 659 deletions
--- a/Tools/Source/TianoTools/Common/CommonLib.h
+++ b/Tools/Source/TianoTools/Common/CommonLib.h
@@ -22,13 +22,7 @@ Abstract:
 #ifndef _EFI_COMMON_LIB_H
 #define _EFI_COMMON_LIB_H

-/*
-#include "TianoCommon.h"
-#include "TianoCommon.h"
-#include "PeiHob.h"
-*/
-#include <Base.h>
-#include <UefiBaseTypes.h>
+#include <Common/UefiBaseTypes.h>

 #ifndef _MAX_PATH
 #define _MAX_PATH 500
--- a/Tools/Source/TianoTools/Common/Crc32.h
+++ b/Tools/Source/TianoTools/Common/Crc32.h
@@ -19,22 +19,17 @@ Abstract:
  
 --*/

-/*
-#include "TianoCommon.h"
-*/
-#include <Base.h>
-#include <UefiBaseTypes.h>
-
 #ifndef _CRC32_H
 #define _CRC32_H
+
+#include <Common/UefiBaseTypes.h>
+
 EFI_STATUS
 CalculateCrc32 (
  IN  UINT8                             *Data,
  IN  UINTN                             DataSize,
  IN OUT UINT32                         *CrcOut
  )
-;
-
 /*++

 Routine Description:
@@ -54,4 +49,6 @@ Returns:
  EFI_INVALID_PARAMETER     - Data / CrcOut = NULL, or DataSize = 0

 --*/
+;
+
 #endif
--- a/Tools/Source/TianoTools/Common/EfiCompress.c
+++ b/Tools/Source/TianoTools/Common/EfiCompress.c
@@ -23,9 +23,6 @@ Abstract:

 --*/

-/*
-#include "TianoCommon.h"
-*/
 #include "EfiCompress.h"

 //
--- a/Tools/Source/TianoTools/Common/EfiCompress.h
+++ b/Tools/Source/TianoTools/Common/EfiCompress.h
@@ -19,13 +19,14 @@ Abstract:
  
 --*/

-#include <string.h>
-#include <stdlib.h>
-#include <Base.h>
-#include <UefiBaseTypes.h>
-
 #ifndef _EFICOMPRESS_H
 #define _EFICOMPRESS_H
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <Common/UefiBaseTypes.h>
+
 EFI_STATUS
 Compress (
  IN      UINT8   *SrcBuffer,
--- a/Tools/Source/TianoTools/Common/EfiCustomizedCompress.h
+++ b/Tools/Source/TianoTools/Common/EfiCustomizedCompress.h
@@ -19,11 +19,11 @@ Abstract:
  
 --*/

-#include <Base.h>
-#include <UefiBaseTypes.h>
-
 #ifndef _EFICUSTOMIZEDCOMPRESS_H
 #define _EFICUSTOMIZEDCOMPRESS_H
+
+#include <Common/UefiBaseTypes.h>
+
 EFI_STATUS
 SetCustomizedCompressionType (
  IN  CHAR8   *Type
--- a/Tools/Source/TianoTools/Common/EfiDecompress.h
+++ b/Tools/Source/TianoTools/Common/EfiDecompress.h
@@ -18,11 +18,12 @@ Abstract:
  Header file for compression routine
  
 --*/
-#include <Base.h>
-#include <UefiBaseTypes.h>

 #ifndef _EFI_DECOMPRESS_H
 #define _EFI_DECOMPRESS_H
+
+#include <Common/UefiBaseTypes.h>
+
 EFI_STATUS
 GetInfo (
  IN      VOID    *Source,
--- a/Tools/Source/TianoTools/Common/EfiUtilityMsgs.c
+++ b/Tools/Source/TianoTools/Common/EfiUtilityMsgs.c
@@ -25,9 +25,6 @@ Abstract:
 #include <ctype.h>
 #include <stdarg.h>

-/*
-#include "Tiano.h"
-*/
 #include "EfiUtilityMsgs.h"

 #define MAX_LINE_LEN  200
--- a/Tools/Source/TianoTools/Common/EfiUtilityMsgs.h
+++ b/Tools/Source/TianoTools/Common/EfiUtilityMsgs.h
@@ -19,12 +19,11 @@ Abstract:
  
 --*/

-#include <Base.h>
-#include <UefiBaseTypes.h>
-
 #ifndef _EFI_UTILITY_MSGS_H_
 #define _EFI_UTILITY_MSGS_H_

+#include <Common/UefiBaseTypes.h>
+
 //
 // Status codes returned by EFI utility programs and functions
 //
--- a/Tools/Source/TianoTools/Common/FvLib.c
+++ b/Tools/Source/TianoTools/Common/FvLib.c
@@ -25,14 +25,6 @@ Abstract:
 #include "FvLib.h"
 #include "CommonLib.h"
 #include "EfiUtilityMsgs.h"
-#include "MultiPhase.h"
-/*
-#include <CommonBuild.h>
-*/
-
-/*
-#include EFI_GUID_DEFINITION (FirmwareFileSystem)
-*/

 //
 // Module global variables
--- a/Tools/Source/TianoTools/Common/FvLib.h
+++ b/Tools/Source/TianoTools/Common/FvLib.h
@@ -25,18 +25,14 @@ Abstract:
 //
 // Include files
 //
-#include <Base.h>
-#include <UefiBaseTypes.h>
+#include <string.h>
+
+#include <Common/UefiBaseTypes.h>
 #include <Common/EfiImage.h>
 #include <Common/FirmwareVolumeImageFormat.h>
 #include <Common/FirmwareFileSystem.h>
 #include <Common/FirmwareVolumeHeader.h>
-/*
-#include "TianoCommon.h"
-#include "EfiFirmwareVolumeHeader.h"
-#include "EfiFirmwareFileSystem.h"
-*/
-#include <string.h>
+#include <Common/MultiPhase.h>

 EFI_STATUS
 InitializeFvLib (
--- a/Tools/Source/TianoTools/Common/MyAlloc.h
+++ b/Tools/Source/TianoTools/Common/MyAlloc.h
@@ -25,11 +25,8 @@ Abstract:
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <Base.h>

-/*
-#include "Tiano.h"
-*/
+#include <Common/BaseTypes.h>

 //
 // Default operation is to use the memory allocation tracking functions.
--- a/Tools/Source/TianoTools/Common/ParseInf.c
+++ b/Tools/Source/TianoTools/Common/ParseInf.c
@@ -19,11 +19,11 @@ Abstract:

 --*/

-#include "ParseInf.h"
 #include <assert.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include "ParseInf.h"

 #ifndef _MAX_PATH
 #define _MAX_PATH 500
--- a/Tools/Source/TianoTools/Common/ParseInf.h
+++ b/Tools/Source/TianoTools/Common/ParseInf.h
@@ -22,11 +22,10 @@ Abstract:
 #ifndef _EFI_PARSE_INF_H
 #define _EFI_PARSE_INF_H

-/* #include "TianoCommon.h" */
-#include <Base.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <UefiBaseTypes.h>
+
+#include <Common/UefiBaseTypes.h>

 //
 // Common data structures
--- a/Tools/Source/TianoTools/Common/SimpleFileParsing.c
+++ b/Tools/Source/TianoTools/Common/SimpleFileParsing.c
@@ -24,9 +24,6 @@ Abstract:
 #include <stdlib.h>
 #include <ctype.h>

-/*
-#include "Tiano.h"
-*/
 #include "EfiUtilityMsgs.h"
 #include "SimpleFileParsing.h"

--- a/Tools/Source/TianoTools/Common/SimpleFileParsing.h
+++ b/Tools/Source/TianoTools/Common/SimpleFileParsing.h
@@ -19,12 +19,11 @@ Abstract:

 --*/

-#include <Base.h>
-#include <UefiBaseTypes.h>
-
 #ifndef _SIMPLE_FILE_PARSING_H_
 #define _SIMPLE_FILE_PARSING_H_

+#include <Common/UefiBaseTypes.h>
+
 #define T_CHAR  char

 STATUS
--- a/Tools/Source/TianoTools/Common/build.xml
+++ b/Tools/Source/TianoTools/Common/build.xml
@@ -60,20 +60,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
      </echo>
    </else>
    </if>
-		<if>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
+    <if>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
+      <then>
        <property name="ext_static" value=".lib"/>
        <property name="ext_dynamic" value=".dll"/>
-			</then>
-			<elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+      </then>
+      <elseif>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
+        <then>
          <property name="ext_static" value=".a"/>
          <property name="ext_dynamic" value=".so"/>
-				</then>
-			</elseif>
-		</if>
+        </then>
+      </elseif>
+    </if>
  </target>

  <target name="ToolsLibrary" depends="init">
@@ -83,7 +83,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
        optimize="speed">

      <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>

      <fileset dir="${basedir}/Common"