tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1. Removed the unnecessary #include statements and include files 

2. Removed the unnecessary library and include path from MSA files


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@541 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
yshi8 2006-06-16 11:42:42 +00:00
parent 5a96e3e3fe
commit ce53a8c3b2
93 changed files with 434 additions and 659 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/Source/TianoTools/Common/CommonLib.h
View File

@ -22,13 +22,7 @@ Abstract:
#ifndef _EFI_COMMON_LIB_H
#define _EFI_COMMON_LIB_H
/*
#include "TianoCommon.h"
#include "TianoCommon.h"
#include "PeiHob.h"
*/
#include <Base.h>
#include <UefiBaseTypes.h>
#include <Common/UefiBaseTypes.h>
#ifndef _MAX_PATH
#define _MAX_PATH 500

13
Tools/Source/TianoTools/Common/Crc32.h
View File

@ -19,22 +19,17 @@ Abstract:
--*/
/*
#include "TianoCommon.h"
*/
#include <Base.h>
#include <UefiBaseTypes.h>
#ifndef _CRC32_H
#define _CRC32_H
#include <Common/UefiBaseTypes.h>
EFI_STATUS
CalculateCrc32 (
IN UINT8 *Data,
IN UINTN DataSize,
IN OUT UINT32 *CrcOut
)
;
/*++
Routine Description:
@ -54,4 +49,6 @@ Returns:
EFI_INVALID_PARAMETER - Data / CrcOut = NULL, or DataSize = 0
--*/
;
#endif

3
Tools/Source/TianoTools/Common/EfiCompress.c
View File

@ -23,9 +23,6 @@ Abstract:
--*/
/*
#include "TianoCommon.h"
*/
#include "EfiCompress.h"
//

11
Tools/Source/TianoTools/Common/EfiCompress.h
View File

