OvmfPkg: upgrade the FADT to ACPI 2.0 without functional changes

[mirror_edk2.git] / OvmfPkg / AcpiTables / Platform.h

diff --git a/OvmfPkg/AcpiTables/Platform.h b/OvmfPkg/AcpiTables/Platform.h
index 547a5a3e6c4fb1001d08a5a2cc12316082206d36..c95cbb20d572f4df2eeb7e6be5f6c452ffd527f0 100644 (file)
--- a/OvmfPkg/AcpiTables/Platform.h
+++ b/OvmfPkg/AcpiTables/Platform.h
@@ -28,7 +28,6 @@
 #define EFI_ACPI_CREATOR_ID       SIGNATURE_32('O','V','M','F')\r
 #define EFI_ACPI_CREATOR_REVISION 0x00000099\r
 \r
-#define INT_MODEL       0x01\r
 #define SCI_INT_VECTOR  0x0009\r
 #define SMI_CMD_IO_PORT 0xB2\r
 #define ACPI_ENABLE     0xF1\r
@@ -52,7 +51,21 @@
 #define DAY_ALRM        0x00\r
 #define MON_ALRM        0x00\r
 #define CENTURY         0x00\r
-#define FLAG            EFI_ACPI_1_0_WBINVD | EFI_ACPI_1_0_PROC_C1 | EFI_ACPI_1_0_SLP_BUTTON | EFI_ACPI_1_0_RTC_S4\r
+#define FLAG            (EFI_ACPI_2_0_WBINVD | \\r
+                         EFI_ACPI_2_0_PROC_C1 | \\r
+                         EFI_ACPI_2_0_SLP_BUTTON | \\r
+                         EFI_ACPI_2_0_RTC_S4)\r
 \r
-#endif\r
+//\r
+// Byte-aligned IO port register block initializer for\r
+// EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE\r
+//\r
+#define GAS2_IO(Base, Size) {                             \\r
+          EFI_ACPI_2_0_SYSTEM_IO, /* AddressSpaceId    */ \\r
+          (Size) * 8,             /* RegisterBitWidth  */ \\r
+          0,                      /* RegisterBitOffset */ \\r
+          0,                      /* Reserved          */ \\r
+          (Base)                  /* Address           */ \\r
+          }\r
 \r
+#endif\r