add #pragma pack(1) for some structures.

[mirror_edk2.git] / MdePkg / Include / IndustryStandard / Acpi20.h

diff --git a/MdePkg/Include/IndustryStandard/Acpi20.h b/MdePkg/Include/IndustryStandard/Acpi20.h
index 3b5a4e8a891e134783cb88df61ff2189cc4a5cc6..4476bf9f22d469abde3b322417cb6fd5eb1b4fa6 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi20.h
+++ b/MdePkg/Include/IndustryStandard/Acpi20.h
@@ -32,6 +32,8 @@ typedef struct {
   UINT64  Address;\r
 } EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE;\r
 \r
+#pragma pack()\r
+\r
 //\r
 // Generic Address Space Address IDs\r
 //\r
@@ -97,6 +99,10 @@ typedef struct {
 ///\r
 #define EFI_ACPI_2_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_REVISION 0x01\r
 \r
+//           \r
+// Ensure proper structure formats\r
+//           \r
+#pragma pack(1)\r
 ///\r
 /// Fixed ACPI Description Table Structure (FADT)\r
 ///\r
@@ -154,37 +160,38 @@ typedef struct {
   EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  XGpe0Blk;\r
   EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  XGpe1Blk;\r
 } EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE;\r
+#pragma pack()\r
 \r
 ///\r
 /// FADT Version (as defined in ACPI 2.0 spec.)\r
 ///\r
 #define EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION  0x03\r
 \r
-///\r
-/// Fixed ACPI Description Table Boot Architecture Flags\r
-/// All other bits are reserved and must be set to 0.\r
-///\r
-#define EFI_ACPI_2_0_LEGACY_DEVICES (1 << 0)\r
-#define EFI_ACPI_2_0_8042           (1 << 1)\r
+//\r
+// Fixed ACPI Description Table Boot Architecture Flags\r
+// All other bits are reserved and must be set to 0.\r
+//\r
+#define EFI_ACPI_2_0_LEGACY_DEVICES          BIT0\r
+#define EFI_ACPI_2_0_8042                    BIT1\r
 \r
 //\r
 // Fixed ACPI Description Table Fixed Feature Flags\r
 // All other bits are reserved and must be set to 0.\r
 //\r
-#define EFI_ACPI_2_0_WBINVD         (1 << 0)\r
-#define EFI_ACPI_2_0_WBINVD_FLUSH   (1 << 1)\r
-#define EFI_ACPI_2_0_PROC_C1        (1 << 2)\r
-#define EFI_ACPI_2_0_P_LVL2_UP      (1 << 3)\r
-#define EFI_ACPI_2_0_PWR_BUTTON     (1 << 4)\r
-#define EFI_ACPI_2_0_SLP_BUTTON     (1 << 5)\r
-#define EFI_ACPI_2_0_FIX_RTC        (1 << 6)\r
-#define EFI_ACPI_2_0_RTC_S4         (1 << 7)\r
-#define EFI_ACPI_2_0_TMR_VAL_EXT    (1 << 8)\r
-#define EFI_ACPI_2_0_DCK_CAP        (1 << 9)\r
-#define EFI_ACPI_2_0_RESET_REG_SUP  (1 << 10)\r
-#define EFI_ACPI_2_0_SEALED_CASE    (1 << 11)\r
-#define EFI_ACPI_2_0_HEADLESS       (1 << 12)\r
-#define EFI_ACPI_2_0_CPU_SW_SLP     (1 << 13)\r
+#define EFI_ACPI_2_0_WBINVD                  BIT0\r
+#define EFI_ACPI_2_0_WBINVD_FLUSH            BIT1\r
+#define EFI_ACPI_2_0_PROC_C1                 BIT2\r
+#define EFI_ACPI_2_0_P_LVL2_UP               BIT3\r
+#define EFI_ACPI_2_0_PWR_BUTTON              BIT4\r
+#define EFI_ACPI_2_0_SLP_BUTTON              BIT5\r
+#define EFI_ACPI_2_0_FIX_RTC                 BIT6\r
+#define EFI_ACPI_2_0_RTC_S4                  BIT7\r
+#define EFI_ACPI_2_0_TMR_VAL_EXT             BIT8\r
+#define EFI_ACPI_2_0_DCK_CAP                 BIT9\r
+#define EFI_ACPI_2_0_RESET_REG_SUP           BIT10\r
+#define EFI_ACPI_2_0_SEALED_CASE             BIT11\r
+#define EFI_ACPI_2_0_HEADLESS                BIT12\r
+#define EFI_ACPI_2_0_CPU_SW_SLP              BIT13\r
 \r
 ///\r
 /// Firmware ACPI Control Structure\r
@@ -210,7 +217,7 @@ typedef struct {
 /// Firmware Control Structure Feature Flags\r
 /// All other bits are reserved and must be set to 0.\r
 ///\r
-#define EFI_ACPI_2_0_S4BIOS_F (1 << 0)\r
+#define EFI_ACPI_2_0_S4BIOS_F        BIT0\r
 \r
 ///\r
 /// Multiple APIC Description Table header definition.  The rest of the table\r
@@ -231,7 +238,7 @@ typedef struct {
 /// Multiple APIC Flags\r
 /// All other bits are reserved and must be set to 0.\r
 ///\r
-#define EFI_ACPI_2_0_PCAT_COMPAT  (1 << 0)\r
+#define EFI_ACPI_2_0_PCAT_COMPAT          BIT0\r
 \r
 //\r
 // Multiple APIC Description Table APIC structure types\r
@@ -266,7 +273,7 @@ typedef struct {
 ///\r
 /// Local APIC Flags.  All other bits are reserved and must be 0.\r
 ///\r
-#define EFI_ACPI_2_0_LOCAL_APIC_ENABLED (1 << 0)\r
+#define EFI_ACPI_2_0_LOCAL_APIC_ENABLED         BIT0\r
 \r
 ///\r
 /// IO APIC Structure\r
@@ -302,6 +309,11 @@ typedef struct {
   UINT32  GlobalSystemInterrupt;\r
 } EFI_ACPI_2_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE;\r
 \r
+//\r
+// Ensure proper structure formats\r
+//\r
+#pragma pack(1)\r
+\r
 ///\r
 /// Local APIC NMI Structure\r
 ///\r
@@ -323,6 +335,8 @@ typedef struct {
   UINT64  LocalApicAddress;\r
 } EFI_ACPI_2_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE;\r
 \r
+#pragma pack()\r
+\r
 ///\r
 /// IO SAPIC Structure\r
 ///\r
@@ -403,7 +417,7 @@ typedef struct {
 ///\r
 /// "RSD PTR " Root System Description Pointer\r
 ///\r
-#define EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  0x2052545020445352\r
+#define EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ')\r
 \r
 ///\r
 /// "SPIC" Multiple SAPIC Description Table\r
@@ -411,98 +425,96 @@ typedef struct {
 /// BUGBUG: Don't know where this came from except SR870BN4 uses it.\r
 /// #define EFI_ACPI_2_0_MULTIPLE_SAPIC_DESCRIPTION_TABLE_SIGNATURE 0x43495053\r
 ///\r
-#define EFI_ACPI_2_0_MULTIPLE_SAPIC_DESCRIPTION_TABLE_SIGNATURE 0x43495041\r
+#define EFI_ACPI_2_0_MULTIPLE_SAPIC_DESCRIPTION_TABLE_SIGNATURE  SIGNATURE_32('S', 'P', 'I', 'C')\r
 \r
 ///\r
 /// "BOOT" MS Simple Boot Spec\r
 ///\r
-#define EFI_ACPI_2_0_SIMPLE_BOOT_FLAG_TABLE_SIGNATURE 0x544F4F42\r
+#define EFI_ACPI_2_0_SIMPLE_BOOT_FLAG_TABLE_SIGNATURE  SIGNATURE_32('B', 'O', 'O', 'T')\r
 \r
 ///\r
 /// "DBGP" MS Bebug Port Spec\r
 ///\r
-#define EFI_ACPI_2_0_DEBUG_PORT_TABLE_SIGNATURE 0x50474244\r
+#define EFI_ACPI_2_0_DEBUG_PORT_TABLE_SIGNATURE  SIGNATURE_32('D', 'B', 'G', 'P')\r
 \r
 ///\r
 /// "DSDT" Differentiated System Description Table\r
 ///\r
-#define EFI_ACPI_2_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE  0x54445344\r
+#define EFI_ACPI_2_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE  SIGNATURE_32('D', 'S', 'D', 'T')\r
 \r
 ///\r
 /// "ECDT" Embedded Controller Boot Resources Table\r
 ///\r
-#define EFI_ACPI_2_0_EMBEDDED_CONTROLLER_BOOT_RESOURCES_TABLE_SIGNATURE 0x54444345\r
+#define EFI_ACPI_2_0_EMBEDDED_CONTROLLER_BOOT_RESOURCES_TABLE_SIGNATURE  SIGNATURE_32('E', 'C', 'D', 'T')\r
 \r
 ///\r
 /// "ETDT" Event Timer Description Table\r
 ///\r
-#define EFI_ACPI_2_0_EVENT_TIMER_DESCRIPTION_TABLE_SIGNATURE  0x54445445\r
+#define EFI_ACPI_2_0_EVENT_TIMER_DESCRIPTION_TABLE_SIGNATURE  SIGNATURE_32('E', 'T', 'D', 'T')\r
 \r
 ///\r
 /// "FACS" Firmware ACPI Control Structure\r
 ///\r
-#define EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE  0x53434146\r
+#define EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE  SIGNATURE_32('F', 'A', 'C', 'S')\r
 \r
 ///\r
 /// "FACP" Fixed ACPI Description Table\r
 ///\r
-#define EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE 0x50434146\r
+#define EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE  SIGNATURE_32('F', 'A', 'C', 'P')\r
 \r
 ///\r
 /// "APIC" Multiple APIC Description Table\r
 ///\r
-#define EFI_ACPI_2_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE  0x43495041\r
+#define EFI_ACPI_2_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE  SIGNATURE_32('A', 'P', 'I', 'C')\r
 \r
 ///\r
 /// "PSDT" Persistent System Description Table\r
 ///\r
-#define EFI_ACPI_2_0_PERSISTENT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE  0x54445350\r
+#define EFI_ACPI_2_0_PERSISTENT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE  SIGNATURE_32('P', 'S', 'D', 'T')\r
 \r
 ///\r
 /// "RSDT" Root System Description Table\r
 ///\r
-#define EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE  0x54445352\r
+#define EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE  SIGNATURE_32('R', 'S', 'D', 'T')\r
 \r
 ///\r
 /// "SBST" Smart Battery Specification Table\r
 ///\r
-#define EFI_ACPI_2_0_SMART_BATTERY_SPECIFICATION_TABLE_SIGNATURE  0x54534253\r
+#define EFI_ACPI_2_0_SMART_BATTERY_SPECIFICATION_TABLE_SIGNATURE  SIGNATURE_32('S', 'B', 'S', 'T')\r
 \r
 ///\r
 /// "SLIT" System Locality Information Table\r
 ///\r
-#define EFI_ACPI_2_0_SYSTEM_LOCALITY_INFORMATION_TABLE_SIGNATURE  0x54494C53\r
+#define EFI_ACPI_2_0_SYSTEM_LOCALITY_INFORMATION_TABLE_SIGNATURE  SIGNATURE_32('S', 'L', 'I', 'T')\r
 \r
 ///\r
 /// "SPCR" Serial Port Concole Redirection Table\r
 ///\r
-#define EFI_ACPI_2_0_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE  0x52435053\r
+#define EFI_ACPI_2_0_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE  SIGNATURE_32('S', 'P', 'C', 'R')\r
 \r
 ///\r
 /// "SRAT" Static Resource Affinity Table\r
 ///\r
-#define EFI_ACPI_2_0_STATIC_RESOURCE_AFFINITY_TABLE_SIGNATURE 0x54415253\r
+#define EFI_ACPI_2_0_STATIC_RESOURCE_AFFINITY_TABLE_SIGNATURE  SIGNATURE_32('S', 'R', 'A', 'T')\r
 \r
 ///\r
 /// "SSDT" Secondary System Description Table\r
 ///\r
-#define EFI_ACPI_2_0_SECONDARY_SYSTEM_DESCRIPTION_TABLE_SIGNATURE 0x54445353\r
+#define EFI_ACPI_2_0_SECONDARY_SYSTEM_DESCRIPTION_TABLE_SIGNATURE  SIGNATURE_32('S', 'S', 'D', 'T')\r
 \r
 ///\r
 /// "SPMI" Server Platform Management Interface Table\r
 ///\r
-#define EFI_ACPI_2_0_SERVER_PLATFORM_MANAGEMENT_INTERFACE_SIGNATURE 0x494D5053\r
+#define EFI_ACPI_2_0_SERVER_PLATFORM_MANAGEMENT_INTERFACE_SIGNATURE  SIGNATURE_32('S', 'P', 'M', 'I')\r
 \r
 ///\r
 /// "XSDT" Extended System Description Table\r
 ///\r
-#define EFI_ACPI_2_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE  0x54445358\r
+#define EFI_ACPI_2_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE  SIGNATURE_32('X', 'S', 'D', 'T')\r
 \r
 ///\r
 /// "MCFG" Static Resource Affinity Table\r
 ///\r
-#define EFI_ACPI_2_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SIGNATURE 0x4746434D\r
-\r
-#pragma pack()\r
+#define EFI_ACPI_2_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SIGNATURE  SIGNATURE_32('M', 'C', 'F', 'G')\r
 \r
 #endif\r