Sync SECTION_SIZE() and EFI_COMMON_SECTION_HEADER_UNION from MdePkg to BaseTools, from an earlier patch in this series.
Cc: Bob Feng <bob.c.f...@intel.com> Cc: Liming Gao <liming....@intel.com> Cc: Yonghong Zhu <yonghong....@intel.com> Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=1710 Signed-off-by: Laszlo Ersek <ler...@redhat.com> --- BaseTools/Source/C/Include/Common/PiFirmwareFile.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/C/Include/Common/PiFirmwareFile.h b/BaseTools/Source/C/Include/Common/PiFirmwareFile.h index 5bc871df4855..0ce89e1074a7 100644 --- a/BaseTools/Source/C/Include/Common/PiFirmwareFile.h +++ b/BaseTools/Source/C/Include/Common/PiFirmwareFile.h @@ -144,16 +144,21 @@ typedef UINT8 EFI_SECTION_TYPE; #define EFI_SECTION_PEI_DEPEX 0x1B #define EFI_SECTION_SMM_DEPEX 0x1C typedef struct { UINT8 Size[3]; EFI_SECTION_TYPE Type; } EFI_COMMON_SECTION_HEADER; +typedef union { + EFI_COMMON_SECTION_HEADER Hdr; + UINT32 Uint32; +} EFI_COMMON_SECTION_HEADER_UNION; + typedef struct { UINT8 Size[3]; EFI_SECTION_TYPE Type; UINT32 ExtendedSize; } EFI_COMMON_SECTION_HEADER2; #define MAX_SECTION_SIZE 0x1000000 @@ -296,17 +301,17 @@ typedef struct { typedef struct { EFI_COMMON_SECTION_HEADER2 CommonHeader; UINT16 BuildNumber; CHAR16 VersionString[1]; } EFI_VERSION_SECTION2; #define SECTION_SIZE(SectionHeaderPtr) \ - ((UINT32) (*((UINT32 *) ((EFI_COMMON_SECTION_HEADER *) SectionHeaderPtr)->Size) & 0x00ffffff)) + (((EFI_COMMON_SECTION_HEADER_UNION *) (SectionHeaderPtr))->Uint32 & 0x00ffffff) #pragma pack() typedef union { EFI_COMMON_SECTION_HEADER *CommonHeader; EFI_COMPRESSION_SECTION *CompressionSection; EFI_GUID_DEFINED_SECTION *GuidDefinedSection; EFI_PE32_SECTION *Pe32Section; -- 2.19.1.3.g30247aa5d201 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#38988): https://edk2.groups.io/g/devel/message/38988 Mute This Topic: https://groups.io/mt/31070303/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
