#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
\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
EFI_INVALID_PARAMETER - Data / CrcOut = NULL, or DataSize = 0\r
\r
--*/\r
+;\r
+\r
#endif\r
\r
--*/\r
\r
-/*\r
-#include "TianoCommon.h"\r
-*/\r
#include "EfiCompress.h"\r
\r
//\r
\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
\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
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
#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
\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
#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
//\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
#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
\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
#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
#include <stdlib.h>\r
#include <ctype.h>\r
\r
-/*\r
-#include "Tiano.h"\r
-*/\r
#include "EfiUtilityMsgs.h"\r
#include "SimpleFileParsing.h"\r
\r
\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
</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
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
//\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
//\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
void* Reserved \r
)\r
{\r
- return TRUE;\r
+ return TRUE;\r
}\r
#else\r
#ifdef __GNUC__\r
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
<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
<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
#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
\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
\r
--*/\r
\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <Common/UefiBaseTypes.h>\r
\r
EFI_STATUS\r
SetCustomizedCompressionType (\r
</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
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
#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
\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
#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
\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
#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
#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
//\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
\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
</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
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
\r
--*/\r
\r
-#include <WinNtInclude.h>\r
+#include "WinNtInclude.h"\r
+\r
#ifndef __GNUC__\r
#include <windows.h>\r
#endif\r
#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
#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
\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
#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
#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
</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
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
#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
\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
Ptrx++;\r
}\r
\r
- Ptrx++;\r
+ Ptrx++;\r
while (*Ptrx != '}') {\r
Ptrx++;\r
}\r
- //\r
+ //\r
// Absorb the closing }\r
//\r
Ptrx++;\r
#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
</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
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
#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
#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
\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
#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
//\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
#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
</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
\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
//\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
#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
//\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
//\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
\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
\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
//\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
</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
\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
#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
</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
\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
#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
#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
</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
\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
#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
\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
</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
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
--*/\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
//\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
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
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
);\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
);\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
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
/** @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
\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
\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
\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
\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
\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
\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
\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
#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
</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
\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
\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
\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
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
\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
\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
\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
\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
</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
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
\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
#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
#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
\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
\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
\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
**/\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
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
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
Length--;\r
}\r
\r
- // ZeroMem (Destination, Length * sizeof (*Destination));\r
memset (Destination, 0, Length * sizeof (*Destination));\r
return ReturnValue;\r
}\r
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
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
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
\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
)\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
\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
}\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
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
\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
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
\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
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
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
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
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
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
\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
)\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
\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
)\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
\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
)\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
\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
\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
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
\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
\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
\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
\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
#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
\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
#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
</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
<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
\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
</else>\r
</if>\r
\r
- <ToolChainSetup confPath="${WORKSPACE_DIR}/Tools/Conf" />\r
- \r
<if>\r
<isset property="env.TOOL_CHAIN" />\r
<then>\r
projects / mirror_edk2.git / commitdiff