From 1e69186a23d08399ed6245c74fb501e1bc49aaf3 Mon Sep 17 00:00:00 2001 From: jljusten Date: Mon, 4 Mar 2013 17:37:15 +0000 Subject: [PATCH] OvmfPkg: fold macros of unsupported PM2 control reg. block into Facp.aslc Soon 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@14153 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/AcpiTables/Facp.aslc | 4 ++-- OvmfPkg/AcpiTables/Platform.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/AcpiTables/Facp.aslc b/OvmfPkg/AcpiTables/Facp.aslc index 45bb50768f..3f09f928b6 100644 --- a/OvmfPkg/AcpiTables/Facp.aslc +++ b/OvmfPkg/AcpiTables/Facp.aslc @@ -41,13 +41,13 @@ EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = { 0, // Power Mgt 1b Event Reg Blk unsupported PM1a_CNT_BLK, // Port address of Power Mgt 1a Ctrl Reg Blk 0, // Power Mgt 1b Ctrl Reg Blk unsupported - PM2_CNT_BLK, // Port address of Power Mgt 2 Ctrl Reg Blk + 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 PM1_EVT_LEN, // Byte Length of ports at pm1X_evt_blk PM1_CNT_LEN, // Byte Length of ports at pm1X_cnt_blk - PM2_CNT_LEN, // Byte Length of ports at pm2_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 diff --git a/OvmfPkg/AcpiTables/Platform.h b/OvmfPkg/AcpiTables/Platform.h index 684156a475..3f0269bf08 100644 --- a/OvmfPkg/AcpiTables/Platform.h +++ b/OvmfPkg/AcpiTables/Platform.h @@ -36,13 +36,11 @@ #define S4BIOS_REQ 0x00 #define PM1a_EVT_BLK 0x0000b000 #define PM1a_CNT_BLK 0x0000b004 -#define PM2_CNT_BLK 0x00000000 #define PM_TMR_BLK 0x0000b008 #define GPE0_BLK 0x0000afe0 #define GPE1_BLK 0x00000000 #define PM1_EVT_LEN 0x04 #define PM1_CNT_LEN 0x02 -#define PM2_CNT_LEN 0x00 #define PM_TM_LEN 0x04 #define GPE0_BLK_LEN 0x04 #define GPE1_BLK_LEN 0x00 -- 2.39.2