tree: Replace ShiftLeft(a,b,c) with ASL 2.0 syntax
Replace `ShiftLeft (a, b, c)` with `c = a << b`.
Change-Id: Ibd25a05f49f79e80592482a1b0532334f727af58
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70841
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/ec/lenovo/h8/acpi/thinkpad.asl b/src/ec/lenovo/h8/acpi/thinkpad.asl
index e1c979e..28431e8 100644
--- a/src/ec/lenovo/h8/acpi/thinkpad.asl
+++ b/src/ec/lenovo/h8/acpi/thinkpad.asl
@@ -51,7 +51,7 @@
/* Report event */
Method (RHK, 1, NotSerialized) {
- ShiftLeft (One, Arg0 - 1, Local0)
+ Local0 = One << (Arg0 - 1)
If (EMSK & Local0) {
BTN = Arg0
Notify (HKEY, 0x80)
@@ -60,7 +60,7 @@
/* Report tablet */
Method (RTAB, 1, NotSerialized) {
- ShiftLeft (One, Arg0 - 1, Local0)
+ Local0 = One << (Arg0 - 1)
If (ETAB & Local0) {
BTAB = Arg0
Notify (HKEY, 0x80)
@@ -84,7 +84,7 @@
/* Enable/disable event. */
Method (MHKM, 2, NotSerialized) {
If (Arg0 <= 0x20) {
- ShiftLeft (One, Arg0 - 1, Local0)
+ Local0 = One << (Arg0 - 1)
If (Arg1)
{
Or (DHKN, Local0, DHKN)
diff --git a/src/ec/smsc/mec1308/acpi/battery.asl b/src/ec/smsc/mec1308/acpi/battery.asl
index dbccf0f..fad52d2 100644
--- a/src/ec/smsc/mec1308/acpi/battery.asl
+++ b/src/ec/smsc/mec1308/acpi/battery.asl
@@ -60,7 +60,7 @@
Method (SWAB, 1, NotSerialized)
{
Local0 = Arg0 >> 8
- ShiftLeft (Arg0, 8, Local1)
+ Local1 = Arg0 << 8
And (Local1, 0xFF00, Local1)
Or (Local0, Local1, Local0)
If (Local0 == 0xFFFF) {
diff --git a/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl b/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl
index 5f27bff..4189271 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl
@@ -40,7 +40,7 @@
Local1++
If (Local1 > 0x40)
{
- ShiftLeft (Local1, 0x1A, LELM)
+ LELM = Local1 << 0x1A
}
diff --git a/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl b/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl
index a2537c2..6976be8 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl
@@ -43,7 +43,7 @@
CreateDWordField (PBRS, \_SB.PCI0._Y08._LEN, LENM)
And (\_SB.PCI0.TOLM, 0xF800, Local1)
Local1 >>= 4
- ShiftLeft (Local1, 0x14, MEML)
+ MEML = Local1 << 0x14
MEMH = IO_APIC_ADDR - 1
LENM = IO_APIC_ADDR - MEML
diff --git a/src/mainboard/aopen/dxplplusu/acpi/superio.asl b/src/mainboard/aopen/dxplplusu/acpi/superio.asl
index 1d1d2d8..22b0e22 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/superio.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/superio.asl
@@ -76,7 +76,7 @@
IOM1 = 0x00
IOM2 = 0x00
Or (\_SB.PCI0.ICH0.SMSC.IOAH, IOM1, IOM1)
- ShiftLeft (IOM1, 0x08, IOM1)
+ IOM1 <<= 8
Or (\_SB.PCI0.ICH0.SMSC.IOAL, IOM1, IOM1)
IOM2 = IOM1
If (IOM1 != 0)
diff --git a/src/mainboard/lenovo/s230u/acpi/gpe.asl b/src/mainboard/lenovo/s230u/acpi/gpe.asl
index 76461f6..9b22e67 100644
--- a/src/mainboard/lenovo/s230u/acpi/gpe.asl
+++ b/src/mainboard/lenovo/s230u/acpi/gpe.asl
@@ -4,7 +4,7 @@
{
Name (PDET, Zero)
Method (PNOT, 2, Serialized) {
- ShiftLeft (Arg0, Arg1, Local0)
+ Local0 = Arg0 << Arg1
Not( ShiftLeft (One, Arg1), Local1)
Or (Local0, And (Local1, PDET), PDET)
If (PDET == Zero) {
@@ -17,7 +17,7 @@
}
Method (TINV, 2, Serialized) {
- ShiftLeft (One, Arg1, Local0)
+ Local0 = One << Arg1
If (Arg0 == Zero) {
Not (Local0, Local0)
And (GIV0, Local0, GIV0)
diff --git a/src/soc/intel/baytrail/acpi/irqlinks.asl b/src/soc/intel/baytrail/acpi/irqlinks.asl
index d0f3dcb..9d42bef 100644
--- a/src/soc/intel/baytrail/acpi/irqlinks.asl
+++ b/src/soc/intel/baytrail/acpi/irqlinks.asl
@@ -31,7 +31,7 @@
IRQ0 = Zero
/* Set the bit from PRTA */
- ShiftLeft(1, And(PRTA, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTA, 0x0f)
Return (RTLA)
}
@@ -90,7 +90,7 @@
IRQ0 = Zero
/* Set the bit from PRTB */
- ShiftLeft(1, And(PRTB, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTB, 0x0f)
Return (RTLB)
}
@@ -149,7 +149,7 @@
IRQ0 = Zero
/* Set the bit from PRTC */
- ShiftLeft(1, And(PRTC, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTC, 0x0f)
Return (RTLC)
}
@@ -208,7 +208,7 @@
IRQ0 = Zero
/* Set the bit from PRTD */
- ShiftLeft(1, And(PRTD, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTD, 0x0f)
Return (RTLD)
}
@@ -267,7 +267,7 @@
IRQ0 = Zero
/* Set the bit from PRTE */
- ShiftLeft(1, And(PRTE, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTE, 0x0f)
Return (RTLE)
}
@@ -326,7 +326,7 @@
IRQ0 = Zero
/* Set the bit from PRTF */
- ShiftLeft(1, And(PRTF, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTF, 0x0f)
Return (RTLF)
}
@@ -385,7 +385,7 @@
IRQ0 = Zero
/* Set the bit from PRTG */
- ShiftLeft(1, And(PRTG, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTG, 0x0f)
Return (RTLG)
}
@@ -444,7 +444,7 @@
IRQ0 = Zero
/* Set the bit from PRTH */
- ShiftLeft(1, And(PRTH, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTH, 0x0f)
Return (RTLH)
}
diff --git a/src/soc/intel/braswell/acpi/irqlinks.asl b/src/soc/intel/braswell/acpi/irqlinks.asl
index 42fc97e..bfb80fc 100644
--- a/src/soc/intel/braswell/acpi/irqlinks.asl
+++ b/src/soc/intel/braswell/acpi/irqlinks.asl
@@ -31,7 +31,7 @@
IRQ0 = Zero
/* Set the bit from PRTA */
- ShiftLeft(1, And(PRTA, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTA, 0x0f)
Return (RTLA)
}
@@ -90,7 +90,7 @@
IRQ0 = Zero
/* Set the bit from PRTB */
- ShiftLeft(1, And(PRTB, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTB, 0x0f)
Return (RTLB)
}
@@ -149,7 +149,7 @@
IRQ0 = Zero
/* Set the bit from PRTC */
- ShiftLeft(1, And(PRTC, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTC, 0x0f)
Return (RTLC)
}
@@ -208,7 +208,7 @@
IRQ0 = Zero
/* Set the bit from PRTD */
- ShiftLeft(1, And(PRTD, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTD, 0x0f)
Return (RTLD)
}
@@ -267,7 +267,7 @@
IRQ0 = Zero
/* Set the bit from PRTE */
- ShiftLeft(1, And(PRTE, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTE, 0x0f)
Return (RTLE)
}
@@ -326,7 +326,7 @@
IRQ0 = Zero
/* Set the bit from PRTF */
- ShiftLeft(1, And(PRTF, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTF, 0x0f)
Return (RTLF)
}
@@ -385,7 +385,7 @@
IRQ0 = Zero
/* Set the bit from PRTG */
- ShiftLeft(1, And(PRTG, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTG, 0x0f)
Return (RTLG)
}
@@ -444,7 +444,7 @@
IRQ0 = Zero
/* Set the bit from PRTH */
- ShiftLeft(1, And(PRTH, 0x0f), IRQ0)
+ IRQ0 = 1 << And(PRTH, 0x0f)
Return (RTLH)
}
diff --git a/src/southbridge/intel/i82371eb/acpi/intx.asl b/src/southbridge/intel/i82371eb/acpi/intx.asl
index 087ab4d..ae5aeee 100644
--- a/src/southbridge/intel/i82371eb/acpi/intx.asl
+++ b/src/southbridge/intel/i82371eb/acpi/intx.asl
@@ -30,7 +30,7 @@
\
Method(_CRS ,0) { \
CreateWordField(IRQB, 1, IRQN) \
- ShiftLeft(1, And(pinx, 0x0f), IRQN) \
+ IRQN = 1 << And(pinx, 0x0f) \
Return(IRQB) \
} \
\
diff --git a/src/southbridge/intel/i82371eb/acpi/pirq.asl b/src/southbridge/intel/i82371eb/acpi/pirq.asl
index f39c6d5..3f7518c 100644
--- a/src/southbridge/intel/i82371eb/acpi/pirq.asl
+++ b/src/southbridge/intel/i82371eb/acpi/pirq.asl
@@ -40,7 +40,7 @@
\
Method(_CRS ,0) { \
CreateWordField(IRQB, 1, IRQN) \
- ShiftLeft(1, And(pinx, 0x0f), IRQN) \
+ IRQN = 1 << And(pinx, 0x0f) \
Return(IRQB) \
} \
\
diff --git a/src/superio/acpi/pnp.asl b/src/superio/acpi/pnp.asl
index f403a66..51fdb4f 100644
--- a/src/superio/acpi/pnp.asl
+++ b/src/superio/acpi/pnp.asl
@@ -108,11 +108,11 @@
#define PNP_READ_IRQ(IRQ_FROM, RESOURCE_TEMPLATE, IRQ_TAG) \
CreateWordField (RESOURCE_TEMPLATE, IRQ_TAG._INT, IRQ_TAG##W)\
- ShiftLeft (One, IRQ_FROM, IRQ_TAG##W)
+ IRQ_TAG##W = One << IRQ_FROM
#define PNP_READ_DMA(DMA_FROM, RESOURCE_TEMPLATE, DMA_TAG) \
CreateByteField (RESOURCE_TEMPLATE, DMA_TAG._DMA, DMA_TAG##W)\
- ShiftLeft (One, DMA_FROM, DMA_TAG##W)
+ DMA_TAG##W = One << DMA_FROM
#define PNP_WRITE_IO(IO_TO, RESOURCE, IO_TAG) \
CreateWordField (RESOURCE, IO_TAG._MIN, IO_TAG##I)\
diff --git a/src/superio/winbond/w83627hf/acpi/superio.asl b/src/superio/winbond/w83627hf/acpi/superio.asl
index d2b7264..37f5cfa 100644
--- a/src/superio/winbond/w83627hf/acpi/superio.asl
+++ b/src/superio/winbond/w83627hf/acpi/superio.asl
@@ -304,7 +304,7 @@
Local1 = IO1H
Local2 = IO1L
EXIT_CONFIG_MODE ()
- ShiftLeft(Local1, 8, Local1)
+ Local1 <<= 8
Or(Local1, Local2, Local1)
If (!Local0) {
Return (FDE)
@@ -503,7 +503,7 @@
}
/* Calculate IRQ bitmap */
Local0 = One
- ShiftLeft (Local0, Local5, IRQW)
+ IRQW = Local0 << Local5
/* Return resource template */
Return (CRS)
}
@@ -660,7 +660,7 @@
CreateWordField (CRS, IRQX._INT, IRQW)
Local3 = One
- ShiftLeft (Local3, Local2, IRQW)
+ IRQW = Local3 << Local2
Return (CRS)
}
@@ -785,7 +785,7 @@
CreateWordField (CRS, IRQX._INT, IRQW)
Local3 = One
- ShiftLeft (Local3, Local2, IRQW)
+ IRQW = Local3 << Local2
Return (CRS)
}
@@ -910,7 +910,7 @@
CreateWordField (CRS, IRQX._INT, IRQW)
Local3 = One
- ShiftLeft (Local3, Local2, IRQW)
+ IRQW = Local3 << Local2
Return (CRS)
}
@@ -1013,7 +1013,7 @@
CreateWordField (CRS, IRQX._INT, IRQW)
Local3 = One
- ShiftLeft (Local3, Local2, IRQW)
+ IRQW = Local3 << Local2
Return (CRS)
}
@@ -1114,7 +1114,7 @@
CreateWordField (CRS, IRQX._INT, IRQW)
Local5 = One
- ShiftLeft (Local5, Local4, IRQW)
+ IRQW = Local5 << Local4
Return (CRS)
}
@@ -1199,7 +1199,7 @@
CreateWordField (CRS, IRQX._INT, IRQW)
Local5 = One
- ShiftLeft (Local5, Local4, IRQW)
+ IRQW = Local5 << Local4
Return (CRS)
}
@@ -1278,7 +1278,7 @@
If (Local2) {
CreateWordField (CRS, IRQX._INT, IRQW)
Local3 = One
- ShiftLeft (Local3, Local2, IRQW)
+ IRQW = Local3 << Local2
}
Return (CRS)
@@ -1333,7 +1333,7 @@
If (Local2) {
CreateWordField (CRS, IRQX._INT, IRQW)
Local3 = One
- ShiftLeft (Local3, Local2, IRQW)
+ IRQW = Local3 << Local2
}
Return (CRS)
@@ -1432,7 +1432,7 @@
If (Local2) {
CreateWordField (CRS, IRQX._INT, IRQW)
Local3 = One
- ShiftLeft (Local3, Local2, IRQW)
+ IRQW = Local3 << Local2
}
Return (CRS)
}