]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdePkg/Include/IndustryStandard/Acpi40.h
MdePkg: Apply uncrustify changes
[mirror_edk2.git] / MdePkg / Include / IndustryStandard / Acpi40.h
index c03ba7a6290b7f3dc3d904c5511dcf674737657e..862113dff906b65626424fcb8957b399863de865 100644 (file)
 /// ACPI 4.0 Generic Address Space definition\r
 ///\r
 typedef struct {\r
-  UINT8   AddressSpaceId;\r
-  UINT8   RegisterBitWidth;\r
-  UINT8   RegisterBitOffset;\r
-  UINT8   AccessSize;\r
-  UINT64  Address;\r
+  UINT8     AddressSpaceId;\r
+  UINT8     RegisterBitWidth;\r
+  UINT8     RegisterBitOffset;\r
+  UINT8     AccessSize;\r
+  UINT64    Address;\r
 } EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE;\r
 \r
 //\r
@@ -53,29 +53,29 @@ typedef struct {
 /// Root System Description Pointer Structure\r
 ///\r
 typedef struct {\r
-  UINT64  Signature;\r
-  UINT8   Checksum;\r
-  UINT8   OemId[6];\r
-  UINT8   Revision;\r
-  UINT32  RsdtAddress;\r
-  UINT32  Length;\r
-  UINT64  XsdtAddress;\r
-  UINT8   ExtendedChecksum;\r
-  UINT8   Reserved[3];\r
+  UINT64    Signature;\r
+  UINT8     Checksum;\r
+  UINT8     OemId[6];\r
+  UINT8     Revision;\r
+  UINT32    RsdtAddress;\r
+  UINT32    Length;\r
+  UINT64    XsdtAddress;\r
+  UINT8     ExtendedChecksum;\r
+  UINT8     Reserved[3];\r
 } EFI_ACPI_4_0_ROOT_SYSTEM_DESCRIPTION_POINTER;\r
 \r
 ///\r
 /// RSD_PTR Revision (as defined in ACPI 4.0b spec.)\r
 ///\r
-#define EFI_ACPI_4_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION 0x02  ///< ACPISpec (Revision 4.0a) says current value is 2\r
+#define EFI_ACPI_4_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION  0x02 ///< ACPISpec (Revision 4.0a) says current value is 2\r
 \r
 ///\r
 /// Common table header, this prefaces all ACPI tables, including FACS, but\r
 /// excluding the RSD PTR structure\r
 ///\r
 typedef struct {\r
-  UINT32  Signature;\r
-  UINT32  Length;\r
+  UINT32    Signature;\r
+  UINT32    Length;\r
 } EFI_ACPI_4_0_COMMON_HEADER;\r
 \r
 //\r
@@ -87,7 +87,7 @@ typedef struct {
 ///\r
 /// RSDT Revision (as defined in ACPI 4.0 spec.)\r
 ///\r
-#define EFI_ACPI_4_0_ROOT_SYSTEM_DESCRIPTION_TABLE_REVISION 0x01\r
+#define EFI_ACPI_4_0_ROOT_SYSTEM_DESCRIPTION_TABLE_REVISION  0x01\r
 \r
 //\r
 // Extended System Description Table\r
@@ -98,64 +98,64 @@ typedef struct {
 ///\r
 /// XSDT Revision (as defined in ACPI 4.0 spec.)\r
 ///\r
-#define EFI_ACPI_4_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_REVISION 0x01\r
+#define EFI_ACPI_4_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_REVISION  0x01\r
 \r
 ///\r
 /// Fixed ACPI Description Table Structure (FADT)\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER             Header;\r
-  UINT32                                  FirmwareCtrl;\r
-  UINT32                                  Dsdt;\r
-  UINT8                                   Reserved0;\r
-  UINT8                                   PreferredPmProfile;\r
-  UINT16                                  SciInt;\r
-  UINT32                                  SmiCmd;\r
-  UINT8                                   AcpiEnable;\r
-  UINT8                                   AcpiDisable;\r
-  UINT8                                   S4BiosReq;\r
-  UINT8                                   PstateCnt;\r
-  UINT32                                  Pm1aEvtBlk;\r
-  UINT32                                  Pm1bEvtBlk;\r
-  UINT32                                  Pm1aCntBlk;\r
-  UINT32                                  Pm1bCntBlk;\r
-  UINT32                                  Pm2CntBlk;\r
-  UINT32                                  PmTmrBlk;\r
-  UINT32                                  Gpe0Blk;\r
-  UINT32                                  Gpe1Blk;\r
-  UINT8                                   Pm1EvtLen;\r
-  UINT8                                   Pm1CntLen;\r
-  UINT8                                   Pm2CntLen;\r
-  UINT8                                   PmTmrLen;\r
-  UINT8                                   Gpe0BlkLen;\r
-  UINT8                                   Gpe1BlkLen;\r
-  UINT8                                   Gpe1Base;\r
-  UINT8                                   CstCnt;\r
-  UINT16                                  PLvl2Lat;\r
-  UINT16                                  PLvl3Lat;\r
-  UINT16                                  FlushSize;\r
-  UINT16                                  FlushStride;\r
-  UINT8                                   DutyOffset;\r
-  UINT8                                   DutyWidth;\r
-  UINT8                                   DayAlrm;\r
-  UINT8                                   MonAlrm;\r
-  UINT8                                   Century;\r
-  UINT16                                  IaPcBootArch;\r
-  UINT8                                   Reserved1;\r
-  UINT32                                  Flags;\r
-  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE  ResetReg;\r
-  UINT8                                   ResetValue;\r
-  UINT8                                   Reserved2[3];\r
-  UINT64                                  XFirmwareCtrl;\r
-  UINT64                                  XDsdt;\r
-  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE  XPm1aEvtBlk;\r
-  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE  XPm1bEvtBlk;\r
-  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE  XPm1aCntBlk;\r
-  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE  XPm1bCntBlk;\r
-  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE  XPm2CntBlk;\r
-  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE  XPmTmrBlk;\r
-  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE  XGpe0Blk;\r
-  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE  XGpe1Blk;\r
+  EFI_ACPI_DESCRIPTION_HEADER               Header;\r
+  UINT32                                    FirmwareCtrl;\r
+  UINT32                                    Dsdt;\r
+  UINT8                                     Reserved0;\r
+  UINT8                                     PreferredPmProfile;\r
+  UINT16                                    SciInt;\r
+  UINT32                                    SmiCmd;\r
+  UINT8                                     AcpiEnable;\r
+  UINT8                                     AcpiDisable;\r
+  UINT8                                     S4BiosReq;\r
+  UINT8                                     PstateCnt;\r
+  UINT32                                    Pm1aEvtBlk;\r
+  UINT32                                    Pm1bEvtBlk;\r
+  UINT32                                    Pm1aCntBlk;\r
+  UINT32                                    Pm1bCntBlk;\r
+  UINT32                                    Pm2CntBlk;\r
+  UINT32                                    PmTmrBlk;\r
+  UINT32                                    Gpe0Blk;\r
+  UINT32                                    Gpe1Blk;\r
+  UINT8                                     Pm1EvtLen;\r
+  UINT8                                     Pm1CntLen;\r
+  UINT8                                     Pm2CntLen;\r
+  UINT8                                     PmTmrLen;\r
+  UINT8                                     Gpe0BlkLen;\r
+  UINT8                                     Gpe1BlkLen;\r
+  UINT8                                     Gpe1Base;\r
+  UINT8                                     CstCnt;\r
+  UINT16                                    PLvl2Lat;\r
+  UINT16                                    PLvl3Lat;\r
+  UINT16                                    FlushSize;\r
+  UINT16                                    FlushStride;\r
+  UINT8                                     DutyOffset;\r
+  UINT8                                     DutyWidth;\r
+  UINT8                                     DayAlrm;\r
+  UINT8                                     MonAlrm;\r
+  UINT8                                     Century;\r
+  UINT16                                    IaPcBootArch;\r
+  UINT8                                     Reserved1;\r
+  UINT32                                    Flags;\r
+  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE    ResetReg;\r
+  UINT8                                     ResetValue;\r
+  UINT8                                     Reserved2[3];\r
+  UINT64                                    XFirmwareCtrl;\r
+  UINT64                                    XDsdt;\r
+  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE    XPm1aEvtBlk;\r
+  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE    XPm1bEvtBlk;\r
+  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE    XPm1aCntBlk;\r
+  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE    XPm1bCntBlk;\r
+  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE    XPm2CntBlk;\r
+  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE    XPmTmrBlk;\r
+  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE    XGpe0Blk;\r
+  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE    XGpe1Blk;\r
 } EFI_ACPI_4_0_FIXED_ACPI_DESCRIPTION_TABLE;\r
 \r
 ///\r
@@ -179,52 +179,52 @@ typedef struct {
 // Fixed ACPI Description Table Boot Architecture Flags\r
 // All other bits are reserved and must be set to 0.\r
 //\r
-#define EFI_ACPI_4_0_LEGACY_DEVICES              BIT0\r
-#define EFI_ACPI_4_0_8042                        BIT1\r
-#define EFI_ACPI_4_0_VGA_NOT_PRESENT             BIT2\r
-#define EFI_ACPI_4_0_MSI_NOT_SUPPORTED           BIT3\r
-#define EFI_ACPI_4_0_PCIE_ASPM_CONTROLS          BIT4\r
+#define EFI_ACPI_4_0_LEGACY_DEVICES      BIT0\r
+#define EFI_ACPI_4_0_8042                BIT1\r
+#define EFI_ACPI_4_0_VGA_NOT_PRESENT     BIT2\r
+#define EFI_ACPI_4_0_MSI_NOT_SUPPORTED   BIT3\r
+#define EFI_ACPI_4_0_PCIE_ASPM_CONTROLS  BIT4\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_4_0_WBINVD                                 BIT0\r
-#define EFI_ACPI_4_0_WBINVD_FLUSH                           BIT1\r
-#define EFI_ACPI_4_0_PROC_C1                                BIT2\r
-#define EFI_ACPI_4_0_P_LVL2_UP                              BIT3\r
-#define EFI_ACPI_4_0_PWR_BUTTON                             BIT4\r
-#define EFI_ACPI_4_0_SLP_BUTTON                             BIT5\r
-#define EFI_ACPI_4_0_FIX_RTC                                BIT6\r
-#define EFI_ACPI_4_0_RTC_S4                                 BIT7\r
-#define EFI_ACPI_4_0_TMR_VAL_EXT                            BIT8\r
-#define EFI_ACPI_4_0_DCK_CAP                                BIT9\r
-#define EFI_ACPI_4_0_RESET_REG_SUP                          BIT10\r
-#define EFI_ACPI_4_0_SEALED_CASE                            BIT11\r
-#define EFI_ACPI_4_0_HEADLESS                               BIT12\r
-#define EFI_ACPI_4_0_CPU_SW_SLP                             BIT13\r
-#define EFI_ACPI_4_0_PCI_EXP_WAK                            BIT14\r
-#define EFI_ACPI_4_0_USE_PLATFORM_CLOCK                     BIT15\r
-#define EFI_ACPI_4_0_S4_RTC_STS_VALID                       BIT16\r
-#define EFI_ACPI_4_0_REMOTE_POWER_ON_CAPABLE                BIT17\r
-#define EFI_ACPI_4_0_FORCE_APIC_CLUSTER_MODEL               BIT18\r
-#define EFI_ACPI_4_0_FORCE_APIC_PHYSICAL_DESTINATION_MODE   BIT19\r
+#define EFI_ACPI_4_0_WBINVD                                BIT0\r
+#define EFI_ACPI_4_0_WBINVD_FLUSH                          BIT1\r
+#define EFI_ACPI_4_0_PROC_C1                               BIT2\r
+#define EFI_ACPI_4_0_P_LVL2_UP                             BIT3\r
+#define EFI_ACPI_4_0_PWR_BUTTON                            BIT4\r
+#define EFI_ACPI_4_0_SLP_BUTTON                            BIT5\r
+#define EFI_ACPI_4_0_FIX_RTC                               BIT6\r
+#define EFI_ACPI_4_0_RTC_S4                                BIT7\r
+#define EFI_ACPI_4_0_TMR_VAL_EXT                           BIT8\r
+#define EFI_ACPI_4_0_DCK_CAP                               BIT9\r
+#define EFI_ACPI_4_0_RESET_REG_SUP                         BIT10\r
+#define EFI_ACPI_4_0_SEALED_CASE                           BIT11\r
+#define EFI_ACPI_4_0_HEADLESS                              BIT12\r
+#define EFI_ACPI_4_0_CPU_SW_SLP                            BIT13\r
+#define EFI_ACPI_4_0_PCI_EXP_WAK                           BIT14\r
+#define EFI_ACPI_4_0_USE_PLATFORM_CLOCK                    BIT15\r
+#define EFI_ACPI_4_0_S4_RTC_STS_VALID                      BIT16\r
+#define EFI_ACPI_4_0_REMOTE_POWER_ON_CAPABLE               BIT17\r
+#define EFI_ACPI_4_0_FORCE_APIC_CLUSTER_MODEL              BIT18\r
+#define EFI_ACPI_4_0_FORCE_APIC_PHYSICAL_DESTINATION_MODE  BIT19\r
 \r
 ///\r
 /// Firmware ACPI Control Structure\r
 ///\r
 typedef struct {\r
-  UINT32  Signature;\r
-  UINT32  Length;\r
-  UINT32  HardwareSignature;\r
-  UINT32  FirmwareWakingVector;\r
-  UINT32  GlobalLock;\r
-  UINT32  Flags;\r
-  UINT64  XFirmwareWakingVector;\r
-  UINT8   Version;\r
-  UINT8   Reserved0[3];\r
-  UINT32  OspmFlags;\r
-  UINT8   Reserved1[24];\r
+  UINT32    Signature;\r
+  UINT32    Length;\r
+  UINT32    HardwareSignature;\r
+  UINT32    FirmwareWakingVector;\r
+  UINT32    GlobalLock;\r
+  UINT32    Flags;\r
+  UINT64    XFirmwareWakingVector;\r
+  UINT8     Version;\r
+  UINT8     Reserved0[3];\r
+  UINT32    OspmFlags;\r
+  UINT8     Reserved1[24];\r
 } EFI_ACPI_4_0_FIRMWARE_ACPI_CONTROL_STRUCTURE;\r
 \r
 ///\r
@@ -236,14 +236,14 @@ typedef struct {
 /// Firmware Control Structure Feature Flags\r
 /// All other bits are reserved and must be set to 0.\r
 ///\r
-#define EFI_ACPI_4_0_S4BIOS_F                     BIT0\r
-#define EFI_ACPI_4_0_64BIT_WAKE_SUPPORTED_F       BIT1\r
+#define EFI_ACPI_4_0_S4BIOS_F                BIT0\r
+#define EFI_ACPI_4_0_64BIT_WAKE_SUPPORTED_F  BIT1\r
 \r
 ///\r
 /// OSPM Enabled Firmware Control Structure Flags\r
 /// All other bits are reserved and must be set to 0.\r
 ///\r
-#define EFI_ACPI_4_0_OSPM_64BIT_WAKE__F           BIT0\r
+#define EFI_ACPI_4_0_OSPM_64BIT_WAKE__F  BIT0\r
 \r
 //\r
 // Differentiated System Description Table,\r
@@ -252,29 +252,29 @@ typedef struct {
 // no definition needed as they are common description table header, the same with\r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a definition block.\r
 //\r
-#define EFI_ACPI_4_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_REVISION   0x02\r
-#define EFI_ACPI_4_0_SECONDARY_SYSTEM_DESCRIPTION_TABLE_REVISION        0x02\r
+#define EFI_ACPI_4_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_REVISION  0x02\r
+#define EFI_ACPI_4_0_SECONDARY_SYSTEM_DESCRIPTION_TABLE_REVISION       0x02\r
 \r
 ///\r
 /// Multiple APIC Description Table header definition.  The rest of the table\r
 /// must be defined in a platform specific manner.\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER Header;\r
-  UINT32                      LocalApicAddress;\r
-  UINT32                      Flags;\r
+  EFI_ACPI_DESCRIPTION_HEADER    Header;\r
+  UINT32                         LocalApicAddress;\r
+  UINT32                         Flags;\r
 } EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER;\r
 \r
 ///\r
 /// MADT Revision (as defined in ACPI 4.0 spec.)\r
 ///\r
-#define EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION 0x03\r
+#define EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION  0x03\r
 \r
 ///\r
 /// Multiple APIC Flags\r
 /// All other bits are reserved and must be set to 0.\r
 ///\r
-#define EFI_ACPI_4_0_PCAT_COMPAT         BIT0\r
+#define EFI_ACPI_4_0_PCAT_COMPAT  BIT0\r
 \r
 //\r
 // Multiple APIC Description Table APIC structure types\r
@@ -301,57 +301,57 @@ typedef struct {
 /// Processor Local APIC Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT8   AcpiProcessorId;\r
-  UINT8   ApicId;\r
-  UINT32  Flags;\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT8     AcpiProcessorId;\r
+  UINT8     ApicId;\r
+  UINT32    Flags;\r
 } EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE;\r
 \r
 ///\r
 /// Local APIC Flags.  All other bits are reserved and must be 0.\r
 ///\r
-#define EFI_ACPI_4_0_LOCAL_APIC_ENABLED        BIT0\r
+#define EFI_ACPI_4_0_LOCAL_APIC_ENABLED  BIT0\r
 \r
 ///\r
 /// IO APIC Structure\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT8   IoApicId;\r
-  UINT8   Reserved;\r
-  UINT32  IoApicAddress;\r
-  UINT32  GlobalSystemInterruptBase;\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT8     IoApicId;\r
+  UINT8     Reserved;\r
+  UINT32    IoApicAddress;\r
+  UINT32    GlobalSystemInterruptBase;\r
 } EFI_ACPI_4_0_IO_APIC_STRUCTURE;\r
 \r
 ///\r
 /// Interrupt Source Override Structure\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT8   Bus;\r
-  UINT8   Source;\r
-  UINT32  GlobalSystemInterrupt;\r
-  UINT16  Flags;\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT8     Bus;\r
+  UINT8     Source;\r
+  UINT32    GlobalSystemInterrupt;\r
+  UINT16    Flags;\r
 } EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE;\r
 \r
 ///\r
 /// Platform Interrupt Sources Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT16  Flags;\r
-  UINT8   InterruptType;\r
-  UINT8   ProcessorId;\r
-  UINT8   ProcessorEid;\r
-  UINT8   IoSapicVector;\r
-  UINT32  GlobalSystemInterrupt;\r
-  UINT32  PlatformInterruptSourceFlags;\r
-  UINT8   CpeiProcessorOverride;\r
-  UINT8   Reserved[31];\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT16    Flags;\r
+  UINT8     InterruptType;\r
+  UINT8     ProcessorId;\r
+  UINT8     ProcessorEid;\r
+  UINT8     IoSapicVector;\r
+  UINT32    GlobalSystemInterrupt;\r
+  UINT32    PlatformInterruptSourceFlags;\r
+  UINT8     CpeiProcessorOverride;\r
+  UINT8     Reserved[31];\r
 } EFI_ACPI_4_0_PLATFORM_INTERRUPT_APIC_STRUCTURE;\r
 \r
 //\r
@@ -365,43 +365,43 @@ typedef struct {
 /// Non-Maskable Interrupt Source Structure\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT16  Flags;\r
-  UINT32  GlobalSystemInterrupt;\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT16    Flags;\r
+  UINT32    GlobalSystemInterrupt;\r
 } EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE;\r
 \r
 ///\r
 /// Local APIC NMI Structure\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT8   AcpiProcessorId;\r
-  UINT16  Flags;\r
-  UINT8   LocalApicLint;\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT8     AcpiProcessorId;\r
+  UINT16    Flags;\r
+  UINT8     LocalApicLint;\r
 } EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE;\r
 \r
 ///\r
 /// Local APIC Address Override Structure\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT16  Reserved;\r