@ -19,13 +19,14 @@ Abstract:
--*/
#include <string.h>
#include <stdlib.h>
#include <Base.h>
#include <UefiBaseTypes.h>
#ifndef _EFICOMPRESS_H
#define _EFICOMPRESS_H
#include <string.h>
#include <stdlib.h>
#include <Common/UefiBaseTypes.h>
EFI_STATUS
Compress (
IN UINT8 *SrcBuffer,

6
Tools/Source/TianoTools/Common/EfiCustomizedCompress.h
View File

@ -19,11 +19,11 @@ Abstract:
--*/
#include <Base.h>
#include <UefiBaseTypes.h>
#ifndef _EFICUSTOMIZEDCOMPRESS_H
#define _EFICUSTOMIZEDCOMPRESS_H
#include <Common/UefiBaseTypes.h>
EFI_STATUS
SetCustomizedCompressionType (
IN CHAR8 *Type

5
Tools/Source/TianoTools/Common/EfiDecompress.h
View File

@ -18,11 +18,12 @@ Abstract:
Header file for compression routine
--*/
#include <Base.h>
#include <UefiBaseTypes.h>
#ifndef _EFI_DECOMPRESS_H
#define _EFI_DECOMPRESS_H
#include <Common/UefiBaseTypes.h>
EFI_STATUS
GetInfo (
IN VOID *Source,

3
Tools/Source/TianoTools/Common/EfiUtilityMsgs.c
View File

@ -25,9 +25,6 @@ Abstract:
#include <ctype.h>
#include <stdarg.h>
/*
#include "Tiano.h"
*/
#include "EfiUtilityMsgs.h"
#define MAX_LINE_LEN 200

5
Tools/Source/TianoTools/Common/EfiUtilityMsgs.h
View File

@ -19,12 +19,11 @@ Abstract:
--*/
#include <Base.h>
#include <UefiBaseTypes.h>
#ifndef _EFI_UTILITY_MSGS_H_
#define _EFI_UTILITY_MSGS_H_
#include <Common/UefiBaseTypes.h>
//
// Status codes returned by EFI utility programs and functions
//

8
Tools/Source/TianoTools/Common/FvLib.c
View File

@ -25,14 +25,6 @@ Abstract:
#include "FvLib.h"
#include "CommonLib.h"
#include "EfiUtilityMsgs.h"
#include "MultiPhase.h"
/*
#include <CommonBuild.h>
*/
/*
#include EFI_GUID_DEFINITION (FirmwareFileSystem)
*/
//
// Module global variables

12
Tools/Source/TianoTools/Common/FvLib.h
View File

@ -25,18 +25,14 @@ Abstract:
//
// Include files
//
#include <Base.h>
#include <UefiBaseTypes.h>
#include <string.h>
#include <Common/UefiBaseTypes.h>
#include <Common/EfiImage.h>
#include <Common/FirmwareVolumeImageFormat.h>
#include <Common/FirmwareFileSystem.h>
#include <Common/FirmwareVolumeHeader.h>
/*
#include "TianoCommon.h"
#include "EfiFirmwareVolumeHeader.h"
#include "EfiFirmwareFileSystem.h"
*/
#include <string.h>
#include <Common/MultiPhase.h>
EFI_STATUS
InitializeFvLib (

5
Tools/Source/TianoTools/Common/MyAlloc.h
View File

@ -25,11 +25,8 @@ Abstract:
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <Base.h>
/*
#include "Tiano.h"
*/
#include <Common/BaseTypes.h>
//
// Default operation is to use the memory allocation tracking functions.

2
Tools/Source/TianoTools/Common/ParseInf.c
View File

@ -19,11 +19,11 @@ Abstract:
--*/
#include "ParseInf.h"
#include <assert.h>
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
#include "ParseInf.h"
#ifndef _MAX_PATH
#define _MAX_PATH 500

5
Tools/Source/TianoTools/Common/ParseInf.h
View File

@ -22,11 +22,10 @@ Abstract:
#ifndef _EFI_PARSE_INF_H
#define _EFI_PARSE_INF_H
/* #include "TianoCommon.h" */
#include <Base.h>
#include <stdio.h>
#include <stdlib.h>
#include <UefiBaseTypes.h>
#include <Common/UefiBaseTypes.h>
//
// Common data structures

3
Tools/Source/TianoTools/Common/SimpleFileParsing.c
View File

@ -24,9 +24,6 @@ Abstract:
#include <stdlib.h>
#include <ctype.h>
/*
#include "Tiano.h"
*/
#include "EfiUtilityMsgs.h"
#include "SimpleFileParsing.h"

5
Tools/Source/TianoTools/Common/SimpleFileParsing.h
View File

@ -19,12 +19,11 @@ Abstract:
--*/
#include <Base.h>
#include <UefiBaseTypes.h>
#ifndef _SIMPLE_FILE_PARSING_H_
#define _SIMPLE_FILE_PARSING_H_
#include <Common/UefiBaseTypes.h>
#define T_CHAR char
STATUS

21
Tools/Source/TianoTools/Common/build.xml
View File

@ -60,20 +60,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</echo>
</else>
</if>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<property name="ext_static" value=".lib"/>
<property name="ext_dynamic" value=".dll"/>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<property name="ext_static" value=".a"/>
<property name="ext_dynamic" value=".so"/>
</then>
</elseif>
</if>
</then>
</elseif>
</if>
</target>
<target name="ToolsLibrary" depends="init">
@ -83,7 +83,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
optimize="speed">
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<fileset dir="${basedir}/Common"

22
Tools/Source/TianoTools/CompressDll/CompressDll.c
View File

@ -32,14 +32,14 @@ JNIEXPORT jbyteArray JNICALL Java_org_tianocore_framework_tasks_Compress_CallCo
//
Result = Compress (
(char*) InputBuffer,
SourceSize,
DestBuffer,
&DestSize
);
(char*) InputBuffer,
SourceSize,
DestBuffer,
&DestSize
);
if (Result = EFI_BUFFER_TOO_SMALL) {
DestBuffer = malloc (DestSize);
DestBuffer = malloc (DestSize);
}
//
@ -47,10 +47,10 @@ JNIEXPORT jbyteArray JNICALL Java_org_tianocore_framework_tasks_Compress_CallCo
//
Result = Compress(
(char*) InputBuffer,
SourceSize,
DestBuffer,
&DestSize
);
SourceSize,
DestBuffer,
&DestSize
);
//
// new a MV array to store the return compressed buffer
@ -80,7 +80,7 @@ DllMainCRTStartup(
void* Reserved
)
{
return TRUE;
return TRUE;
}
#else
#ifdef __GNUC__

14
Tools/Source/TianoTools/CompressDll/build.xml
View 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.
-->
<project default="GenTool" basedir=".">
<!--EDK GenDepex Tool
Copyright (c) 2006, Intel Corporation-->
<!--
EDK GenDepex Tool
Copyright (c) 2006, Intel Corporation
-->
<property environment="env"/>
<property name="WORKSPACE" value="${env.WORKSPACE}"/>
<property name="ToolName" value="CompressDll"/>
<property name="LibName" value="CompressDll"/>
<property name="FileSet" value="CompressDll.c CompressDll.h"/>
<property name="LibFileSet" value="CompressDll.c DepexParser.h"/>
<taskdef resource="cpptasks.tasks"/>
<typedef resource="cpptasks.types"/>
<taskdef resource="net/sf/antcontrib/antlib.xml"/>
<property name="LINK_OUTPUT_TYPE" value="static"/>
<property name="BUILD_DIR" value="${WORKSPACE}/Tools/Source/TianoTools/${ToolName}/tmp"/>
<target name="GenTool" depends="init,Lib" >
<echo message="Building the EDK Tool: ${ToolName}"/>
</target>
<target name="init">
<echo message="The EDK Tool: ${ToolName}"/>
<mkdir dir="${BUILD_DIR}"/>
@ -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"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<includepath path="${env.JAVA_HOME}/include"/>
<includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>
@ -94,12 +100,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<copy file="${result}" tofile="${BIN_DIR}/CompressDll.dll"/>
<chmod file="${BIN_DIR}/CompressDll.dll" perm="ugo+x"/>
</target>
<target name="clean" depends="init">
<echo message="Removing Intermediate Files Only"/>
<delete>
<fileset dir="${BUILD_DIR}" includes="*.obj"/>
</delete>
</target>
<target name="cleanall" depends="init">
<echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>
<delete dir="${BUILD_DIR}">

4
Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c
View File

@ -23,8 +23,8 @@ Abstract:
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "UefiBaseTypes.h"
#include "Base.h"
#include <Common/UefiBaseTypes.h>
#define PROGRAM_NAME "CreateMtFile"

3
Tools/Source/TianoTools/CreateMtFile/build.xml
View File

@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
</cc>
</target>

3
Tools/Source/TianoTools/CustomizedCompress/CustomizedCompress.c
View File

@ -19,8 +19,7 @@ Abstract:
--*/
#include <Base.h>
#include <UefiBaseTypes.h>
#include <Common/UefiBaseTypes.h>
EFI_STATUS
SetCustomizedCompressionType (

26
Tools/Source/TianoTools/CustomizedCompress/build.xml
View File

@ -59,23 +59,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</echo>
</else>
</if>
<property name="HOST_ARCH" value="IA32" />
<ToolChainSetup confPath="${WORKSPACE}/Tools/Conf" />
<echo message="Compiler: ${CC}"/>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<echo message="ToolChain: ${ToolChain}"/>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<property name="ext_static" value=".lib"/>
<property name="ext_dynamic" value=".dll"/>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<property name="ext_static" value=".a"/>
<property name="ext_dynamic" value=".so"/>
</then>
</elseif>
</if>
</then>
</elseif>
</if>
</target>
<target name="ToolsLibrary" depends="init">
@ -91,7 +90,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
</cc>
<if>

5
Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c
View File

@ -25,8 +25,9 @@ Abstract:
#include <ctype.h>
#include <stdarg.h>
#include <stdio.h>
#include <UefiBaseTypes.h>
#include <Base.h>
#include <Common/UefiBaseTypes.h>
#include "EfiCompress.h"
int

4
Tools/Source/TianoTools/EfiCompress/build.xml
View File

@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>

25
Tools/Source/TianoTools/EfiRom/EfiRom.c
View File

@ -25,24 +25,15 @@ Abstract:
#include <string.h>
#include <stdlib.h>
//
// Includes for EFI 1.1 build
//
// #include "Tiano.h" // required defines for Compress.h
// #include "EfiImage.h" // for PE32 structure definitions
// #include "Compress.h" // for compression function
// Includes for Tiano build
//
#include <UefiBaseTypes.h>
#include <EfiImage.h> // for PE32 structure definitions
#include <EfiCompress.h>
#include <CommonLib.h>
#include <MultiPhase.h>
#include <Common/UefiBaseTypes.h>
#include <Common/EfiImage.h> // for PE32 structure definitions
#include <Common/MultiPhase.h>
#include <IndustryStandard/pci22.h> // for option ROM header structures
#include "EfiCompress.h"
#include "CommonLib.h"
//
// END include differences
//
#include "pci22.h" // for option ROM header structures
//
// Version of this utility
//

5
Tools/Source/TianoTools/EfiRom/build.xml
View File

@ -93,11 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Include/IndustryStandard"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>

9
Tools/Source/TianoTools/FlashMap/FlashDefFile.c
View File

@ -24,16 +24,15 @@ Abstract:
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <UefiBaseTypes.h>
#include <Base.h>
#include <Common/UefiBaseTypes.h>
#include <Common/FirmwareVolumeHeader.h>
#include <Common/MultiPhase.h>
#include "EfiUtilityMsgs.h"
#include "FlashDefFile.h"
#include "SimpleFileParsing.h"
#include "Symbols.h"
// #include "EfiFirmwareVolumeHeader.h"
#include "MultiPhase.h"
#include "FirmwareVolumeHeader.h"
//
// #include "TrackMallocFree.h"

4
Tools/Source/TianoTools/FlashMap/FlashMap.c
View File

@ -24,8 +24,8 @@ Abstract:
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <UefiBaseTypes.h>
#include <Base.h>
#include <Common/UefiBaseTypes.h>
#include "EfiUtilityMsgs.h"
#include "Microcode.h"

5
Tools/Source/TianoTools/FlashMap/Symbols.c
View File

@ -29,10 +29,9 @@ Abstract:
//
#include <ctype.h>
#include <UefiBaseTypes.h>
#include <Base.h>
#include <CommonLib.h>
#include <Common/UefiBaseTypes.h>
#include "CommonLib.h"
#include "EfiUtilityMsgs.h"
#include "Symbols.h"

4
Tools/Source/TianoTools/FlashMap/build.xml
View File

@ -98,10 +98,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>

23
Tools/Source/TianoTools/FwImage/build.xml
View File

@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</echo>
</else>
</if>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<property name="ext_static" value=".lib"/>
<property name="ext_dynamic" value=".dll"/>
<property name="ext_exe" value=".exe"/>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<property name="ext_static" value=".a"/>
<property name="ext_dynamic" value=".so"/>
<property name="ext_exe" value=""/>
</then>
</elseif>
</if>
</then>
</elseif>
</if>
</target>
<target name="Tool" depends="init">
@ -91,10 +91,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>

13
Tools/Source/TianoTools/FwImage/fwimage.c
View File

@ -19,7 +19,8 @@ Abstract:
--*/
#include <WinNtInclude.h>
#include "WinNtInclude.h"
#ifndef __GNUC__
#include <windows.h>
#endif
@ -28,11 +29,11 @@ Abstract:
#include <string.h>
#include <time.h>
#include <Base.h>
#include <UefiBaseTypes.h>
#include <CommonLib.h>
#include <EfiImage.h>
#include <EfiUtilityMsgs.c>
#include <Common/UefiBaseTypes.h>
#include <Common/EfiImage.h>
#include "CommonLib.h"
#include "EfiUtilityMsgs.c"
#define UTILITY_NAME "FwImage"

8
Tools/Source/TianoTools/GenAcpiTable/GenAcpiTable.c
View File

@ -23,10 +23,10 @@ Abstract:
#include <string.h>
#include <stdlib.h>
#include <UefiBaseTypes.h>
#include <Base.h>
#include <CommonLib.h>
#include "EfiImage.h" // for PE32 structure definitions
#include <Common/UefiBaseTypes.h>
#include <Common/EfiImage.h> // for PE32 structure definitions
#include "CommonLib.h"
#include "EfiUtilityMsgs.h"
//

4
Tools/Source/TianoTools/GenAcpiTable/build.xml
View File

@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>

13
Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.h
View File

@ -31,8 +31,7 @@ Abstract:
#include <assert.h>
/* MDE Headers */
#include <Base.h>
#include <UefiBaseTypes.h>
#include <Common/UefiBaseTypes.h>
#include <Common/EfiImage.h>
#include <Common/FirmwareVolumeImageFormat.h>
#include <Common/FirmwareFileSystem.h>
@ -40,11 +39,11 @@ Abstract:
#include <Protocol/GuidedSectionExtraction.h>
/* Tool Headers */
#include <CommonLib.h>
#include <Crc32.h>
#include <EfiCompress.h>
#include <EfiUtilityMsgs.h>
#include <ParseInf.h>
#include "CommonLib.h"
#include "Crc32.h"
#include "EfiCompress.h"
#include "EfiUtilityMsgs.h"
#include "ParseInf.h"
//
// Module Coded to Tiano Coding Conventions

23
Tools/Source/TianoTools/GenCRC32Section/build.xml
View File

@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</echo>
</else>
</if>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<property name="ext_static" value=".lib"/>
<property name="ext_dynamic" value=".dll"/>
<property name="ext_exe" value=".exe"/>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<property name="ext_static" value=".a"/>
<property name="ext_dynamic" value=".so"/>
<property name="ext_exe" value=""/>
</then>
</elseif>
</if>
</then>
</elseif>
</if>
</target>
<target name="Tool" depends="init">
@ -89,10 +89,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
includes="${FileSet}"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>

20
Tools/Source/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c
View File

@ -28,18 +28,18 @@ Abstract:
#include <stdlib.h>
#include <ctype.h>
#include <UefiBaseTypes.h>
#include <Base.h>
#include <CommonLib.h>
#include <Common/UefiBaseTypes.h>
#include <Common/MultiPhase.h>
#include <Common/Capsule.h>
#include <Common/FirmwareVolumeImageFormat.h>
#include <Common/FirmwareVolumeHeader.h>
#include <Common/FirmwareFileSystem.h> // for FV header GUID
#include <Guid/Capsule.h>
#include <Guid/FirmwareFileSystem.h> // for FV header GUID
#include "CommonLib.h"
#include "EfiUtilityMsgs.h"
#include "MultiPhase.h"
#include "Capsule.h"
#include "Guid/Capsule.h"
#include "FirmwareVolumeImageFormat.h"
#include "FirmwareVolumeHeader.h"
#include "FirmwareFileSystem.h" // for FV header GUID
#include "Guid/FirmwareFileSystem.h" // for FV header GUID
#define MAX_PATH 256
#define PROGRAM_NAME "GenCapsuleHdr"

4
Tools/Source/TianoTools/GenCapsuleHdr/build.xml
View File

@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>

4
Tools/Source/TianoTools/GenDepex/GenDepex.c
View File

@ -728,11 +728,11 @@ Returns:
Ptrx++;
}
Ptrx++;
Ptrx++;
while (*Ptrx != '}') {
Ptrx++;
}
//
//
// Absorb the closing }
//
Ptrx++;

6
Tools/Source/TianoTools/GenDepex/GenDepex.h
View File

@ -30,9 +30,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef __GNUC__
#include <malloc.h>
#endif
#include <Base.h>
#include <UefiBaseTypes.h>
#include <Dependency.h>
#include <Common/UefiBaseTypes.h>
#include <Common/Dependency.h>
#define DEPENDENCY_START "DEPENDENCY_START"
#define OPERATOR_BEFORE "BEFORE"

24
Tools/Source/TianoTools/GenDepex/build.xml
View File

@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</echo>
</else>
</if>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<property name="ext_static" value=".lib"/>
<property name="ext_dynamic" value=".dll"/>
<property name="ext_exe" value=".exe"/>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<property name="ext_static" value=".a"/>
<property name="ext_dynamic" value=".so"/>
<property name="ext_exe" value=""/>
</then>
</elseif>
</if>
</then>
</elseif>
</if>
</target>
<target name="Tool" depends="init">
@ -90,12 +90,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
includes="${FileSet}" />
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>
</target>
<target name="clean" depends="init">
<echo message="Removing Intermediate Files Only"/>

3
Tools/Source/TianoTools/GenFdImage/GenFdImage.h
View File

@ -33,10 +33,9 @@ Abstract:
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
// #include <io.h>
#include <assert.h>
#include "ParseInf.h"
// #include "GenFvImage.h"
//
// Defines

7
Tools/Source/TianoTools/GenFdImage/GenFdImageDll.c
View File

@ -26,12 +26,11 @@ Intel Corporation.
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
// #include <io.h>
#include <assert.h>
#include "UefiBaseTypes.h"
#include "Base.h"
#include <Common/UefiBaseTypes.h>
#include "GenFdImage.h"
// #include "GenFvImage.h"
#include "ParseInf.h"
//

23
Tools/Source/TianoTools/GenFfsFile/GenFfsFile.c
View File

@ -20,17 +20,6 @@ Abstract:
--*/
#include "Base.h"
#include "UefiBaseTypes.h"
#include "FirmwareVolumeImageFormat.h"
#include "FirmwareFileSystem.h"
#include "FirmwareVolumeHeader.h"
#include "FirmwareVolumeImageFormat.h"
#include "ParseInf.h"
#include "EfiCompress.h"
#include "EfiCustomizedCompress.h"
#include "Crc32.h"
#include "GenFfsFile.h"
#include <stdio.h>
#include <ctype.h> // for isalpha()
//
@ -41,6 +30,18 @@ Abstract:
#endif
#include <stdlib.h>
#include <string.h>
#include <Common/UefiBaseTypes.h>
#include <Common/FirmwareVolumeImageFormat.h>
#include <Common/FirmwareFileSystem.h>
#include <Common/FirmwareVolumeHeader.h>
#include <Common/FirmwareVolumeImageFormat.h>
#include "ParseInf.h"
#include "EfiCompress.h"
#include "EfiCustomizedCompress.h"
#include "Crc32.h"
#include "GenFfsFile.h"
#include "CommonLib.h"
#include "EfiUtilityMsgs.h"
#include "SimpleFileParsing.h"

6
Tools/Source/TianoTools/GenFfsFile/GenFfsFile.h
View File

@ -28,9 +28,9 @@ Abstract:
//
// External Files Referenced
//
#include "Base.h"
#include "UefiBaseTypes.h"
#include "FirmwareVolumeImageFormat.h"
#include <Common/UefiBaseTypes.h>
#include <Common/FirmwareVolumeImageFormat.h>
#include "MyAlloc.h"
#endif

4
Tools/Source/TianoTools/GenFfsFile/SimpleFileParsing.c
View File

@ -24,8 +24,8 @@ Abstract:
#include <stdlib.h>
#include <ctype.h>
#include "Base.h"
#include "UefiBaseTypes.h"
#include <Common/UefiBaseTypes.h>
#include "EfiUtilityMsgs.h"
#include "SimpleFileParsing.h"

24
Tools/Source/TianoTools/GenFfsFile/build.xml
View File

@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</echo>
</else>
</if>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<property name="ext_static" value=".lib"/>
<property name="ext_dynamic" value=".dll"/>
<property name="ext_exe" value=".exe"/>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<property name="ext_static" value=".a"/>
<property name="ext_dynamic" value=".so"/>
<property name="ext_exe" value=""/>
</then>
</elseif>
</if>
</then>
</elseif>
</if>
</target>
<target name="Tool" depends="init">
@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
</cc>
</target>

26
Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c
View File

@ -23,8 +23,6 @@ Abstract:
//
// Include files
//
#define EFI_SPECIFICATION_VERSION 0x00020000
#define EDK_RELEASE_VERSION 0x00020000
#ifdef __GNUC__
#include <uuid/uuid.h>
#include <sys/stat.h>
@ -34,19 +32,21 @@ Abstract:
#include <io.h>
#endif
#include <assert.h>
#include <Dxe.h>
#include <Library/PeCoffLib.h>
#include <Common/UefiBaseTypes.h>
#include <Common/FirmwareVolumeImageFormat.h>
#include <Common/Variable.h>
#include <Common/WorkingBlockHeader.h>
#include <Guid/FirmwareFileSystem.h>
#include "GenFvImageLib.h"
#include "GenFvImageLibInternal.h"
#include <CommonLib.h>
#include <FirmwareVolumeImageFormat.h>
#include <Crc32.h>
#include <EfiUtilityMsgs.h>
#include <FvLib.h>
#include <EfiCompress.h>
#include <Variable.h>
#include <WinNtInclude.h>
#include <WorkingBlockHeader.h>
#include "CommonLib.h"
#include "Crc32.h"
#include "EfiUtilityMsgs.h"
#include "FvLib.h"
#include "EfiCompress.h"
#include "WinNtInclude.h"
//

4
Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h
View File

@ -26,7 +26,9 @@ Abstract:
//
// Include files
//
// #include "Efi2WinNT.h"
#include <Common/UefiBaseTypes.h>
#include <Common/MultiPhase.h>
#include "ParseInf.h"
//

8
Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h
View File

@ -26,10 +26,12 @@ Abstract:
//
// Include files
//
#include "GenFvImageLib.h"
#include <stdlib.h>
#include <CommonLib.h>
#include "FirmwareVolumeHeader.h"
#include <Common/FirmwareVolumeHeader.h>
#include "CommonLib.h"
#include "GenFvImageLib.h"
//
// Private data declarations

8
Tools/Source/TianoTools/GenFvImage/build.xml
View File

@ -123,14 +123,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/${ToolName}"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Include/Library"/>
<includepath path="${PACKAGE_DIR}/Include/ToBeRemoved"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
<linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>
<syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>
<syslibset libs="RpcRT4" unless="gcc"/>

17
Tools/Source/TianoTools/GenSection/GenSection.c
View File

@ -19,22 +19,21 @@ Abstract:
--*/
#include <Base.h>
#include <UefiBaseTypes.h>
#include "FirmwareVolumeImageFormat.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <Common/UefiBaseTypes.h>
#include <Common/FirmwareVolumeImageFormat.h>
#include <Protocol/GuidedSectionExtraction.h>
#include "CommonLib.h"
#include "EfiCompress.h"
#include "EfiCustomizedCompress.h"
#include "Crc32.h"
#include "EfiUtilityMsgs.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "GenSection.h"
#include <GuidedSectionExtraction.h>
#define UTILITY_NAME "GenSection"

5
Tools/Source/TianoTools/GenSection/GenSection.h
View File

@ -28,9 +28,8 @@ Abstract:
//
// External Files Referenced
//
#include <Base.h>
#include <UefiBaseTypes.h>
#include "FirmwareVolumeImageFormat.h"
#include <Common/UefiBaseTypes.h>
#include <Common/FirmwareVolumeImageFormat.h>
typedef struct {
EFI_GUID_DEFINED_SECTION GuidSectionHeader;

24
Tools/Source/TianoTools/GenSection/build.xml
View File

@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</echo>
</else>
</if>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<property name="ext_static" value=".lib"/>
<property name="ext_dynamic" value=".dll"/>
<property name="ext_exe" value=".exe"/>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<property name="ext_static" value=".a"/>
<property name="ext_dynamic" value=".so"/>
<property name="ext_exe" value=""/>
</then>
</elseif>
</if>
</then>
</elseif>
</if>
</target>
<target name="Tool" depends="init">
@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
</cc>
</target>

7
Tools/Source/TianoTools/GenTEImage/GenTEImage.c
View File

@ -24,11 +24,10 @@ Abstract:
#include <string.h>
#include <stdlib.h>
#include <UefiBaseTypes.h>
#include <Base.h>
#include <CommonLib.h>
#include <Common/UefiBaseTypes.h>
#include <Common/EfiImage.h> // for PE32 structure definitions
#include "EfiImage.h" // for PE32 structure definitions
#include "CommonLib.h"
#include "EfiUtilityMsgs.h"
//

24
Tools/Source/TianoTools/GenTEImage/build.xml
View File

@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</echo>
</else>
</if>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<property name="ext_static" value=".lib"/>
<property name="ext_dynamic" value=".dll"/>
<property name="ext_exe" value=".exe"/>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<property name="ext_static" value=".a"/>
<property name="ext_dynamic" value=".so"/>
<property name="ext_exe" value=""/>
</then>
</elseif>
</if>
</then>
</elseif>
</if>
</target>
<target name="Tool" depends="init">
@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>

10
Tools/Source/TianoTools/GuidChk/GuidList.c
View File

@ -39,14 +39,12 @@ Notes:
#include <stdlib.h>
#include <ctype.h>
#include <Base.h>
#include <UefiBaseTypes.h>
#include <UgaDraw.h>
#include <Common/UefiBaseTypes.h>
#include <Guid/Apriori.h>
#include <Guid/AcpiTableStorage.h>
#include "EfiUtilityMsgs.h"
#include <Apriori.h>
#include <AcpiTableStorage.h>
// #include <Bmp.h>
#define GUID_XREF(varname, guid) { \
#varname, #guid, guid \

4
Tools/Source/TianoTools/GuidChk/UtilsMsgs.c
View File

@ -25,8 +25,8 @@ Abstract:
#include <ctype.h>
#include <stdarg.h>
#include <Base.h>
#include <UefiBaseTypes.h>
#include <Common/UefiBaseTypes.h>
#include "EfiUtilityMsgs.h"
#define MAX_LINE_LEN 200

26
Tools/Source/TianoTools/GuidChk/build.xml
View File

@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</echo>
</else>
</if>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<property name="ext_static" value=".lib"/>
<property name="ext_dynamic" value=".dll"/>
<property name="ext_exe" value=".exe"/>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<property name="ext_static" value=".a"/>
<property name="ext_dynamic" value=".so"/>
<property name="ext_exe" value=""/>
</then>
</elseif>
</if>
</then>
</elseif>
</if>
</target>
<target name="Tool" depends="init" unless="gcc">
@ -93,12 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Guid"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<linkerarg value="${LIB_DIR}/CommonTools.lib"/>
<linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>

6
Tools/Source/TianoTools/MakeDeps/MakeDeps.c
View File

@ -25,10 +25,10 @@ Abstract:
#include <stdlib.h>
#include <ctype.h>
#include <Base.h>
#include <UefiBaseTypes.h>
#include <Common/UefiBaseTypes.h>
#include "EfiUtilityMsgs.h"
#include <CommonLib.h>
#include "CommonLib.h"
//
// Structure to maintain a linked list of strings

4
Tools/Source/TianoTools/MakeDeps/build.xml
View File

@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>

22
Tools/Source/TianoTools/ModifyInf/build.xml
View File

@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</echo>
</else>
</if>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<property name="ext_static" value=".lib"/>
<property name="ext_dynamic" value=".dll"/>
<property name="ext_exe" value=".exe"/>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<property name="ext_static" value=".a"/>
<property name="ext_dynamic" value=".so"/>
<property name="ext_exe" value=""/>
</then>
</elseif>
</if>
</then>
</elseif>
</if>
</target>
<target name="Tool" depends="init">
@ -92,10 +92,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>

52
Tools/Source/TianoTools/PeCoffLoader/BasePeCoff.c
View File

@ -22,11 +22,9 @@ Revision History
--*/
#define EFI_SPECIFICATION_VERSION 0x00000000
#define EDK_RELEASE_VERSION 0x00020000
#include <Base.h>
#include <Common/UefiBaseTypes.h>
#include <Common/EfiImage.h>
#include <Library/PeCoffLib.h>
#include <Library/BaseMemoryLib.h>
STATIC
RETURN_STATUS
@ -600,11 +598,11 @@ Returns:
//
RelocDir = &TeHdr->DataDirectory[0];
RelocBase = (EFI_IMAGE_BASE_RELOCATION *)(UINTN)(
ImageContext->ImageAddress +
RelocDir->VirtualAddress +
sizeof(EFI_TE_IMAGE_HEADER) -
TeHdr->StrippedSize
);
ImageContext->ImageAddress +
RelocDir->VirtualAddress +
sizeof(EFI_TE_IMAGE_HEADER) -
TeHdr->StrippedSize
);
RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *) ((UINTN) RelocBase + (UINTN) RelocDir->Size - 1);
}
@ -620,10 +618,10 @@ Returns:
FixupBase = PeCoffLoaderImageAddress (ImageContext, RelocBase->VirtualAddress);
} else {
FixupBase = (CHAR8 *)(UINTN)(ImageContext->ImageAddress +
RelocBase->VirtualAddress +
sizeof(EFI_TE_IMAGE_HEADER) -
TeHdr->StrippedSize
);
RelocBase->VirtualAddress +
sizeof(EFI_TE_IMAGE_HEADER) -
TeHdr->StrippedSize
);
}
if ((CHAR8 *) RelocEnd < (CHAR8 *) ((UINTN) ImageContext->ImageAddress) ||
@ -836,9 +834,9 @@ Returns:
TeHdr = (EFI_TE_IMAGE_HEADER *) (UINTN) (ImageContext->ImageAddress);
FirstSection = (EFI_IMAGE_SECTION_HEADER *) (
(UINTN)ImageContext->ImageAddress +
sizeof(EFI_TE_IMAGE_HEADER)
);
(UINTN)ImageContext->ImageAddress +
sizeof(EFI_TE_IMAGE_HEADER)
);
NumberOfSections = (UINTN) (TeHdr->NumberOfSections);
}
@ -933,9 +931,9 @@ Returns:
);
} else {
ImageContext->EntryPoint = (PHYSICAL_ADDRESS) (
(UINTN)ImageContext->ImageAddress +
(UINTN)TeHdr->AddressOfEntryPoint +
(UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
(UINTN)ImageContext->ImageAddress +
(UINTN)TeHdr->AddressOfEntryPoint +
(UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
(UINTN) TeHdr->StrippedSize
);
}
@ -976,11 +974,11 @@ Returns:
);
} else {
DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)(UINTN)(
ImageContext->ImageAddress +
ImageContext->DebugDirectoryEntryRva +
sizeof(EFI_TE_IMAGE_HEADER) -
TeHdr->StrippedSize
);
ImageContext->ImageAddress +
ImageContext->DebugDirectoryEntryRva +
sizeof(EFI_TE_IMAGE_HEADER) -
TeHdr->StrippedSize
);
}
if (DebugEntry != NULL) {
@ -999,9 +997,9 @@ Returns:
ImageContext->CodeView = PeCoffLoaderImageAddress (ImageContext, TempDebugEntryRva);
} else {
ImageContext->CodeView = (VOID *)(
(UINTN)ImageContext->ImageAddress +
(UINTN)TempDebugEntryRva +
(UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
(UINTN)ImageContext->ImageAddress +
(UINTN)TempDebugEntryRva +
(UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
(UINTN) TeHdr->StrippedSize
);
}

22
Tools/Source/TianoTools/PeCoffLoader/Common/EfiImage.h
View File

@ -1,19 +1,19 @@
/** @file
EFI image format for PE32+. Please note some data structures are different
for IA-32 and Itanium-based images, look for UINTN and the #ifdef EFI_IA64
EFI image format for PE32+. Please note some data structures are different
for IA-32 and Itanium-based images, look for UINTN and the #ifdef EFI_IA64
@bug Fix text - doc as defined in MSFT EFI specification.
@bug Fix text - doc as defined in MSFT EFI specification.
Copyright (c) 2006, Intel Corporation
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
Copyright (c) 2006, Intel Corporation
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name: EfiImage.h
Module Name: EfiImage.h
**/

10
Tools/Source/TianoTools/PeCoffLoader/Ia32/PeCoffLoaderEx.c
View File

@ -21,15 +21,7 @@ Revision History
--*/
#define EFI_SPECIFICATION_VERSION 0x00000000
#define EDK_RELEASE_VERSION 0x00020000
#include <Base.h>
#include <Library/PeCoffLib.h>
#include <Library/BaseMemoryLib.h>
#include <Common/UefiBaseTypes.h>
RETURN_STATUS
PeCoffLoaderRelocateImageEx (

6
Tools/Source/TianoTools/PeCoffLoader/Ipf/PeCoffLoaderEx.c
View File

@ -22,11 +22,9 @@ Revision History
--*/
#define EFI_SPECIFICATION_VERSION 0x00000000
#define EDK_RELEASE_VERSION 0x00020000
#include <Base.h>
#include <Common/UefiBaseTypes.h>
#include <Common/EfiImage.h>
#include <Library/PeCoffLib.h>
#include <Library/BaseMemoryLib.h>

6
Tools/Source/TianoTools/PeCoffLoader/X64/PeCoffLoaderEx.c
View File

@ -22,11 +22,9 @@ Revision History
--*/
#define EFI_SPECIFICATION_VERSION 0x00000000
#define EDK_RELEASE_VERSION 0x00020000
#include <Base.h>
#include <Common/UefiBaseTypes.h>
#include <Common/EfiImage.h>
#include <Library/PeCoffLib.h>
#include <Library/BaseMemoryLib.h>

12
Tools/Source/TianoTools/PeCoffLoader/build.xml
View File

@ -125,11 +125,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/${LibName}"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Include/Library"/>
<includepath path="${PACKAGE_DIR}/Common"/>
</cc>
</target>
@ -150,11 +146,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/${LibName}"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Include/Library"/>
<includepath path="${PACKAGE_DIR}/Common"/>
</cc>
</target>
@ -175,11 +167,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/${LibName}"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Include/Library"/>
<includepath path="${PACKAGE_DIR}/Common"/>
</cc>
</target>

13
Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
View File

@ -22,19 +22,18 @@ Abstract:
--*/
#include <UefiBaseTypes.h>
#include <Base.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "CommonLib.h"
#include <Common/UefiBaseTypes.h>
#include <Common/FirmwareVolumeImageFormat.h>
#include <Common/FirmwareFileSystem.h>
#include <Library/PeCoffLib.h>
#include "ParseInf.h"
#include "FvLib.h"
#include "EfiUtilityMsgs.h"
#include "FirmwareFileSystem.h"
#include "PeCoffLib.h"
#include "PeiRebaseExe.h"
EFI_STATUS

8
Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h
View File

@ -23,10 +23,10 @@ Abstract:
#ifndef _EFI_PEIM_FIXUP_EXE_H
#define _EFI_PEIM_FIXUP_EXE_H
// #include "Efi2WinNt.h"
#include "FirmwareFileSystem.h"
#include "FirmwareVolumeHeader.h"
#include "MultiPhase.h"
#include <Common/FirmwareVolumeImageFormat.h>
#include <Common/FirmwareFileSystem.h>
#include <Common/FirmwareVolumeHeader.h>
#include <Common/MultiPhase.h>
//
// Utility Name

35
Tools/Source/TianoTools/PeiRebase/build.xml
View File

@ -63,22 +63,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</echo>
</else>
</if>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<property name="ext_static" value=".lib"/>
<property name="ext_dynamic" value=".dll"/>
<property name="ext_exe" value=".exe"/>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<property name="ext_static" value=".a"/>
<property name="ext_dynamic" value=".so"/>
<property name="ext_exe" value=""/>
</then>
</elseif>
</if>
</then>
</elseif>
</if>
</target>
<target name="PeiRebase_Ia32" depends="init">
@ -92,11 +92,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Include/Library"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_Ia32"/>
<libset dir="${LIB_DIR}" libs="CommonTools PeCoffLoader_Ia32"/>
</cc>
</target>
@ -111,11 +108,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Include/Library"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_Ipf"/>
<libset dir="${LIB_DIR}" libs="CommonTools PeCoffLoader_Ipf"/>
</cc>
</target>
@ -130,11 +124,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Include/Library"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_X64"/>
<libset dir="${LIB_DIR}" libs="CommonTools PeCoffLoader_X64"/>
</cc>
</target>

2
Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.c
View 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);
free ((VOID *)FileBufferRaw);
return STATUS_ERROR;
}
}
//
// Fix up Ap reset vector and calculate the IPI vector
//

