sb/amd/{agesa,pi}hudson/acpi: Convert 'pci_int.asl' to ASL 2.0 syntax

Change-Id: I1a382eaf122e40aeaefedf88425749616a2090d9
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45876
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>

2 files changed, 114 insertions, 114 deletions

diff --git a/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl b/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl
index 69727d4759..a01fb5b700 100644
--- a/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl
+++ b/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl
@@ -109,7 +109,7 @@
 		{
 			\_SB.CIRQ()
 		}
-		Store(Arg0, PICM)
+		PICM = Arg0
 	}
 
 	Method(CIRQ, 0x00, NotSerialized){
@@ -133,9 +133,9 @@
 
 		Method(_STA, 0) {
 			if (PIRA) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTA._STA) */
 
@@ -145,14 +145,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKA\\_PRS\n") */
-			Return(IRQP)
+			Return (IRQP)
 		} /* Method(_SB.INTA._PRS) */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKA\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRA, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRA
+			Return (IRQB)
 		} /* Method(_SB.INTA._CRS) */
 
 		Method(_SRS, 1) {
@@ -162,9 +162,9 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRA)
+			PIRA = Local0
 		} /* End Method(_SB.INTA._SRS) */
 	} /* End Device(INTA) */
 
@@ -174,9 +174,9 @@
 
 		Method(_STA, 0) {
 			if (PIRB) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTB._STA) */
 
@@ -186,14 +186,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKB\\_PRS\n") */
-			Return(IRQP)
+			Return (IRQP)
 		} /* Method(_SB.INTB._PRS) */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKB\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRB, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRB
+			Return (IRQB)
 		} /* Method(_SB.INTB._CRS) */
 
 		Method(_SRS, 1) {
@@ -203,9 +203,9 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRB)
+			PIRB = Local0
 		} /* End Method(_SB.INTB._SRS) */
 	} /* End Device(INTB)  */
 
@@ -215,9 +215,9 @@
 
 		Method(_STA, 0) {
 			if (PIRC) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTC._STA) */
 
@@ -227,14 +227,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKC\\_PRS\n") */
-			Return(IRQP)
+			Return (IRQP)
 		} /* Method(_SB.INTC._PRS) */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKC\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRC, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRC
+			Return (IRQB)
 		} /* Method(_SB.INTC._CRS) */
 
 		Method(_SRS, 1) {
@@ -244,9 +244,9 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRC)
+			PIRC = Local0
 		} /* End Method(_SB.INTC._SRS) */
 	} /* End Device(INTC)  */
 
@@ -256,9 +256,9 @@
 
 		Method(_STA, 0) {
 			if (PIRD) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTD._STA) */
 
@@ -268,14 +268,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKD\\_PRS\n") */
-			Return(IRQP)
+			Return (IRQP)
 		} /* Method(_SB.INTD._PRS) */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKD\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRD, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRD
+			Return (IRQB)
 		} /* Method(_SB.INTD._CRS) */
 
 		Method(_SRS, 1) {
@@ -285,9 +285,9 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRD)
+			PIRD = Local0
 		} /* End Method(_SB.INTD._SRS) */
 	} /* End Device(INTD)  */
 
@@ -297,9 +297,9 @@
 
 		Method(_STA, 0) {
 			if (PIRE) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTE._STA) */
 
@@ -309,14 +309,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKE\\_PRS\n") */
-			Return(IRQP)
+			Return (IRQP)
 		} /* Method(_SB.INTE._PRS) */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKE\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRE, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRE
+			Return (IRQB)
 		} /* Method(_SB.INTE._CRS) */
 
 		Method(_SRS, 1) {
@@ -326,9 +326,9 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRE)
+			PIRE = Local0
 		} /* End Method(_SB.INTE._SRS) */
 	} /* End Device(INTE)  */
 
@@ -338,9 +338,9 @@
 
 		Method(_STA, 0) {
 			if (PIRF) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTF._STA) */
 
@@ -350,14 +350,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKF\\_PRS\n") */
-			Return(PITF)
+			Return (PITF)
 		} /* Method(_SB.INTF._PRS) */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKF\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRF, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRF
