From fd171542e0aa89ac12a09d79608173f48019b14b Mon Sep 17 00:00:00 2001 From: vanjeff Date: Fri, 11 Sep 2009 03:14:43 +0000 Subject: Sync basetools' source and binary files with r1707 of the basetools project. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9257 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Source/C/Include/Common/BaseTypes.h | 16 ++++++++-------- BaseTools/Source/C/Include/Common/PiFirmwareFile.h | 1 + BaseTools/Source/C/Include/Common/UefiCapsule.h | 3 ++- .../C/Include/Common/UefiInternalFormRepresentation.h | 2 +- BaseTools/Source/C/Include/Ia32/ProcessorBind.h | 4 ++-- BaseTools/Source/C/Include/IndustryStandard/Acpi1_0.h | 1 + 6 files changed, 15 insertions(+), 12 deletions(-) (limited to 'BaseTools/Source/C/Include') diff --git a/BaseTools/Source/C/Include/Common/BaseTypes.h b/BaseTools/Source/C/Include/Common/BaseTypes.h index 438d949a6b..43721ae469 100644 --- a/BaseTools/Source/C/Include/Common/BaseTypes.h +++ b/BaseTools/Source/C/Include/Common/BaseTypes.h @@ -26,7 +26,7 @@ #include // -// Modifiers to absract standard types to aid in debug of problems +// Modifiers to abstract standard types to aid in debug of problems // #define CONST const #define STATIC static @@ -38,8 +38,8 @@ // #ifndef IN // -// Some other envirnments use this construct, so #ifndef to prevent -// mulitple definition. +// Some other environments use this construct, so #ifndef to prevent +// multiple definition. // #define IN #define OUT @@ -68,13 +68,13 @@ // // Support for variable length argument lists using the ANSI standard. // -// Since we are using the ANSI standard we used the standard nameing and -// did not folow the coding convention +// Since we are using the ANSI standard we used the standard naming and +// did not follow the coding convention // // VA_LIST - typedef for argument list. // VA_START (VA_LIST Marker, argument before the ...) - Init Marker for use. // VA_END (VA_LIST Marker) - Clear Marker -// VA_ARG (VA_LIST Marker, var arg size) - Use Marker to get an argumnet from +// VA_ARG (VA_LIST Marker, var arg size) - Use Marker to get an argument from // the ... list. You must know the size and pass it in this macro. // // example: @@ -136,12 +136,12 @@ #define _CR(Record, TYPE, Field) ((TYPE *) ((CHAR8 *) (Record) - (CHAR8 *) &(((TYPE *) 0)->Field))) /// -/// ALIGN_POINTER - aligns a pointer to the lowest boundry +/// ALIGN_POINTER - aligns a pointer to the lowest boundary /// #define ALIGN_POINTER(p, s) ((VOID *) ((UINTN)(p) + (((s) - ((UINTN) (p))) & ((s) - 1)))) /// -/// ALIGN_VARIABLE - aligns a variable up to the next natural boundry for int size of a processor +/// ALIGN_VARIABLE - aligns a variable up to the next natural boundary for int size of a processor /// #define ALIGN_VARIABLE(Value, Adjustment) \ Adjustment = 0U; \ diff --git a/BaseTools/Source/C/Include/Common/PiFirmwareFile.h b/BaseTools/Source/C/Include/Common/PiFirmwareFile.h index 1e9f6028b4..158e672970 100644 --- a/BaseTools/Source/C/Include/Common/PiFirmwareFile.h +++ b/BaseTools/Source/C/Include/Common/PiFirmwareFile.h @@ -134,6 +134,7 @@ typedef UINT8 EFI_SECTION_TYPE; #define EFI_SECTION_FREEFORM_SUBTYPE_GUID 0x18 #define EFI_SECTION_RAW 0x19 #define EFI_SECTION_PEI_DEPEX 0x1B +#define EFI_SECTION_SMM_DEPEX 0x1C typedef struct { UINT8 Size[3]; diff --git a/BaseTools/Source/C/Include/Common/UefiCapsule.h b/BaseTools/Source/C/Include/Common/UefiCapsule.h index d50492662b..70d87234f7 100644 --- a/BaseTools/Source/C/Include/Common/UefiCapsule.h +++ b/BaseTools/Source/C/Include/Common/UefiCapsule.h @@ -1,7 +1,7 @@ /** @file Defines for the EFI Capsule functionality. - Copyright (c) 2006 - 2008, Intel Corporation All rights reserved. + Copyright (c) 2006 - 2009, 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 @@ -30,5 +30,6 @@ typedef struct { #define CAPSULE_FLAGS_PERSIST_ACROSS_RESET 0x00010000 #define CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE 0x00020000 +#define CAPSULE_FLAGS_INITIATE_RESET 0x00040000 #endif // #ifndef _EFI_CAPSULE_H_ diff --git a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h index a127c952d4..f54614abf2 100644 --- a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h +++ b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h @@ -839,7 +839,7 @@ typedef struct _EFI_IFR_REF4 { typedef struct _EFI_IFR_RESET_BUTTON { EFI_IFR_OP_HEADER Header; - EFI_IFR_QUESTION_HEADER Question; + EFI_IFR_STATEMENT_HEADER Statement; EFI_DEFAULT_ID DefaultId; } EFI_IFR_RESET_BUTTON; diff --git a/BaseTools/Source/C/Include/Ia32/ProcessorBind.h b/BaseTools/Source/C/Include/Ia32/ProcessorBind.h index 122a0b1178..df778a583e 100644 --- a/BaseTools/Source/C/Include/Ia32/ProcessorBind.h +++ b/BaseTools/Source/C/Include/Ia32/ProcessorBind.h @@ -54,7 +54,7 @@ #pragma warning ( disable : 4057 ) // -// ASSERT(FALSE) or while (TRUE) are legal constructes so supress this warning +// ASSERT(FALSE) or while (TRUE) are legal constructs so suppress this warning // #pragma warning ( disable : 4127 ) @@ -141,7 +141,7 @@ typedef INT32 INTN; // // Modifier to ensure that all protocol member functions and EFI intrinsics // use the correct C calling convention. All protocol member functions and -// EFI intrinsics are required to modify thier member functions with EFIAPI. +// EFI intrinsics are required to modify their member functions with EFIAPI. // #if _MSC_EXTENSIONS // diff --git a/BaseTools/Source/C/Include/IndustryStandard/Acpi1_0.h b/BaseTools/Source/C/Include/IndustryStandard/Acpi1_0.h index 946c524ddb..fb8599333c 100644 --- a/BaseTools/Source/C/Include/IndustryStandard/Acpi1_0.h +++ b/BaseTools/Source/C/Include/IndustryStandard/Acpi1_0.h @@ -114,6 +114,7 @@ typedef struct { #define EFI_ACPI_1_0_TMR_VAL_EXT (1 << 8) #define EFI_ACPI_1_0_DCK_CAP (1 << 9) +#define EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION 0x0 // // Firmware ACPI Control Structure // -- cgit v1.2.3