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

[mirror_edk2.git] / OvmfPkg / AcpiTables / Facp.aslc

diff --git a/OvmfPkg/AcpiTables/Facp.aslc b/OvmfPkg/AcpiTables/Facp.aslc
index c55094b8380224988db0dd685ec642eda2b34df5..3f09f928b60d3c147d22e04e893ef6c0f2631d29 100644 (file)
--- a/OvmfPkg/AcpiTables/Facp.aslc
+++ b/OvmfPkg/AcpiTables/Facp.aslc
@@ -1,7 +1,8 @@
 /** @file\r
   FACP Table\r
 \r
-  Copyright (c) 2008 - 2009, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013, Red Hat, Inc.\r
+  Copyright (c) 2008 - 2012, 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
@@ -15,15 +16,17 @@
 #include "Platform.h"\r
 \r
 EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {\r
-  EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,\r
-  sizeof (EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE),\r
-  EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION,\r
-  0,                // to make sum of entire table == 0\r
-  EFI_ACPI_OEM_ID,         // OEMID is a 6 bytes long field\r
-  EFI_ACPI_OEM_TABLE_ID,      // OEM table identification(8 bytes long)\r
-  EFI_ACPI_OEM_REVISION,      // OEM revision number\r
-  EFI_ACPI_CREATOR_ID,        // ASL compiler vendor ID\r
-  EFI_ACPI_CREATOR_REVISION,  // ASL compiler revision number\r
+  {\r
+    EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,\r
+    sizeof (EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE),\r
+    EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION,\r
+    0,                          // to make sum of entire table == 0\r
+    {EFI_ACPI_OEM_ID},          // OEMID is a 6 bytes long field\r
+    EFI_ACPI_OEM_TABLE_ID,      // OEM table identification(8 bytes long)\r
+    EFI_ACPI_OEM_REVISION,      // OEM revision number\r
+    EFI_ACPI_CREATOR_ID,        // ASL compiler vendor ID\r
+    EFI_ACPI_CREATOR_REVISION   // ASL compiler revision number\r
+  },\r
   0,                // Physical addesss of FACS\r
   0,                // Physical address of DSDT\r
   INT_MODEL,        // System Interrupt Model\r
@@ -35,16 +38,16 @@ EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {
   S4BIOS_REQ,       // Value to write to SMI CMD port to enter the S4BIOS state\r
   0,                // PState control\r
   PM1a_EVT_BLK,     // Port address of Power Mgt 1a Event Reg Blk\r
-  PM1b_EVT_BLK,     // Port address of Power Mgt 1b Event Reg Blk\r
+  0,                // Power Mgt 1b Event Reg Blk unsupported\r
   PM1a_CNT_BLK,     // Port address of Power Mgt 1a Ctrl Reg Blk\r
-  PM1b_CNT_BLK,     // Port address of Power Mgt 1b Ctrl Reg Blk\r
-  PM2_CNT_BLK,      // Port address of Power Mgt 2  Ctrl Reg Blk\r
+  0,                // Power Mgt 1b Ctrl Reg Blk unsupported\r
+  0,                // Power Mgt 2  Ctrl Reg Blk unsupported\r
   PM_TMR_BLK,       // Port address of Power Mgt Timer Ctrl Reg Blk\r
   GPE0_BLK,         // Port addr of General Purpose Event 0 Reg Blk\r
   GPE1_BLK,         // Port addr of General Purpose Event 1 Reg Blk\r
   PM1_EVT_LEN,      // Byte Length of ports at pm1X_evt_blk\r
   PM1_CNT_LEN,      // Byte Length of ports at pm1X_cnt_blk\r
-  PM2_CNT_LEN,      // Byte Length of ports at pm2_cnt_blk\r
+  0,                // Power Mgt 2 Ctrl Reg Blk unsupported\r
   PM_TM_LEN,        // Byte Length of ports at pm_tm_blk\r
   GPE0_BLK_LEN,     // Byte Length of ports at gpe0_blk\r
   GPE1_BLK_LEN,     // Byte Length of ports at gpe1_blk\r
@@ -59,7 +62,7 @@ EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {
   DAY_ALRM,         // index to day-of-month alarm in RTC CMOS RAM\r
   MON_ALRM,         // index to month-of-year alarm in RTC CMOS RAM\r
   CENTURY,          // index to century in RTC CMOS RAM\r
-  0x03,             // Boot architecture flag\r
+  0x00,             // Boot architecture flag\r
   0x00,             // Boot architecture flag\r
   RESERVED,         // reserved\r
   FLAG\r