diff options
| author | Felix Singer <felixsinger@posteo.net> | 2022-12-16 07:11:17 +0100 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-12-23 10:18:48 +0000 |
| commit | 35e65a8bc36628baad7d2ed94bef7619971e6d88 (patch) | |
| tree | a3b4d2afe3494eee4049db95f04a69d61113f006 /src/ec | |
| parent | 86bc2e708dc2600c5611b6573d43645e7d57e561 (diff) | |
tree: Replace And(a,b,c) with ASL 2.0 syntax
Replace `And (a, b, c)` with `c = a & b`, respectively `c &= b` where
possible.
Change-Id: Ie558f9d0b597c56ca3b31498edb68de8877d3a2f
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70850
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/ec')
| -rw-r--r-- | src/ec/google/chromeec/acpi/ec.asl | 2 | ||||
| -rw-r--r-- | src/ec/quanta/ene_kb3940q/acpi/ec.asl | 2 | ||||
| -rw-r--r-- | src/ec/quanta/it8518/acpi/battery.asl | 4 | ||||
| -rw-r--r-- | src/ec/smsc/mec1308/acpi/battery.asl | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl index 59f14d1d08..ce81880051 100644 --- a/src/ec/google/chromeec/acpi/ec.asl +++ b/src/ec/google/chromeec/acpi/ec.asl @@ -630,7 +630,7 @@ Device (EC0) */ Method (UPPC, 1, Serialized) { - And (USPP, Not (1 << Arg0), USPP) + USPP &= Not (1 << Arg0) } #endif diff --git a/src/ec/quanta/ene_kb3940q/acpi/ec.asl b/src/ec/quanta/ene_kb3940q/acpi/ec.asl index 9d38bb6461..f60238b950 100644 --- a/src/ec/quanta/ene_kb3940q/acpi/ec.asl +++ b/src/ec/quanta/ene_kb3940q/acpi/ec.asl @@ -131,7 +131,7 @@ Device (EC0) Local0 = CTMP // Use Local0 to avoid iasl warning: Method Local is set but never used - And(Local0, Ones, Local0) + Local0 &= Ones // Find and program number of P-States MPST = SizeOf (\_SB.CP00._PSS) diff --git a/src/ec/quanta/it8518/acpi/battery.asl b/src/ec/quanta/it8518/acpi/battery.asl index ef7a8e2520..53bcb6a10f 100644 --- a/src/ec/quanta/it8518/acpi/battery.asl +++ b/src/ec/quanta/it8518/acpi/battery.asl @@ -244,7 +244,7 @@ Device (BATX) If (ACPW) { // Set only charging/discharging bits - And (Local0, 0x03, Local1) + Local1 = Local0 & 3 } Else { @@ -253,7 +253,7 @@ Device (BATX) } // Flag if the battery level is critical - And (Local0, 0x04, Local4) + Local4 = Local0 & 4 Local1 |= Local4 PBST[0] = Local1 diff --git a/src/ec/smsc/mec1308/acpi/battery.asl b/src/ec/smsc/mec1308/acpi/battery.asl index f0e6d6d4ec..09f3bd51ad 100644 --- a/src/ec/smsc/mec1308/acpi/battery.asl +++ b/src/ec/smsc/mec1308/acpi/battery.asl @@ -61,7 +61,7 @@ Device (BAT0) { Local0 = Arg0 >> 8 Local1 = Arg0 << 8 - And (Local1, 0xFF00, Local1) + Local1 &= 0xFF00 Local0 |= Local1 If (Local0 == 0xFFFF) { Local0 = 0xFFFFFFFF @@ -111,14 +111,14 @@ Device (BAT0) // Check if AC is present If (ACEX) { // Set only charging/discharging bits - And (Local0, 0x03, Local1) + Local1 = Local0 & 3 } Else { // Always discharging when on battery power Local1 = 0x01 } // Flag if the battery level is critical - And (Local0, 0x04, Local4) + Local4 = Local0 & 4 Local1 |= Local4 PBST[0] = Local1 |