OvmfPkg: fold macros of unsupported GPE1 register block into Facp.aslc

In the next patch we're going to specify Extended Addresses of register
blocks in Generic Address Structure format. The GAS is easy to fill if we
want to posit either "unsupported" (all zero) or a given address in a
specific address space. However deriving "unsupported" just from a macro
expanding to zero is unwieldy, so let's avoid the need.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14154 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/AcpiTables/Facp.aslc b/OvmfPkg/AcpiTables/Facp.aslc
index 3f09f928b60d3c147d22e04e893ef6c0f2631d29..2aec355d9f13121e01568d6a9741496668100a6f 100644 (file)
--- a/OvmfPkg/AcpiTables/Facp.aslc
+++ b/OvmfPkg/AcpiTables/Facp.aslc
@@ -44,14 +44,14 @@ EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {
   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
+  0,                // General Purpose Event 1 Reg Blk unsupported\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
   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
-  GPE1_BASE,        // offset in gpe model where gpe1 events start\r
+  0,                // General Purpose Event 1 Reg Blk unsupported\r
+  0,                // General Purpose Event 1 Reg Blk unsupported\r
   0,                // _CST support\r
   P_LVL2_LAT,       // worst case HW latency to enter/exit C2 state\r
   P_LVL3_LAT,       // worst case HW latency to enter/exit C3 state\r

diff --git a/OvmfPkg/AcpiTables/Platform.h b/OvmfPkg/AcpiTables/Platform.h
index 3f0269bf08de576a0c8ab9976982632292610f99..547a5a3e6c4fb1001d08a5a2cc12316082206d36 100644 (file)
--- a/OvmfPkg/AcpiTables/Platform.h
+++ b/OvmfPkg/AcpiTables/Platform.h
@@ -38,13 +38,10 @@
 #define PM1a_CNT_BLK    0x0000b004\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 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