1. Removed the unnecessary #include statements and include files
authoryshi8 <yshi8@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 16 Jun 2006 11:42:42 +0000 (11:42 +0000)
committeryshi8 <yshi8@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 16 Jun 2006 11:42:42 +0000 (11:42 +0000)
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

93 files changed:
Tools/Source/TianoTools/Common/CommonLib.h
Tools/Source/TianoTools/Common/Crc32.h
Tools/Source/TianoTools/Common/EfiCompress.c
Tools/Source/TianoTools/Common/EfiCompress.h
Tools/Source/TianoTools/Common/EfiCustomizedCompress.h
Tools/Source/TianoTools/Common/EfiDecompress.h
Tools/Source/TianoTools/Common/EfiUtilityMsgs.c
Tools/Source/TianoTools/Common/EfiUtilityMsgs.h
Tools/Source/TianoTools/Common/FvLib.c
Tools/Source/TianoTools/Common/FvLib.h
Tools/Source/TianoTools/Common/MyAlloc.h
Tools/Source/TianoTools/Common/ParseInf.c
Tools/Source/TianoTools/Common/ParseInf.h
Tools/Source/TianoTools/Common/SimpleFileParsing.c
Tools/Source/TianoTools/Common/SimpleFileParsing.h
Tools/Source/TianoTools/Common/build.xml
Tools/Source/TianoTools/CompressDll/CompressDll.c
Tools/Source/TianoTools/CompressDll/build.xml
Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c
Tools/Source/TianoTools/CreateMtFile/build.xml
Tools/Source/TianoTools/CustomizedCompress/CustomizedCompress.c
Tools/Source/TianoTools/CustomizedCompress/build.xml
Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c
Tools/Source/TianoTools/EfiCompress/build.xml
Tools/Source/TianoTools/EfiRom/EfiRom.c
Tools/Source/TianoTools/EfiRom/build.xml
Tools/Source/TianoTools/FlashMap/FlashDefFile.c
Tools/Source/TianoTools/FlashMap/FlashMap.c
Tools/Source/TianoTools/FlashMap/Symbols.c
Tools/Source/TianoTools/FlashMap/build.xml
Tools/Source/TianoTools/FwImage/build.xml
Tools/Source/TianoTools/FwImage/fwimage.c
Tools/Source/TianoTools/GenAcpiTable/GenAcpiTable.c
Tools/Source/TianoTools/GenAcpiTable/build.xml
Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.h
Tools/Source/TianoTools/GenCRC32Section/build.xml
Tools/Source/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c
Tools/Source/TianoTools/GenCapsuleHdr/build.xml
Tools/Source/TianoTools/GenDepex/GenDepex.c
Tools/Source/TianoTools/GenDepex/GenDepex.h
Tools/Source/TianoTools/GenDepex/build.xml
Tools/Source/TianoTools/GenFdImage/GenFdImage.h
Tools/Source/TianoTools/GenFdImage/GenFdImageDll.c
Tools/Source/TianoTools/GenFfsFile/GenFfsFile.c
Tools/Source/TianoTools/GenFfsFile/GenFfsFile.h
Tools/Source/TianoTools/GenFfsFile/SimpleFileParsing.c
Tools/Source/TianoTools/GenFfsFile/build.xml
Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c
Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h
Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h
Tools/Source/TianoTools/GenFvImage/build.xml
Tools/Source/TianoTools/GenSection/GenSection.c
Tools/Source/TianoTools/GenSection/GenSection.h
Tools/Source/TianoTools/GenSection/build.xml
Tools/Source/TianoTools/GenTEImage/GenTEImage.c
Tools/Source/TianoTools/GenTEImage/build.xml
Tools/Source/TianoTools/GuidChk/GuidList.c
Tools/Source/TianoTools/GuidChk/UtilsMsgs.c
Tools/Source/TianoTools/GuidChk/build.xml
Tools/Source/TianoTools/MakeDeps/MakeDeps.c
Tools/Source/TianoTools/MakeDeps/build.xml
Tools/Source/TianoTools/ModifyInf/build.xml
Tools/Source/TianoTools/PeCoffLoader/BasePeCoff.c
Tools/Source/TianoTools/PeCoffLoader/Common/EfiImage.h
Tools/Source/TianoTools/PeCoffLoader/Ia32/PeCoffLoaderEx.c
Tools/Source/TianoTools/PeCoffLoader/Ipf/PeCoffLoaderEx.c
Tools/Source/TianoTools/PeCoffLoader/X64/PeCoffLoaderEx.c
Tools/Source/TianoTools/PeCoffLoader/build.xml
Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h
Tools/Source/TianoTools/PeiRebase/build.xml
Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.c
Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
Tools/Source/TianoTools/SecFixup/SecFixup.c
Tools/Source/TianoTools/SecFixup/build.xml
Tools/Source/TianoTools/SetStamp/build.xml
Tools/Source/TianoTools/SplitFile/build.xml
Tools/Source/TianoTools/StrGather/StrGather.c
Tools/Source/TianoTools/StrGather/StringDB.c
Tools/Source/TianoTools/StrGather/build.xml
Tools/Source/TianoTools/String/PrintLib.c
Tools/Source/TianoTools/String/PrintLibInternal.c
Tools/Source/TianoTools/String/String.c
Tools/Source/TianoTools/String/build.xml
Tools/Source/TianoTools/Strip/Strip.c
Tools/Source/TianoTools/Strip/build.xml
Tools/Source/TianoTools/VfrCompile/EfiVfr.h
Tools/Source/TianoTools/VfrCompile/VfrCompile.g
Tools/Source/TianoTools/VfrCompile/VfrServices.cpp
Tools/Source/TianoTools/VfrCompile/build.xml
Tools/Source/TianoTools/ZeroDebugData/build.xml
Tools/Source/TianoTools/build.xml

index 80cd883..46f0cba 100644 (file)
@@ -22,13 +22,7 @@ Abstract:
 #ifndef _EFI_COMMON_LIB_H\r
 #define _EFI_COMMON_LIB_H\r
 \r
-/*\r
-#include "TianoCommon.h"\r
-#include "TianoCommon.h"\r
-#include "PeiHob.h"\r
-*/\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <Common/UefiBaseTypes.h>\r
 \r
 #ifndef _MAX_PATH\r
 #define _MAX_PATH 500\r
index 0d24004..ec48cdd 100644 (file)
@@ -19,22 +19,17 @@ Abstract:
   \r
 --*/\r
 \r
-/*\r
-#include "TianoCommon.h"\r
-*/\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-\r
 #ifndef _CRC32_H\r
 #define _CRC32_H\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+\r
 EFI_STATUS\r
 CalculateCrc32 (\r
   IN  UINT8                             *Data,\r
   IN  UINTN                             DataSize,\r
   IN OUT UINT32                         *CrcOut\r
   )\r
-;\r
-\r
 /*++\r
 \r
 Routine Description:\r
@@ -54,4 +49,6 @@ Returns:
   EFI_INVALID_PARAMETER     - Data / CrcOut = NULL, or DataSize = 0\r
 \r
 --*/\r
+;\r
+\r
 #endif\r
index 0a60a46..5b91b1d 100644 (file)
@@ -23,9 +23,6 @@ Abstract:
 \r
 --*/\r
 \r
-/*\r
-#include "TianoCommon.h"\r
-*/\r
 #include "EfiCompress.h"\r
 \r
 //\r
index a129f2c..6ad80e4 100644 (file)
@@ -19,13 +19,14 @@ Abstract:
   \r
 --*/\r
 \r
+#ifndef _EFICOMPRESS_H\r
+#define _EFICOMPRESS_H\r
+\r
 #include <string.h>\r
 #include <stdlib.h>\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
 \r