-  UINT64  LocalApicAddress;\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT16    Reserved;\r
+  UINT64    LocalApicAddress;\r
 } EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE;\r
 \r
 ///\r
 /// IO SAPIC Structure\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT8   IoApicId;\r
-  UINT8   Reserved;\r
-  UINT32  GlobalSystemInterruptBase;\r
-  UINT64  IoSapicAddress;\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT8     IoApicId;\r
+  UINT8     Reserved;\r
+  UINT32    GlobalSystemInterruptBase;\r
+  UINT64    IoSapicAddress;\r
 } EFI_ACPI_4_0_IO_SAPIC_STRUCTURE;\r
 \r
 ///\r
@@ -409,75 +409,75 @@ typedef struct {
 /// This struct followed by a null-terminated ASCII string - ACPI Processor UID String\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT8   AcpiProcessorId;\r
-  UINT8   LocalSapicId;\r
-  UINT8   LocalSapicEid;\r
-  UINT8   Reserved[3];\r
-  UINT32  Flags;\r
-  UINT32  ACPIProcessorUIDValue;\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT8     AcpiProcessorId;\r
+  UINT8     LocalSapicId;\r
+  UINT8     LocalSapicEid;\r
+  UINT8     Reserved[3];\r
+  UINT32    Flags;\r
+  UINT32    ACPIProcessorUIDValue;\r
 } EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE;\r
 \r
 ///\r
 /// Platform Interrupt Sources Structure\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT16  Flags;\r
