From e1fad9b3ba8187038b9787f2307e48f02ef78b80 Mon Sep 17 00:00:00 2001 From: jljusten Date: Mon, 4 Mar 2013 17:37:29 +0000 Subject: 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 Reviewed-by: Jordan Justen git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14154 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/AcpiTables/Facp.aslc | 6 +++--- OvmfPkg/AcpiTables/Platform.h | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'OvmfPkg') diff --git a/OvmfPkg/AcpiTables/Facp.aslc b/OvmfPkg/AcpiTables/Facp.aslc index 3f09f928b6..2aec355d9f 100644 --- 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 PM_TMR_BLK, // Port address of Power Mgt Timer Ctrl Reg Blk GPE0_BLK, // Port addr of General Purpose Event 0 Reg Blk - GPE1_BLK, // Port addr of General Purpose Event 1 Reg Blk + 0, // General Purpose Event 1 Reg Blk unsupported PM1_EVT_LEN, // Byte Length of ports at pm1X_evt_blk PM1_CNT_LEN, // Byte Length of ports at pm1X_cnt_blk 0, // Power Mgt 2 Ctrl Reg Blk unsupported PM_TM_LEN, // Byte Length of ports at pm_tm_blk GPE0_BLK_LEN, // Byte Length of ports at gpe0_blk - GPE1_BLK_LEN, // Byte Length of ports at gpe1_blk - GPE1_BASE, // offset in gpe model where gpe1 events start + 0, // General Purpose Event 1 Reg Blk unsupported + 0, // General Purpose Event 1 Reg Blk unsupported 0, // _CST support P_LVL2_LAT, // worst case HW latency to enter/exit C2 state P_LVL3_LAT, // worst case HW latency to enter/exit C3 state diff --git a/OvmfPkg/AcpiTables/Platform.h b/OvmfPkg/AcpiTables/Platform.h index 3f0269bf08..547a5a3e6c 100644 --- a/OvmfPkg/AcpiTables/Platform.h +++ b/OvmfPkg/AcpiTables/Platform.h @@ -38,13 +38,10 @@ #define PM1a_CNT_BLK 0x0000b004 #define PM_TMR_BLK 0x0000b008 #define GPE0_BLK 0x0000afe0 -#define GPE1_BLK 0x00000000 #define PM1_EVT_LEN 0x04 #define PM1_CNT_LEN 0x02 #define PM_TM_LEN 0x04 #define GPE0_BLK_LEN 0x04 -#define GPE1_BLK_LEN 0x00 -#define GPE1_BASE 0x00 #define RESERVED 0x00 #define P_LVL2_LAT 0x0065 #define P_LVL3_LAT 0x03E9 -- cgit v1.2.3