Revert all the #pramga(1) related patches to r6434, we need to review all the updates carefully.

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

1 files changed, 25 insertions, 37 deletions

diff --git a/MdePkg/Include/IndustryStandard/Acpi20.h b/MdePkg/Include/IndustryStandard/Acpi20.h
index 4476bf9f22..9c1db57a42 100644
--- a/MdePkg/Include/IndustryStandard/Acpi20.h
+++ b/MdePkg/Include/IndustryStandard/Acpi20.h
@@ -32,8 +32,6 @@ typedef struct {
   UINT64  Address;

 } EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE;

 

-#pragma pack()

-

 //

 // Generic Address Space Address IDs

 //

@@ -99,10 +97,6 @@ typedef struct {
 ///

 #define EFI_ACPI_2_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_REVISION 0x01

 

-//           

-// Ensure proper structure formats

-//           

-#pragma pack(1)

 ///

 /// Fixed ACPI Description Table Structure (FADT)

 ///

@@ -160,38 +154,37 @@ typedef struct {
   EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  XGpe0Blk;

   EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  XGpe1Blk;

 } EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE;

-#pragma pack()

 

 ///

 /// FADT Version (as defined in ACPI 2.0 spec.)

 ///

 #define EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION  0x03

 

-//

-// Fixed ACPI Description Table Boot Architecture Flags

-// All other bits are reserved and must be set to 0.

-//

-#define EFI_ACPI_2_0_LEGACY_DEVICES          BIT0

-#define EFI_ACPI_2_0_8042                    BIT1

+///

+/// Fixed ACPI Description Table Boot Architecture Flags

+/// All other bits are reserved and must be set to 0.

+///

+#define EFI_ACPI_2_0_LEGACY_DEVICES (1 << 0)

+#define EFI_ACPI_2_0_8042           (1 << 1)

 

 //

 // Fixed ACPI Description Table Fixed Feature Flags

 // All other bits are reserved and must be set to 0.

 //

-#define EFI_ACPI_2_0_WBINVD                  BIT0

-#define EFI_ACPI_2_0_WBINVD_FLUSH            BIT1

-#define EFI_ACPI_2_0_PROC_C1                 BIT2

-#define EFI_ACPI_2_0_P_LVL2_UP               BIT3

-#define EFI_ACPI_2_0_PWR_BUTTON              BIT4

-#define EFI_ACPI_2_0_SLP_BUTTON              BIT5

-#define EFI_ACPI_2_0_FIX_RTC                 BIT6

-#define EFI_ACPI_2_0_RTC_S4                  BIT7

-#define EFI_ACPI_2_0_TMR_VAL_EXT             BIT8

-#define EFI_ACPI_2_0_DCK_CAP                 BIT9

-#define EFI_ACPI_2_0_RESET_REG_SUP           BIT10

-#define EFI_ACPI_2_0_SEALED_CASE             BIT11

-#define EFI_ACPI_2_0_HEADLESS                BIT12

-#define EFI_ACPI_2_0_CPU_SW_SLP              BIT13

+#define EFI_ACPI_2_0_WBINVD         (1 << 0)

+#define EFI_ACPI_2_0_WBINVD_FLUSH   (1 << 1)

+#define EFI_ACPI_2_0_PROC_C1        (1 << 2)

+#define EFI_ACPI_2_0_P_LVL2_UP      (1 << 3)

+#define EFI_ACPI_2_0_PWR_BUTTON     (1 << 4)

+#define EFI_ACPI_2_0_SLP_BUTTON     (1 << 5)

+#define EFI_ACPI_2_0_FIX_RTC        (1 << 6)

+#define EFI_ACPI_2_0_RTC_S4         (1 << 7)

+#define EFI_ACPI_2_0_TMR_VAL_EXT    (1 << 8)

+#define EFI_ACPI_2_0_DCK_CAP        (1 << 9)

+#define EFI_ACPI_2_0_RESET_REG_SUP  (1 << 10)

+#define EFI_ACPI_2_0_SEALED_CASE    (1 << 11)

+#define EFI_ACPI_2_0_HEADLESS       (1 << 12)

+#define EFI_ACPI_2_0_CPU_SW_SLP     (1 << 13)

 

 ///

 /// Firmware ACPI Control Structure

@@ -217,7 +210,7 @@ typedef struct {
 /// Firmware Control Structure Feature Flags

 /// All other bits are reserved and must be set to 0.

 ///

-#define EFI_ACPI_2_0_S4BIOS_F        BIT0

+#define EFI_ACPI_2_0_S4BIOS_F (1 << 0)

 

 ///

 /// Multiple APIC Description Table header definition.  The rest of the table

@@ -238,7 +231,7 @@ typedef struct {
 /// Multiple APIC Flags

 /// All other bits are reserved and must be set to 0.

 ///

-#define EFI_ACPI_2_0_PCAT_COMPAT          BIT0

+#define EFI_ACPI_2_0_PCAT_COMPAT  (1 << 0)

 

 //

 // Multiple APIC Description Table APIC structure types

@@ -273,7 +266,7 @@ typedef struct {
 ///

 /// Local APIC Flags.  All other bits are reserved and must be 0.

 ///

-#define EFI_ACPI_2_0_LOCAL_APIC_ENABLED         BIT0

+#define EFI_ACPI_2_0_LOCAL_APIC_ENABLED (1 << 0)

 

 ///

 /// IO APIC Structure

@@ -309,11 +302,6 @@ typedef struct {
   UINT32  GlobalSystemInterrupt;

 } EFI_ACPI_2_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE;

 

-//

-// Ensure proper structure formats

-//

-#pragma pack(1)

-

 ///

 /// Local APIC NMI Structure

 ///

@@ -335,8 +323,6 @@ typedef struct {
   UINT64  LocalApicAddress;

 } EFI_ACPI_2_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE;

 

-#pragma pack()

-

 ///

 /// IO SAPIC Structure

 ///

@@ -517,4 +503,6 @@ typedef struct {
 ///

 #define EFI_ACPI_2_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SIGNATURE  SIGNATURE_32('M', 'C', 'F', 'G')

 

+#pragma pack()

+

 #endif