13
Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
View File

@ -25,12 +25,13 @@ Abstract:
#include <stdio.h>
#include <stdlib.h>
#include <UefiBaseTypes.h>
#include <Base.h>
#include "EfiImage.h"
#include <FirmwareVolumeImageFormat.h>
#include "FirmwareFileSystem.h"
#include "FirmwareVolumeHeader.h"
#include <Common/UefiBaseTypes.h>
#include <Common/EfiImage.h>
#include <Common/FirmwareVolumeImageFormat.h>
#include <Common/FirmwareFileSystem.h>
#include <Common/FirmwareVolumeHeader.h>
#include "EfiUtilityMsgs.c"
#include "CommonLib.h"

4
Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
View File

@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>

9
Tools/Source/TianoTools/SecFixup/SecFixup.c
View File

@ -28,12 +28,11 @@ Abstract:
#include <stdio.h>
#include <UefiBaseTypes.h>
#include <Base.h>
#include "EfiImage.h"
#include "FirmwareVolumeImageFormat.h"
#include "EfiUtilityMsgs.c"
#include <Common/UefiBaseTypes.h>
#include <Common/EfiImage.h>
#include <Common/FirmwareVolumeImageFormat.h>
#include "EfiUtilityMsgs.c"
#include "SecFixup.h"
VOID