-  UINT8   InterruptType;\r
-  UINT8   ProcessorId;\r
-  UINT8   ProcessorEid;\r
-  UINT8   IoSapicVector;\r
-  UINT32  GlobalSystemInterrupt;\r
-  UINT32  PlatformInterruptSourceFlags;\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT16    Flags;\r
+  UINT8     InterruptType;\r
+  UINT8     ProcessorId;\r
+  UINT8     ProcessorEid;\r
+  UINT8     IoSapicVector;\r
+  UINT32    GlobalSystemInterrupt;\r
+  UINT32    PlatformInterruptSourceFlags;\r
 } EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE;\r
 \r
 ///\r
 /// Platform Interrupt Source Flags.\r
 /// All other bits are reserved and must be set to 0.\r
 ///\r
-#define EFI_ACPI_4_0_CPEI_PROCESSOR_OVERRIDE          BIT0\r
+#define EFI_ACPI_4_0_CPEI_PROCESSOR_OVERRIDE  BIT0\r
 \r
 ///\r
 /// Processor Local x2APIC Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT8   Reserved[2];\r
-  UINT32  X2ApicId;\r
-  UINT32  Flags;\r
-  UINT32  AcpiProcessorUid;\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT8     Reserved[2];\r
+  UINT32    X2ApicId;\r
+  UINT32    Flags;\r
+  UINT32    AcpiProcessorUid;\r
 } EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE;\r
 \r
 ///\r
 /// Local x2APIC NMI Structure\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT16  Flags;\r
-  UINT32  AcpiProcessorUid;\r
-  UINT8   LocalX2ApicLint;\r
-  UINT8   Reserved[3];\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT16    Flags;\r
+  UINT32    AcpiProcessorUid;\r
+  UINT8     LocalX2ApicLint;\r
+  UINT8     Reserved[3];\r
 } EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE;\r
 \r
 ///\r
 /// Smart Battery Description Table (SBST)\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER Header;\r
-  UINT32                      WarningEnergyLevel;\r
-  UINT32                      LowEnergyLevel;\r
-  UINT32                      CriticalEnergyLevel;\r
+  EFI_ACPI_DESCRIPTION_HEADER    Header;\r
+  UINT32                         WarningEnergyLevel;\r
+  UINT32                         LowEnergyLevel;\r
+  UINT32                         CriticalEnergyLevel;\r
 } EFI_ACPI_4_0_SMART_BATTERY_DESCRIPTION_TABLE;\r
 \r
 ///\r
 /// SBST Version (as defined in ACPI 4.0 spec.)\r
 ///\r
-#define EFI_ACPI_4_0_SMART_BATTERY_DESCRIPTION_TABLE_REVISION 0x01\r
+#define EFI_ACPI_4_0_SMART_BATTERY_DESCRIPTION_TABLE_REVISION  0x01\r
 \r
 ///\r
 /// Embedded Controller Boot Resources Table (ECDT)\r
@@ -485,11 +485,11 @@ typedef struct {
 /// a fully qualified reference to the name space object.\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER             Header;\r
-  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE  EcControl;\r
-  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE  EcData;\r
-  UINT32                                  Uid;\r
-  UINT8                                   GpeBit;\r
+  EFI_ACPI_DESCRIPTION_HEADER               Header;\r
+  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE    EcControl;\r
+  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE    EcData;\r
+  UINT32                                    Uid;\r
+  UINT8                                     GpeBit;\r
 } EFI_ACPI_4_0_EMBEDDED_CONTROLLER_BOOT_RESOURCES_TABLE;\r
 \r
 ///\r
@@ -502,9 +502,9 @@ typedef struct {
 /// must be defined in a platform specific manner.\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER Header;\r
-  UINT32                      Reserved1;  ///< Must be set to 1\r
-  UINT64                      Reserved2;\r
+  EFI_ACPI_DESCRIPTION_HEADER    Header;\r
+  UINT32                         Reserved1; ///< Must be set to 1\r
+  UINT64                         Reserved2;\r
 } EFI_ACPI_4_0_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER;\r
 \r
 ///\r
@@ -525,57 +525,57 @@ typedef struct {
 /// Processor Local APIC/SAPIC Affinity Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT8   ProximityDomain7To0;\r
-  UINT8   ApicId;\r
-  UINT32  Flags;\r
-  UINT8   LocalSapicEid;\r
-  UINT8   ProximityDomain31To8[3];\r
-  UINT32  ClockDomain;\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT8     ProximityDomain7To0;\r
+  UINT8     ApicId;\r
+  UINT32    Flags;\r
+  UINT8     LocalSapicEid;\r
+  UINT8     ProximityDomain31To8[3];\r
+  UINT32    ClockDomain;\r
 } EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_SAPIC_AFFINITY_STRUCTURE;\r
 \r
 ///\r
 /// Local APIC/SAPIC Flags.  All other bits are reserved and must be 0.\r
 ///\r
-#define EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_SAPIC_ENABLED (1 << 0)\r
+#define EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_SAPIC_ENABLED  (1 << 0)\r
 \r
 ///\r
 /// Memory Affinity Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT32  ProximityDomain;\r
-  UINT16  Reserved1;\r
-  UINT32  AddressBaseLow;\r
-  UINT32  AddressBaseHigh;\r
-  UINT32  LengthLow;\r
-  UINT32  LengthHigh;\r
-  UINT32  Reserved2;\r
-  UINT32  Flags;\r
-  UINT64  Reserved3;\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT32    ProximityDomain;\r
+  UINT16    Reserved1;\r
+  UINT32    AddressBaseLow;\r
+  UINT32    AddressBaseHigh;\r
+  UINT32    LengthLow;\r
+  UINT32    LengthHigh;\r
+  UINT32    Reserved2;\r
+  UINT32    Flags;\r
+  UINT64    Reserved3;\r
 } EFI_ACPI_4_0_MEMORY_AFFINITY_STRUCTURE;\r
 \r
 //\r
 // Memory Flags.  All other bits are reserved and must be 0.\r
 //\r