-#ifndef _EFICOMPRESS_H\r
-#define _EFICOMPRESS_H\r
+#include <Common/UefiBaseTypes.h>\r
+\r
 EFI_STATUS\r
 Compress (\r
   IN      UINT8   *SrcBuffer,\r
index 4953e42..af26b6f 100644 (file)
@@ -19,11 +19,11 @@ Abstract:
   \r
 --*/\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-\r
 #ifndef _EFICUSTOMIZEDCOMPRESS_H\r
 #define _EFICUSTOMIZEDCOMPRESS_H\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+\r
 EFI_STATUS\r
 SetCustomizedCompressionType (\r
   IN  CHAR8   *Type\r
index c5004a7..3f82ac6 100644 (file)
@@ -18,11 +18,12 @@ Abstract:
   Header file for compression routine\r
   \r
 --*/\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
 \r
 #ifndef _EFI_DECOMPRESS_H\r
 #define _EFI_DECOMPRESS_H\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+\r
 EFI_STATUS\r
 GetInfo (\r
   IN      VOID    *Source,\r
index 6312c17..566d214 100644 (file)
@@ -25,9 +25,6 @@ Abstract:
 #include <ctype.h>\r
 #include <stdarg.h>\r
 \r
-/*\r
-#include "Tiano.h"\r
-*/\r
 #include "EfiUtilityMsgs.h"\r
 \r
 #define MAX_LINE_LEN  200\r
index 777cacf..a76b822 100644 (file)
@@ -19,12 +19,11 @@ Abstract:
   \r
 --*/\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-\r
 #ifndef _EFI_UTILITY_MSGS_H_\r
 #define _EFI_UTILITY_MSGS_H_\r
 \r
+#include <Common/UefiBaseTypes.h>\r
+\r
 //\r
 // Status codes returned by EFI utility programs and functions\r
 //\r
index 9bfd843..e8d6279 100644 (file)
@@ -25,14 +25,6 @@ Abstract:
 #include "FvLib.h"\r
 #include "CommonLib.h"\r
 #include "EfiUtilityMsgs.h"\r
-#include "MultiPhase.h"\r
-/*\r
-#include <CommonBuild.h>\r
-*/\r
-\r
-/*\r
-#include EFI_GUID_DEFINITION (FirmwareFileSystem)\r
-*/\r
 \r
 //\r
 // Module global variables\r
index 4a10a3d..1ad1e81 100644 (file)
@@ -25,18 +25,14 @@ Abstract:
 //\r
 // Include files\r
 //\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <string.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
 #include <Common/EfiImage.h>\r
 #include <Common/FirmwareVolumeImageFormat.h>\r
 #include <Common/FirmwareFileSystem.h>\r
 #include <Common/FirmwareVolumeHeader.h>\r
-/*\r
-#include "TianoCommon.h"\r
-#include "EfiFirmwareVolumeHeader.h"\r
-#include "EfiFirmwareFileSystem.h"\r
-*/\r
-#include <string.h>\r
+#include <Common/MultiPhase.h>\r
 \r
 EFI_STATUS\r
 InitializeFvLib (\r
index d766682..9697012 100644 (file)
@@ -25,11 +25,8 @@ Abstract:
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
-#include <Base.h>\r
 \r
-/*\r
-#include "Tiano.h"\r
-*/\r
+#include <Common/BaseTypes.h>\r
 \r
 //\r
 // Default operation is to use the memory allocation tracking functions.\r
index 989add7..de0ffd8 100644 (file)
@@ -19,11 +19,11 @@ Abstract:
 \r
 --*/\r
 \r
-#include "ParseInf.h"\r
 #include <assert.h>\r
 #include <string.h>\r
 #include <ctype.h>\r
 #include <stdlib.h>\r
+#include "ParseInf.h"\r
 \r
 #ifndef _MAX_PATH\r
 #define _MAX_PATH 500\r
index 5691e53..ae10b6f 100644 (file)
@@ -22,11 +22,10 @@ Abstract:
 #ifndef _EFI_PARSE_INF_H\r
 #define _EFI_PARSE_INF_H\r
 \r
-/* #include "TianoCommon.h" */\r
-#include <Base.h>\r
 #include <stdio.h>\r
 #include <stdlib.h>\r
-#include <UefiBaseTypes.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
 \r
 //\r
 // Common data structures\r
index 3ee3349..73b74cd 100644 (file)
@@ -24,9 +24,6 @@ Abstract:
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r
-/*\r
-#include "Tiano.h"\r
-*/\r
 #include "EfiUtilityMsgs.h"\r
 #include "SimpleFileParsing.h"\r
 \r
index ea1f5a0..7cf25a6 100644 (file)
@@ -19,12 +19,11 @@ Abstract:
 \r
 --*/\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-\r
 #ifndef _SIMPLE_FILE_PARSING_H_\r
 #define _SIMPLE_FILE_PARSING_H_\r
 \r
+#include <Common/UefiBaseTypes.h>\r
+\r
 #define T_CHAR  char\r
 \r
 STATUS\r
index 5653594..749df92 100644 (file)
@@ -60,20 +60,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
   <target name="ToolsLibrary" depends="init">\r
@@ -83,7 +83,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         optimize="speed">\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <fileset dir="${basedir}/Common" \r
index 783587f..dd0e209 100644 (file)
@@ -32,14 +32,14 @@ JNIEXPORT jbyteArray JNICALL  Java_org_tianocore_framework_tasks_Compress_CallCo
    //\r
 \r
    Result = Compress (\r
-                         (char*) InputBuffer, \r
-                         SourceSize,  \r
-                         DestBuffer,\r
-                         &DestSize\r
-                         );\r
+        (char*) InputBuffer, \r
+        SourceSize,  \r
+        DestBuffer,\r
+        &DestSize\r
+        );\r
 \r
    if (Result = EFI_BUFFER_TOO_SMALL) {\r
-          DestBuffer = malloc (DestSize);\r
+     DestBuffer = malloc (DestSize);\r
    }\r
 \r
    //\r
@@ -47,10 +47,10 @@ JNIEXPORT jbyteArray JNICALL  Java_org_tianocore_framework_tasks_Compress_CallCo
    //\r
    Result = Compress(\r
               (char*) InputBuffer, \r
-                         SourceSize,  \r
-                         DestBuffer,\r
-                         &DestSize  \r
-          );\r
+        SourceSize,  \r
+        DestBuffer,\r
+        &DestSize  \r
+     );\r
 \r
    //\r
    // new a MV array to store the return compressed buffer\r
@@ -80,7 +80,7 @@ DllMainCRTStartup(
     void*   Reserved    \r
 )\r
 {\r
-       return TRUE;\r
+  return TRUE;\r
 }\r
 #else\r
 #ifdef __GNUC__\r
index c3af125..93873c9 100644 (file)
@@ -10,22 +10,29 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 -->\r
 <project default="GenTool" basedir=".">\r
-  <!--EDK GenDepex Tool\r
-  Copyright (c) 2006, Intel Corporation-->\r
+<!--\r
+    EDK GenDepex Tool\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+\r
   <property environment="env"/>\r
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <property name="ToolName" value="CompressDll"/>\r
   <property name="LibName" value="CompressDll"/>\r
   <property name="FileSet" value="CompressDll.c CompressDll.h"/>\r
   <property name="LibFileSet" value="CompressDll.c DepexParser.h"/>\r
+\r
   <taskdef resource="cpptasks.tasks"/>\r
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
+\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${WORKSPACE}/Tools/Source/TianoTools/${ToolName}/tmp"/>\r
+\r
   <target name="GenTool" depends="init,Lib" >\r
     <echo message="Building the EDK Tool: ${ToolName}"/>\r
   </target>\r
+\r
   <target name="init">\r
     <echo message="The EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
@@ -83,7 +90,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <fileset dir="${ToolName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${env.JAVA_HOME}/include"/>\r
       <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>\r
@@ -94,12 +100,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <copy file="${result}" tofile="${BIN_DIR}/CompressDll.dll"/>\r
     <chmod file="${BIN_DIR}/CompressDll.dll" perm="ugo+x"/>\r
   </target>\r
+\r
   <target name="clean" depends="init">\r
     <echo message="Removing Intermediate Files Only"/>\r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
+\r
   <target name="cleanall" depends="init">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>\r
     <delete dir="${BUILD_DIR}">\r
index 055c187..d0718fa 100644 (file)
@@ -23,8 +23,8 @@ Abstract:
 #include <stdio.h>\r
 #include <string.h>\r
 #include <stdlib.h>\r
-#include "UefiBaseTypes.h"\r
-#include "Base.h"\r
+\r
+#include <Common/UefiBaseTypes.h>\r
 \r
 #define PROGRAM_NAME  "CreateMtFile"\r
 \r
index 8d96e39..337c255 100644 (file)
@@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
     </cc>\r
   </target>\r
 \r
index ca0ea17..0dc6612 100644 (file)
@@ -19,8 +19,7 @@ Abstract:
   \r
 --*/\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <Common/UefiBaseTypes.h>\r
 \r
 EFI_STATUS\r
 SetCustomizedCompressionType (\r
index 07e5595..21be49a 100644 (file)
@@ -59,23 +59,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <property name="HOST_ARCH" value="IA32" />\r
-               <ToolChainSetup confPath="${WORKSPACE}/Tools/Conf" />\r
-    <echo message="Compiler: ${CC}"/>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+\r
+    <echo message="ToolChain: ${ToolChain}"/>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
   <target name="ToolsLibrary" depends="init">\r
@@ -91,7 +90,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
     </cc>\r
     <if>\r
index 5964eb5..8655545 100644 (file)
@@ -25,8 +25,9 @@ Abstract:
 #include <ctype.h>\r
 #include <stdarg.h>\r
 #include <stdio.h>\r
-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+\r
 #include "EfiCompress.h"\r
 \r
 int\r
index b8bf7f5..f582b7b 100644 (file)
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r
   </target>\r
 \r
index 5fb99ab..235084c 100644 (file)
@@ -25,24 +25,15 @@ Abstract:
 #include <string.h>\r
 #include <stdlib.h>\r
 \r
-//\r
-// Includes for EFI 1.1 build\r
-//\r
-// #include "Tiano.h"        // required defines for Compress.h\r
-// #include "EfiImage.h"   // for PE32 structure definitions\r
-// #include "Compress.h"   // for compression function\r
-// Includes for Tiano build\r
-//\r
-#include <UefiBaseTypes.h>\r
-#include <EfiImage.h> // for PE32 structure definitions\r
-#include <EfiCompress.h>\r
-#include <CommonLib.h>\r
-#include <MultiPhase.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>  // for PE32 structure definitions\r
+#include <Common/MultiPhase.h>\r
+\r
+#include <IndustryStandard/pci22.h>  // for option ROM header structures\r
+\r
+#include "EfiCompress.h"\r
+#include "CommonLib.h"\r
 \r
-//\r
-// END include differences\r
-//\r
-#include "pci22.h"  // for option ROM header structures\r
 //\r
 // Version of this utility\r
 //\r
index 956614f..ee07603 100644 (file)
@@ -93,11 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/IndustryStandard"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r
   </target>\r
 \r
index a4de901..561c2d7 100644 (file)
@@ -24,16 +24,15 @@ Abstract:
 #include <stdio.h>\r
 #include <string.h>\r
 #include <stdlib.h>\r
-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeHeader.h>\r
+#include <Common/MultiPhase.h>\r
 \r
 #include "EfiUtilityMsgs.h"\r
 #include "FlashDefFile.h"\r
 #include "SimpleFileParsing.h"\r
 #include "Symbols.h"\r
-// #include "EfiFirmwareVolumeHeader.h"\r
-#include "MultiPhase.h"\r
-#include "FirmwareVolumeHeader.h"\r
 \r
 //\r
 // #include "TrackMallocFree.h"\r
index ce20157..bf07c2d 100644 (file)
@@ -24,8 +24,8 @@ Abstract:
 #include <string.h>\r
 #include <stdlib.h>\r
 #include <ctype.h>\r
-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
 \r
 #include "EfiUtilityMsgs.h"\r
 #include "Microcode.h"\r
index b83f150..347cb89 100644 (file)
@@ -29,10 +29,9 @@ Abstract:
 //\r
 #include <ctype.h>\r
 \r
-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include <CommonLib.h>\r
+#include <Common/UefiBaseTypes.h>\r
 \r
+#include "CommonLib.h"\r
 #include "EfiUtilityMsgs.h"\r
 #include "Symbols.h"\r
 \r
index 169ca6b..7b2ac0c 100644 (file)
@@ -98,10 +98,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r
   </target>\r
 \r
index dc49385..6bccbd2 100644 (file)
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
         <property name="ext_exe" value=".exe"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
           <property name="ext_exe" value=""/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r
@@ -91,10 +91,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-                       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r
   </target>\r
 \r
index e2e0d49..b8fd1e1 100644 (file)
@@ -19,7 +19,8 @@ Abstract:
 \r
 --*/\r
 \r
-#include <WinNtInclude.h>\r
+#include "WinNtInclude.h"\r
+\r
 #ifndef __GNUC__\r
 #include <windows.h>\r
 #endif\r
@@ -28,11 +29,11 @@ Abstract:
 #include <string.h>\r
 #include <time.h>\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <CommonLib.h>\r
-#include <EfiImage.h>\r
-#include <EfiUtilityMsgs.c>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>\r
+\r
+#include "CommonLib.h"\r
+#include "EfiUtilityMsgs.c"\r
 \r
 #define UTILITY_NAME  "FwImage"\r
 \r
index c0b9147..978bd19 100644 (file)
@@ -23,10 +23,10 @@ Abstract:
 #include <string.h>\r
 #include <stdlib.h>\r
 \r
-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include <CommonLib.h>\r
-#include "EfiImage.h" // for PE32 structure definitions\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h> // for PE32 structure definitions\r
+\r
+#include "CommonLib.h"\r
 #include "EfiUtilityMsgs.h"\r
 \r
 //\r
index c5179bf..31ad365 100644 (file)
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r
   </target>\r
 \r
index 574231d..1cf976b 100644 (file)
@@ -31,8 +31,7 @@ Abstract:
 #include <assert.h>\r
 \r
 /* MDE Headers */\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <Common/UefiBaseTypes.h>\r
 #include <Common/EfiImage.h>\r
 #include <Common/FirmwareVolumeImageFormat.h>\r
 #include <Common/FirmwareFileSystem.h>\r
@@ -40,11 +39,11 @@ Abstract:
 #include <Protocol/GuidedSectionExtraction.h>\r
 \r
 /* Tool Headers */\r
-#include <CommonLib.h>\r
-#include <Crc32.h>\r
-#include <EfiCompress.h>\r
-#include <EfiUtilityMsgs.h>\r
-#include <ParseInf.h>\r
+#include "CommonLib.h"\r
+#include "Crc32.h"\r
+#include "EfiCompress.h"\r
+#include "EfiUtilityMsgs.h"\r
+#include "ParseInf.h"\r
 \r
 //\r
 // Module Coded to Tiano Coding Conventions\r
index c581605..5b61b6d 100644 (file)
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
         <property name="ext_exe" value=".exe"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
           <property name="ext_exe" value=""/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r
@@ -89,10 +89,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         includes="${FileSet}"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-                       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
 \r
     </cc>\r
   </target>\r
index 88944cc..617e959 100644 (file)
@@ -28,18 +28,18 @@ Abstract:
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r
-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include <CommonLib.h>\r
-\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/MultiPhase.h>\r
+#include <Common/Capsule.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/FirmwareVolumeHeader.h>\r
+#include <Common/FirmwareFileSystem.h>  // for FV header GUID\r
+#include <Guid/Capsule.h>\r
+#include <Guid/FirmwareFileSystem.h>  // for FV header GUID\r
+\r
+#include "CommonLib.h"\r
 #include "EfiUtilityMsgs.h"\r
-#include "MultiPhase.h"\r
-#include "Capsule.h"\r
-#include "Guid/Capsule.h"\r
-#include "FirmwareVolumeImageFormat.h"\r
-#include "FirmwareVolumeHeader.h"\r
-#include "FirmwareFileSystem.h"  // for FV header GUID\r
-#include "Guid/FirmwareFileSystem.h"  // for FV header GUID\r
+\r
 #define MAX_PATH                  256\r
 #define PROGRAM_NAME              "GenCapsuleHdr"\r
 \r
index b826515..d05ab19 100644 (file)
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r
   </target>\r
 \r
index 608e27e..34857fc 100644 (file)
@@ -728,11 +728,11 @@ Returns:
         Ptrx++;\r
       }\r
 \r
-         Ptrx++;\r
+    Ptrx++;\r
       while (*Ptrx != '}') {\r
         Ptrx++;\r
       }\r
-         //\r
+    //\r
       // Absorb the closing }\r
       //\r
       Ptrx++;\r
index cfba0f2..b198156 100644 (file)
@@ -30,9 +30,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __GNUC__\r
 #include <malloc.h>\r
 #endif\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <Dependency.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/Dependency.h>\r
 \r
 #define DEPENDENCY_START            "DEPENDENCY_START"\r
 #define OPERATOR_BEFORE             "BEFORE"\r
index 4cccca4..dd6cd59 100644 (file)
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
         <property name="ext_exe" value=".exe"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
           <property name="ext_exe" value=""/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r
@@ -90,12 +90,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         includes="${FileSet}" />\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-                       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r
-       </target>\r
+  </target>\r
 \r
   <target name="clean" depends="init">\r
     <echo message="Removing Intermediate Files Only"/>  \r
index d9c2686..a2c1afb 100644 (file)
@@ -33,10 +33,9 @@ Abstract:
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
-// #include <io.h>\r
 #include <assert.h>\r
+\r
 #include "ParseInf.h"\r
-// #include "GenFvImage.h"\r
 \r
 //\r
 // Defines\r
index ff78aee..057c108 100644 (file)
@@ -26,12 +26,11 @@ Intel Corporation.
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
-// #include <io.h>\r
 #include <assert.h>\r
-#include "UefiBaseTypes.h"\r
-#include "Base.h"\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+\r
 #include "GenFdImage.h"\r
-// #include "GenFvImage.h"\r
 #include "ParseInf.h"\r
 \r
 //\r
index 0e93a47..1eea09f 100644 (file)
@@ -20,17 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-#include "Base.h"\r
-#include "UefiBaseTypes.h"\r
-#include "FirmwareVolumeImageFormat.h"\r
-#include "FirmwareFileSystem.h"\r
-#include "FirmwareVolumeHeader.h"\r
-#include "FirmwareVolumeImageFormat.h"\r
-#include "ParseInf.h"\r
-#include "EfiCompress.h"\r
-#include "EfiCustomizedCompress.h"\r
-#include "Crc32.h"\r
-#include "GenFfsFile.h"\r
 #include <stdio.h>\r
 #include <ctype.h>  // for isalpha()\r
 //\r
@@ -41,6 +30,18 @@ Abstract:
 #endif\r
 #include <stdlib.h>\r
 #include <string.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/FirmwareFileSystem.h>\r
+#include <Common/FirmwareVolumeHeader.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+\r
+#include "ParseInf.h"\r
+#include "EfiCompress.h"\r
+#include "EfiCustomizedCompress.h"\r
+#include "Crc32.h"\r
+#include "GenFfsFile.h"\r
 #include "CommonLib.h"\r
 #include "EfiUtilityMsgs.h"\r
 #include "SimpleFileParsing.h"\r
index 695809c..f5bc718 100644 (file)
@@ -28,9 +28,9 @@ Abstract:
 //\r
 // External Files Referenced\r
 //\r
-#include "Base.h"\r
-#include "UefiBaseTypes.h"\r
-#include "FirmwareVolumeImageFormat.h"\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+\r
 #include "MyAlloc.h"\r
 \r
 #endif\r
index d3933db..5fa5a22 100644 (file)
@@ -24,8 +24,8 @@ Abstract:
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r
-#include "Base.h"\r
-#include "UefiBaseTypes.h"\r
+#include <Common/UefiBaseTypes.h>\r
+\r
 #include "EfiUtilityMsgs.h"\r
 #include "SimpleFileParsing.h"\r
 \r
index 5955233..ccf34c8 100644 (file)
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
         <property name="ext_exe" value=".exe"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
           <property name="ext_exe" value=""/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-                       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
     </cc>\r
   </target>\r
 \r
index 6cc5a0d..379818b 100644 (file)
@@ -23,8 +23,6 @@ Abstract:
 //\r
 // Include files\r
 //\r
-#define EFI_SPECIFICATION_VERSION 0x00020000\r
-#define EDK_RELEASE_VERSION       0x00020000\r
 #ifdef __GNUC__\r
 #include <uuid/uuid.h>\r
 #include <sys/stat.h>\r
@@ -34,19 +32,21 @@ Abstract:
 #include <io.h>\r
 #endif\r
 #include <assert.h>\r
-#include <Dxe.h>\r
-#include <Library/PeCoffLib.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/Variable.h>\r
+#include <Common/WorkingBlockHeader.h>\r
+#include <Guid/FirmwareFileSystem.h>\r
+\r
 #include "GenFvImageLib.h"\r
 #include "GenFvImageLibInternal.h"\r
-#include <CommonLib.h>\r
-#include <FirmwareVolumeImageFormat.h>\r
-#include <Crc32.h>\r
-#include <EfiUtilityMsgs.h>\r
-#include <FvLib.h>\r
-#include <EfiCompress.h>\r
-#include <Variable.h>\r
-#include <WinNtInclude.h>\r
-#include <WorkingBlockHeader.h>\r
+#include "CommonLib.h"\r
+#include "Crc32.h"\r
+#include "EfiUtilityMsgs.h"\r
+#include "FvLib.h"\r
+#include "EfiCompress.h"\r
+#include "WinNtInclude.h"\r
 \r
 \r
 //\r
index cc761b8..47a5a3b 100644 (file)
@@ -26,7 +26,9 @@ Abstract:
 //\r
 // Include files\r
 //\r
-// #include "Efi2WinNT.h"\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/MultiPhase.h>\r
+\r
 #include "ParseInf.h"\r
 \r
 //\r
index f38fe11..cff3b1a 100644 (file)
@@ -26,10 +26,12 @@ Abstract:
 //\r
 // Include files\r
 //\r
-#include "GenFvImageLib.h"\r
 #include <stdlib.h>\r
-#include <CommonLib.h>\r
-#include "FirmwareVolumeHeader.h"\r
+\r
+#include <Common/FirmwareVolumeHeader.h>\r
+\r
+#include "CommonLib.h"\r
+#include "GenFvImageLib.h"\r
 \r
 //\r
 // Private data declarations\r
index cc2141d..15fbf7c 100644 (file)
@@ -123,14 +123,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/${ToolName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/ToBeRemoved"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
+\r
       <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>\r
       <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>\r
       <syslibset libs="RpcRT4" unless="gcc"/>\r
index 8ae0a9c..353b1a3 100644 (file)
@@ -19,22 +19,21 @@ Abstract:
 \r
 --*/\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include "FirmwareVolumeImageFormat.h"\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <string.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Protocol/GuidedSectionExtraction.h>\r
+\r
 #include "CommonLib.h"\r
 #include "EfiCompress.h"\r
 #include "EfiCustomizedCompress.h"\r
 #include "Crc32.h"\r
 #include "EfiUtilityMsgs.h"\r
-\r
-#include <stdio.h>\r
-#include <stdlib.h>\r
-#include <string.h>\r
-\r
 #include "GenSection.h"\r
 \r
-#include <GuidedSectionExtraction.h>\r
 \r
 #define UTILITY_NAME            "GenSection"\r
 \r
index 847b3eb..3606463 100644 (file)
@@ -28,9 +28,8 @@ Abstract:
 //\r
 // External Files Referenced\r
 //\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include "FirmwareVolumeImageFormat.h"\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
 \r
 typedef struct {\r
   EFI_GUID_DEFINED_SECTION  GuidSectionHeader;\r
index 18935d3..d56a933 100644 (file)
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
         <property name="ext_exe" value=".exe"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
           <property name="ext_exe" value=""/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-                       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
     </cc>\r
   </target>\r
 \r
index 8313f96..26349b4 100644 (file)
@@ -24,11 +24,10 @@ Abstract:
 #include <string.h>\r
 #include <stdlib.h>\r
 \r
-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include <CommonLib.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h> // for PE32 structure definitions\r
 \r
-#include "EfiImage.h" // for PE32 structure definitions\r
+#include "CommonLib.h"\r
 #include "EfiUtilityMsgs.h"\r
 \r
 //\r
index 472160f..ac45f5e 100644 (file)
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
         <property name="ext_exe" value=".exe"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
           <property name="ext_exe" value=""/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-                       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r
   </target>\r
 \r
index 0e8afde..bb6a44d 100644 (file)
@@ -39,14 +39,12 @@ Notes:
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <UgaDraw.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Guid/Apriori.h>\r
+#include <Guid/AcpiTableStorage.h>\r
+\r
 #include "EfiUtilityMsgs.h"\r
 \r
-#include <Apriori.h>\r
-#include <AcpiTableStorage.h>\r
-// #include <Bmp.h>\r
 \r
 #define GUID_XREF(varname, guid) { \\r
     #varname, #guid, guid \\r
index b9fcab0..8aa343f 100644 (file)
@@ -25,8 +25,8 @@ Abstract:
 #include <ctype.h>\r
 #include <stdarg.h>\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <Common/UefiBaseTypes.h>\r
+\r
 #include "EfiUtilityMsgs.h"\r
 \r
 #define MAX_LINE_LEN  200\r
index 478edc6..b5c64d3 100644 (file)
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
         <property name="ext_exe" value=".exe"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
           <property name="ext_exe" value=""/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
   <target name="Tool" depends="init" unless="gcc">\r
@@ -93,12 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Guid"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-                       <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
-                       <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
 \r
     </cc>\r
   </target>\r
index 96ce31e..de1afea 100755 (executable)
@@ -25,10 +25,10 @@ Abstract:
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <Common/UefiBaseTypes.h>\r
+\r
 #include "EfiUtilityMsgs.h"\r
-#include <CommonLib.h>\r
+#include "CommonLib.h"\r
 \r
 //\r
 // Structure to maintain a linked list of strings\r
index 05bf75b..5498876 100755 (executable)
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r
   </target>\r
 \r
index aadd823..baa7bed 100644 (file)
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
         <property name="ext_exe" value=".exe"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
           <property name="ext_exe" value=""/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r
@@ -92,10 +92,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-                       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
 \r
     </cc>\r
   </target>\r
index b41a3a0..b90d762 100644 (file)
@@ -22,11 +22,9 @@ Revision History
 --*/\r
 \r
 \r
-#define EFI_SPECIFICATION_VERSION    0x00000000\r
-#define EDK_RELEASE_VERSION          0x00020000\r
-#include <Base.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>\r
 #include <Library/PeCoffLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
 \r
 STATIC\r
 RETURN_STATUS\r
@@ -600,11 +598,11 @@ Returns:
     //\r
     RelocDir = &TeHdr->DataDirectory[0];\r
     RelocBase = (EFI_IMAGE_BASE_RELOCATION *)(UINTN)(\r
-                                               ImageContext->ImageAddress + \r
-                                               RelocDir->VirtualAddress +\r
-                                               sizeof(EFI_TE_IMAGE_HEADER) - \r
-                                               TeHdr->StrippedSize\r
-                                               );\r
+                                    ImageContext->ImageAddress + \r
+                                    RelocDir->VirtualAddress +\r
+                                    sizeof(EFI_TE_IMAGE_HEADER) - \r
+                                    TeHdr->StrippedSize\r
+                                    );\r
     RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *) ((UINTN) RelocBase + (UINTN) RelocDir->Size - 1);\r
   }\r
   \r
@@ -620,10 +618,10 @@ Returns:
       FixupBase = PeCoffLoaderImageAddress (ImageContext, RelocBase->VirtualAddress);\r
     } else {\r
       FixupBase = (CHAR8 *)(UINTN)(ImageContext->ImageAddress +\r
-                             RelocBase->VirtualAddress +\r
-                             sizeof(EFI_TE_IMAGE_HEADER) - \r
-                             TeHdr->StrippedSize\r
-                             );\r
+                    RelocBase->VirtualAddress +\r
+                    sizeof(EFI_TE_IMAGE_HEADER) - \r
+                    TeHdr->StrippedSize\r
+                    );\r
     }\r
 \r
     if ((CHAR8 *) RelocEnd < (CHAR8 *) ((UINTN) ImageContext->ImageAddress) ||\r
@@ -836,9 +834,9 @@ Returns:
     TeHdr             = (EFI_TE_IMAGE_HEADER *) (UINTN) (ImageContext->ImageAddress);\r
 \r
     FirstSection = (EFI_IMAGE_SECTION_HEADER *) (\r
-                     (UINTN)ImageContext->ImageAddress +\r
-                     sizeof(EFI_TE_IMAGE_HEADER)\r
-                     );\r
+          (UINTN)ImageContext->ImageAddress +\r
+          sizeof(EFI_TE_IMAGE_HEADER)\r
+          );\r
     NumberOfSections  = (UINTN) (TeHdr->NumberOfSections);\r
 \r
   }\r