+			Return (IRQB)
 		} /* Method(_SB.INTF._CRS) */
 
 		Method(_SRS, 1) {
@@ -367,9 +367,9 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRF)
+			PIRF = Local0
 		} /*  End Method(_SB.INTF._SRS) */
 	} /* End Device(INTF)  */
 
@@ -379,9 +379,9 @@
 
 		Method(_STA, 0) {
 			if (PIRG) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTG._STA)  */
 
@@ -391,14 +391,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKG\\_PRS\n") */
-			Return(IRQP)
+			Return (IRQP)
 		} /* Method(_SB.INTG._CRS)  */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKG\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRG, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRG
+			Return (IRQB)
 		} /* Method(_SB.INTG._CRS)  */
 
 		Method(_SRS, 1) {
@@ -408,9 +408,9 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRG)
+			PIRG = Local0
 		} /* End Method(_SB.INTG._SRS)  */
 	} /* End Device(INTG)  */
 
@@ -420,9 +420,9 @@
 
 		Method(_STA, 0) {
 			if (PIRH) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTH._STA)  */
 
@@ -432,14 +432,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKH\\_PRS\n") */
-			Return(IRQP)
+			Return (IRQP)
 		} /* Method(_SB.INTH._CRS)  */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKH\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRH, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRH
+			Return (IRQB)
 		} /* Method(_SB.INTH._CRS)  */
 
 		Method(_SRS, 1) {
@@ -449,8 +449,8 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRH)
+			PIRH = Local0
 		} /* End Method(_SB.INTH._SRS)  */
 	} /* End Device(INTH)   */
diff --git a/src/southbridge/amd/pi/hudson/acpi/pci_int.asl b/src/southbridge/amd/pi/hudson/acpi/pci_int.asl
index 69727d4759..a01fb5b700 100644
--- a/src/southbridge/amd/pi/hudson/acpi/pci_int.asl
+++ b/src/southbridge/amd/pi/hudson/acpi/pci_int.asl
@@ -109,7 +109,7 @@
 		{
 			\_SB.CIRQ()
 		}
-		Store(Arg0, PICM)
+		PICM = Arg0
 	}
 
 	Method(CIRQ, 0x00, NotSerialized){
@@ -133,9 +133,9 @@
 
 		Method(_STA, 0) {
 			if (PIRA) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTA._STA) */
 
@@ -145,14 +145,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKA\\_PRS\n") */
-			Return(IRQP)
+			Return (IRQP)
 		} /* Method(_SB.INTA._PRS) */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKA\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRA, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRA
+			Return (IRQB)
 		} /* Method(_SB.INTA._CRS) */
 
 		Method(_SRS, 1) {
@@ -162,9 +162,9 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRA)
+			PIRA = Local0
 		} /* End Method(_SB.INTA._SRS) */
 	} /* End Device(INTA) */
 
@@ -174,9 +174,9 @@
 
 		Method(_STA, 0) {
 			if (PIRB) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTB._STA) */
 
@@ -186,14 +186,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKB\\_PRS\n") */
-			Return(IRQP)
+			Return (IRQP)
 		} /* Method(_SB.INTB._PRS) */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKB\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRB, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRB
+			Return (IRQB)
 		} /* Method(_SB.INTB._CRS) */
 
 		Method(_SRS, 1) {
@@ -203,9 +203,9 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRB)
+			PIRB = Local0
 		} /* End Method(_SB.INTB._SRS) */
 	} /* End Device(INTB)  */
 
@@ -215,9 +215,9 @@
 
 		Method(_STA, 0) {
 			if (PIRC) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTC._STA) */
 
@@ -227,14 +227,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKC\\_PRS\n") */
-			Return(IRQP)
+			Return (IRQP)
 		} /* Method(_SB.INTC._PRS) */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKC\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRC, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRC
+			Return (IRQB)
 		} /* Method(_SB.INTC._CRS) */
 
 		Method(_SRS, 1) {
@@ -244,9 +244,9 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRC)
+			PIRC = Local0
 		} /* End Method(_SB.INTC._SRS) */
 	} /* End Device(INTC)  */
 