-#define EFI_ACPI_4_0_MEMORY_ENABLED       (1 << 0)\r
-#define EFI_ACPI_4_0_MEMORY_HOT_PLUGGABLE (1 << 1)\r
-#define EFI_ACPI_4_0_MEMORY_NONVOLATILE   (1 << 2)\r
+#define EFI_ACPI_4_0_MEMORY_ENABLED        (1 << 0)\r
+#define EFI_ACPI_4_0_MEMORY_HOT_PLUGGABLE  (1 << 1)\r
+#define EFI_ACPI_4_0_MEMORY_NONVOLATILE    (1 << 2)\r
 \r
 ///\r
 /// Processor Local x2APIC Affinity Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT8   Reserved1[2];\r
-  UINT32  ProximityDomain;\r
-  UINT32  X2ApicId;\r
-  UINT32  Flags;\r
-  UINT32  ClockDomain;\r
-  UINT8   Reserved2[4];\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT8     Reserved1[2];\r
+  UINT32    ProximityDomain;\r
+  UINT32    X2ApicId;\r
+  UINT32    Flags;\r
+  UINT32    ClockDomain;\r
+  UINT8     Reserved2[4];\r
 } EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_AFFINITY_STRUCTURE;\r
 \r
 ///\r
@@ -583,8 +583,8 @@ typedef struct {
 /// The rest of the table is a matrix.\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER Header;\r
-  UINT64                      NumberOfSystemLocalities;\r
+  EFI_ACPI_DESCRIPTION_HEADER    Header;\r
+  UINT64                         NumberOfSystemLocalities;\r
 } EFI_ACPI_4_0_SYSTEM_LOCALITY_DISTANCE_INFORMATION_TABLE_HEADER;\r
 \r
 ///\r
@@ -596,14 +596,14 @@ typedef struct {
 /// Corrected Platform Error Polling Table (CPEP)\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER Header;\r
-  UINT8                       Reserved[8];\r
+  EFI_ACPI_DESCRIPTION_HEADER    Header;\r
+  UINT8                          Reserved[8];\r
 } EFI_ACPI_4_0_CORRECTED_PLATFORM_ERROR_POLLING_TABLE_HEADER;\r
 \r
 ///\r
 /// CPEP Version (as defined in ACPI 4.0 spec.)\r
 ///\r
-#define EFI_ACPI_4_0_CORRECTED_PLATFORM_ERROR_POLLING_TABLE_REVISION 0x01\r
+#define EFI_ACPI_4_0_CORRECTED_PLATFORM_ERROR_POLLING_TABLE_REVISION  0x01\r
 \r
 //\r
 // CPEP processor structure types.\r
@@ -614,76 +614,76 @@ typedef struct {
 /// Corrected Platform Error Polling Processor Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT8   ProcessorId;\r
-  UINT8   ProcessorEid;\r
-  UINT32  PollingInterval;\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT8     ProcessorId;\r
+  UINT8     ProcessorEid;\r
+  UINT32    PollingInterval;\r
 } EFI_ACPI_4_0_CPEP_PROCESSOR_APIC_SAPIC_STRUCTURE;\r
 \r
 ///\r
 /// Maximum System Characteristics Table (MSCT)\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER Header;\r
-  UINT32                      OffsetProxDomInfo;\r
-  UINT32                      MaximumNumberOfProximityDomains;\r
-  UINT32                      MaximumNumberOfClockDomains;\r
-  UINT64                      MaximumPhysicalAddress;\r
+  EFI_ACPI_DESCRIPTION_HEADER    Header;\r
+  UINT32                         OffsetProxDomInfo;\r
+  UINT32                         MaximumNumberOfProximityDomains;\r
+  UINT32                         MaximumNumberOfClockDomains;\r
+  UINT64                         MaximumPhysicalAddress;\r
 } EFI_ACPI_4_0_MAXIMUM_SYSTEM_CHARACTERISTICS_TABLE_HEADER;\r
 \r
 ///\r
 /// MSCT Version (as defined in ACPI 4.0 spec.)\r
 ///\r
-#define EFI_ACPI_4_0_MAXIMUM_SYSTEM_CHARACTERISTICS_TABLE_REVISION 0x01\r
+#define EFI_ACPI_4_0_MAXIMUM_SYSTEM_CHARACTERISTICS_TABLE_REVISION  0x01\r
 \r
 ///\r
 /// Maximum Proximity Domain Information Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT8   Revision;\r
-  UINT8   Length;\r
-  UINT32  ProximityDomainRangeLow;\r
-  UINT32  ProximityDomainRangeHigh;\r
-  UINT32  MaximumProcessorCapacity;\r
-  UINT64  MaximumMemoryCapacity;\r
+  UINT8     Revision;\r
+  UINT8     Length;\r
+  UINT32    ProximityDomainRangeLow;\r
+  UINT32    ProximityDomainRangeHigh;\r
+  UINT32    MaximumProcessorCapacity;\r
+  UINT64    MaximumMemoryCapacity;\r
 } EFI_ACPI_4_0_MAXIMUM_PROXIMITY_DOMAIN_INFORMATION_STRUCTURE;\r
 \r
 ///\r
 /// Boot Error Record Table (BERT)\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER Header;\r
-  UINT32                      BootErrorRegionLength;\r
-  UINT64                      BootErrorRegion;\r
+  EFI_ACPI_DESCRIPTION_HEADER    Header;\r
+  UINT32                         BootErrorRegionLength;\r
+  UINT64                         BootErrorRegion;\r
 } EFI_ACPI_4_0_BOOT_ERROR_RECORD_TABLE_HEADER;\r
 \r
 ///\r
 /// BERT Version (as defined in ACPI 4.0 spec.)\r
 ///\r
-#define EFI_ACPI_4_0_BOOT_ERROR_RECORD_TABLE_REVISION 0x01\r
+#define EFI_ACPI_4_0_BOOT_ERROR_RECORD_TABLE_REVISION  0x01\r
 \r
 ///\r
 /// Boot Error Region Block Status Definition\r
 ///\r
 typedef struct {\r
-  UINT32       UncorrectableErrorValid:1;\r
-  UINT32       CorrectableErrorValid:1;\r
-  UINT32       MultipleUncorrectableErrors:1;\r
-  UINT32       MultipleCorrectableErrors:1;\r
-  UINT32       ErrorDataEntryCount:10;\r
-  UINT32       Reserved:18;\r
+  UINT32    UncorrectableErrorValid     : 1;\r
+  UINT32    CorrectableErrorValid       : 1;\r
+  UINT32    MultipleUncorrectableErrors : 1;\r
+  UINT32    MultipleCorrectableErrors   : 1;\r
+  UINT32    ErrorDataEntryCount         : 10;\r
+  UINT32    Reserved                    : 18;\r
 } EFI_ACPI_4_0_ERROR_BLOCK_STATUS;\r
 \r
 ///\r
 /// Boot Error Region Definition\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_4_0_ERROR_BLOCK_STATUS              BlockStatus;\r
-  UINT32                                       RawDataOffset;\r
-  UINT32                                       RawDataLength;\r
-  UINT32                                       DataLength;\r
-  UINT32                                       ErrorSeverity;\r
+  EFI_ACPI_4_0_ERROR_BLOCK_STATUS    BlockStatus;\r
+  UINT32                             RawDataOffset;\r
+  UINT32                             RawDataLength;\r
+  UINT32                             DataLength;\r
+  UINT32                             ErrorSeverity;\r
 } EFI_ACPI_4_0_BOOT_ERROR_REGION_STRUCTURE;\r
 \r
 //\r
