aboutsummaryrefslogtreecommitdiff
path: root/src/ec
diff options
context:
space:
mode:
Diffstat (limited to 'src/ec')
-rw-r--r--src/ec/google/chromeec/acpi/battery.asl2
-rw-r--r--src/ec/google/chromeec/acpi/ec.asl2
-rw-r--r--src/ec/kontron/it8516e/acpi/pm_channels.asl2
-rw-r--r--src/ec/lenovo/h8/acpi/thinkpad.asl14
-rw-r--r--src/ec/quanta/it8518/acpi/battery.asl4
-rw-r--r--src/ec/smsc/mec1308/acpi/battery.asl4
6 files changed, 14 insertions, 14 deletions
diff --git a/src/ec/google/chromeec/acpi/battery.asl b/src/ec/google/chromeec/acpi/battery.asl
index 114a10c36c..a98117126b 100644
--- a/src/ec/google/chromeec/acpi/battery.asl
+++ b/src/ec/google/chromeec/acpi/battery.asl
@@ -175,7 +175,7 @@ Method (BBST, 4, Serialized)
// Check for critical battery level
If (BFCR) {
- Or (Local1, 0x04, Local1)
+ Local1 |= 4
}
Arg1[0] = Local1
diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl
index 7a17c54cfc..59f14d1d08 100644
--- a/src/ec/google/chromeec/acpi/ec.asl
+++ b/src/ec/google/chromeec/acpi/ec.asl
@@ -621,7 +621,7 @@ Device (EC0)
*/
Method (UPPS, 1, Serialized)
{
- Or (USPP, 1 << Arg0, USPP)
+ USPP |= 1 << Arg0
}
/*
diff --git a/src/ec/kontron/it8516e/acpi/pm_channels.asl b/src/ec/kontron/it8516e/acpi/pm_channels.asl
index b57e1995b7..8f3fc7e1d2 100644
--- a/src/ec/kontron/it8516e/acpi/pm_channels.asl
+++ b/src/ec/kontron/it8516e/acpi/pm_channels.asl
@@ -90,7 +90,7 @@ Device (PM2) {
}
Release (EC_MUTEX)
- Or (Local1 << 8, Local0, Local0)
+ Local0 |= Local1 << 8
Local0 *= 10 / 64 /* Convert to 10th °C */
Return (Local0 + 2732) /* Return as 10th Kelvin */
}
diff --git a/src/ec/lenovo/h8/acpi/thinkpad.asl b/src/ec/lenovo/h8/acpi/thinkpad.asl
index f4b2dbd63e..fea97c15df 100644
--- a/src/ec/lenovo/h8/acpi/thinkpad.asl
+++ b/src/ec/lenovo/h8/acpi/thinkpad.asl
@@ -87,7 +87,7 @@ Device (HKEY)
Local0 = One << (Arg0 - 1)
If (Arg1)
{
- Or (DHKN, Local0, DHKN)
+ DHKN |= Local0
}
Else
{
@@ -165,9 +165,9 @@ Device (HKEY)
Local0 = One
If(\_SB.PCI0.LPCB.EC.BTEB)
{
- Or(Local0, 2, Local0)
+ Local0 |= 2
}
- Or(Local0, WBDC << 2, Local0)
+ Local0 |= WBDC << 2
Return (Local0)
} Else {
Return (0)
@@ -207,9 +207,9 @@ Device (HKEY)
Local0 = One
If(\_SB.PCI0.LPCB.EC.WWEB)
{
- Or(Local0, 2, Local0)
+ Local0 |= 2
}
- Or(Local0, WWAN << 2, Local0)
+ Local0 |= WWAN << 2
Return (Local0)
} Else {
Return (0)
@@ -243,7 +243,7 @@ Device (HKEY)
If (HKBL) {
Local0 = 0x200
/* FIXME: Support 2bit brightness control */
- Or (Local0, \_SB.PCI0.LPCB.EC.KBLT, Local0)
+ Local0 |= \_SB.PCI0.LPCB.EC.KBLT
Return (Local0)
} Else {
Return (0)
@@ -273,7 +273,7 @@ Device (HKEY)
Local0 = One
If(\_SB.PCI0.LPCB.EC.UWBE)
{
- Or(Local0, 2, Local0)
+ Local0 |= 2
}
Return (Local0)
} Else {
diff --git a/src/ec/quanta/it8518/acpi/battery.asl b/src/ec/quanta/it8518/acpi/battery.asl
index 82269010ef..ef7a8e2520 100644
--- a/src/ec/quanta/it8518/acpi/battery.asl
+++ b/src/ec/quanta/it8518/acpi/battery.asl
@@ -235,7 +235,7 @@ Device (BATX)
// Set critical flag if battery is empty
If (And (HB0S, 0x0F) == 0)
{
- Or (Local0, 4, Local0)
+ Local0 |= 4
}
Local1 = Zero
@@ -254,7 +254,7 @@ Device (BATX)
// Flag if the battery level is critical
And (Local0, 0x04, Local4)
- Or (Local1, Local4, Local1)
+ Local1 |= Local4
PBST[0] = Local1
//
diff --git a/src/ec/smsc/mec1308/acpi/battery.asl b/src/ec/smsc/mec1308/acpi/battery.asl
index fad52d2091..f0e6d6d4ec 100644
--- a/src/ec/smsc/mec1308/acpi/battery.asl
+++ b/src/ec/smsc/mec1308/acpi/battery.asl
@@ -62,7 +62,7 @@ Device (BAT0)
Local0 = Arg0 >> 8
Local1 = Arg0 << 8
And (Local1, 0xFF00, Local1)
- Or (Local0, Local1, Local0)
+ Local0 |= Local1
If (Local0 == 0xFFFF) {
Local0 = 0xFFFFFFFF
}
@@ -119,7 +119,7 @@ Device (BAT0)
// Flag if the battery level is critical
And (Local0, 0x04, Local4)
- Or (Local1, Local4, Local1)
+ Local1 |= Local4
PBST[0] = Local1
// Notify if battery state has changed since last time