grml...

[seabios.git] / src / acpi-dsdt.dsl

diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl
index f97d463e6a94c3073cc2fac7bfd458b75f476024..7082b651a119d2887fd9b0f56c600a646f073235 100644 (file)
--- a/src/acpi-dsdt.dsl
+++ b/src/acpi-dsdt.dsl
@@ -132,12 +132,6 @@ DefinitionBlock (
                 B0EJ, 32,
             }
 
-            OperationRegion(RMVC, SystemIO, 0xae0c, 0x04)
-            Field(RMVC, DWordAcc, NoLock, WriteAsZeros)
-            {
-                PCRM, 32,
-            }
-
             Name (_CRS, ResourceTemplate ()
             {
                 WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
@@ -239,7 +233,6 @@ DefinitionBlock (
                                  Return (0x00)
                          }
                  }
-                 Method(_RMV) { Return (0x00) }
         }
     }
 
@@ -251,7 +244,6 @@ DefinitionBlock (
     Scope(\_SB.PCI0) {
         Device (ISA) {
             Name (_ADR, 0x00010000)
-            Method(_RMV) { Return (0x00) }
 
             /* PIIX PCI to ISA irq remapping */
             OperationRegion (P40C, PCI_Config, 0x60, 0x04)
@@ -466,13 +458,6 @@ DefinitionBlock (
 
     Scope(\_SB.PCI0) {
         /* Methods called by bulk generated PCI devices below */
-        Method (PRMV, 1, NotSerialized) {
-            // _RMV method - check if device can be removed
-            If (And(\_SB.PCI0.PCRM, ShiftLeft(1, Arg0))) {
-                Return (0x1)
-            }
-            Return (0x0)
-        }
 
         /* Methods called by hotplug devices */
         Method (PCEJ, 1, NotSerialized) {
@@ -523,10 +508,6 @@ DefinitionBlock (
             }
             Return (0x0B)
         }
-        Method (IQDI, 1, NotSerialized) {
-            // _DIS method - disable interrupt
-            Or(DerefOf(Arg0), 0x80, Arg0)
-        }
         Method (IQCR, 1, NotSerialized) {
             // _CRS method - get current settings
             Name (PRR0, ResourceTemplate ()
@@ -540,11 +521,13 @@ DefinitionBlock (
             }
             Return (PRR0)
         }
-        Method (IQSR, 2, NotSerialized) {
-            // _SRS method - set interrupt
-            CreateDWordField (Arg1, 0x05, PRRI)
-            Store (PRRI, Arg0)
-        }
+        // _DIS method - disable interrupt
+#define DISIRQ(PRQVAR)                          \
+            Or(PRQVAR, 0x80, PRQVAR)            \
+        // _SRS method - set interrupt
+#define SETIRQ(PRQVAR, IRQINFO)                         \
+            CreateDWordField (IRQINFO, 0x05, PRRI)      \
+            Store (PRRI, PRQVAR)
 
         Device(LNKA) {
             Name(_HID, EISAID("PNP0C0F"))     // PCI interrupt link
@@ -554,9 +537,9 @@ DefinitionBlock (
                     { 5, 10, 11 }
             })
             Method (_STA, 0, NotSerialized) { Return (IQST(PRQ0)) }
-            Method (_DIS, 0, NotSerialized) { IQDI(RefOf(PRQ0)) }
+            Method (_DIS, 0, NotSerialized) { DISIRQ(PRQ0) }
             Method (_CRS, 0, NotSerialized) { Return (IQCR(PRQ0)) }
-            Method (_SRS, 1, NotSerialized) { IQSR(RefOf(PRQ0), Arg0) }
+            Method (_SRS, 1, NotSerialized) { SETIRQ(PRQ0, Arg0) }
         }
         Device(LNKB) {
             Name(_HID, EISAID("PNP0C0F"))     // PCI interrupt link
@@ -566,9 +549,9 @@ DefinitionBlock (
                     { 5, 10, 11 }
             })
             Method (_STA, 0, NotSerialized) { Return (IQST(PRQ1)) }
-            Method (_DIS, 0, NotSerialized) { IQDI(RefOf(PRQ1)) }
+            Method (_DIS, 0, NotSerialized) { DISIRQ(PRQ1) }
             Method (_CRS, 0, NotSerialized) { Return (IQCR(PRQ1)) }
-            Method (_SRS, 1, NotSerialized) { IQSR(RefOf(PRQ1), Arg0) }
+            Method (_SRS, 1, NotSerialized) { SETIRQ(PRQ1, Arg0) }
         }
         Device(LNKC) {
             Name(_HID, EISAID("PNP0C0F"))     // PCI interrupt link
@@ -578,9 +561,9 @@ DefinitionBlock (
                     { 5, 10, 11 }
             })
             Method (_STA, 0, NotSerialized) { Return (IQST(PRQ2)) }
-            Method (_DIS, 0, NotSerialized) { IQDI(RefOf(PRQ2)) }
+            Method (_DIS, 0, NotSerialized) { DISIRQ(PRQ2) }
             Method (_CRS, 0, NotSerialized) { Return (IQCR(PRQ2)) }
-            Method (_SRS, 1, NotSerialized) { IQSR(RefOf(PRQ2), Arg0) }
+            Method (_SRS, 1, NotSerialized) { SETIRQ(PRQ2, Arg0) }
         }
         Device(LNKD) {
             Name(_HID, EISAID("PNP0C0F"))     // PCI interrupt link
@@ -590,9 +573,9 @@ DefinitionBlock (
                     { 5, 10, 11 }
             })
             Method (_STA, 0, NotSerialized) { Return (IQST(PRQ3)) }
-            Method (_DIS, 0, NotSerialized) { IQDI(RefOf(PRQ3)) }
+            Method (_DIS, 0, NotSerialized) { DISIRQ(PRQ3) }
             Method (_CRS, 0, NotSerialized) { Return (IQCR(PRQ3)) }
-            Method (_SRS, 1, NotSerialized) { IQSR(RefOf(PRQ3), Arg0) }
+            Method (_SRS, 1, NotSerialized) { SETIRQ(PRQ3, Arg0) }
         }
         Device(LNKS) {
             Name(_HID, EISAID("PNP0C0F"))     // PCI interrupt link
@@ -602,7 +585,7 @@ DefinitionBlock (
                     { 9 }
             })
             Method (_STA, 0, NotSerialized) { Return (IQST(PRQ0)) }
-            Method (_DIS, 0, NotSerialized) { IQDI(RefOf(PRQ0)) }
+            Method (_DIS, 0, NotSerialized) { DISIRQ(PRQ0) }
             Method (_CRS, 0, NotSerialized) { Return (IQCR(PRQ0)) }
         }
     }