4
Tools/Source/TianoTools/SecFixup/build.xml
View File

@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>

22
Tools/Source/TianoTools/SetStamp/build.xml
View File

@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</echo>
</else>
</if>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<if>
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<property name="ext_static" value=".lib"/>
<property name="ext_dynamic" value=".dll"/>
<property name="ext_exe" value=".exe"/>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
</then>
<elseif>
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<property name="ext_static" value=".a"/>
<property name="ext_dynamic" value=".so"/>
<property name="ext_exe" value=""/>
</then>
</elseif>
</if>
</then>
</elseif>
</if>
</target>
<target name="Tool" depends="init">
@ -92,10 +92,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc>
</target>

3
Tools/Source/TianoTools/SplitFile/build.xml
View File

@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
</cc>
</target>

6
Tools/Source/TianoTools/StrGather/StrGather.c
View File

@ -24,9 +24,9 @@ Abstract:
#include <stdlib.h>
#include <ctype.h>
#include <Base.h>
#include <UefiBaseTypes.h>
#include <CommonLib.h>
#include <Common/UefiBaseTypes.h>
#include "CommonLib.h"
#include "EfiUtilityMsgs.h"
#include "StrGather.h"
#include "StringDB.h"

15
Tools/Source/TianoTools/StrGather/StringDB.c
View File

