summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/lenovo/s230u/acpi/ec.asl28
-rw-r--r--src/mainboard/lenovo/s230u/acpi/platform.asl10
2 files changed, 19 insertions, 19 deletions
diff --git a/src/mainboard/lenovo/s230u/acpi/ec.asl b/src/mainboard/lenovo/s230u/acpi/ec.asl
index 20a9096395..7365d74825 100644
--- a/src/mainboard/lenovo/s230u/acpi/ec.asl
+++ b/src/mainboard/lenovo/s230u/acpi/ec.asl
@@ -127,7 +127,7 @@ Device (EC0)
/* Switched to AC power */
Method (_Q26, 0, NotSerialized)
{
- Store (One, PWRS)
+ PWRS = 1
Notify (^AC, 0x80)
Notify (^BAT0, 0x80)
\PNOT ()
@@ -137,7 +137,7 @@ Device (EC0)
/* Switched to battery power */
Method (_Q27, 0, NotSerialized)
{
- Store (Zero, PWRS)
+ PWRS = 0
Notify (^AC, 0x80)
Notify (^BAT0, 0x80)
\PNOT ()
@@ -147,7 +147,7 @@ Device (EC0)
/* Lid openend */
Method (_Q2A, 0, NotSerialized)
{
- Store (One, LIDS)
+ LIDS = 1
Notify(^LID, 0x80)
^HKEY.MHKQ (0x5002)
}
@@ -155,7 +155,7 @@ Device (EC0)
/* Lid closed */
Method (_Q2B, 0, NotSerialized)
{
- Store (Zero, LIDS)
+ LIDS = 0
Notify(^LID, 0x80)
^HKEY.MHKQ (0x5001)
}
@@ -236,7 +236,7 @@ Device (EC0)
/* FN+Esc pressed / FN row mode switch */
Method (_Q74, 0, NotSerialized) {
- XOr(One, HKFA, HKFA)
+ HKFA = 1 ^ HKFA
^HKEY.MHKQ (0x6060)
}
@@ -270,11 +270,11 @@ Device (EC0)
{
Acquire (XDHK, 0xFFFF)
- ShiftLeft (One, Decrement (Arg0), Local0)
+ Local0 = 1 << Arg0--
If (Arg1) {
- Or (Local0, DHKN, DHKN)
+ DHKN |= Local0
} Else {
- And (Not(Local0), DHKN, DHKN)
+ DHKN &= ~Local0
}
Release (XDHK)
@@ -284,7 +284,7 @@ Device (EC0)
{
Acquire (XDHK, 0xFFFF)
- Store (Arg0, DHKC)
+ DHKC = Arg0
Release (XDHK)
}
@@ -293,11 +293,11 @@ Device (EC0)
{
Acquire (XDHK, 0xFFFF)
- Store (Zero, Local0)
+ Local0 = 0
if (DHKV) {
- Store (DHKV, Local0)
- Store (Zero, DHKV)
+ Local0 = DHKV
+ DHKV = 0
}
Release (XDHK)
@@ -309,7 +309,7 @@ Device (EC0)
{
Acquire (XDHK, 0xFFFF)
- Store (Arg0, DHKV)
+ DHKV = Arg0
Release (XDHK)
@@ -320,7 +320,7 @@ Device (EC0)
/* LED support for thinkpad-acpi */
Method (LED, 2, NotSerialized)
{
- Or (Arg0, Arg1, HLCL)
+ HLCL = Arg0 | Arg1
}
Device (AC)
diff --git a/src/mainboard/lenovo/s230u/acpi/platform.asl b/src/mainboard/lenovo/s230u/acpi/platform.asl
index 149fb3a874..9ad3ff1f0e 100644
--- a/src/mainboard/lenovo/s230u/acpi/platform.asl
+++ b/src/mainboard/lenovo/s230u/acpi/platform.asl
@@ -3,8 +3,8 @@
Method(_WAK,1)
{
/* Turn on radios */
- Store (One, GP33) /* WLBT_OFF_5# (To pin 5 of WiFi mPCIe) */
- Store (One, GP36) /* WLBT_OFF_51# (To pin 51 of WiFi mPCIe) */
+ GP33 = 1 /* WLBT_OFF_5# (To pin 5 of WiFi mPCIe) */
+ GP36 = 1 /* WLBT_OFF_51# (To pin 51 of WiFi mPCIe) */
/* There also is RF_OFF# on pin 20, controlled by the EC */
Return(Package(){0,0})
@@ -13,8 +13,8 @@ Method(_WAK,1)
Method(_PTS,1)
{
/* Turn off radios */
- Store (Zero, GP33) /* WLBT_OFF_5# (To pin 5 of WiFi mPCIe) */
- Store (Zero, GP36) /* WLBT_OFF_51# (To pin 51 of WiFi mPCIe) */
+ GP33 = 0 /* WLBT_OFF_5# (To pin 5 of WiFi mPCIe) */
+ GP36 = 0 /* WLBT_OFF_51# (To pin 51 of WiFi mPCIe) */
/* There also is RF_OFF# on pin 20, controlled by the EC */
}
@@ -22,7 +22,7 @@ Scope(\_SI)
{
Method(_SST, 1, NotSerialized)
{
- If (LLess(Arg0, 2))
+ If (Arg0 < 2)
{
/* Thinkpad LED on */
\_SB.PCI0.LPCB.EC0.LED (Zero, 0x80)