Revision: 17436
http://sourceforge.net/p/edk2/code/17436
Author: lersek
Date: 2015-05-13 09:31:53 +0000 (Wed, 13 May 2015)
Log Message:
-----------
OvmfPkg: extract some bits and port offsets common to Q35 and I440FX
The PMBA_RTE and ACPI_TIMER_OFFSET macros apply equally to both boards,
plus they are triplicated between the various AcpiTimerLib instances.
Define them centrally in "OvmfPlatforms.h".
Cc: Gabriel Somlo <[email protected]>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <[email protected]>
Acked-by: Gabriel Somlo <[email protected]>
Tested-by: Gabriel Somlo <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Modified Paths:
--------------
trunk/edk2/OvmfPkg/Include/OvmfPlatforms.h
trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c
trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
trunk/edk2/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c
Modified: trunk/edk2/OvmfPkg/Include/OvmfPlatforms.h
===================================================================
--- trunk/edk2/OvmfPkg/Include/OvmfPlatforms.h 2015-05-13 09:31:49 UTC (rev
17435)
+++ trunk/edk2/OvmfPkg/Include/OvmfPlatforms.h 2015-05-13 09:31:53 UTC (rev
17436)
@@ -27,4 +27,14 @@
#define OVMF_HOSTBRIDGE_DID \
PCI_LIB_ADDRESS (0, 0, 0, PCI_DEVICE_ID_OFFSET)
+//
+// Common bits in same-purpose registers
+//
+#define PMBA_RTE BIT0
+
+//
+// Common IO ports relative to the Power Management Base Address
+//
+#define ACPI_TIMER_OFFSET 0x8
+
#endif
Modified: trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c
===================================================================
--- trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c 2015-05-13
09:31:49 UTC (rev 17435)
+++ trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c 2015-05-13
09:31:53 UTC (rev 17436)
@@ -19,16 +19,6 @@
#include <OvmfPlatforms.h>
//
-// Power Management PCI Configuration Register fields
-//
-#define PMBA_RTE BIT0
-
-//
-// Offset in the Power Management Base Address to the ACPI Timer
-//
-#define ACPI_TIMER_OFFSET 0x8
-
-//
// Cached ACPI Timer IO Address
//
STATIC UINT32 mAcpiTimerIoAddr;
Modified: trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
===================================================================
--- trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
2015-05-13 09:31:49 UTC (rev 17435)
+++ trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
2015-05-13 09:31:53 UTC (rev 17436)
@@ -19,16 +19,6 @@
#include <Library/PcdLib.h>
#include <OvmfPlatforms.h>
-//
-// Power Management PCI Configuration Register fields
-//
-#define PMBA_RTE BIT0
-
-//
-// Offset in the Power Management Base Address to the ACPI Timer
-//
-#define ACPI_TIMER_OFFSET 0x8
-
/**
The constructor function enables ACPI IO space.
Modified: trunk/edk2/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c
===================================================================
--- trunk/edk2/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c 2015-05-13
09:31:49 UTC (rev 17435)
+++ trunk/edk2/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c 2015-05-13
09:31:53 UTC (rev 17436)
@@ -19,16 +19,6 @@
#include <OvmfPlatforms.h>
//
-// Power Management PCI Configuration Register fields
-//
-#define PMBA_RTE BIT0
-
-//
-// Offset in the Power Management Base Address to the ACPI Timer
-//
-#define ACPI_TIMER_OFFSET 0x8
-
-//
// Cached ACPI Timer IO Address
//
STATIC UINT32 mAcpiTimerIoAddr;
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
