OvmfPkg: Update DSC/FDF to use NetworkPkg's include fragment file.

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

diff --git a/OvmfPkg/AcpiTables/Platform.h b/OvmfPkg/AcpiTables/Platform.h
index e6a23e59cc2bb4a5b12f4c11cf29e958824a4cf1..e4ee848961c647d09207a608ef4435c697cb9fb9 100644 (file)
--- a/OvmfPkg/AcpiTables/Platform.h
+++ b/OvmfPkg/AcpiTables/Platform.h
@@ -1,14 +1,9 @@
 /** @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
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -23,31 +18,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 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     0x00000000\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     0x00\r
 #define PM_TM_LEN       0x04\r
 #define GPE0_BLK_LEN    0x04\r
-#define GPE1_BLK_LEN    0x00\r
-#define GPE1_BASE       0x00\r
 #define RESERVED        0x00\r
 #define P_LVL2_LAT      0x0065\r
 #define P_LVL3_LAT      0x03E9\r
@@ -55,10 +42,27 @@
 #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_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
+                         EFI_ACPI_2_0_RESET_REG_SUP)\r
+#define RESET_REG       0xCF9\r
+#define RESET_VALUE     (BIT2 | BIT1) // PIIX3 Reset CPU + System Reset\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