@@ -698,14 +698,14 @@ typedef struct {
 /// Generic Error Data Entry Definition\r
 ///\r
 typedef struct {\r
-  UINT8    SectionType[16];\r
-  UINT32   ErrorSeverity;\r
-  UINT16   Revision;\r
-  UINT8    ValidationBits;\r
-  UINT8    Flags;\r
-  UINT32   ErrorDataLength;\r
-  UINT8    FruId[16];\r
-  UINT8    FruText[20];\r
+  UINT8     SectionType[16];\r
+  UINT32    ErrorSeverity;\r
+  UINT16    Revision;\r
+  UINT8     ValidationBits;\r
+  UINT8     Flags;\r
+  UINT32    ErrorDataLength;\r
+  UINT8     FruId[16];\r
+  UINT8     FruText[20];\r
 } EFI_ACPI_4_0_GENERIC_ERROR_DATA_ENTRY_STRUCTURE;\r
 \r
 ///\r
@@ -717,14 +717,14 @@ typedef struct {
 /// HEST - Hardware Error Source Table\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER Header;\r
-  UINT32                      ErrorSourceCount;\r
+  EFI_ACPI_DESCRIPTION_HEADER    Header;\r
+  UINT32                         ErrorSourceCount;\r
 } EFI_ACPI_4_0_HARDWARE_ERROR_SOURCE_TABLE_HEADER;\r
 \r
 ///\r
 /// HEST Version (as defined in ACPI 4.0 spec.)\r
 ///\r
-#define EFI_ACPI_4_0_HARDWARE_ERROR_SOURCE_TABLE_REVISION 0x01\r
+#define EFI_ACPI_4_0_HARDWARE_ERROR_SOURCE_TABLE_REVISION  0x01\r
 \r
 //\r
 // Error Source structure types.\r
@@ -740,383 +740,383 @@ typedef struct {
 //\r
 // Error Source structure flags.\r
 //\r
-#define EFI_ACPI_4_0_ERROR_SOURCE_FLAG_FIRMWARE_FIRST       (1 << 0)\r
-#define EFI_ACPI_4_0_ERROR_SOURCE_FLAG_GLOBAL               (1 << 1)\r
+#define EFI_ACPI_4_0_ERROR_SOURCE_FLAG_FIRMWARE_FIRST  (1 << 0)\r
+#define EFI_ACPI_4_0_ERROR_SOURCE_FLAG_GLOBAL          (1 << 1)\r
 \r
 ///\r
 /// IA-32 Architecture Machine Check Exception Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT16  Type;\r
-  UINT16  SourceId;\r
-  UINT8   Reserved0[2];\r
-  UINT8   Flags;\r
-  UINT8   Enabled;\r
-  UINT32  NumberOfRecordsToPreAllocate;\r
-  UINT32  MaxSectionsPerRecord;\r
-  UINT64  GlobalCapabilityInitData;\r
-  UINT64  GlobalControlInitData;\r
-  UINT8   NumberOfHardwareBanks;\r
-  UINT8   Reserved1[7];\r
+  UINT16    Type;\r
+  UINT16    SourceId;\r
+  UINT8     Reserved0[2];\r
+  UINT8     Flags;\r
+  UINT8     Enabled;\r
+  UINT32    NumberOfRecordsToPreAllocate;\r
+  UINT32    MaxSectionsPerRecord;\r
+  UINT64    GlobalCapabilityInitData;\r
+  UINT64    GlobalControlInitData;\r
+  UINT8     NumberOfHardwareBanks;\r
+  UINT8     Reserved1[7];\r
 } EFI_ACPI_4_0_IA32_ARCHITECTURE_MACHINE_CHECK_EXCEPTION_STRUCTURE;\r
 \r
 ///\r
 /// IA-32 Architecture Machine Check Bank Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT8   BankNumber;\r
-  UINT8   ClearStatusOnInitialization;\r
-  UINT8   StatusDataFormat;\r
-  UINT8   Reserved0;\r
-  UINT32  ControlRegisterMsrAddress;\r
-  UINT64  ControlInitData;\r
-  UINT32  StatusRegisterMsrAddress;\r
-  UINT32  AddressRegisterMsrAddress;\r
-  UINT32  MiscRegisterMsrAddress;\r
+  UINT8     BankNumber;\r
+  UINT8     ClearStatusOnInitialization;\r
+  UINT8     StatusDataFormat;\r
+  UINT8     Reserved0;\r
+  UINT32    ControlRegisterMsrAddress;\r
+  UINT64    ControlInitData;\r
+  UINT32    StatusRegisterMsrAddress;\r
+  UINT32    AddressRegisterMsrAddress;\r
+  UINT32    MiscRegisterMsrAddress;\r
 } EFI_ACPI_4_0_IA32_ARCHITECTURE_MACHINE_CHECK_ERROR_BANK_STRUCTURE;\r
 \r
 ///\r
 /// IA-32 Architecture Machine Check Bank Structure MCA data format\r
 ///\r
-#define EFI_ACPI_4_0_IA32_ARCHITECTURE_MACHINE_CHECK_ERROR_DATA_FORMAT_IA32      0x00\r
-#define EFI_ACPI_4_0_IA32_ARCHITECTURE_MACHINE_CHECK_ERROR_DATA_FORMAT_INTEL64   0x01\r
-#define EFI_ACPI_4_0_IA32_ARCHITECTURE_MACHINE_CHECK_ERROR_DATA_FORMAT_AMD64     0x02\r
+#define EFI_ACPI_4_0_IA32_ARCHITECTURE_MACHINE_CHECK_ERROR_DATA_FORMAT_IA32     0x00\r
+#define EFI_ACPI_4_0_IA32_ARCHITECTURE_MACHINE_CHECK_ERROR_DATA_FORMAT_INTEL64  0x01\r
+#define EFI_ACPI_4_0_IA32_ARCHITECTURE_MACHINE_CHECK_ERROR_DATA_FORMAT_AMD64    0x02\r
 \r
 //\r
 // Hardware Error Notification types. All other values are reserved\r
 //\r
-#define EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_POLLED                0x00\r
-#define EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_EXTERNAL_INTERRUPT    0x01\r
-#define EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_LOCAL_INTERRUPT       0x02\r
-#define EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_SCI                   0x03\r
-#define EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_NMI                   0x04\r
+#define EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_POLLED              0x00\r
+#define EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_EXTERNAL_INTERRUPT  0x01\r
+#define EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_LOCAL_INTERRUPT     0x02\r
+#define EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_SCI                 0x03\r
+#define EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_NMI                 0x04\r
 \r
 ///\r
 /// Hardware Error Notification Configuration Write Enable Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT16    Type:1;\r
-  UINT16    PollInterval:1;\r
-  UINT16    SwitchToPollingThresholdValue:1;\r
-  UINT16    SwitchToPollingThresholdWindow:1;\r
-  UINT16    ErrorThresholdValue:1;\r
-  UINT16    ErrorThresholdWindow:1;\r
-  UINT16    Reserved:10;\r
+  UINT16    Type                           : 1;\r
+  UINT16    PollInterval                   : 1;\r
+  UINT16    SwitchToPollingThresholdValue  : 1;\r
+  UINT16    SwitchToPollingThresholdWindow : 1;\r
+  UINT16    ErrorThresholdValue            : 1;\r
+  UINT16    ErrorThresholdWindow           : 1;\r
+  UINT16    Reserved                       : 10;\r
 } EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_CONFIGURATION_WRITE_ENABLE_STRUCTURE;\r
 \r
 ///\r
 /// Hardware Error Notification Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT8                                                                          Type;\r
-  UINT8                                                                          Length;\r
-  EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_CONFIGURATION_WRITE_ENABLE_STRUCTURE  ConfigurationWriteEnable;\r
-  UINT32                                                                         PollInterval;\r
-  UINT32                                                                         Vector;\r
-  UINT32                                                                         SwitchToPollingThresholdValue;\r
-  UINT32                                                                         SwitchToPollingThresholdWindow;\r
-  UINT32                                                                         ErrorThresholdValue;\r
-  UINT32                                                                         ErrorThresholdWindow;\r
+  UINT8                                                                            Type;\r
+  UINT8                                                                            Length;\r
+  EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_CONFIGURATION_WRITE_ENABLE_STRUCTURE    ConfigurationWriteEnable;\r
+  UINT32                                                                           PollInterval;\r
+  UINT32                                                                           Vector;\r
+  UINT32                                                                           SwitchToPollingThresholdValue;\r
+  UINT32                                                                           SwitchToPollingThresholdWindow;\r
+  UINT32                                                                           ErrorThresholdValue;\r
+  UINT32                                                                           ErrorThresholdWindow;\r
 } EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_STRUCTURE;\r
 \r
 ///\r
 /// IA-32 Architecture Corrected Machine Check Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT16                                                 Type;\r
-  UINT16                                                 SourceId;\r
-  UINT8                                                  Reserved0[2];\r
-  UINT8                                                  Flags;\r
-  UINT8                                                  Enabled;\r
-  UINT32                                                 NumberOfRecordsToPreAllocate;\r
-  UINT32                                                 MaxSectionsPerRecord;\r
-  EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_STRUCTURE     NotificationStructure;\r
-  UINT8                                                  NumberOfHardwareBanks;\r
-  UINT8                                                  Reserved1[3];\r
+  UINT16                                                Type;\r
+  UINT16                                                SourceId;\r
+  UINT8                                                 Reserved0[2];\r
+  UINT8                                                 Flags;\r
+  UINT8                                                 Enabled;\r
+  UINT32                                                NumberOfRecordsToPreAllocate;\r
+  UINT32                                                MaxSectionsPerRecord;\r
+  EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_STRUCTURE    NotificationStructure;\r
+  UINT8                                                 NumberOfHardwareBanks;\r
+  UINT8                                                 Reserved1[3];\r
 } EFI_ACPI_4_0_IA32_ARCHITECTURE_CORRECTED_MACHINE_CHECK_STRUCTURE;\r
 \r
 ///\r
 /// IA-32 Architecture NMI Error Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT16  Type;\r
-  UINT16  SourceId;\r
-  UINT8   Reserved0[2];\r
-  UINT32  NumberOfRecordsToPreAllocate;\r
-  UINT32  MaxSectionsPerRecord;\r
-  UINT32  MaxRawDataLength;\r
+  UINT16    Type;\r
+  UINT16    SourceId;\r
+  UINT8     Reserved0[2];\r
+  UINT32    NumberOfRecordsToPreAllocate;\r
+  UINT32    MaxSectionsPerRecord;\r
+  UINT32    MaxRawDataLength;\r
 } EFI_ACPI_4_0_IA32_ARCHITECTURE_NMI_ERROR_STRUCTURE;\r
 \r
 ///\r
 /// PCI Express Root Port AER Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT16  Type;\r
