diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2012-12-03 19:04:55 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2012-12-05 10:57:52 -0500 |
| commit | f92f83311d7c1a10d0e2566ab8d8bc6899b62dd0 (patch) | |
| tree | 54dae91a0fa4c6321ffb50b680f6a94bc25fce26 | |
| parent | 7a53595a35fa76c9abb34fd9a73e5661a50aa6d6 (diff) | |
| download | seabios-f92f83311d7c1a10d0e2566ab8d8bc6899b62dd0.tar.gz | |
acpi: Minor - merge the two dsdt ISA areas into one ISA area.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | src/acpi-dsdt.dsl | 48 |
1 files 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" |