GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tree: Replace ShiftLeft(a,b) with ASL 2.0 syntax 

Replace `ShiftLeft (a, b)` with `a << b`.

Change-Id: I812b1ed9dcf3a5749b39a9beb9f870258ad6a0de
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70842
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Singer 2022-12-16 03:49:55 +01:00
parent 3c9291b335
commit 372573eaff
11 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ec/apple/acpi/battery.asl
View File

@ -34,7 +34,7 @@ Method(SBPC, 0, NotSerialized)
Method(SBRW, 2, NotSerialized) Method(SBRW, 2, NotSerialized)
{ {
Acquire(ECLK, 0xFFFF) Acquire(ECLK, 0xFFFF)
SADR = ShiftLeft(Arg0, 0x01) SADR = Arg0 << 1
SCMD = Arg1 SCMD = Arg1
SPTR = 0x09 SPTR = 0x09
SBPC() SBPC()
@ -46,7 +46,7 @@ Method(SBRW, 2, NotSerialized)
Method(SBRB, 2, NotSerialized) Method(SBRB, 2, NotSerialized)
{ {
Acquire(ECLK, 0xFFFF) Acquire(ECLK, 0xFFFF)
SADR = ShiftLeft(Arg0, 0x01) SADR = Arg0 << 1
SCMD = Arg1 SCMD = Arg1
SPTR = 0x0B SPTR = 0x0B
SBPC() SBPC()

4
src/ec/google/chromeec/acpi/ec.asl
View File

@ -621,7 +621,7 @@ Device (EC0)
*/ */
Method (UPPS, 1, Serialized) Method (UPPS, 1, Serialized)
{ {
Or (USPP, ShiftLeft (1, Arg0), USPP) Or (USPP, 1 << Arg0, USPP)
} }
/* /*
@ -630,7 +630,7 @@ Device (EC0)
*/ */
Method (UPPC, 1, Serialized) Method (UPPC, 1, Serialized)
{ {
And (USPP, Not (ShiftLeft (1, Arg0)), USPP) And (USPP, Not (1 << Arg0), USPP)
} }
#endif #endif

2
src/ec/kontron/it8516e/acpi/pm_channels.asl
View File

@ -90,7 +90,7 @@ Device (PM2) {
} }
Release (EC_MUTEX) Release (EC_MUTEX)
Or (ShiftLeft (Local1, 8), Local0, Local0) Or (Local1 << 8, Local0, Local0)
Local0 *= 10 / 64 /* Convert to 10th °C */ Local0 *= 10 / 64 /* Convert to 10th °C */
Return (Local0 + 2732) /* Return as 10th Kelvin */ Return (Local0 + 2732) /* Return as 10th Kelvin */
} }

6
src/ec/lenovo/h8/acpi/thinkpad.asl
View File

@ -109,7 +109,7 @@ Device (HKEY)
/* Report tablet mode switch state */ /* Report tablet mode switch state */
Method (MHKG, 0, NotSerialized) Method (MHKG, 0, NotSerialized)
{ {
Return (ShiftLeft(TBSW, 3)) Return (TBSW << 3)
} }
/* Mute audio */ /* Mute audio */
@ -167,7 +167,7 @@ Device (HKEY)
{ {
Or(Local0, 2, Local0) Or(Local0, 2, Local0)
} }
Or(Local0, ShiftLeft(WBDC, 2), Local0) Or(Local0, WBDC << 2, Local0)
Return (Local0) Return (Local0)
} Else { } Else {
Return (0) Return (0)
@ -209,7 +209,7 @@ Device (HKEY)
{ {
Or(Local0, 2, Local0) Or(Local0, 2, Local0)
} }
Or(Local0, ShiftLeft(WWAN, 2), Local0) Or(Local0, WWAN << 2, Local0)
Return (Local0) Return (Local0)
} Else { } Else {
Return (0) Return (0)

2
src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl
View File

@ -53,7 +53,7 @@ Device (MBRS)
If (Local1 > 0x10) If (Local1 > 0x10)
{ {
Local1 -= 0x0F Local1 -= 0x0F
MEM2 = ShiftLeft (Local1, 0x14) MEM2 = Local1 << 0x14
MS00 = 0x01000000 MS00 = 0x01000000
MS01 = MS00 MS01 = MS00
} }

2
src/mainboard/lenovo/s230u/acpi/gpe.asl
View File

@ -5,7 +5,7 @@ Scope (_GPE)
Name (PDET, Zero) Name (PDET, Zero)
Method (PNOT, 2, Serialized) { Method (PNOT, 2, Serialized) {
Local0 = Arg0 << Arg1 Local0 = Arg0 << Arg1
Not( ShiftLeft (One, Arg1), Local1) Not(One << Arg1, Local1)
Or (Local0, And (Local1, PDET), PDET) Or (Local0, And (Local1, PDET), PDET)
If (PDET == Zero) { If (PDET == Zero) {
// Palm removed // Palm removed

2
src/soc/intel/cannonlake/acpi/xhci.asl
View File

@ -19,7 +19,7 @@ Method (UPWE, 3, Serialized)
Local0 = Arg1 + ((Arg0 - 1) * 0x10) Local0 = Arg1 + ((Arg0 - 1) * 0x10)
/* Map ((XMEM << 16) + Local0 in PSCR */ /* Map ((XMEM << 16) + Local0 in PSCR */
OperationRegion (PSCR, SystemMemory, ShiftLeft (Arg2, 16) + Local0, 0x10) OperationRegion (PSCR, SystemMemory, (Arg2 << 16) + Local0, 0x10)
Field (PSCR, DWordAcc, NoLock, Preserve) Field (PSCR, DWordAcc, NoLock, Preserve)
{ {
PSCT, 32, PSCT, 32,

2
src/soc/intel/skylake/acpi/pmc.asl
View File

@ -13,7 +13,7 @@ Device (PMC)
PWRM, 20, /* PWRMBASE */ PWRM, 20, /* PWRMBASE */
} }
OperationRegion (PMCM, SystemMemory, ShiftLeft (PWRM, 12), 0x3f) OperationRegion (PMCM, SystemMemory, PWRM << 12, 0x3f)
Field (PMCM, DWordAcc, NoLock, Preserve) Field (PMCM, DWordAcc, NoLock, Preserve)
{ {
Offset (0x1c), /* PCH_PM_STS */ Offset (0x1c), /* PCH_PM_STS */

4
src/soc/intel/skylake/acpi/xhci.asl
View File

@ -17,7 +17,7 @@ Method (UPWE, 3, Serialized)
Local0 = Arg1 + ((Arg0 - 1) * 0x10) Local0 = Arg1 + ((Arg0 - 1) * 0x10)
/* Map ((XMEM << 16) + Local0 in PSCR */ /* Map ((XMEM << 16) + Local0 in PSCR */
OperationRegion (PSCR, SystemMemory, ShiftLeft (Arg2, 16) + Local0, 0x10) OperationRegion (PSCR, SystemMemory, (Arg2 << 16) + Local0, 0x10)
Field (PSCR, DWordAcc, NoLock, Preserve) Field (PSCR, DWordAcc, NoLock, Preserve)
{ {
PSCT, 32, PSCT, 32,
@ -100,7 +100,7 @@ Device (XHCI)
D3HE, 1, /* D3_hot_en */ D3HE, 1, /* D3_hot_en */
} }
OperationRegion (XREG, SystemMemory, ShiftLeft (XMEM, 16) + 0x8000, 0x200) OperationRegion (XREG, SystemMemory, (XMEM << 16) + 0x8000, 0x200)
Field (XREG, DWordAcc, Lock, Preserve) Field (XREG, DWordAcc, Lock, Preserve)
{ {
Offset (0x1c4), /* USB2PMCTRL */ Offset (0x1c4), /* USB2PMCTRL */

2
src/superio/acpi/pnp.asl
View File

@ -102,7 +102,7 @@
#define PNP_READ_IO(IO_FROM, RESOURCE_TEMPLATE, IO_TAG) \ #define PNP_READ_IO(IO_FROM, RESOURCE_TEMPLATE, IO_TAG) \
CreateWordField (RESOURCE_TEMPLATE, IO_TAG._MIN, IO_TAG##I)\ CreateWordField (RESOURCE_TEMPLATE, IO_TAG._MIN, IO_TAG##I)\
CreateWordField (RESOURCE_TEMPLATE, IO_TAG._MAX, IO_TAG##A)\ CreateWordField (RESOURCE_TEMPLATE, IO_TAG._MAX, IO_TAG##A)\
Or (ShiftLeft (IO_FROM##_HIGH_BYTE, 8), IO_FROM##_LOW_BYTE, Local0)\ Or (IO_FROM##_HIGH_BYTE << 8, IO_FROM##_LOW_BYTE, Local0)\
IO_TAG##I = Local0 \ IO_TAG##I = Local0 \
IO_TAG##A = Local0 IO_TAG##A = Local0

26
src/superio/winbond/w83627hf/acpi/superio.asl
View File

@ -259,7 +259,7 @@ Device(SIO) {
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
/* Calculate full IO port address */ /* Calculate full IO port address */
Or(ShiftLeft(Local1, 8), Local0, Local0) Or(Local1 << 8, Local0, Local0)
/* Modify the resource template and return it */ /* Modify the resource template and return it */
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
@ -483,7 +483,7 @@ Device(SIO) {
Local5 = IRQ0 Local5 = IRQ0
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
/* Calculate IO port and modify template */ /* Calculate IO port and modify template */
Or(ShiftLeft(Local1, 8), Local0, Local0) Or(Local1 << 8, Local0, Local0)
IOP0 = Local1 IOP0 = Local1
IOR0 = Local1 IOR0 = Local1
@ -651,7 +651,7 @@ Device(SIO) {
Local1 = IO1H Local1 = IO1H
Local2 = IRQ0 Local2 = IRQ0
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(ShiftLeft(Local1, 8), Local0, Local0) Or(Local1 << 8, Local0, Local0)
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
IMIN = Local0 IMIN = Local0
@ -776,7 +776,7 @@ Device(SIO) {
Local1 = IO1H Local1 = IO1H
Local2 = IRQ0 Local2 = IRQ0
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(ShiftLeft(Local1, 8), Local0, Local0) Or(Local1 << 8, Local0, Local0)
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
IMIN = Local0 IMIN = Local0
@ -901,7 +901,7 @@ Device(SIO) {
Local0 = IO1L Local0 = IO1L
Local2 = IRQ0 Local2 = IRQ0
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(ShiftLeft(Local1, 8), Local0, Local0) Or(Local1 << 8, Local0, Local0)
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
IMIN = Local0 IMIN = Local0
@ -1004,7 +1004,7 @@ Device(SIO) {
Local1 = IO1H Local1 = IO1H
Local2 = IRQ0 Local2 = IRQ0
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(ShiftLeft(Local1, 8), Local0, Local0) Or(Local1 << 8, Local0, Local0)
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
IMIN = Local0 IMIN = Local0
@ -1099,8 +1099,8 @@ Device(SIO) {
Local4 = IRQ0 Local4 = IRQ0
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(ShiftLeft(Local1, 8), Local0, Local0) Or(Local1 << 8, Local0, Local0)
Or(ShiftLeft(Local3, 8), Local2, Local2) Or(Local3 << 8, Local2, Local2)
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
IMIN = Local0 IMIN = Local0
@ -1268,7 +1268,7 @@ Device(SIO) {
Local2 = IRQ0 Local2 = IRQ0
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(ShiftLeft(Local1, 8), Local0, Local0) Or(Local1 << 8, Local0, Local0)
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
CreateWordField (CRS, IO0._MAX, IMAX) CreateWordField (CRS, IO0._MAX, IMAX)
@ -1323,7 +1323,7 @@ Device(SIO) {
Local2 = IRQ1 Local2 = IRQ1
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(ShiftLeft(Local1, 8), Local0, Local0) Or(Local1 << 8, Local0, Local0)
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
CreateWordField (CRS, IO0._MAX, IMAX) CreateWordField (CRS, IO0._MAX, IMAX)
@ -1348,7 +1348,7 @@ Device(SIO) {
ENTER_CONFIG_MODE (9) ENTER_CONFIG_MODE (9)
Local0 = OPT4 Local0 = OPT4
And(Local0, 63, Local0) And(Local0, 63, Local0)
Or(Local0, ShiftLeft(And(Arg0, 0x03), 6), OPT4) Or(Local0, And(Arg0, 0x03) << 6, OPT4)
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
} }
@ -1358,7 +1358,7 @@ Device(SIO) {
ENTER_CONFIG_MODE (8) ENTER_CONFIG_MODE (8)
Local0 = OPT4 Local0 = OPT4
And(Local0, 63, Local0) And(Local0, 63, Local0)
Or(Local0, ShiftLeft(And(Arg0, 0x03), 6), OPT4) Or(Local0, And(Arg0, 0x03) << 6, OPT4)
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
} }
@ -1422,7 +1422,7 @@ Device(SIO) {
Local2 = IRQ1 Local2 = IRQ1
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(ShiftLeft(Local1, 8), Local0, Local0) Or(Local1 << 8, Local0, Local0)
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
CreateWordField (CRS, IO0._MAX, IMAX) CreateWordField (CRS, IO0._MAX, IMAX)