mirror of
https://github.com/acidanthera/audk.git
synced 2025-04-08 17:05:09 +02:00
Clean ECP for build failure.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6760 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
286f1bd2a9
commit
88b6bcec9d
@ -20,13 +20,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
//
|
||||
// This structure is only intended to be used in this file.
|
||||
//
|
||||
#pragma pack(push, 1)
|
||||
#pragma pack(1)
|
||||
typedef struct {
|
||||
EFI_HII_PACK_HEADER PackageHeader;
|
||||
FRAMEWORK_EFI_IFR_FORM_SET FormSet;
|
||||
FRAMEWORK_EFI_IFR_END_FORM_SET EndFormSet;
|
||||
} FW_HII_FORMSET_TEMPLATE;
|
||||
#pragma pack(pop)
|
||||
#pragma pack()
|
||||
|
||||
FW_HII_FORMSET_TEMPLATE FormSetTemplate = {
|
||||
{
|
||||
|
@ -64,12 +64,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#define FRAMEWORK_RESERVED_VARSTORE_ID 0x0001
|
||||
|
||||
|
||||
#pragma pack (push, 1)
|
||||
#pragma pack (1)
|
||||
typedef struct {
|
||||
EFI_HII_PACK_HEADER FrameworkPackageHeader;
|
||||
EFI_HII_PACKAGE_HEADER PackageHeader;
|
||||
} TIANO_AUTOGEN_PACKAGES_HEADER;
|
||||
#pragma pack (pop)
|
||||
#pragma pack ()
|
||||
|
||||
#define HII_THUNK_PRIVATE_DATA_FROM_THIS(Record) CR(Record, HII_THUNK_PRIVATE_DATA, Hii, HII_THUNK_PRIVATE_DATA_SIGNATURE)
|
||||
#define HII_THUNK_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('H', 'i', 'I', 'T')
|
||||
|
@ -22,6 +22,9 @@ BOOLEAN mInFrameworkHiiRemovePack = FALSE;
|
||||
BOOLEAN mInFrameworkUpdatePakcage = FALSE;
|
||||
UINT64 mGuidCount = 0;
|
||||
|
||||
EFI_GUID mGuidBase = { 0x14f95e01, 0xd562, 0x432e, { 0x84, 0x4a, 0x95, 0xa4, 0x39, 0x5, 0x10, 0x7e }};
|
||||
|
||||
|
||||
|
||||
/**
|
||||
Get the number of package IFR and STRING packages in the package list passed in.
|
||||
@ -357,9 +360,7 @@ GenerateRandomGuid (
|
||||
OUT EFI_GUID * Guid
|
||||
)
|
||||
{
|
||||
EFI_GUID GuidBase = { 0x14f95e01, 0xd562, 0x432e, { 0x84, 0x4a, 0x95, 0xa4, 0x39, 0x5, 0x10, 0x7e }};
|
||||
|
||||
CopyGuid (Guid, &GuidBase);
|
||||
CopyGuid (Guid, &mGuidBase);
|
||||
|
||||
mGuidCount++;
|
||||
*((UINT64 *) Guid) = *((UINT64 *) Guid) + mGuidCount;
|
||||
|
@ -35,7 +35,7 @@ Abstract:
|
||||
0x9576e91, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \
|
||||
}
|
||||
|
||||
#pragma pack(push, 1)
|
||||
#pragma pack(1)
|
||||
|
||||
typedef struct {
|
||||
UINT8 Type;
|
||||
@ -43,7 +43,7 @@ typedef struct {
|
||||
UINT8 Length[2];
|
||||
} EFI_DEVICE_PATH_PROTOCOL;
|
||||
|
||||
#pragma pack(pop)
|
||||
#pragma pack()
|
||||
|
||||
#define EFI_END_ENTIRE_DEVICE_PATH 0xff
|
||||
#define EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE 0xff
|
||||
|
@ -27,7 +27,7 @@ Revision History
|
||||
//#include "pci23.h"
|
||||
//#include "pci30.h"
|
||||
|
||||
#pragma pack(push, 1)
|
||||
#pragma pack(1)
|
||||
|
||||
typedef struct {
|
||||
UINT8 Register;
|
||||
@ -59,6 +59,6 @@ typedef union {
|
||||
EFI_LEGACY_EXPANSION_ROM_HEADER *PcAt;
|
||||
} EFI_PCI_ROM_HEADER;
|
||||
|
||||
#pragma pack(pop)
|
||||
#pragma pack()
|
||||
|
||||
#endif
|
||||
|
@ -57,7 +57,7 @@ Abstract:
|
||||
//
|
||||
// Set structure alignment to 1-byte
|
||||
//
|
||||
#pragma pack (push, 1)
|
||||
#pragma pack (1)
|
||||
|
||||
typedef UINT32 TCG_EVENTTYPE;
|
||||
|
||||
@ -139,6 +139,6 @@ typedef struct tdEFI_VARIABLE_DATA {
|
||||
//
|
||||
// Restore original structure alignment
|
||||
//
|
||||
#pragma pack (pop)
|
||||
#pragma pack ()
|
||||
|
||||
#endif // _EFI_TPM_H_
|
||||
|
@ -28,7 +28,7 @@ Abstract:
|
||||
//
|
||||
// Define MP table structures. All are packed.
|
||||
//
|
||||
#pragma pack(push, 1)
|
||||
#pragma pack(1)
|
||||
|
||||
#define EFI_LEGACY_MP_TABLE_FLOATING_POINTER_SIGNATURE EFI_SIGNATURE_32 ('_', 'M', 'P', '_')
|
||||
typedef struct {
|
||||
@ -278,6 +278,6 @@ typedef struct {
|
||||
UINT32 PredefinedRangeList;
|
||||
} EFI_LEGACY_MP_TABLE_ENTRY_EXT_COMPAT_BUS_ADDR_SPACE_MODIFIER;
|
||||
|
||||
#pragma pack(pop)
|
||||
#pragma pack()
|
||||
|
||||
#endif
|
||||
|
@ -35,7 +35,7 @@ Revision History
|
||||
//
|
||||
#define PCI_VGA_PALETTE_SNOOP_DISABLED 0x20
|
||||
|
||||
#pragma pack(push, 1)
|
||||
#pragma pack(1)
|
||||
typedef struct {
|
||||
UINT16 VendorId;
|
||||
UINT16 DeviceId;
|
||||
@ -544,7 +544,7 @@ typedef struct {
|
||||
#define PCI_BAR_IDX5 0x05
|
||||
#define PCI_BAR_ALL 0xFF
|
||||
|
||||
#pragma pack(pop)
|
||||
#pragma pack()
|
||||
|
||||
//
|
||||
// NOTE: The following header files are included here for
|
||||
|
@ -28,7 +28,7 @@ Revision History
|
||||
#define PCI_CLASS_MASS_STORAGE_SATADPA 0x06
|
||||
#define PCI_CLASS_MASS_STORAGE_AHCI PCI_CLASS_MASS_STORAGE_SATADPA
|
||||
|
||||
#pragma pack(push, 1)
|
||||
#pragma pack(1)
|
||||
|
||||
typedef struct {
|
||||
UINT32 Signature; // "PCIR"
|
||||
@ -47,6 +47,6 @@ typedef struct {
|
||||
UINT16 DMTFCLPEntryPointOffset;
|
||||
} PCI_3_0_DATA_STRUCTURE;
|
||||
|
||||
#pragma pack(pop)
|
||||
#pragma pack()
|
||||
|
||||
#endif
|
||||
|
@ -189,7 +189,11 @@ typedef int64_t intn_t;
|
||||
// Inject a break point in the code to assist debugging.
|
||||
//
|
||||
#define EFI_DEADLOOP() { volatile int __iii; __iii = 1; while (__iii); }
|
||||
#define EFI_BREAKPOINT() __debugbreak()
|
||||
#if _MSC_EXTENSIONS
|
||||
#define EFI_BREAKPOINT() __debugbreak()
|
||||
#elif __GNUC__
|
||||
#define EFI_BREAKPOINT() asm(" int $3");
|
||||
#endif
|
||||
|
||||
//
|
||||
// Memory Fence forces serialization, and is needed to support out of order
|
||||
|
@ -561,8 +561,6 @@ COMPONENT_TYPE = LIBRARY
|
||||
ChkStkGcc.c | GCC
|
||||
|
||||
[Sources.IPF]
|
||||
SynchronizationMsc.c
|
||||
Math64.c
|
||||
Ipf/asm.h
|
||||
Ipf/ia_64gen.h
|
||||
Ipf/PalCallStatic.s
|
||||
@ -570,7 +568,6 @@ COMPONENT_TYPE = LIBRARY
|
||||
Ipf/longjmp.s
|
||||
Ipf/SwitchStack.s
|
||||
Ipf/Unaligned.c
|
||||
Ipf/CpuBreakpoint.c
|
||||
Ipf/InterlockedCompareExchange32.s
|
||||
Ipf/InterlockedCompareExchange64.s
|
||||
Ipf/Synchronization.c
|
||||
@ -589,7 +586,13 @@ COMPONENT_TYPE = LIBRARY
|
||||
Ipf/ExecFc.s
|
||||
Ipf/ReadCpuid.s
|
||||
Ipf/AccessGp.s
|
||||
|
||||
Math64.c
|
||||
Ipf/CpuBreakpoint.c | INTEL
|
||||
Ipf/CpuBreakpoint.c | MSFT
|
||||
Synchronization.c | INTEL
|
||||
SynchronizationMsc.c | MSFT
|
||||
SynchronizationGcc.c | GCC
|
||||
|
||||
[sources.ebc]
|
||||
Math64.c
|
||||
Unaligned.c
|
||||
|
@ -229,7 +229,7 @@ PROCEDURE_ENTRY(LongJump)
|
||||
//
|
||||
// check if RNAT is saved between saved BSP and curr BSPSTORE
|
||||
//
|
||||
dep r18 = 1,r16,3,6 // get RNAT address
|
||||
dep r18 = -1,r16,3,6 // get RNAT address
|
||||
;;
|
||||
cmp.ltu p8,p9 = r18, r17 // RNAT saved on RSE
|
||||
;;
|
||||
|
@ -23,7 +23,7 @@ Abstract:
|
||||
#include "Thunk16Lib.h"
|
||||
#include "EfiCommonLib.h"
|
||||
|
||||
#define IA32API __cdecl
|
||||
#define IA32API EFIAPI
|
||||
|
||||
extern CONST UINTN mCode16Size;
|
||||
|
||||
|
@ -50,7 +50,7 @@ EFI_FORWARD_DECLARATION (EFI_TCG_PROTOCOL);
|
||||
//
|
||||
// Set structure alignment to 1-byte
|
||||
//
|
||||
#pragma pack (push, 1)
|
||||
#pragma pack (1)
|
||||
|
||||
typedef struct {
|
||||
UINT8 Major;
|
||||
@ -74,7 +74,7 @@ typedef UINT32 TCG_ALGORITHM_ID;
|
||||
//
|
||||
// Restore original structure alignment
|
||||
//
|
||||
#pragma pack (pop)
|
||||
#pragma pack ()
|
||||
|
||||
typedef
|
||||
EFI_STATUS
|
||||
|
Loading…
x
Reference in New Issue
Block a user