Add pack(1) for section header structure.

[mirror_edk2.git] / MdePkg / Include / Pi / PiFirmwareFile.h

diff --git a/MdePkg/Include/Pi/PiFirmwareFile.h b/MdePkg/Include/Pi/PiFirmwareFile.h
index 3f2b8b126edc03ef51fb232c32602802c5e45725..6487ae943d96bd92e6a7a4518ce2a258722ff6cf 100644 (file)
--- a/MdePkg/Include/Pi/PiFirmwareFile.h
+++ b/MdePkg/Include/Pi/PiFirmwareFile.h
@@ -18,6 +18,7 @@
 #ifndef __PI_FIRMWARE_FILE_H__\r
 #define __PI_FIRMWARE_FILE_H__\r
 \r
 #ifndef __PI_FIRMWARE_FILE_H__\r
 #define __PI_FIRMWARE_FILE_H__\r
 \r

+#pragma pack(1)\r

 //\r
 // Used to verify the integrity of the file.\r
 // \r
 //\r
 // Used to verify the integrity of the file.\r
 // \r


@@ -30,22 +31,6 @@ typedef union {
 } EFI_FFS_INTEGRITY_CHECK;\r
 \r
 typedef UINT8 EFI_FV_FILETYPE;\r
 } EFI_FFS_INTEGRITY_CHECK;\r
 \r
 typedef UINT8 EFI_FV_FILETYPE;\r

-\r
-#define EFI_FV_FILETYPE_ALL                   0x00\r
-#define EFI_FV_FILETYPE_RAW                   0x01\r
-#define EFI_FV_FILETYPE_FREEFORM              0x02\r
-#define EFI_FV_FILETYPE_SECURITY_CORE         0x03\r
-#define EFI_FV_FILETYPE_PEI_CORE              0x04\r
-#define EFI_FV_FILETYPE_DXE_CORE              0x05\r
-#define EFI_FV_FILETYPE_PEIM                  0x06\r
-#define EFI_FV_FILETYPE_DRIVER                0x07\r
-#define EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER  0x08\r
-#define EFI_FV_FILETYPE_APPLICATION           0x09\r
-//\r
-// File type 0x0A is reserved and should not be used\r
-//\r
-#define EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE 0x0B\r
-\r

 typedef UINT8 EFI_FFS_FILE_ATTRIBUTES;\r
 typedef UINT8 EFI_FFS_FILE_STATE;\r
 \r
 typedef UINT8 EFI_FFS_FILE_ATTRIBUTES;\r
 typedef UINT8 EFI_FFS_FILE_STATE;\r
 \r


@@ -240,6 +225,7 @@ typedef struct {
 #define SECTION_SIZE(SectionHeaderPtr) \\r
     ((UINT32) (*((UINT32 *) ((EFI_COMMON_SECTION_HEADER *) SectionHeaderPtr)->Size) & 0x00ffffff))\r
 \r
 #define SECTION_SIZE(SectionHeaderPtr) \\r
     ((UINT32) (*((UINT32 *) ((EFI_COMMON_SECTION_HEADER *) SectionHeaderPtr)->Size) & 0x00ffffff))\r
 \r

+#pragma pack()\r

 \r
 #endif\r
 \r
 \r
 #endif\r
 \r