remove duplicated #pragma pack().

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6802 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 5 insertions, 15 deletions

diff --git a/MdePkg/Include/IndustryStandard/Sal.h b/MdePkg/Include/IndustryStandard/Sal.h
index b792df6f6e..ca1bfb2c29 100644
--- a/MdePkg/Include/IndustryStandard/Sal.h
+++ b/MdePkg/Include/IndustryStandard/Sal.h
@@ -392,7 +392,6 @@ typedef struct {
   ///

   UINT8   Reserved2[8];

 } SAL_SYSTEM_TABLE_HEADER;

-#pragma pack()

 

 #define EFI_SAL_ST_HEADER_SIGNATURE "SST_"

 #define EFI_SAL_REVISION            0x0320

@@ -416,9 +415,8 @@ typedef struct {
 #define EFI_SAL_ST_PTC_SIZE                16

 #define EFI_SAL_ST_AP_WAKEUP_SIZE          16

 

-#pragma pack(1)

 ///

-/// Format Entrypoint Descriptor Entry

+/// Format of Entrypoint Descriptor Entry

 ///

 typedef struct {

   UINT8   Type;         ///< Type here should be 0

@@ -429,16 +427,15 @@ typedef struct {
   UINT64  Reserved2[2];

 } SAL_ST_ENTRY_POINT_DESCRIPTOR;

 

-#pragma pack(1)

 ///

-/// Format Platform Features Descriptor Entry

+/// Format of Platform Features Descriptor Entry

 ///

 typedef struct {

   UINT8 Type;           ///< Type here should be 2

   UINT8 PlatformFeatures;

   UINT8 Reserved[14];

 } SAL_ST_PLATFORM_FEATURES;

-#pragma pack()

+

 //

 // Value of Platform Feature List

 //

@@ -446,7 +443,6 @@ typedef struct {
 #define SAL_PLAT_FEAT_PLAT_IPI_HINT 0x02

 #define SAL_PLAT_FEAT_PROC_IPI_HINT 0x04

 

-#pragma pack(1)

 ///

 /// Format of Translation Register Descriptor Entry

 ///

@@ -459,14 +455,13 @@ typedef struct {
   UINT64  EncodedPageSize;

   UINT64  Reserved1;

 } SAL_ST_TR_DECRIPTOR;

-#pragma pack()

+

 //

 // Type of Translation Register

 //

 #define EFI_SAL_ST_TR_USAGE_INSTRUCTION 00

 #define EFI_SAL_ST_TR_USAGE_DATA        01

 

-#pragma pack(1)

 ///

 /// Definition of Coherence Domain Information

 ///

@@ -474,9 +469,7 @@ typedef struct {
   UINT64  NumberOfProcessors;

   UINT64  LocalIDRegister;

 } SAL_COHERENCE_DOMAIN_INFO;

-#pragma pack()

-

-#pragma pack(1)

+           

 ///

 /// Format of Purge Translation Cache Coherence Domain Entry

 ///

@@ -486,9 +479,7 @@ typedef struct {
   UINT32                    NumberOfDomains;

   SAL_COHERENCE_DOMAIN_INFO *DomainInformation;

 } SAL_ST_CACHE_COHERENCE_DECRIPTOR;

-#pragma pack()

 

-#pragma pack(1)

 ///

 /// Format of Application Processor Wake-Up Descriptor Entry

 ///

@@ -498,7 +489,6 @@ typedef struct {
   UINT8   Reserved[6];

   UINT64  ExternalInterruptVector;

 } SAL_ST_AP_WAKEUP_DECRIPTOR;

-#pragma pack()

 

 ///

 /// Format of Firmware Interface Table (FIT) Entry