@ -23,18 +23,17 @@ Abstract:
#include <stdlib.h>
#include <string.h>
#include <ctype.h> // for tolower()
#include <Base.h>
#include <UefiBaseTypes.h>
#include <MultiPhase.h>
#include <BaseLib.h>
#include <Common/UefiBaseTypes.h>
#include <Common/MultiPhase.h>
#include <Common/InternalFormRepresentation.h>
#include <Protocol/UgaDraw.h> // for EFI_UGA_PIXEL definition
#include <Protocol/Hii.h>
#include "EfiUtilityMsgs.h"
#include "StrGather.h"
#include "StringDB.h"
#include "InternalFormRepresentation.h"
// #include EFI_PROTOCOL_DEFINITION (Hii)
#include <UgaDraw.h>
#include <Hii.h>
#define STRING_OFFSET RELOFST

5
Tools/Source/TianoTools/StrGather/build.xml
View File

@ -95,11 +95,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Include/Library"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress String"/>
<libset dir="${LIB_DIR}" libs="CommonTools String"/>
</cc>
</target>

8
Tools/Source/TianoTools/String/PrintLib.c
View File

@ -14,10 +14,10 @@
**/
#include <Base.h>
#include <UefiBaseTypes.h>
#include <PrintLib.h>
#include <CommonLib.h>
#include <Common/UefiBaseTypes.h>
#include <Library/PrintLib.h>
#include "CommonLib.h"
#include "PrintLibInternal.h"
typedef struct {

9
Tools/Source/TianoTools/String/PrintLibInternal.c
View File

@ -14,11 +14,10 @@
**/
#include <Base.h>
#include <UefiBaseTypes.h>
#include <PrintLib.h>
#include <BaseLib.h>
#include <CommonLib.h>
#include <Common/UefiBaseTypes.h>
#include <Library/PrintLib.h>
#include "CommonLib.h"
#include "PrintLibInternal.h"
static CONST CHAR8 mHexStr[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};

107
Tools/Source/TianoTools/String/String.c
View File

@ -15,13 +15,10 @@
**/
#include <assert.h>
#include <Base.h>
#include <UefiBaseTypes.h>
#include <BaseLib.h>
#include <PcdLib.h>
#include <CommonLib.h>
#define _gPcd_FixedAtBuild_PcdMaximumUnicodeStringLength 0
#define _gPcd_FixedAtBuild_PcdMaximumAsciiStringLength 0
#include <Common/UefiBaseTypes.h>
#include "CommonLib.h"
/**
Copies one Null-terminated Unicode string to another Null-terminated Unicode
@ -34,8 +31,6 @@
If Destination is NULL, then ASSERT().
If Source is NULL, then ASSERT().
If Source and Destination overlap, then ASSERT().
If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
@param Destination Pointer to a Null-terminated Unicode string.
@param Source Pointer to a Null-terminated Unicode string.
@ -87,8 +82,6 @@ StrCpy (
If Destination is NULL, then ASSERT().
If Source is NULL, then ASSERT().
If Source and Destination overlap, then ASSERT().
If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
@param Destination Pointer to a Null-terminated Unicode string.
@param Source Pointer to a Null-terminated Unicode string.
@ -130,7 +123,6 @@ StrnCpy (
Length--;
}
// ZeroMem (Destination, Length * sizeof (*Destination));
memset (Destination, 0, Length * sizeof (*Destination));
return ReturnValue;
}
@ -142,8 +134,6 @@ StrnCpy (
Unicode string specified by String.
If String is NULL, then ASSERT().
If PcdMaximumUnicodeStringLength is not zero, and String contains more than
PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
@param String Pointer to a Null-terminated Unicode string.
@ -161,13 +151,7 @@ StrLen (
ASSERT (String != NULL);
for (Length = 0; *String != L'\0'; String++, Length++) {
//
// If PcdMaximumUnicodeStringLength is not zero,
// length should not more than PcdMaximumUnicodeStringLength
//
if (FixedPcdGet32 (PcdMaximumUnicodeStringLength) != 0) {
ASSERT (Length < FixedPcdGet32 (PcdMaximumUnicodeStringLength));
}
;
}
return Length;
}
@ -180,8 +164,6 @@ StrLen (
string specified by String.
If String is NULL, then ASSERT().
If PcdMaximumUnicodeStringLength is not zero, and String contains more than
PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
@param String Pointer to a Null-terminated Unicode string.
@ -209,10 +191,6 @@ StrSize (
If FirstString is NULL, then ASSERT().
If SecondString is NULL, then ASSERT().
If PcdMaximumUnicodeStringLength is not zero, and FirstString contains more
than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
If PcdMaximumUnicodeStringLength is not zero, and SecondString contains more
than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
@param FirstString Pointer to a Null-terminated Unicode string.
@param SecondString Pointer to a Null-terminated Unicode string.
@ -229,7 +207,7 @@ StrCmp (
)
{
//
// ASSERT both strings are less long than PcdMaximumUnicodeStringLength
// ASSERT both strings should never be zero
//
ASSERT (StrSize (FirstString) != 0);
ASSERT (StrSize (SecondString) != 0);
@ -254,10 +232,6 @@ StrCmp (
If FirstString is NULL, then ASSERT().
If SecondString is NULL, then ASSERT().
If PcdMaximumUnicodeStringLength is not zero, and FirstString contains more
than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
If PcdMaximumUnicodeStringLength is not zero, and SecondString contains more
than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
@param FirstString Pointer to a Null-terminated Unicode string.
@param SecondString Pointer to a Null-terminated Unicode string.
@ -280,8 +254,7 @@ StrnCmp (
}
//
// ASSERT both strings are less long than PcdMaximumUnicodeStringLength.
// Length tests are performed inside StrLen().
// ASSERT both strings should never be zero
//
ASSERT (StrSize (FirstString) != 0);
ASSERT (StrSize (SecondString) != 0);
@ -310,13 +283,6 @@ StrnCmp (
If Destination is NULL, then ASSERT().
If Source is NULL, then ASSERT().
If Source and Destination overlap, then ASSERT().
If PcdMaximumUnicodeStringLength is not zero, and Destination contains more
than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
If PcdMaximumUnicodeStringLength is not zero, and concatenating Destination
and Source results in a Unicode string with more than
PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
@param Destination Pointer to a Null-terminated Unicode string.
@param Source Pointer to a Null-terminated Unicode string.
@ -335,7 +301,6 @@ StrCat (
//
// Size of the resulting string should never be zero.
// PcdMaximumUnicodeStringLength is tested inside StrLen().
//
ASSERT (StrSize (Destination) != 0);
return Destination;
@ -357,13 +322,6 @@ StrCat (
If Destination is NULL, then ASSERT().
If Source is NULL, then ASSERT().
If Source and Destination overlap, then ASSERT().
If PcdMaximumUnicodeStringLength is not zero, and Destination contains more
than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
If PcdMaximumUnicodeStringLength is not zero, and concatenating Destination
and Source results in a Unicode string with more than
PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
@param Destination Pointer to a Null-terminated Unicode string.
@param Source Pointer to a Null-terminated Unicode string.
@ -385,7 +343,6 @@ StrnCat (
//
// Size of the resulting string should never be zero.
// PcdMaximumUnicodeStringLength is tested inside StrLen().
//
ASSERT (StrSize (Destination) != 0);
return Destination;
@ -402,8 +359,6 @@ StrnCat (
If Destination is NULL, then ASSERT().
If Source is NULL, then ASSERT().
If Source and Destination overlap, then ASSERT().
If PcdMaximumAsciiStringLength is not zero and Source contains more than
PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
@param Destination Pointer to a Null-terminated ASCII string.
@param Source Pointer to a Null-terminated ASCII string.
@ -454,8 +409,6 @@ AsciiStrCpy (
If Destination is NULL, then ASSERT().
If Source is NULL, then ASSERT().
If Source and Destination overlap, then ASSERT().
If PcdMaximumAsciiStringLength is not zero, and Source contains more than
PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
@param Destination Pointer to a Null-terminated ASCII string.
@param Source Pointer to a Null-terminated ASCII string.
@ -508,8 +461,6 @@ AsciiStrnCpy (
ASCII string specified by String.
If String is NULL, then ASSERT().
If PcdMaximumAsciiStringLength is not zero and String contains more than
PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
@param String Pointer to a Null-terminated ASCII string.
@ -527,13 +478,7 @@ AsciiStrLen (
ASSERT (String != NULL);
for (Length = 0; *String != '\0'; String++, Length++) {
//
// If PcdMaximumUnicodeStringLength is not zero,
// length should not more than PcdMaximumUnicodeStringLength
//
if (FixedPcdGet32 (PcdMaximumAsciiStringLength) != 0) {
ASSERT (Length < FixedPcdGet32 (PcdMaximumAsciiStringLength));
}
;
}
return Length;
}
@ -546,8 +491,6 @@ AsciiStrLen (
specified by String.
If String is NULL, then ASSERT().
If PcdMaximumAsciiStringLength is not zero and String contains more than
PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
@param String Pointer to a Null-terminated ASCII string.
@ -575,10 +518,6 @@ AsciiStrSize (
If FirstString is NULL, then ASSERT().
If SecondString is NULL, then ASSERT().
If PcdMaximumAsciiStringLength is not zero and FirstString contains more than
PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
If PcdMaximumAsciiStringLength is not zero and SecondString contains more
than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
@param FirstString Pointer to a Null-terminated ASCII string.
@param SecondString Pointer to a Null-terminated ASCII string.
@ -595,7 +534,7 @@ AsciiStrCmp (
)
{
//
// ASSERT both strings are less long than PcdMaximumAsciiStringLength
// ASSERT both strings should never be zero
//
ASSERT (AsciiStrSize (FirstString));
ASSERT (AsciiStrSize (SecondString));
@ -631,10 +570,6 @@ AsciiToUpper (
If FirstString is NULL, then ASSERT().
If SecondString is NULL, then ASSERT().
If PcdMaximumAsciiStringLength is not zero and FirstString contains more than
PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
If PcdMaximumAsciiStringLength is not zero and SecondString contains more
than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
@param FirstString Pointer to a Null-terminated ASCII string.
@param SecondString Pointer to a Null-terminated ASCII string.
@ -653,7 +588,7 @@ AsciiStriCmp (
)
{
//
// ASSERT both strings are less long than PcdMaximumAsciiStringLength
// ASSERT both strings should never be zero
//
ASSERT (AsciiStrSize (FirstString));
ASSERT (AsciiStrSize (SecondString));
@ -680,10 +615,6 @@ AsciiStriCmp (
If FirstString is NULL, then ASSERT().
If SecondString is NULL, then ASSERT().
If PcdMaximumAsciiStringLength is not zero and FirstString contains more than
PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
If PcdMaximumAsciiStringLength is not zero and SecondString contains more
than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
@param FirstString Pointer to a Null-terminated ASCII string.
@param SecondString Pointer to a Null-terminated ASCII string.
@ -701,7 +632,7 @@ AsciiStrnCmp (
)
{
//
// ASSERT both strings are less long than PcdMaximumAsciiStringLength
// ASSERT both strings should never be zero
//
ASSERT (AsciiStrSize (FirstString));
ASSERT (AsciiStrSize (SecondString));
@ -727,13 +658,6 @@ AsciiStrnCmp (
If Destination is NULL, then ASSERT().
If Source is NULL, then ASSERT().
If PcdMaximumAsciiStringLength is not zero and Destination contains more than
PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
If PcdMaximumAsciiStringLength is not zero and Source contains more than
PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
If PcdMaximumAsciiStringLength is not zero and concatenating Destination and
Source results in a ASCII string with more than PcdMaximumAsciiStringLength
ASCII characters, then ASSERT().
@param Destination Pointer to a Null-terminated ASCII string.
@param Source Pointer to a Null-terminated ASCII string.
@ -752,7 +676,6 @@ AsciiStrCat (
//
// Size of the resulting string should never be zero.
// PcdMaximumUnicodeStringLength is tested inside StrLen().
//
ASSERT (AsciiStrSize (Destination) != 0);
return Destination;
@ -774,13 +697,6 @@ AsciiStrCat (
If Destination is NULL, then ASSERT().
If Source is NULL, then ASSERT().
If Source and Destination overlap, then ASSERT().
If PcdMaximumAsciiStringLength is not zero, and Destination contains more
than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
If PcdMaximumAsciiStringLength is not zero, and Source contains more than
PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
If PcdMaximumAsciiStringLength is not zero, and concatenating Destination and
Source results in a ASCII string with more than PcdMaximumAsciiStringLength
ASCII characters, then ASSERT().
@param Destination Pointer to a Null-terminated ASCII string.
@param Source Pointer to a Null-terminated ASCII string.
@ -802,7 +718,6 @@ AsciiStrnCat (
//
// Size of the resulting string should never be zero.
// PcdMaximumUnicodeStringLength is tested inside StrLen().
//
ASSERT (AsciiStrSize (Destination) != 0);
return Destination;

4
Tools/Source/TianoTools/String/build.xml
View File

@ -116,11 +116,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/${LibName}"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Include/Library"/>
<includepath path="${PACKAGE_DIR}/Common"/>
</cc>
</target>

2
Tools/Source/TianoTools/Strip/Strip.c
View File

@ -82,7 +82,7 @@ Returns:
fseek (InFile, 0, SEEK_SET);
Buffer = malloc (FileSize);
Buffer = (char *) malloc (FileSize);
if (Buffer == NULL) {
printf ("Error: Out of resources.\n");
return -1;

3
Tools/Source/TianoTools/Strip/build.xml
View File

@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
</cc>
</target>

6
Tools/Source/TianoTools/VfrCompile/EfiVfr.h
View File

@ -23,11 +23,11 @@ Abstract:
#ifndef _EFI_VFR_H_
#define _EFI_VFR_H_
#include <Base.h>
#include <UefiBaseTypes.h>
#include "InternalFormRepresentation.h"
#include <string.h>
#include <Common/UefiBaseTypes.h>
#include <Common/InternalFormRepresentation.h>
//
// This number should be incremented with each change to the VFR compiler.
// We write the version to the output list file for debug purposes.

13
Tools/Source/TianoTools/VfrCompile/VfrCompile.g
View File

@ -21,15 +21,16 @@ Abstract:
#header<<
#include <Base.h>
#include <UefiBaseTypes.h>
#include <CommonLib.h>
#include <MultiPhase.h>
#include <Common/UefiBaseTypes.h>
#include <Common/MultiPhase.h>
#include <Common/InternalFormRepresentation.h>
#include <Protocol/UgaDraw.h>
#include <Protocol/Hii.h>
#include "CommonLib.h"
#include "EfiUtilityMsgs.h"
#include "EfiVfr.h"
#include "VfrServices.h"
#include <UgaDraw.h>
#include <Hii.h>
#include <ctype.h>
#ifndef __GNUC__

11
Tools/Source/TianoTools/VfrCompile/VfrServices.cpp
View File

@ -22,15 +22,16 @@ Abstract:
#include <stdio.h> // for FILE routines
#include <stdlib.h> // for malloc() and free()
#include <Base.h>
#include <UefiBaseTypes.h>
#include <MultiPhase.h>
#include <Common/UefiBaseTypes.h>
#include <Common/MultiPhase.h>
#include <Common/InternalFormRepresentation.h>
#include <Protocol/UgaDraw.h> // for EFI_UGA_PIXEL definition
#include <Protocol/Hii.h>
#include "EfiUtilityMsgs.h"
#include "EfiVfr.h"
#include "VfrServices.h"
#include <UgaDraw.h>
#include <Hii.h>
static const char *mSourceFileHeader[] = {
"//",

26
Tools/Source/TianoTools/VfrCompile/build.xml
View File

@ -77,25 +77,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</then>
</elseif>
</if>
<condition property="CheckDepends">
<uptodate targetfile="${WORKSPACE}/Tools/bin/VfrCompile${ext_exe}">
<srcfiles dir="${WORKSPACE}/Tools/Source/TianoTools/VfrCompile"
<condition property="CheckDepends">
<uptodate targetfile="${WORKSPACE}/Tools/bin/VfrCompile${ext_exe}">
<srcfiles dir="${WORKSPACE}/Tools/Source/TianoTools/VfrCompile"
includes="EfiVfrParser.cpp DLGLexer.cpp VfrCompile.cpp VfrCompile.g VfrServices.cpp parser.dlg"/>
</uptodate>
</condition>
</uptodate>
</condition>
<condition property="gxx_extra_libs" value="stdc++ System gcc_s.10.4 gcc">
<os family="mac"/>
</condition>
</condition>
<condition property="gxx_extra_libs" value="stdc++">
<os name="linux"/>
</condition>
</condition>
<condition property="gxx_extra_libs" value="stdc++">
<os family="windows"/>
</condition>
</condition>
</target>
<target name="Antlr" depends="init" unless="CheckDepends">
@ -122,11 +122,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<fileset dir="${basedir}/Pccts/h"
includes="${FileSetPccts}" />
<includepath path="${env.WORKSPACE}/Tools/Source/TianoTools/Pccts/h"/>
<includepath path="${PACKAGE_DIR}/Pccts/h"/>
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
<syslibset libs="${gxx_extra_libs}" if="gcc"/>

3
Tools/Source/TianoTools/ZeroDebugData/build.xml
View File

@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/>
<includepath path="${PACKAGE_DIR}/Include/Common"/>
<includepath path="${PACKAGE_DIR}/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
</cc>
</target>

2
Tools/Source/TianoTools/build.xml
View File

@ -65,8 +65,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</else>
</if>
<ToolChainSetup confPath="${WORKSPACE_DIR}/Tools/Conf" />
<if>
<isset property="env.TOOL_CHAIN" />
<then>