diff options
author | Felix Singer <felixsinger@posteo.net> | 2022-12-16 03:49:55 +0100 |
---|---|---|
committer | Felix Singer <felixsinger@posteo.net> | 2022-12-23 08:30:39 +0000 |
commit | 372573eaff0f757f004de2f4fb3f688de93bbbba (patch) | |
tree | e0159c28a9011c24bd3bade8167335830cb257dc | |
parent | 3c9291b3359d91d7238ed1886f4d87d635a6df55 (diff) | |
download | coreboot-372573eaff0f757f004de2f4fb3f688de93bbbba.tar.gz |
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>
-rw-r--r-- | src/ec/apple/acpi/battery.asl | 4 | ||||
-rw-r--r-- | src/ec/google/chromeec/acpi/ec.asl | 4 | ||||
-rw-r--r-- | src/ec/kontron/it8516e/acpi/pm_channels.asl | 2 | ||||
-rw-r--r-- | src/ec/lenovo/h8/acpi/thinkpad.asl | 6 | ||||
-rw-r--r-- | src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl | 2 | ||||
-rw-r--r-- | src/mainboard/lenovo/s230u/acpi/gpe.asl | 2 | ||||
-rw-r--r-- | src/soc/intel/cannonlake/acpi/xhci.asl | 2 | ||||
-rw-r--r-- | src/soc/intel/skylake/acpi/pmc.asl | 2 | ||||
-rw-r--r-- | src/soc/intel/skylake/acpi/xhci.asl | 4 | ||||
-rw-r--r-- | src/superio/acpi/pnp.asl | 2 | ||||
-rw-r--r-- | src/superio/winbond/w83627hf/acpi/superio.asl | 26 |
11 files changed, 28 insertions, 28 deletions
diff --git a/src/ec/apple/acpi/battery.asl b/src/ec/apple/acpi/battery.asl index 6d4ab57c63..13761b36e6 100644 --- a/src/ec/apple/acpi/battery.asl +++ b/src/ec/apple/acpi/battery.asl @@ -34,7 +34,7 @@ Method(SBPC, 0, NotSerialized) Method(SBRW, 2, NotSerialized) { Acquire(ECLK, 0xFFFF) - SADR = ShiftLeft(Arg0, 0x01) + SADR = Arg0 << 1 SCMD = Arg1 SPTR = 0x09 SBPC() @@ -46,7 +46,7 @@ Method(SBRW, 2, NotSerialized) Method(SBRB, 2, NotSerialized) { Acquire(ECLK, 0xFFFF) - SADR = ShiftLeft(Arg0, 0x01) + SADR = Arg0 << 1 SCMD = Arg1 SPTR = 0x0B SBPC() diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl index 8b0948df47..7a17c54cfc 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, ShiftLeft (1, Arg0), USPP) + Or (USPP, 1 << Arg0, USPP) } /* @@ -630,7 +630,7 @@ Device (EC0) */ Method (UPPC, 1, Serialized) { - And (USPP, Not (ShiftLeft (1, Arg0)), USPP) + And (USPP, Not (1 << Arg0), USPP) } #endif diff --git a/src/ec/kontron/it8516e/acpi/pm_channels.asl b/src/ec/kontron/it8516e/acpi/pm_channels.asl index 133a0651fa..b57e1995b7 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 (ShiftLeft (Local1, 8), Local0, Local0) + Or (Local1 << 8, Local0, Local0) 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 28431e8f03..f4b2dbd63e 100644 --- a/src/ec/lenovo/h8/acpi/thinkpad.asl +++ b/src/ec/lenovo/h8/acpi/thinkpad.asl @@ -109,7 +109,7 @@ Device (HKEY) /* Report tablet mode switch state */ Method (MHKG, 0, NotSerialized) { - Return (ShiftLeft(TBSW, 3)) + Return (TBSW << 3) } /* Mute audio */ @@ -167,7 +167,7 @@ Device (HKEY) { Or(Local0, 2, Local0) } - Or(Local0, ShiftLeft(WBDC, 2), Local0) + Or(Local0, WBDC << 2, Local0) Return (Local0) } Else { Return (0) @@ -209,7 +209,7 @@ Device (HKEY) { Or(Local0, 2, Local0) } - Or(Local0, ShiftLeft(WWAN, 2), Local0) + Or(Local0, WWAN << 2, Local0) Return (Local0) } Else { Return (0) diff --git a/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl b/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl index 4189271493..4ea50c5aac 100644 --- a/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl +++ b/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl @@ -53,7 +53,7 @@ Device (MBRS) If (Local1 > 0x10) { Local1 -= 0x0F - MEM2 = ShiftLeft (Local1, 0x14) + MEM2 = Local1 << 0x14 MS00 = 0x01000000 MS01 = MS00 } diff --git a/src/mainboard/lenovo/s230u/acpi/gpe.asl b/src/mainboard/lenovo/s230u/acpi/gpe.asl index 9b22e67ecc..4f25557cf6 100644 --- a/src/mainboard/lenovo/s230u/acpi/gpe.asl +++ b/src/mainboard/lenovo/s230u/acpi/gpe.asl @@ -5,7 +5,7 @@ Scope (_GPE) Name (PDET, Zero) Method (PNOT, 2, Serialized) { Local0 = Arg0 << Arg1 - Not( ShiftLeft (One, Arg1), Local1) + Not(One << Arg1, Local1) Or (Local0, And (Local1, PDET), PDET) If (PDET == Zero) { // Palm removed diff --git a/src/soc/intel/cannonlake/acpi/xhci.asl b/src/soc/intel/cannonlake/acpi/xhci.asl index 614268c992..52fdcbe30e 100644 --- a/src/soc/intel/cannonlake/acpi/xhci.asl +++ b/src/soc/intel/cannonlake/acpi/xhci.asl @@ -19,7 +19,7 @@ Method (UPWE, 3, Serialized) Local0 = Arg1 + ((Arg0 - 1) * 0x10) /* 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) { PSCT, 32, diff --git a/src/soc/intel/skylake/acpi/pmc.asl b/src/soc/intel/skylake/acpi/pmc.asl index ddb711546f..9b62afafb3 100644 --- a/src/soc/intel/skylake/acpi/pmc.asl +++ b/src/soc/intel/skylake/acpi/pmc.asl @@ -13,7 +13,7 @@ Device (PMC) PWRM, 20, /* PWRMBASE */ } - OperationRegion (PMCM, SystemMemory, ShiftLeft (PWRM, 12), 0x3f) + OperationRegion (PMCM, SystemMemory, PWRM << 12, 0x3f) Field (PMCM, DWordAcc, NoLock, Preserve) { Offset (0x1c), /* PCH_PM_STS */ diff --git a/src/soc/intel/skylake/acpi/xhci.asl b/src/soc/intel/skylake/acpi/xhci.asl index da5c10bac1..31d215219a 100644 --- a/src/soc/intel/skylake/acpi/xhci.asl +++ b/src/soc/intel/skylake/acpi/xhci.asl @@ -17,7 +17,7 @@ Method (UPWE, 3, Serialized) Local0 = Arg1 + ((Arg0 - 1) * 0x10) /* 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) { PSCT, 32, @@ -100,7 +100,7 @@ Device (XHCI) 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) { Offset (0x1c4), /* USB2PMCTRL */ diff --git a/src/superio/acpi/pnp.asl b/src/superio/acpi/pnp.asl index 51fdb4fbb8..167c3636b1 100644 --- a/src/superio/acpi/pnp.asl +++ b/src/superio/acpi/pnp.asl @@ -102,7 +102,7 @@ #define PNP_READ_IO(IO_FROM, RESOURCE_TEMPLATE, IO_TAG) \ CreateWordField (RESOURCE_TEMPLATE, IO_TAG._MIN, IO_TAG##I)\ 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##A = Local0 diff --git a/src/superio/winbond/w83627hf/acpi/superio.asl b/src/superio/winbond/w83627hf/acpi/superio.asl index 37f5cfa3e8..24c1323ea7 100644 --- a/src/superio/winbond/w83627hf/acpi/superio.asl +++ b/src/superio/winbond/w83627hf/acpi/superio.asl @@ -259,7 +259,7 @@ Device(SIO) { EXIT_CONFIG_MODE () /* Calculate full IO port address */ - Or(ShiftLeft(Local1, 8), Local0, Local0) + Or(Local1 << 8, Local0, Local0) /* Modify the resource template and return it */ CreateWordField (CRS, IO0._MIN, IMIN) @@ -483,7 +483,7 @@ Device(SIO) { Local5 = IRQ0 EXIT_CONFIG_MODE () /* Calculate IO port and modify template */ - Or(ShiftLeft(Local1, 8), Local0, Local0) + Or(Local1 << 8, Local0, Local0) IOP0 = Local1 IOR0 = Local1 @@ -651,7 +651,7 @@ Device(SIO) { Local1 = IO1H Local2 = IRQ0 EXIT_CONFIG_MODE () - Or(ShiftLeft(Local1, 8), Local0, Local0) + Or(Local1 << 8, Local0, Local0) CreateWordField (CRS, IO0._MIN, IMIN) IMIN = Local0 @@ -776,7 +776,7 @@ Device(SIO) { Local1 = IO1H Local2 = IRQ0 EXIT_CONFIG_MODE () - Or(ShiftLeft(Local1, 8), Local0, Local0) + Or(Local1 << 8, Local0, Local0) CreateWordField (CRS, IO0._MIN, IMIN) IMIN = Local0 @@ -901,7 +901,7 @@ Device(SIO) { Local0 = IO1L Local2 = IRQ0 EXIT_CONFIG_MODE () - Or(ShiftLeft(Local1, 8), Local0, Local0) + Or(Local1 << 8, Local0, Local0) CreateWordField (CRS, IO0._MIN, IMIN) IMIN = Local0 @@ -1004,7 +1004,7 @@ Device(SIO) { Local1 = IO1H Local2 = IRQ0 EXIT_CONFIG_MODE () - Or(ShiftLeft(Local1, 8), Local0, Local0) + Or(Local1 << 8, Local0, Local0) CreateWordField (CRS, IO0._MIN, IMIN) IMIN = Local0 @@ -1099,8 +1099,8 @@ Device(SIO) { Local4 = IRQ0 EXIT_CONFIG_MODE () - Or(ShiftLeft(Local1, 8), Local0, Local0) - Or(ShiftLeft(Local3, 8), Local2, Local2) + Or(Local1 << 8, Local0, Local0) + Or(Local3 << 8, Local2, Local2) CreateWordField (CRS, IO0._MIN, IMIN) IMIN = Local0 @@ -1268,7 +1268,7 @@ Device(SIO) { Local2 = IRQ0 EXIT_CONFIG_MODE () - Or(ShiftLeft(Local1, 8), Local0, Local0) + Or(Local1 << 8, Local0, Local0) CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MAX, IMAX) @@ -1323,7 +1323,7 @@ Device(SIO) { Local2 = IRQ1 EXIT_CONFIG_MODE () - Or(ShiftLeft(Local1, 8), Local0, Local0) + Or(Local1 << 8, Local0, Local0) CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MAX, IMAX) @@ -1348,7 +1348,7 @@ Device(SIO) { ENTER_CONFIG_MODE (9) Local0 = OPT4 And(Local0, 63, Local0) - Or(Local0, ShiftLeft(And(Arg0, 0x03), 6), OPT4) + Or(Local0, And(Arg0, 0x03) << 6, OPT4) EXIT_CONFIG_MODE () } @@ -1358,7 +1358,7 @@ Device(SIO) { ENTER_CONFIG_MODE (8) Local0 = OPT4 And(Local0, 63, Local0) - Or(Local0, ShiftLeft(And(Arg0, 0x03), 6), OPT4) + Or(Local0, And(Arg0, 0x03) << 6, OPT4) EXIT_CONFIG_MODE () } @@ -1422,7 +1422,7 @@ Device(SIO) { Local2 = IRQ1 EXIT_CONFIG_MODE () - Or(ShiftLeft(Local1, 8), Local0, Local0) + Or(Local1 << 8, Local0, Local0) CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MAX, IMAX) |