-  UINT16  SourceId;\r
-  UINT8   Reserved0[2];\r
-  UINT8   Flags;\r
-  UINT8   Enabled;\r
-  UINT32  NumberOfRecordsToPreAllocate;\r
-  UINT32  MaxSectionsPerRecord;\r
-  UINT32  Bus;\r
-  UINT16  Device;\r
-  UINT16  Function;\r
-  UINT16  DeviceControl;\r
-  UINT8   Reserved1[2];\r
-  UINT32  UncorrectableErrorMask;\r
-  UINT32  UncorrectableErrorSeverity;\r
-  UINT32  CorrectableErrorMask;\r
-  UINT32  AdvancedErrorCapabilitiesAndControl;\r
-  UINT32  RootErrorCommand;\r
+  UINT16    Type;\r
+  UINT16    SourceId;\r
+  UINT8     Reserved0[2];\r
+  UINT8     Flags;\r
+  UINT8     Enabled;\r
+  UINT32    NumberOfRecordsToPreAllocate;\r
+  UINT32    MaxSectionsPerRecord;\r
+  UINT32    Bus;\r
+  UINT16    Device;\r
+  UINT16    Function;\r
+  UINT16    DeviceControl;\r
+  UINT8     Reserved1[2];\r
+  UINT32    UncorrectableErrorMask;\r
+  UINT32    UncorrectableErrorSeverity;\r
+  UINT32    CorrectableErrorMask;\r
+  UINT32    AdvancedErrorCapabilitiesAndControl;\r
+  UINT32    RootErrorCommand;\r
 } EFI_ACPI_4_0_PCI_EXPRESS_ROOT_PORT_AER_STRUCTURE;\r
 \r
 ///\r
 /// PCI Express Device AER Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT16  Type;\r
-  UINT16  SourceId;\r
-  UINT8   Reserved0[2];\r
-  UINT8   Flags;\r
-  UINT8   Enabled;\r
-  UINT32  NumberOfRecordsToPreAllocate;\r
-  UINT32  MaxSectionsPerRecord;\r
-  UINT32  Bus;\r
-  UINT16  Device;\r
-  UINT16  Function;\r
-  UINT16  DeviceControl;\r
-  UINT8   Reserved1[2];\r
-  UINT32  UncorrectableErrorMask;\r
-  UINT32  UncorrectableErrorSeverity;\r
-  UINT32  CorrectableErrorMask;\r
-  UINT32  AdvancedErrorCapabilitiesAndControl;\r
+  UINT16    Type;\r
+  UINT16    SourceId;\r
+  UINT8     Reserved0[2];\r
+  UINT8     Flags;\r
+  UINT8     Enabled;\r
+  UINT32    NumberOfRecordsToPreAllocate;\r
+  UINT32    MaxSectionsPerRecord;\r
+  UINT32    Bus;\r
+  UINT16    Device;\r
+  UINT16    Function;\r
+  UINT16    DeviceControl;\r
+  UINT8     Reserved1[2];\r
+  UINT32    UncorrectableErrorMask;\r
+  UINT32    UncorrectableErrorSeverity;\r
+  UINT32    CorrectableErrorMask;\r
+  UINT32    AdvancedErrorCapabilitiesAndControl;\r
 } EFI_ACPI_4_0_PCI_EXPRESS_DEVICE_AER_STRUCTURE;\r
 \r
 ///\r
 /// PCI Express Bridge AER Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT16  Type;\r
-  UINT16  SourceId;\r
-  UINT8   Reserved0[2];\r
-  UINT8   Flags;\r
-  UINT8   Enabled;\r
-  UINT32  NumberOfRecordsToPreAllocate;\r
-  UINT32  MaxSectionsPerRecord;\r
-  UINT32  Bus;\r
-  UINT16  Device;\r
-  UINT16  Function;\r
-  UINT16  DeviceControl;\r
-  UINT8   Reserved1[2];\r
-  UINT32  UncorrectableErrorMask;\r
-  UINT32  UncorrectableErrorSeverity;\r
-  UINT32  CorrectableErrorMask;\r
-  UINT32  AdvancedErrorCapabilitiesAndControl;\r
-  UINT32  SecondaryUncorrectableErrorMask;\r
-  UINT32  SecondaryUncorrectableErrorSeverity;\r
-  UINT32  SecondaryAdvancedErrorCapabilitiesAndControl;\r
+  UINT16    Type;\r
+  UINT16    SourceId;\r
+  UINT8     Reserved0[2];\r
+  UINT8     Flags;\r
+  UINT8     Enabled;\r
+  UINT32    NumberOfRecordsToPreAllocate;\r
+  UINT32    MaxSectionsPerRecord;\r
+  UINT32    Bus;\r
+  UINT16    Device;\r
+  UINT16    Function;\r
+  UINT16    DeviceControl;\r
+  UINT8     Reserved1[2];\r
+  UINT32    UncorrectableErrorMask;\r
+  UINT32    UncorrectableErrorSeverity;\r
+  UINT32    CorrectableErrorMask;\r
+  UINT32    AdvancedErrorCapabilitiesAndControl;\r
+  UINT32    SecondaryUncorrectableErrorMask;\r
+  UINT32    SecondaryUncorrectableErrorSeverity;\r
+  UINT32    SecondaryAdvancedErrorCapabilitiesAndControl;\r
 } EFI_ACPI_4_0_PCI_EXPRESS_BRIDGE_AER_STRUCTURE;\r
 \r
 ///\r
 /// Generic Hardware Error Source Structure Definition\r
 ///\r
 typedef struct {\r
-  UINT16                                                 Type;\r
-  UINT16                                                 SourceId;\r
-  UINT16                                                 RelatedSourceId;\r
-  UINT8                                                  Flags;\r
-  UINT8                                                  Enabled;\r
-  UINT32                                                 NumberOfRecordsToPreAllocate;\r
-  UINT32                                                 MaxSectionsPerRecord;\r
-  UINT32                                                 MaxRawDataLength;\r
-  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE                 ErrorStatusAddress;\r
-  EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_STRUCTURE     NotificationStructure;\r
-  UINT32                                                 ErrorStatusBlockLength;\r
+  UINT16                                                Type;\r
+  UINT16                                                SourceId;\r
+  UINT16                                                RelatedSourceId;\r
+  UINT8                                                 Flags;\r
+  UINT8                                                 Enabled;\r
+  UINT32                                                NumberOfRecordsToPreAllocate;\r
+  UINT32                                                MaxSectionsPerRecord;\r
+  UINT32                                                MaxRawDataLength;\r
+  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE                ErrorStatusAddress;\r
+  EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_STRUCTURE    NotificationStructure;\r
+  UINT32                                                ErrorStatusBlockLength;\r
 } EFI_ACPI_4_0_GENERIC_HARDWARE_ERROR_SOURCE_STRUCTURE;\r
 \r
 ///\r
 /// Generic Error Status Definition\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_4_0_ERROR_BLOCK_STATUS              BlockStatus;\r
-  UINT32                                       RawDataOffset;\r
-  UINT32                                       RawDataLength;\r
-  UINT32                                       DataLength;\r
-  UINT32                                       ErrorSeverity;\r
+  EFI_ACPI_4_0_ERROR_BLOCK_STATUS    BlockStatus;\r
+  UINT32                             RawDataOffset;\r
+  UINT32                             RawDataLength;\r
+  UINT32                             DataLength;\r
+  UINT32                             ErrorSeverity;\r
 } EFI_ACPI_4_0_GENERIC_ERROR_STATUS_STRUCTURE;\r
 \r
 ///\r
 /// ERST - Error Record Serialization Table\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER Header;\r
-  UINT32                      SerializationHeaderSize;\r
-  UINT8                       Reserved0[4];\r
-  UINT32                      InstructionEntryCount;\r
+  EFI_ACPI_DESCRIPTION_HEADER    Header;\r
+  UINT32                         SerializationHeaderSize;\r
+  UINT8                          Reserved0[4];\r
+  UINT32                         InstructionEntryCount;\r
 } EFI_ACPI_4_0_ERROR_RECORD_SERIALIZATION_TABLE_HEADER;\r
 \r
 ///\r
 /// ERST Version (as defined in ACPI 4.0 spec.)\r
 ///\r
-#define EFI_ACPI_4_0_ERROR_RECORD_SERIALIZATION_TABLE_REVISION 0x01\r
+#define EFI_ACPI_4_0_ERROR_RECORD_SERIALIZATION_TABLE_REVISION  0x01\r
 \r
 ///\r
 /// ERST Serialization Actions\r
 ///\r
