[SeaBIOS] [PATCH 1/3] acpi: Minor - merge the two dsdt ISA areas into one ISA area.
Kevin O'Connor
kevin at koconnor.net
Wed Dec 5 23:36:15 CET 2012
Signed-off-by: Kevin O'Connor <kevin at koconnor.net>
---
src/acpi-dsdt.dsl | 48 ++++++++++++++++++++----------------------------
1 file changed, 20 insertions(+), 28 deletions(-)
diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl
index 7cde312..8019b71 100644
--- a/src/acpi-dsdt.dsl
+++ b/src/acpi-dsdt.dsl
@@ -77,20 +77,6 @@ DefinitionBlock (
/****************************************************************
- * PIIX3 ISA bridge
- ****************************************************************/
-
- Scope(\_SB.PCI0) {
- Device(ISA) {
- Name(_ADR, 0x00010000)
-
- /* PIIX PCI to ISA irq remapping */
- OperationRegion(P40C, PCI_Config, 0x60, 0x04)
- }
- }
-
-
-/****************************************************************
* PIIX4 PM
****************************************************************/
@@ -103,23 +89,29 @@ DefinitionBlock (
/****************************************************************
- * SuperIO devices (kbd, mouse, etc.)
+ * PIIX3 ISA bridge
****************************************************************/
- Scope(\_SB.PCI0.ISA) {
-
- /* enable bits */
- Field(\_SB.PCI0.PX13.P13C, AnyAcc, NoLock, Preserve) {
- Offset(0x5f),
- , 7,
- LPEN, 1, // LPT
- Offset(0x67),
- , 3,
- CAEN, 1, // COM1
- , 3,
- CBEN, 1, // COM2
+ Scope(\_SB.PCI0) {
+ Device(ISA) {
+ Name(_ADR, 0x00010000)
+
+ /* PIIX PCI to ISA irq remapping */
+ OperationRegion(P40C, PCI_Config, 0x60, 0x04)
+
+ /* enable bits */
+ Field(\_SB.PCI0.PX13.P13C, AnyAcc, NoLock, Preserve) {
+ Offset(0x5f),
+ , 7,
+ LPEN, 1, // LPT
+ Offset(0x67),
+ , 3,
+ CAEN, 1, // COM1
+ , 3,
+ CBEN, 1, // COM2
+ }
+ Name(FDEN, 1)
}
- Name(FDEN, 1)
}
#include "acpi-dsdt-isa.dsl"
--
1.7.11.7
More information about the SeaBIOS
mailing list