OvmfPkg: fold macros of unsupported PM2 control reg. block into Facp.aslc

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

diff --git a/OvmfPkg/AcpiTables/Platform.h b/OvmfPkg/AcpiTables/Platform.h
index b9a491cd788b0f3c5b1b73225606cda1b6c651e6..3f0269bf08de576a0c8ab9976982632292610f99 100644 (file)
--- a/OvmfPkg/AcpiTables/Platform.h
+++ b/OvmfPkg/AcpiTables/Platform.h
@@ -1,6 +1,7 @@
 /** @file\r
   Platform specific defines for constructing ACPI tables\r
 \r
+  Copyright (c) 2012, 2013, Red Hat, Inc.\r
   Copyright (c) 2008, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials are\r
   licensed and made available under the terms and conditions of the BSD License\r
@@ -23,27 +24,23 @@
 //\r
 #define EFI_ACPI_OEM_ID           'O','V','M','F',' ',' '   // OEMID 6 bytes long\r
 #define EFI_ACPI_OEM_TABLE_ID     SIGNATURE_64('O','V','M','F','E','D','K','2') // OEM table id 8 bytes long\r
-#define EFI_ACPI_OEM_REVISION     0x02000820\r
+#define EFI_ACPI_OEM_REVISION     0x20130221\r
 #define EFI_ACPI_CREATOR_ID       SIGNATURE_32('O','V','M','F')\r
-#define EFI_ACPI_CREATOR_REVISION 0x00000097\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 0 // If SMM was supported, then this would be 0xB2\r
-#define ACPI_ENABLE     0\r
-#define ACPI_DISABLE    0\r
+#define SMI_CMD_IO_PORT 0xB2\r
+#define ACPI_ENABLE     0xF1\r
+#define ACPI_DISABLE    0xF0\r
 #define S4BIOS_REQ      0x00\r
 #define PM1a_EVT_BLK    0x0000b000\r
-#define PM1b_EVT_BLK    0x00000000\r
 #define PM1a_CNT_BLK    0x0000b004\r
-#define PM1b_CNT_BLK    0x00000000\r
-#define PM2_CNT_BLK     0x00000022\r
 #define PM_TMR_BLK      0x0000b008\r
 #define GPE0_BLK        0x0000afe0\r
 #define GPE1_BLK        0x00000000\r
 #define PM1_EVT_LEN     0x04\r
 #define PM1_CNT_LEN     0x02\r
-#define PM2_CNT_LEN     0x01\r
 #define PM_TM_LEN       0x04\r
 #define GPE0_BLK_LEN    0x04\r
 #define GPE1_BLK_LEN    0x00\r
@@ -51,14 +48,14 @@
 #define RESERVED        0x00\r
 #define P_LVL2_LAT      0x0065\r
 #define P_LVL3_LAT      0x03E9\r
-#define FLUSH_SIZE      0x0400\r
-#define FLUSH_STRIDE    0x0010\r
+#define FLUSH_SIZE      0x0000\r
+#define FLUSH_STRIDE    0x0000\r
 #define DUTY_OFFSET     0x00\r
 #define DUTY_WIDTH      0x00\r
-#define DAY_ALRM        0x0D\r
+#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 | EFI_ACPI_1_0_TMR_VAL_EXT\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
 \r
 #endif\r
 \r