-#define EFI_ACPI_4_0_ERST_BEGIN_WRITE_OPERATION                    0x00\r
-#define EFI_ACPI_4_0_ERST_BEGIN_READ_OPERATION                     0x01\r
-#define EFI_ACPI_4_0_ERST_BEGIN_CLEAR_OPERATION                    0x02\r
-#define EFI_ACPI_4_0_ERST_END_OPERATION                            0x03\r
-#define EFI_ACPI_4_0_ERST_SET_RECORD_OFFSET                        0x04\r
-#define EFI_ACPI_4_0_ERST_EXECUTE_OPERATION                        0x05\r
-#define EFI_ACPI_4_0_ERST_CHECK_BUSY_STATUS                        0x06\r
-#define EFI_ACPI_4_0_ERST_GET_COMMAND_STATUS                       0x07\r
-#define EFI_ACPI_4_0_ERST_GET_RECORD_IDENTIFIER                    0x08\r
-#define EFI_ACPI_4_0_ERST_SET_RECORD_IDENTIFIER                    0x09\r
-#define EFI_ACPI_4_0_ERST_GET_RECORD_COUNT                         0x0A\r
-#define EFI_ACPI_4_0_ERST_BEGIN_DUMMY_WRITE_OPERATION              0x0B\r
-#define EFI_ACPI_4_0_ERST_GET_ERROR_LOG_ADDRESS_RANGE              0x0D\r
-#define EFI_ACPI_4_0_ERST_GET_ERROR_LOG_ADDRESS_RANGE_LENGTH       0x0E\r
-#define EFI_ACPI_4_0_ERST_GET_ERROR_LOG_ADDRESS_RANGE_ATTRIBUTES   0x0F\r
+#define EFI_ACPI_4_0_ERST_BEGIN_WRITE_OPERATION                   0x00\r
+#define EFI_ACPI_4_0_ERST_BEGIN_READ_OPERATION                    0x01\r
+#define EFI_ACPI_4_0_ERST_BEGIN_CLEAR_OPERATION                   0x02\r
+#define EFI_ACPI_4_0_ERST_END_OPERATION                           0x03\r
+#define EFI_ACPI_4_0_ERST_SET_RECORD_OFFSET                       0x04\r
+#define EFI_ACPI_4_0_ERST_EXECUTE_OPERATION                       0x05\r
+#define EFI_ACPI_4_0_ERST_CHECK_BUSY_STATUS                       0x06\r
+#define EFI_ACPI_4_0_ERST_GET_COMMAND_STATUS                      0x07\r
+#define EFI_ACPI_4_0_ERST_GET_RECORD_IDENTIFIER                   0x08\r
+#define EFI_ACPI_4_0_ERST_SET_RECORD_IDENTIFIER                   0x09\r
+#define EFI_ACPI_4_0_ERST_GET_RECORD_COUNT                        0x0A\r
+#define EFI_ACPI_4_0_ERST_BEGIN_DUMMY_WRITE_OPERATION             0x0B\r
+#define EFI_ACPI_4_0_ERST_GET_ERROR_LOG_ADDRESS_RANGE             0x0D\r
+#define EFI_ACPI_4_0_ERST_GET_ERROR_LOG_ADDRESS_RANGE_LENGTH      0x0E\r
+#define EFI_ACPI_4_0_ERST_GET_ERROR_LOG_ADDRESS_RANGE_ATTRIBUTES  0x0F\r
 \r
 ///\r
 /// ERST Action Command Status\r
 ///\r
-#define EFI_ACPI_4_0_EINJ_STATUS_SUCCESS                           0x00\r
-#define EFI_ACPI_4_0_EINJ_STATUS_NOT_ENOUGH_SPACE                  0x01\r
-#define EFI_ACPI_4_0_EINJ_STATUS_HARDWARE_NOT_AVAILABLE            0x02\r
-#define EFI_ACPI_4_0_EINJ_STATUS_FAILED                            0x03\r
-#define EFI_ACPI_4_0_EINJ_STATUS_RECORD_STORE_EMPTY                0x04\r
-#define EFI_ACPI_4_0_EINJ_STATUS_RECORD_NOT_FOUND                  0x05\r
+#define EFI_ACPI_4_0_EINJ_STATUS_SUCCESS                 0x00\r
+#define EFI_ACPI_4_0_EINJ_STATUS_NOT_ENOUGH_SPACE        0x01\r
+#define EFI_ACPI_4_0_EINJ_STATUS_HARDWARE_NOT_AVAILABLE  0x02\r
+#define EFI_ACPI_4_0_EINJ_STATUS_FAILED                  0x03\r
+#define EFI_ACPI_4_0_EINJ_STATUS_RECORD_STORE_EMPTY      0x04\r
+#define EFI_ACPI_4_0_EINJ_STATUS_RECORD_NOT_FOUND        0x05\r
 \r
 ///\r
 /// ERST Serialization Instructions\r
 ///\r
-#define EFI_ACPI_4_0_ERST_READ_REGISTER                            0x00\r
-#define EFI_ACPI_4_0_ERST_READ_REGISTER_VALUE                      0x01\r
-#define EFI_ACPI_4_0_ERST_WRITE_REGISTER                           0x02\r
-#define EFI_ACPI_4_0_ERST_WRITE_REGISTER_VALUE                     0x03\r
-#define EFI_ACPI_4_0_ERST_NOOP                                     0x04\r
-#define EFI_ACPI_4_0_ERST_LOAD_VAR1                                0x05\r
-#define EFI_ACPI_4_0_ERST_LOAD_VAR2                                0x06\r
-#define EFI_ACPI_4_0_ERST_STORE_VAR1                               0x07\r
-#define EFI_ACPI_4_0_ERST_ADD                                      0x08\r
-#define EFI_ACPI_4_0_ERST_SUBTRACT                                 0x09\r
-#define EFI_ACPI_4_0_ERST_ADD_VALUE                                0x0A\r
-#define EFI_ACPI_4_0_ERST_SUBTRACT_VALUE                           0x0B\r
-#define EFI_ACPI_4_0_ERST_STALL                                    0x0C\r
-#define EFI_ACPI_4_0_ERST_STALL_WHILE_TRUE                         0x0D\r
-#define EFI_ACPI_4_0_ERST_SKIP_NEXT_INSTRUCTION_IF_TRUE            0x0E\r
-#define EFI_ACPI_4_0_ERST_GOTO                                     0x0F\r
-#define EFI_ACPI_4_0_ERST_SET_SRC_ADDRESS_BASE                     0x10\r
-#define EFI_ACPI_4_0_ERST_SET_DST_ADDRESS_BASE                     0x11\r
-#define EFI_ACPI_4_0_ERST_MOVE_DATA                                0x12\r
+#define EFI_ACPI_4_0_ERST_READ_REGISTER                  0x00\r
+#define EFI_ACPI_4_0_ERST_READ_REGISTER_VALUE            0x01\r
+#define EFI_ACPI_4_0_ERST_WRITE_REGISTER                 0x02\r
+#define EFI_ACPI_4_0_ERST_WRITE_REGISTER_VALUE           0x03\r
+#define EFI_ACPI_4_0_ERST_NOOP                           0x04\r
+#define EFI_ACPI_4_0_ERST_LOAD_VAR1                      0x05\r
+#define EFI_ACPI_4_0_ERST_LOAD_VAR2                      0x06\r
+#define EFI_ACPI_4_0_ERST_STORE_VAR1                     0x07\r
+#define EFI_ACPI_4_0_ERST_ADD                            0x08\r
+#define EFI_ACPI_4_0_ERST_SUBTRACT                       0x09\r
+#define EFI_ACPI_4_0_ERST_ADD_VALUE                      0x0A\r
+#define EFI_ACPI_4_0_ERST_SUBTRACT_VALUE                 0x0B\r
+#define EFI_ACPI_4_0_ERST_STALL                          0x0C\r
+#define EFI_ACPI_4_0_ERST_STALL_WHILE_TRUE               0x0D\r
+#define EFI_ACPI_4_0_ERST_SKIP_NEXT_INSTRUCTION_IF_TRUE  0x0E\r
+#define EFI_ACPI_4_0_ERST_GOTO                           0x0F\r
+#define EFI_ACPI_4_0_ERST_SET_SRC_ADDRESS_BASE           0x10\r
+#define EFI_ACPI_4_0_ERST_SET_DST_ADDRESS_BASE           0x11\r
+#define EFI_ACPI_4_0_ERST_MOVE_DATA                      0x12\r
 \r
 ///\r
 /// ERST Instruction Flags\r
 ///\r
-#define EFI_ACPI_4_0_ERST_PRESERVE_REGISTER                        0x01\r
+#define EFI_ACPI_4_0_ERST_PRESERVE_REGISTER  0x01\r
 \r
 ///\r
 /// ERST Serialization Instruction Entry\r
 ///\r
 typedef struct {\r
-  UINT8                                    SerializationAction;\r
-  UINT8                                    Instruction;\r
-  UINT8                                    Flags;\r
-  UINT8                                    Reserved0;\r
-  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE   RegisterRegion;\r
-  UINT64                                   Value;\r
-  UINT64                                   Mask;\r
+  UINT8                                     SerializationAction;\r
+  UINT8                                     Instruction;\r
+  UINT8                                     Flags;\r
+  UINT8                                     Reserved0;\r
+  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE    RegisterRegion;\r
+  UINT64                                    Value;\r
+  UINT64                                    Mask;\r
 } EFI_ACPI_4_0_ERST_SERIALIZATION_INSTRUCTION_ENTRY;\r
 \r
 ///\r
 /// EINJ - Error Injection Table\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER Header;\r
-  UINT32                      InjectionHeaderSize;\r
-  UINT8                       InjectionFlags;\r
-  UINT8                       Reserved0[3];\r
-  UINT32                      InjectionEntryCount;\r
+  EFI_ACPI_DESCRIPTION_HEADER    Header;\r
+  UINT32                         InjectionHeaderSize;\r
+  UINT8                          InjectionFlags;\r
+  UINT8                          Reserved0[3];\r
+  UINT32                         InjectionEntryCount;\r
 } EFI_ACPI_4_0_ERROR_INJECTION_TABLE_HEADER;\r
 \r
 ///\r
 /// EINJ Version (as defined in ACPI 4.0 spec.)\r
 ///\r
