summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ec/hp/kbc1126/acpi/ac.asl4
-rw-r--r--src/ec/hp/kbc1126/acpi/battery.asl24
-rw-r--r--src/ec/hp/kbc1126/acpi/ec.asl12
-rw-r--r--src/ec/hp/kbc1126/acpi/lid.asl5
4 files changed, 23 insertions, 22 deletions
diff --git a/src/ec/hp/kbc1126/acpi/ac.asl b/src/ec/hp/kbc1126/acpi/ac.asl
index f058cef9f2..59681cf33a 100644
--- a/src/ec/hp/kbc1126/acpi/ac.asl
+++ b/src/ec/hp/kbc1126/acpi/ac.asl
@@ -52,7 +52,7 @@ Device (AC)
Return (0x0F)
}
- Method (_PSR, 0, NotSerialized)
+ Method (_PSR)
{
Local0 = GACS ()
PWRS = Local0 /* GNVS.PWRS */
@@ -63,7 +63,7 @@ Device (AC)
}
}
-Method (_Q06, 0, NotSerialized)
+Method (_Q06)
{
Printf ("EC: AC STATUS")
PWUP (0x05, (0x02 | 0x01))
diff --git a/src/ec/hp/kbc1126/acpi/battery.asl b/src/ec/hp/kbc1126/acpi/battery.asl
index e657f4ca6f..ff542a1610 100644
--- a/src/ec/hp/kbc1126/acpi/battery.asl
+++ b/src/ec/hp/kbc1126/acpi/battery.asl
@@ -40,7 +40,7 @@ Mutex (BTMX, 0x00)
#define NLB1 0xC8 /* design capacity of warning */
#define NLB2 0x64 /* design capacity of low */
-Method (ITLB, 0, NotSerialized)
+Method (ITLB)
{
Local0 = (NLB1 + 9) % 0x0a
Local1 = (NLB1 + 9) / 0x0a
@@ -127,17 +127,17 @@ Device (BAT0)
Name (_HID, EisaId ("PNP0C0A"))
Name (_UID, 0x01)
- Method (_STA, 0, NotSerialized)
+ Method (_STA)
{
Return (BSTA (0x01))
}
- Method (_BIF, 0, NotSerialized)
+ Method (_BIF)
{
Return (BTIF (0x00))
}
- Method (_BST, 0, NotSerialized)
+ Method (_BST)
{
Return (BTSZ (0x00))
}
@@ -153,17 +153,17 @@ Device (BAT1)
Name (_HID, EisaId ("PNP0C0A"))
Name (_UID, 0x02)
- Method (_STA, 0, NotSerialized)
+ Method (_STA)
{
Return (BSTA (0x02))
}
- Method (_BIF, 0, NotSerialized)
+ Method (_BIF)
{
Return (BTIF (0x01))
}
- Method (_BST, 0, NotSerialized)
+ Method (_BST)
{
Return (BTSZ (0x01))
}
@@ -440,7 +440,7 @@ Method (SBTN, 2, Serialized)
}
}
-Method (_Q03, 0, NotSerialized)
+Method (_Q03)
{
Printf ("EC: _Q03")
Acquire (BTMX, 0xFFFF)
@@ -450,7 +450,7 @@ Method (_Q03, 0, NotSerialized)
SBTN (Local0, 0x80)
}
-Method (_Q08, 0, NotSerialized)
+Method (_Q08)
{
Printf ("EC: PRIMARY BATTERY ATTACHED/DETACHED")
PWUP (0x06, 0x01)
@@ -470,7 +470,7 @@ Method (_Q08, 0, NotSerialized)
}
}
-Method (_Q09, 0, NotSerialized)
+Method (_Q09)
{
Printf ("EC: PRIMARY BATTERY STATUS")
PWUP (0x04, 0x01)
@@ -480,7 +480,7 @@ Method (_Q09, 0, NotSerialized)
}
}
-Method (_Q18, 0, NotSerialized)
+Method (_Q18)
{
Printf ("EC: SECONDARY BATTERY ATTACHED/DETACHED")
PWUP (0x06, 0x02)
@@ -500,7 +500,7 @@ Method (_Q18, 0, NotSerialized)
}
}
-Method (_Q19, 0, NotSerialized)
+Method (_Q19)
{
Printf ("EC: SECONDARY BATTERY STATUS")
PWUP (0x04, 0x02)
diff --git a/src/ec/hp/kbc1126/acpi/ec.asl b/src/ec/hp/kbc1126/acpi/ec.asl
index 4c0056dcc6..afe0a70a40 100644
--- a/src/ec/hp/kbc1126/acpi/ec.asl
+++ b/src/ec/hp/kbc1126/acpi/ec.asl
@@ -12,7 +12,7 @@ Device (EC0)
IO (Decode16, 0x66, 0x66, 1, 1)
})
- Method (_STA, 0, NotSerialized)
+ Method (_STA)
{
Return (0x0F)
}
@@ -200,28 +200,28 @@ Device (EC0)
/* The following are _Qxx methods in vendor DSDT whose function
is unknown. Just leave a debug message here. */
- Method (_Q04, 0, NotSerialized)
+ Method (_Q04)
{
Printf ("EC: _Q04")
PNOT()
}
- Method (_Q05, 0, NotSerialized)
+ Method (_Q05)
{
Printf ("EC: _Q05")
}
- Method (_Q0B, 0, NotSerialized)
+ Method (_Q0B)
{
Printf ("EC: _Q0B")
}
- Method (_Q0C, 0, NotSerialized)
+ Method (_Q0C)
{
Printf ("EC: _Q0C")
}
- Method (_Q0D, 0, NotSerialized)
+ Method (_Q0D)
{
Printf ("EC: _Q0D")
}
diff --git a/src/ec/hp/kbc1126/acpi/lid.asl b/src/ec/hp/kbc1126/acpi/lid.asl
index 1a5134ff9a..ac5c55b021 100644
--- a/src/ec/hp/kbc1126/acpi/lid.asl
+++ b/src/ec/hp/kbc1126/acpi/lid.asl
@@ -3,14 +3,15 @@
Device (LID)
{
Name (_HID, EisaId ("PNP0C0D"))
- Method (_LID, 0, NotSerialized)
+
+ Method (_LID)
{
Local0 = CLID
Return (Local0)
}
}
-Method (_Q0A, 0, NotSerialized)
+Method (_Q0A)
{
Printf ("EC: LID STATUS")
Notify (LID, 0x80)