@@ -933,9 +931,9 @@ Returns:
                                                                 );\r
   } else {\r
     ImageContext->EntryPoint =  (PHYSICAL_ADDRESS) (\r
-                                  (UINTN)ImageContext->ImageAddress +\r
-                                  (UINTN)TeHdr->AddressOfEntryPoint +\r
-                                  (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -\r
+                       (UINTN)ImageContext->ImageAddress +\r
+                       (UINTN)TeHdr->AddressOfEntryPoint +\r
+                       (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -\r
           (UINTN) TeHdr->StrippedSize\r
       );\r
   }\r
@@ -976,11 +974,11 @@ Returns:
                     );\r
     } else {\r
       DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)(UINTN)(\r
-                                                        ImageContext->ImageAddress +\r
-                                                        ImageContext->DebugDirectoryEntryRva +\r
-                                                        sizeof(EFI_TE_IMAGE_HEADER) -\r
-                                                        TeHdr->StrippedSize\r
-                                                        );\r
+                                               ImageContext->ImageAddress +\r
+                                               ImageContext->DebugDirectoryEntryRva +\r
+                                               sizeof(EFI_TE_IMAGE_HEADER) -\r
+                                               TeHdr->StrippedSize\r
+                                               );\r
     }\r
 \r
     if (DebugEntry != NULL) {\r
@@ -999,9 +997,9 @@ Returns:
           ImageContext->CodeView = PeCoffLoaderImageAddress (ImageContext, TempDebugEntryRva);\r
         } else {\r
           ImageContext->CodeView = (VOID *)(\r
-                                     (UINTN)ImageContext->ImageAddress +\r
-                                     (UINTN)TempDebugEntryRva +\r
-                                     (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -\r
+                      (UINTN)ImageContext->ImageAddress +\r
+                      (UINTN)TempDebugEntryRva +\r
+                      (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -\r
                 (UINTN) TeHdr->StrippedSize\r
             );\r
         }\r
index 0ad71d3..9528e6b 100644 (file)
@@ -1,19 +1,19 @@
 /** @file\r
-       EFI image format for PE32+. Please note some data structures are different\r
-       for IA-32 and Itanium-based images, look for UINTN and the #ifdef EFI_IA64\r
+  EFI image format for PE32+. Please note some data structures are different\r
+  for IA-32 and Itanium-based images, look for UINTN and the #ifdef EFI_IA64\r
 \r
-       @bug Fix text - doc as defined in MSFT EFI specification.\r
+  @bug Fix text - doc as defined in MSFT EFI specification.\r
 \r
-       Copyright (c) 2006, Intel Corporation                                                         \r
-       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
-       http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2006, Intel Corporation                                                         \r
+  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
+  http://opensource.org/licenses/bsd-license.php                                            \r
 \r
-       THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
-       Module Name:    EfiImage.h\r
+  Module Name:  EfiImage.h\r
 \r
 **/\r
 \r
index 0af4340..f58e8d0 100644 (file)
@@ -21,15 +21,7 @@ Revision History
 \r
 --*/\r
 \r
-\r
-#define EFI_SPECIFICATION_VERSION    0x00000000\r
-#define EDK_RELEASE_VERSION          0x00020000\r
-#include <Base.h>\r
-#include <Library/PeCoffLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-\r
-\r
-\r
+#include <Common/UefiBaseTypes.h>\r
 \r
 RETURN_STATUS\r
 PeCoffLoaderRelocateImageEx (\r
index 2a58a62..3f39899 100644 (file)
@@ -22,11 +22,9 @@ Revision History
 \r
 --*/\r
 \r
-#define EFI_SPECIFICATION_VERSION    0x00000000\r
-#define EDK_RELEASE_VERSION          0x00020000\r
-#include <Base.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>\r
 #include <Library/PeCoffLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
 \r
 \r
 \r
index 6bcae27..1e6cc34 100644 (file)
@@ -22,11 +22,9 @@ Revision History
 \r
 --*/\r
 \r
-#define EFI_SPECIFICATION_VERSION    0x00000000\r
-#define EDK_RELEASE_VERSION          0x00020000\r
-#include <Base.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>\r
 #include <Library/PeCoffLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
 \r
 \r
 \r
index b9d0f11..bd27520 100644 (file)
@@ -125,11 +125,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/${LibName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
     </cc>\r
   </target>\r
@@ -150,11 +146,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/${LibName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
     </cc>\r
   </target>\r
@@ -175,11 +167,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/${LibName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
     </cc>\r
   </target>\r
index 7dc95d6..7b48b67 100644 (file)
@@ -22,19 +22,18 @@ Abstract:
 \r
 --*/\r
 \r
-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
 #include <stdlib.h>\r
 #include <stdio.h>\r
 #include <string.h>\r
-#include "CommonLib.h"\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/FirmwareFileSystem.h>\r
+#include <Library/PeCoffLib.h>\r
+\r
 #include "ParseInf.h"\r
 #include "FvLib.h"\r
-\r
 #include "EfiUtilityMsgs.h"\r
-#include "FirmwareFileSystem.h"\r
-#include "PeCoffLib.h"\r
-\r
 #include "PeiRebaseExe.h"\r
 \r
 EFI_STATUS\r
index b9e71f4..58e1a0c 100644 (file)
@@ -23,10 +23,10 @@ Abstract:
 #ifndef _EFI_PEIM_FIXUP_EXE_H\r
 #define _EFI_PEIM_FIXUP_EXE_H\r
 \r
-// #include "Efi2WinNt.h"\r
-#include "FirmwareFileSystem.h"\r
-#include "FirmwareVolumeHeader.h"\r
-#include "MultiPhase.h"\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/FirmwareFileSystem.h>\r
+#include <Common/FirmwareVolumeHeader.h>\r
+#include <Common/MultiPhase.h>\r
 \r
 //\r
 // Utility Name\r
index 187d5d6..af30cfe 100644 (file)
@@ -63,22 +63,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
         <property name="ext_exe" value=".exe"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
           <property name="ext_exe" value=""/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
   <target name="PeiRebase_Ia32" depends="init">\r
@@ -92,11 +92,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-                       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_Ia32"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools PeCoffLoader_Ia32"/>\r
     </cc>\r
   </target>\r
 \r
@@ -111,11 +108,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-                       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_Ipf"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools PeCoffLoader_Ipf"/>\r
     </cc>\r
   </target>\r
 \r
@@ -130,11 +124,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-                       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_X64"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools PeCoffLoader_X64"/>\r
     </cc>\r
   </target>\r
 \r
index 5cb03f0..1afe112 100644 (file)
@@ -314,7 +314,7 @@ Returns:
     Error (NULL, 0, 0, "The position to place Ap reset vector is not in E and F segment!", NULL);\r
     free ((VOID *)FileBufferRaw);\r
     return STATUS_ERROR; \r
-  }    \r
+  }    \r
   //\r
   // Fix up Ap reset vector and calculate the IPI vector\r
   //\r
index a41fc3a..ea40918 100644 (file)
@@ -25,12 +25,13 @@ Abstract:
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include "EfiImage.h"\r
-#include <FirmwareVolumeImageFormat.h>\r
-#include "FirmwareFileSystem.h"\r
-#include "FirmwareVolumeHeader.h"\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/FirmwareFileSystem.h>\r
+#include <Common/FirmwareVolumeHeader.h>\r
+\r
 #include "EfiUtilityMsgs.c"\r
 #include "CommonLib.h"\r
 \r
index 06622ce..e065f7c 100644 (file)
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r
   </target>\r
 \r
index 96faaf0..927f79c 100644 (file)
@@ -28,12 +28,11 @@ Abstract:
 \r
 #include <stdio.h>\r
 \r
-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include "EfiImage.h"\r
-#include "FirmwareVolumeImageFormat.h"\r
-#include "EfiUtilityMsgs.c"\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
 \r
+#include "EfiUtilityMsgs.c"\r
 #include "SecFixup.h"\r
 \r
 VOID\r
index aab8202..e5e01f7 100644 (file)
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r
   </target>\r
 \r
index f1be1e0..65a975a 100644 (file)
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
         <property name="ext_exe" value=".exe"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
           <property name="ext_exe" value=""/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r
@@ -92,10 +92,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-                       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
 \r
     </cc>\r
   </target>\r
index 0ed8312..aea77d7 100644 (file)
@@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
     </cc>\r
   </target>\r
 \r
index 1fc204d..f909b34 100644 (file)
@@ -24,9 +24,9 @@ Abstract:
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <CommonLib.h>\r
+#include <Common/UefiBaseTypes.h>\r
+\r
+#include "CommonLib.h"\r
 #include "EfiUtilityMsgs.h"\r
 #include "StrGather.h"\r
 #include "StringDB.h"\r
index 353fabb..3a6a5a4 100644 (file)
@@ -23,18 +23,17 @@ Abstract:
 #include <stdlib.h>\r
 #include <string.h>\r
 #include <ctype.h>  // for tolower()\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <MultiPhase.h>\r
-#include <BaseLib.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/MultiPhase.h>\r
+#include <Common/InternalFormRepresentation.h>\r
+#include <Protocol/UgaDraw.h>  // for EFI_UGA_PIXEL definition\r
+#include <Protocol/Hii.h>\r
+\r
 #include "EfiUtilityMsgs.h"\r
 #include "StrGather.h"\r
 #include "StringDB.h"\r
-#include "InternalFormRepresentation.h"\r
 \r
-// #include EFI_PROTOCOL_DEFINITION (Hii)\r
-#include <UgaDraw.h>\r
-#include <Hii.h>\r
 \r
 #define STRING_OFFSET RELOFST\r
 \r
index 389701d..8d2ce83 100644 (file)
@@ -95,11 +95,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress String"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools String"/>\r
     </cc>\r
   </target>\r
 \r
index 868a73e..1c56edb 100644 (file)
 \r
 **/\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <PrintLib.h>\r
-#include <CommonLib.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Library/PrintLib.h>\r
+\r
+#include "CommonLib.h"\r
 #include "PrintLibInternal.h"\r
 \r
 typedef struct {\r
index a475815..4dad384 100644 (file)
 \r
 **/\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <PrintLib.h>\r
-#include <BaseLib.h>\r
-#include <CommonLib.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Library/PrintLib.h>\r
+\r
+#include "CommonLib.h"\r
 #include "PrintLibInternal.h"\r
 \r
 static CONST CHAR8 mHexStr[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};\r
index 1005180..0e4993a 100644 (file)
 **/\r
 \r
 #include <assert.h>\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <BaseLib.h>\r
-#include <PcdLib.h>\r
-#include <CommonLib.h>\r
-#define _gPcd_FixedAtBuild_PcdMaximumUnicodeStringLength   0\r
-#define _gPcd_FixedAtBuild_PcdMaximumAsciiStringLength   0\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+\r
+#include "CommonLib.h"\r
 \r
 /**\r
   Copies one Null-terminated Unicode string to another Null-terminated Unicode\r
@@ -34,8 +31,6 @@
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
 \r
   @param  Destination Pointer to a Null-terminated Unicode string.\r
   @param  Source      Pointer to a Null-terminated Unicode string.\r
@@ -87,8 +82,6 @@ StrCpy (
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
 \r
   @param  Destination Pointer to a Null-terminated Unicode string.\r
   @param  Source      Pointer to a Null-terminated Unicode string.\r
@@ -130,7 +123,6 @@ StrnCpy (
     Length--;\r
   }\r
 \r
-  // ZeroMem (Destination, Length * sizeof (*Destination));\r
   memset (Destination, 0, Length * sizeof (*Destination));\r
   return ReturnValue;\r
 }\r
@@ -142,8 +134,6 @@ StrnCpy (
   Unicode string specified by String.\r
 \r
   If String is NULL, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and String contains more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
 \r
   @param  String  Pointer to a Null-terminated Unicode string.\r
 \r
@@ -161,13 +151,7 @@ StrLen (
   ASSERT (String != NULL);\r
 \r
   for (Length = 0; *String != L'\0'; String++, Length++) {\r
-    //\r
-    // If PcdMaximumUnicodeStringLength is not zero,\r
-    // length should not more than PcdMaximumUnicodeStringLength\r
-    //\r
-    if (FixedPcdGet32 (PcdMaximumUnicodeStringLength) != 0) {\r
-      ASSERT (Length < FixedPcdGet32 (PcdMaximumUnicodeStringLength));\r
-    }\r
+    ;\r
   }\r
   return Length;\r
 }\r
@@ -180,8 +164,6 @@ StrLen (
   string specified by String.\r
 \r
   If String is NULL, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and String contains more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
 \r
   @param  String  Pointer to a Null-terminated Unicode string.\r
 \r
@@ -209,10 +191,6 @@ StrSize (
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and FirstString contains more\r
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and SecondString contains more\r
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
 \r
   @param  FirstString   Pointer to a Null-terminated Unicode string.\r
   @param  SecondString  Pointer to a Null-terminated Unicode string.\r
@@ -229,7 +207,7 @@ StrCmp (
   )\r
 {\r
   //\r
-  // ASSERT both strings are less long than PcdMaximumUnicodeStringLength\r
+  // ASSERT both strings should never be zero\r
   //\r
   ASSERT (StrSize (FirstString) != 0);\r
   ASSERT (StrSize (SecondString) != 0);\r
@@ -254,10 +232,6 @@ StrCmp (
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and FirstString contains more\r
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and SecondString contains more\r
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
 \r
   @param  FirstString   Pointer to a Null-terminated Unicode string.\r
   @param  SecondString  Pointer to a Null-terminated Unicode string.\r
@@ -280,8 +254,7 @@ StrnCmp (
   }\r
 \r
   //\r
-  // ASSERT both strings are less long than PcdMaximumUnicodeStringLength.\r
-  // Length tests are performed inside StrLen().\r
+  // ASSERT both strings should never be zero\r
   //\r
   ASSERT (StrSize (FirstString) != 0);\r
   ASSERT (StrSize (SecondString) != 0);\r
@@ -310,13 +283,6 @@ StrnCmp (
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and Destination contains more\r
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and concatenating Destination\r
-  and Source results in a Unicode string with more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
 \r
   @param  Destination Pointer to a Null-terminated Unicode string.\r
   @param  Source      Pointer to a Null-terminated Unicode string.\r
@@ -335,7 +301,6 @@ StrCat (
 \r
   //\r
   // Size of the resulting string should never be zero.\r
-  // PcdMaximumUnicodeStringLength is tested inside StrLen().\r
   //\r
   ASSERT (StrSize (Destination) != 0);\r
   return Destination;\r
@@ -357,13 +322,6 @@ StrCat (
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and Destination contains more\r
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and concatenating Destination\r
-  and Source results in a Unicode string with more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
 \r
   @param  Destination Pointer to a Null-terminated Unicode string.\r
   @param  Source      Pointer to a Null-terminated Unicode string.\r
@@ -385,7 +343,6 @@ StrnCat (
 \r
   //\r
   // Size of the resulting string should never be zero.\r
-  // PcdMaximumUnicodeStringLength is tested inside StrLen().\r
   //\r
   ASSERT (StrSize (Destination) != 0);\r
   return Destination;\r
@@ -402,8 +359,6 @@ StrnCat (
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and Source contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
 \r
   @param  Destination Pointer to a Null-terminated ASCII string.\r
   @param  Source      Pointer to a Null-terminated ASCII string.\r
@@ -454,8 +409,6 @@ AsciiStrCpy (
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero, and Source contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
 \r
   @param  Destination Pointer to a Null-terminated ASCII string.\r
   @param  Source      Pointer to a Null-terminated ASCII string.\r
@@ -508,8 +461,6 @@ AsciiStrnCpy (
   ASCII string specified by String.\r
 \r
   If String is NULL, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and String contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
 \r
   @param  String  Pointer to a Null-terminated ASCII string.\r
 \r
@@ -527,13 +478,7 @@ AsciiStrLen (
   ASSERT (String != NULL);\r
 \r
   for (Length = 0; *String != '\0'; String++, Length++) {\r
-    //\r
-    // If PcdMaximumUnicodeStringLength is not zero,\r
-    // length should not more than PcdMaximumUnicodeStringLength\r
-    //\r
-    if (FixedPcdGet32 (PcdMaximumAsciiStringLength) != 0) {\r
-      ASSERT (Length < FixedPcdGet32 (PcdMaximumAsciiStringLength));\r
-    }\r
+    ;\r
   }\r
   return Length;\r
 }\r
@@ -546,8 +491,6 @@ AsciiStrLen (
   specified by String.\r
 \r
   If String is NULL, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and String contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
 \r
   @param  String  Pointer to a Null-terminated ASCII string.\r
 \r
@@ -575,10 +518,6 @@ AsciiStrSize (
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and SecondString contains more\r
-  than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
 \r
   @param  FirstString   Pointer to a Null-terminated ASCII string.\r
   @param  SecondString  Pointer to a Null-terminated ASCII string.\r
@@ -595,7 +534,7 @@ AsciiStrCmp (
   )\r
 {\r
   //\r
-  // ASSERT both strings are less long than PcdMaximumAsciiStringLength\r
+  // ASSERT both strings should never be zero\r
   //\r
   ASSERT (AsciiStrSize (FirstString));\r
   ASSERT (AsciiStrSize (SecondString));\r
@@ -631,10 +570,6 @@ AsciiToUpper (
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and SecondString contains more\r
-  than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
 \r
   @param  FirstString   Pointer to a Null-terminated ASCII string.\r
   @param  SecondString  Pointer to a Null-terminated ASCII string.\r
@@ -653,7 +588,7 @@ AsciiStriCmp (
   )\r
 {\r
   //\r
-  // ASSERT both strings are less long than PcdMaximumAsciiStringLength\r
+  // ASSERT both strings should never be zero\r
   //\r
   ASSERT (AsciiStrSize (FirstString));\r
   ASSERT (AsciiStrSize (SecondString));\r
@@ -680,10 +615,6 @@ AsciiStriCmp (
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and SecondString contains more\r
-  than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
 \r
   @param  FirstString   Pointer to a Null-terminated ASCII string.\r
   @param  SecondString  Pointer to a Null-terminated ASCII string.\r
@@ -701,7 +632,7 @@ AsciiStrnCmp (
   )\r
 {\r
   //\r
-  // ASSERT both strings are less long than PcdMaximumAsciiStringLength\r
+  // ASSERT both strings should never be zero\r
   //\r
   ASSERT (AsciiStrSize (FirstString));\r
   ASSERT (AsciiStrSize (SecondString));\r
@@ -727,13 +658,6 @@ AsciiStrnCmp (
 \r
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and Destination contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and Source contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and concatenating Destination and\r
-  Source results in a ASCII string with more than PcdMaximumAsciiStringLength\r
-  ASCII characters, then ASSERT().\r
 \r
   @param  Destination Pointer to a Null-terminated ASCII string.\r
   @param  Source      Pointer to a Null-terminated ASCII string.\r
@@ -752,7 +676,6 @@ AsciiStrCat (
 \r
   //\r
   // Size of the resulting string should never be zero.\r
-  // PcdMaximumUnicodeStringLength is tested inside StrLen().\r
   //\r
   ASSERT (AsciiStrSize (Destination) != 0);\r
   return Destination;\r
@@ -774,13 +697,6 @@ AsciiStrCat (
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero, and Destination contains more\r
-  than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero, and Source contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero, and concatenating Destination and\r
-  Source results in a ASCII string with more than PcdMaximumAsciiStringLength\r
-  ASCII characters, then ASSERT().\r
 \r
   @param  Destination Pointer to a Null-terminated ASCII string.\r
   @param  Source      Pointer to a Null-terminated ASCII string.\r
@@ -802,7 +718,6 @@ AsciiStrnCat (
 \r
   //\r
   // Size of the resulting string should never be zero.\r
-  // PcdMaximumUnicodeStringLength is tested inside StrLen().\r
   //\r
   ASSERT (AsciiStrSize (Destination) != 0);\r
   return Destination;\r
index 16c8768..b77b690 100644 (file)
@@ -116,11 +116,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/${LibName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
     </cc>\r
   </target>\r
index 567b526..b153807 100644 (file)
@@ -82,7 +82,7 @@ Returns:
 \r
   fseek (InFile, 0, SEEK_SET);\r
 \r
-  Buffer = malloc (FileSize);\r
+  Buffer = (char *) malloc (FileSize);\r
   if (Buffer == NULL) {\r
     printf ("Error: Out of resources.\n");\r
     return -1;\r
index d15141a..56e84ce 100644 (file)
@@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
     </cc>\r
   </target>\r
 \r
index f7c534d..6419ad7 100644 (file)
@@ -23,11 +23,11 @@ Abstract:
 #ifndef _EFI_VFR_H_\r
 #define _EFI_VFR_H_\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include "InternalFormRepresentation.h"\r
 #include <string.h>\r
 \r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/InternalFormRepresentation.h>\r
+\r
 //\r
 // This number should be incremented with each change to the VFR compiler.\r
 // We write the version to the output list file for debug purposes.\r
index 3646c5d..db0ba95 100644 (file)
@@ -21,15 +21,16 @@ Abstract:
 \r
 #header<<\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <CommonLib.h>\r
-#include <MultiPhase.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/MultiPhase.h>\r
+#include <Common/InternalFormRepresentation.h>\r
+#include <Protocol/UgaDraw.h>\r
+#include <Protocol/Hii.h>\r
+\r
+#include "CommonLib.h"\r
 #include "EfiUtilityMsgs.h"\r
 #include "EfiVfr.h"\r
 #include "VfrServices.h"\r
-#include <UgaDraw.h>\r
-#include <Hii.h>\r
 \r
 #include <ctype.h>\r
 #ifndef __GNUC__\r
index c66d4df..359256a 100644 (file)
@@ -22,15 +22,16 @@ Abstract:
 #include <stdio.h>    // for FILE routines\r
 #include <stdlib.h>   // for malloc() and free()\r
 \r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <MultiPhase.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/MultiPhase.h>\r
+#include <Common/InternalFormRepresentation.h>\r
+#include <Protocol/UgaDraw.h>  // for EFI_UGA_PIXEL definition\r
+#include <Protocol/Hii.h>\r
+\r
 #include "EfiUtilityMsgs.h"\r
 #include "EfiVfr.h"\r
 #include "VfrServices.h"\r
 \r
-#include <UgaDraw.h>\r
-#include <Hii.h>\r
 \r
 static const char *mSourceFileHeader[] = {\r
   "//",\r
index 26d0787..7b73cf6 100644 (file)
@@ -77,25 +77,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </then>\r
       </elseif>\r
     </if>\r
-               <condition property="CheckDepends">\r
-                 <uptodate targetfile="${WORKSPACE}/Tools/bin/VfrCompile${ext_exe}">\r
-                         <srcfiles dir="${WORKSPACE}/Tools/Source/TianoTools/VfrCompile" \r
+    <condition property="CheckDepends">\r
+      <uptodate targetfile="${WORKSPACE}/Tools/bin/VfrCompile${ext_exe}">\r
+        <srcfiles dir="${WORKSPACE}/Tools/Source/TianoTools/VfrCompile" \r
         includes="EfiVfrParser.cpp DLGLexer.cpp VfrCompile.cpp VfrCompile.g VfrServices.cpp parser.dlg"/>\r
-                       </uptodate>\r
-               </condition>\r
+      </uptodate>\r
+    </condition>\r
 \r
     <condition property="gxx_extra_libs" value="stdc++ System gcc_s.10.4 gcc">\r
       <os family="mac"/>\r
-       </condition>\r
-               \r
+  </condition>\r
+    \r
     <condition property="gxx_extra_libs" value="stdc++">\r
       <os name="linux"/>\r
-       </condition>\r
-               \r
+  </condition>\r
+    \r
     <condition property="gxx_extra_libs" value="stdc++">\r
       <os family="windows"/>\r
-       </condition>\r
-               \r
+  </condition>\r
+    \r
   </target>\r
 \r
   <target name="Antlr" depends="init" unless="CheckDepends">\r
@@ -122,11 +122,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <fileset dir="${basedir}/Pccts/h" \r
         includes="${FileSetPccts}" />\r
 \r
-      <includepath path="${env.WORKSPACE}/Tools/Source/TianoTools/Pccts/h"/>\r
+      <includepath path="${PACKAGE_DIR}/Pccts/h"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
       <syslibset libs="${gxx_extra_libs}" if="gcc"/>\r
index 34781cd..fa3e637 100644 (file)
@@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
     </cc>\r
   </target>\r
 \r
index 64c8fb9..ca81aae 100644 (file)
@@ -65,8 +65,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </else>\r
     </if>\r
 \r
-    <ToolChainSetup confPath="${WORKSPACE_DIR}/Tools/Conf" />\r
-    \r
     <if>\r
         <isset property="env.TOOL_CHAIN" />\r
       <then>\r