-#define EFI_ACPI_4_0_ERROR_INJECTION_TABLE_REVISION 0x01\r
+#define EFI_ACPI_4_0_ERROR_INJECTION_TABLE_REVISION  0x01\r
 \r
 ///\r
 /// EINJ Error Injection Actions\r
 ///\r
-#define EFI_ACPI_4_0_EINJ_BEGIN_INJECTION_OPERATION                0x00\r
-#define EFI_ACPI_4_0_EINJ_GET_TRIGGER_ERROR_ACTION_TABLE           0x01\r
-#define EFI_ACPI_4_0_EINJ_SET_ERROR_TYPE                           0x02\r
-#define EFI_ACPI_4_0_EINJ_GET_ERROR_TYPE                           0x03\r
-#define EFI_ACPI_4_0_EINJ_END_OPERATION                            0x04\r
-#define EFI_ACPI_4_0_EINJ_EXECUTE_OPERATION                        0x05\r
-#define EFI_ACPI_4_0_EINJ_CHECK_BUSY_STATUS                        0x06\r
-#define EFI_ACPI_4_0_EINJ_GET_COMMAND_STATUS                       0x07\r
-#define EFI_ACPI_4_0_EINJ_TRIGGER_ERROR                            0xFF\r
+#define EFI_ACPI_4_0_EINJ_BEGIN_INJECTION_OPERATION       0x00\r
+#define EFI_ACPI_4_0_EINJ_GET_TRIGGER_ERROR_ACTION_TABLE  0x01\r
+#define EFI_ACPI_4_0_EINJ_SET_ERROR_TYPE                  0x02\r
+#define EFI_ACPI_4_0_EINJ_GET_ERROR_TYPE                  0x03\r
+#define EFI_ACPI_4_0_EINJ_END_OPERATION                   0x04\r
+#define EFI_ACPI_4_0_EINJ_EXECUTE_OPERATION               0x05\r
+#define EFI_ACPI_4_0_EINJ_CHECK_BUSY_STATUS               0x06\r
+#define EFI_ACPI_4_0_EINJ_GET_COMMAND_STATUS              0x07\r
+#define EFI_ACPI_4_0_EINJ_TRIGGER_ERROR                   0xFF\r
 \r
 ///\r
 /// EINJ Action Command Status\r
 ///\r
-#define EFI_ACPI_4_0_EINJ_STATUS_SUCCESS                           0x00\r
-#define EFI_ACPI_4_0_EINJ_STATUS_UNKNOWN_FAILURE                   0x01\r
-#define EFI_ACPI_4_0_EINJ_STATUS_INVALID_ACCESS                    0x02\r
+#define EFI_ACPI_4_0_EINJ_STATUS_SUCCESS          0x00\r
+#define EFI_ACPI_4_0_EINJ_STATUS_UNKNOWN_FAILURE  0x01\r
+#define EFI_ACPI_4_0_EINJ_STATUS_INVALID_ACCESS   0x02\r
 \r
 ///\r
 /// EINJ Error Type Definition\r
 ///\r
-#define EFI_ACPI_4_0_EINJ_ERROR_PROCESSOR_CORRECTABLE                 (1 << 0)\r
-#define EFI_ACPI_4_0_EINJ_ERROR_PROCESSOR_UNCORRECTABLE_NONFATAL      (1 << 1)\r
-#define EFI_ACPI_4_0_EINJ_ERROR_PROCESSOR_UNCORRECTABLE_FATAL         (1 << 2)\r
-#define EFI_ACPI_4_0_EINJ_ERROR_MEMORY_CORRECTABLE                    (1 << 3)\r
-#define EFI_ACPI_4_0_EINJ_ERROR_MEMORY_UNCORRECTABLE_NONFATAL         (1 << 4)\r
-#define EFI_ACPI_4_0_EINJ_ERROR_MEMORY_UNCORRECTABLE_FATAL            (1 << 5)\r
-#define EFI_ACPI_4_0_EINJ_ERROR_PCI_EXPRESS_CORRECTABLE               (1 << 6)\r
-#define EFI_ACPI_4_0_EINJ_ERROR_PCI_EXPRESS_UNCORRECTABLE_NONFATAL    (1 << 7)\r
-#define EFI_ACPI_4_0_EINJ_ERROR_PCI_EXPRESS_UNCORRECTABLE_FATAL       (1 << 8)\r
-#define EFI_ACPI_4_0_EINJ_ERROR_PLATFORM_CORRECTABLE                  (1 << 9)\r
-#define EFI_ACPI_4_0_EINJ_ERROR_PLATFORM_UNCORRECTABLE_NONFATAL       (1 << 10)\r
-#define EFI_ACPI_4_0_EINJ_ERROR_PLATFORM_UNCORRECTABLE_FATAL          (1 << 11)\r
+#define EFI_ACPI_4_0_EINJ_ERROR_PROCESSOR_CORRECTABLE               (1 << 0)\r
+#define EFI_ACPI_4_0_EINJ_ERROR_PROCESSOR_UNCORRECTABLE_NONFATAL    (1 << 1)\r
+#define EFI_ACPI_4_0_EINJ_ERROR_PROCESSOR_UNCORRECTABLE_FATAL       (1 << 2)\r
+#define EFI_ACPI_4_0_EINJ_ERROR_MEMORY_CORRECTABLE                  (1 << 3)\r
+#define EFI_ACPI_4_0_EINJ_ERROR_MEMORY_UNCORRECTABLE_NONFATAL       (1 << 4)\r
+#define EFI_ACPI_4_0_EINJ_ERROR_MEMORY_UNCORRECTABLE_FATAL          (1 << 5)\r
+#define EFI_ACPI_4_0_EINJ_ERROR_PCI_EXPRESS_CORRECTABLE             (1 << 6)\r
+#define EFI_ACPI_4_0_EINJ_ERROR_PCI_EXPRESS_UNCORRECTABLE_NONFATAL  (1 << 7)\r
+#define EFI_ACPI_4_0_EINJ_ERROR_PCI_EXPRESS_UNCORRECTABLE_FATAL     (1 << 8)\r
+#define EFI_ACPI_4_0_EINJ_ERROR_PLATFORM_CORRECTABLE                (1 << 9)\r
+#define EFI_ACPI_4_0_EINJ_ERROR_PLATFORM_UNCORRECTABLE_NONFATAL     (1 << 10)\r
+#define EFI_ACPI_4_0_EINJ_ERROR_PLATFORM_UNCORRECTABLE_FATAL        (1 << 11)\r
 \r
 ///\r
 /// EINJ Injection Instructions\r
 ///\r
-#define EFI_ACPI_4_0_EINJ_READ_REGISTER                            0x00\r
-#define EFI_ACPI_4_0_EINJ_READ_REGISTER_VALUE                      0x01\r
-#define EFI_ACPI_4_0_EINJ_WRITE_REGISTER                           0x02\r
-#define EFI_ACPI_4_0_EINJ_WRITE_REGISTER_VALUE                     0x03\r
-#define EFI_ACPI_4_0_EINJ_NOOP                                     0x04\r
+#define EFI_ACPI_4_0_EINJ_READ_REGISTER         0x00\r
+#define EFI_ACPI_4_0_EINJ_READ_REGISTER_VALUE   0x01\r
+#define EFI_ACPI_4_0_EINJ_WRITE_REGISTER        0x02\r
+#define EFI_ACPI_4_0_EINJ_WRITE_REGISTER_VALUE  0x03\r
+#define EFI_ACPI_4_0_EINJ_NOOP                  0x04\r
 \r
 ///\r
 /// EINJ Instruction Flags\r
 ///\r
-#define EFI_ACPI_4_0_EINJ_PRESERVE_REGISTER                        0x01\r
+#define EFI_ACPI_4_0_EINJ_PRESERVE_REGISTER  0x01\r
 \r
 ///\r
 /// EINJ Injection Instruction Entry\r
 ///\r
 typedef struct {\r
-  UINT8                                    InjectionAction;\r
-  UINT8                                    Instruction;\r
-  UINT8                                    Flags;\r
-  UINT8                                    Reserved0;\r
-  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE   RegisterRegion;\r
-  UINT64                                   Value;\r
-  UINT64                                   Mask;\r
+  UINT8                                     InjectionAction;\r
+  UINT8                                     Instruction;\r
+  UINT8                                     Flags;\r
+  UINT8                                     Reserved0;\r
+  EFI_ACPI_4_0_GENERIC_ADDRESS_STRUCTURE    RegisterRegion;\r
+  UINT64                                    Value;\r
+  UINT64                                    Mask;\r
 } EFI_ACPI_4_0_EINJ_INJECTION_INSTRUCTION_ENTRY;\r
 \r
 ///\r
 /// EINJ Trigger Action Table\r
 ///\r
 typedef struct {\r
-  UINT32  HeaderSize;\r
-  UINT32  Revision;\r
-  UINT32  TableSize;\r
-  UINT32  EntryCount;\r
+  UINT32    HeaderSize;\r
+  UINT32    Revision;\r
+  UINT32    TableSize;\r
+  UINT32    EntryCount;\r
 } EFI_ACPI_4_0_EINJ_TRIGGER_ACTION_TABLE;\r
 \r
 //\r