@@ -256,9 +256,9 @@
 
 		Method(_STA, 0) {
 			if (PIRD) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTD._STA) */
 
@@ -268,14 +268,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKD\\_PRS\n") */
-			Return(IRQP)
+			Return (IRQP)
 		} /* Method(_SB.INTD._PRS) */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKD\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRD, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRD
+			Return (IRQB)
 		} /* Method(_SB.INTD._CRS) */
 
 		Method(_SRS, 1) {
@@ -285,9 +285,9 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRD)
+			PIRD = Local0
 		} /* End Method(_SB.INTD._SRS) */
 	} /* End Device(INTD)  */
 
@@ -297,9 +297,9 @@
 
 		Method(_STA, 0) {
 			if (PIRE) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTE._STA) */
 
@@ -309,14 +309,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKE\\_PRS\n") */
-			Return(IRQP)
+			Return (IRQP)
 		} /* Method(_SB.INTE._PRS) */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKE\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRE, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRE
+			Return (IRQB)
 		} /* Method(_SB.INTE._CRS) */
 
 		Method(_SRS, 1) {
@@ -326,9 +326,9 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRE)
+			PIRE = Local0
 		} /* End Method(_SB.INTE._SRS) */
 	} /* End Device(INTE)  */
 
@@ -338,9 +338,9 @@
 
 		Method(_STA, 0) {
 			if (PIRF) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTF._STA) */
 
@@ -350,14 +350,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKF\\_PRS\n") */
-			Return(PITF)
+			Return (PITF)
 		} /* Method(_SB.INTF._PRS) */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKF\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRF, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRF
+			Return (IRQB)
 		} /* Method(_SB.INTF._CRS) */
 
 		Method(_SRS, 1) {
@@ -367,9 +367,9 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRF)
+			PIRF = Local0
 		} /*  End Method(_SB.INTF._SRS) */
 	} /* End Device(INTF)  */
 
@@ -379,9 +379,9 @@
 
 		Method(_STA, 0) {
 			if (PIRG) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTG._STA)  */
 
@@ -391,14 +391,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKG\\_PRS\n") */
-			Return(IRQP)
+			Return (IRQP)
 		} /* Method(_SB.INTG._CRS)  */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKG\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRG, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRG
+			Return (IRQB)
 		} /* Method(_SB.INTG._CRS)  */
 
 		Method(_SRS, 1) {
@@ -408,9 +408,9 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRG)
+			PIRG = Local0
 		} /* End Method(_SB.INTG._SRS)  */
 	} /* End Device(INTG)  */
 
@@ -420,9 +420,9 @@
 
 		Method(_STA, 0) {
 			if (PIRH) {
-				Return(0x0B) /* sata is invisible */
+				Return (0x0b) /* sata is invisible */
 			} else {
-				Return(0x09) /* sata is disabled */
+				Return (0x09) /* sata is disabled */
 			}
 		} /* End Method(_SB.INTH._STA)  */
 
@@ -432,14 +432,14 @@
 
 		Method(_PRS ,0) {
 			/* DBGO("\\_SB\\LNKH\\_PRS\n") */
-			Return(IRQP)
+			Return (IRQP)
 		} /* Method(_SB.INTH._CRS)  */
 
 		Method(_CRS ,0) {
 			/* DBGO("\\_SB\\LNKH\\_CRS\n") */
 			CreateWordField(IRQB, 0x1, IRQN)
-			ShiftLeft(1, PIRH, IRQN)
-			Return(IRQB)
+			IRQN = 1 << PIRH
+			Return (IRQB)
 		} /* Method(_SB.INTH._CRS)  */
 
 		Method(_SRS, 1) {
@@ -449,8 +449,8 @@
 			/* Use lowest available IRQ */
 			FindSetRightBit(IRQM, Local0)
 			if (Local0) {
-				Decrement(Local0)
+				Local0--
 			}
-			Store(Local0, PIRH)
+			PIRH = Local0
 		} /* End Method(_SB.INTH._SRS)  */
 	} /* End Device(INTH)   */