mb/biostar/am1ml: Convert to ASL 2.0 syntax
Generated 'dsdt.dsl' files are identical.
Change-Id: Ifdd5008bcb9c7e41e637a30f70316c7926f927b5
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46161
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
diff --git a/src/mainboard/biostar/am1ml/acpi/ide.asl b/src/mainboard/biostar/am1ml/acpi/ide.asl
index 56f760d..766fcb3 100644
--- a/src/mainboard/biostar/am1ml/acpi/ide.asl
+++ b/src/mainboard/biostar/am1ml/acpi/ide.asl
@@ -52,11 +52,11 @@
Method(GTTM, 1) /* get total time*/
{
- Store(And(Arg0, 0x0F), Local0) /* Recovery Width */
- Increment(Local0)
- Store(ShiftRight(Arg0, 4), Local1) /* Command Width */
- Increment(Local1)
- Return(Multiply(30, Add(Local0, Local1)))
+ Local0 = Arg0 & 0x0F /* Recovery Width */
+ Local0++
+ Local1 = Arg0 >> 4 /* Command Width */
+ Local1++
+ Return(30 * (Local0 + Local1))
}
Device(PRID)
@@ -78,32 +78,32 @@
CreateDwordField(OTBF, 16, BFFG) /* buffer flags */
/* Just return if the channel is disabled */
- If(And(PPCR, 0x01)) { /* primary PIO control */
+ If (PPCR & 0x01) { /* primary PIO control */
Return(OTBF)
}
/* Always tell them independent timing available and IOChannelReady used on both drives */
- Or(BFFG, 0x1A, BFFG)
+ BFFG |= 0x1A
/* save total time of primary PIO master timing to PIO spd0 */
- Store(GTTM(PPTM), PSD0)
+ PSD0 = GTTM (PPTM)
/* save total time of primary PIO slave Timing to PIO spd1 */
- Store(GTTM(PPTS), PSD1)
+ PSD1 = GTTM (PPTS)
- If(And(PDCR, 0x01)) { /* It's under UDMA mode */
- Or(BFFG, 0x01, BFFG)
- Store(DerefOf(Index(UDTT, PDMM)), DSD0)
+ If (PDCR & 0x01) { /* It's under UDMA mode */
+ BFFG |= 0x01
+ DSD0 = DerefOf(UDTT [PDMM])
}
Else {
- Store(GTTM(PMTM), DSD0) /* Primary MWDMA Master Timing, DmaSpd0 */
+ DSD0 = GTTM (PMTM) /* Primary MWDMA Master Timing, DmaSpd0 */
}
- If(And(PDCR, 0x02)) { /* It's under UDMA mode */
- Or(BFFG, 0x04, BFFG)
- Store(DerefOf(Index(UDTT, PDSM)), DSD1)
+ If (PDCR & 0x02) { /* It's under UDMA mode */
+ BFFG |= 0x04
+ DSD1 = DerefOf(UDTT [PDSM])
}
Else {
- Store(GTTM(PMTS), DSD1) /* Primary MWDMA Slave Timing, DmaSpd0 */
+ DSD1 = GTTM (PMTS) /* Primary MWDMA Slave Timing, DmaSpd0 */
}
Return(OTBF) /* out buffer */
@@ -124,35 +124,35 @@
CreateDwordField(INBF, 12, DSD1) /* DMA spd1 */
CreateDwordField(INBF, 16, BFFG) /*buffer flag */
- Store(Match(POTT, MLE, PSD0, MTR, 0, 0), Local0)
- Divide(Local0, 5, PPMM,) /* Primary PIO master Mode */
- Store(Match(POTT, MLE, PSD1, MTR, 0, 0), Local1)
- Divide(Local1, 5, PPSM,) /* Primary PIO slave Mode */
+ Local0 = Match (POTT, MLE, PSD0, MTR, 0, 0)
+ PPMM = Local0 % 5 /* Primary PIO master Mode */
+ Local1 = Match (POTT, MLE, PSD1, MTR, 0, 0)
+ PPSM = Local1 % 5 /* Primary PIO slave Mode */
- Store(DerefOf(Index(PORT, Local0)), PPTM) /* Primary PIO Master Timing */
- Store(DerefOf(Index(PORT, Local1)), PPTS) /* Primary PIO Slave Timing */
+ PPTM = DerefOf(PORT [Local0]) /* Primary PIO Master Timing */
+ PPTS = DerefOf(PORT [Local1]) /* Primary PIO Slave Timing */
- If(And(BFFG, 0x01)) { /* Drive 0 is under UDMA mode */
- Store(Match(UDTT, MLE, DSD0, MTR, 0, 0), Local0)
- Divide(Local0, 7, PDMM,)
- Or(PDCR, 0x01, PDCR)
+ If (BFFG & 0x01) { /* Drive 0 is under UDMA mode */
+ Local0 = Match (UDTT, MLE, DSD0, MTR, 0, 0)
+ PDMM = Local0 % 7
+ PDCR |= 0x01
}
Else {
- If(LNotEqual(DSD0, 0xFFFFFFFF)) {
- Store(Match(MDTT, MLE, DSD0, MTR, 0, 0), Local0)
- Store(DerefOf(Index(MDRT, Local0)), PMTM)
+ If (DSD0 != 0xFFFFFFFF) {
+ Local0 = Match (MDTT, MLE, DSD0, MTR, 0, 0)
+ PMTM = DerefOf(MDRT [Local0])
}
}
- If(And(BFFG, 0x04)) { /* Drive 1 is under UDMA mode */
- Store(Match(UDTT, MLE, DSD1, MTR, 0, 0), Local0)
- Divide(Local0, 7, PDSM,)
- Or(PDCR, 0x02, PDCR)
+ If (BFFG & 0x04) { /* Drive 1 is under UDMA mode */
+ Local0 = Match (UDTT, MLE, DSD1, MTR, 0, 0)
+ PDSM = Local0 % 7
+ PDCR |= 0x02
}
Else {
- If(LNotEqual(DSD1, 0xFFFFFFFF)) {
- Store(Match(MDTT, MLE, DSD1, MTR, 0, 0), Local0)
- Store(DerefOf(Index(MDRT, Local0)), PMTS)
+ If (DSD1 != 0xFFFFFFFF) {
+ Local0 = Match (MDTT, MLE, DSD1, MTR, 0, 0)
+ PMTS = DerefOf(MDRT [Local0])
}
}
/* Return(INBF) */
@@ -172,21 +172,19 @@
CreateByteField(CMBF, 12, CMDB)
CreateByteField(CMBF, 19, CMDC)
- Store(0xA0, CMDA)
- Store(0xA0, CMDB)
- Store(0xA0, CMDC)
+ CMDA = 0xA0
+ CMDB = 0xA0
+ CMDC = 0xA0
- Or(PPMM, 0x08, POMD)
+ POMD = PPMM | 0x08
- If(And(PDCR, 0x01)) {
- Or(PDMM, 0x40, DMMD)
+ If (PDCR & 0x01) {
+ DMMD = PDMM | 0x40
}
Else {
- Store(Match
- (MDTT, MLE, GTTM(PMTM),
- MTR, 0, 0), Local0)
- If(LLess(Local0, 3)) {
- Or(0x20, Local0, DMMD)
+ Local0 = Match (MDTT, MLE, GTTM(PMTM), MTR, 0, 0)
+ If (Local0 < 3) {
+ DMMD = Local0 | 0x20
}
}
Return(CMBF)
@@ -208,21 +206,19 @@
CreateByteField(CMBF, 12, CMDB)
CreateByteField(CMBF, 19, CMDC)
- Store(0xB0, CMDA)
- Store(0xB0, CMDB)
- Store(0xB0, CMDC)
+ CMDA = 0xB0
+ CMDB = 0xB0
+ CMDC = 0xB0
- Or(PPSM, 0x08, POMD)
+ POMD = PPSM | 0x08
- If(And(PDCR, 0x02)) {
- Or(PDSM, 0x40, DMMD)
+ If (PDCR & 0x02) {
+ DMMD = PDSM | 0x40
}
Else {
- Store(Match
- (MDTT, MLE, GTTM(PMTS),
- MTR, 0, 0), Local0)
- If(LLess(Local0, 3)) {
- Or(0x20, Local0, DMMD)
+ Local0 = Match (MDTT, MLE, GTTM(PMTS), MTR, 0, 0)
+ If (Local0 < 3) {
+ DMMD = Local0 | 0x20
}
}
Return(CMBF)
diff --git a/src/mainboard/biostar/am1ml/acpi/sata.asl b/src/mainboard/biostar/am1ml/acpi/sata.asl
index d1a4ee7..31b9374 100644
--- a/src/mainboard/biostar/am1ml/acpi/sata.asl
+++ b/src/mainboard/biostar/am1ml/acpi/sata.asl
@@ -33,7 +33,7 @@
Device(PMST) {
Name(_ADR, 0)
Method(_STA,0) {
- if (LGreater(P0IS,0)) {
+ if (P0IS > 0) {
return (0x0F) /* sata is visible */
}
else {
@@ -46,7 +46,7 @@
{
Name(_ADR, 1)
Method(_STA,0) {
- if (LGreater(P1IS,0)) {
+ if (P1IS > 0) {
return (0x0F) /* sata is visible */
}
else {
@@ -68,7 +68,7 @@
{
Name(_ADR, 0)
Method(_STA,0) {
- if (LGreater(P2IS,0)) {
+ if (P2IS > 0) {
return (0x0F) /* sata is visible */
}
else {
@@ -81,7 +81,7 @@
{
Name(_ADR, 1)
Method(_STA,0) {
- if (LGreater(P3IS,0)) {
+ if (P3IS > 0) {
return (0x0F) /* sata is visible */
}
else {
@@ -95,35 +95,35 @@
Scope(\_GPE) {
Method(_L1F,0x0,NotSerialized) {
if (\_SB.P0PR) {
- if (LGreater(\_SB.P0IS,0)) {
+ if (\_SB.P0IS > 0) {
sleep(32)
}
Notify(\_SB.PCI0.STCR.PMRY.PMST, 0x01) /* NOTIFY_DEVICE_CHECK */
- store(one, \_SB.P0PR)
+ \_SB.P0PR = 1
}
if (\_SB.P1PR) {
- if (LGreater(\_SB.P1IS,0)) {
+ if (\_SB.P1IS > 0) {
sleep(32)
}
Notify(\_SB.PCI0.STCR.PMRY.PSLA, 0x01) /* NOTIFY_DEVICE_CHECK */
- store(one, \_SB.P1PR)
+ \_SB.P1PR = 1
}
if (\_SB.P2PR) {
- if (LGreater(\_SB.P2IS,0)) {
+ if (\_SB.P2IS > 0) {
sleep(32)
}
Notify(\_SB.PCI0.STCR.SEDY.SMST, 0x01) /* NOTIFY_DEVICE_CHECK */
- store(one, \_SB.P2PR)
+ \_SB.P2PR = 1
}
if (\_SB.P3PR) {
- if (LGreater(\_SB.P3IS,0)) {
+ if (\_SB.P3IS > 0) {
sleep(32)
}
Notify(\_SB.PCI0.STCR.SEDY.SSLA, 0x01) /* NOTIFY_DEVICE_CHECK */
- store(one, \_SB.P3PR)
+ \_SB.P3PR = 1
}
}
}
diff --git a/src/mainboard/biostar/am1ml/acpi/sio.asl b/src/mainboard/biostar/am1ml/acpi/sio.asl
index ef0bca5..bf4ff3d 100644
--- a/src/mainboard/biostar/am1ml/acpi/sio.asl
+++ b/src/mainboard/biostar/am1ml/acpi/sio.asl
@@ -26,17 +26,17 @@
/* Enter the 8728 Config */
Method (EPNP)
{
- Store(0x87, SIOI)
- Store(0x01, SIOI)
- Store(0x55, SIOI)
- Store(0x55, SIOI)
+ SIOI = 0x87
+ SIOI = 0x01
+ SIOI = 0x55
+ SIOI = 0x55
}
/* Exit the 8728 Config */
Method (XPNP)
{
- Store (0x02, SIOI)
- Store (0x02, SIOD)
+ SIOI = 0x02
+ SIOD = 0x02
}
/*
@@ -46,20 +46,20 @@
Method (SIOS, 1)
{
/* We only enable KBD PME for S5. */
- If (LLess (Arg0, 0x05))
+ If (Arg0 < 0x05)
{
EPNP()
/* DBGO("8728F\n") */
- Store (0x4, LDN)
- Store (One, ACTR) /* Enable EC */
+ LDN = 0x4
+ ACTR = 1 /* Enable EC */
/*
- Store (0x4, LDN)
- Store (0x04, APC4)
+ LDN = 0x4
+ APC4 = 0x04
*/ /* falling edge. which mode? Not sure. */
- Store (0x4, LDN)
- Store (0x08, APC1) /* clear PME status, Use 0x18 for mouse & KBD */
- Store (0x4, LDN)
- Store (0x08, APC0) /* enable PME, Use 0x18 for mouse & KBD */
+ LDN = 0x4
+ APC1 = 0x08 /* clear PME status, Use 0x18 for mouse & KBD */
+ LDN = 0x4
+ APC0 = 0x08 /* enable PME, Use 0x18 for mouse & KBD */
XPNP()
}
}
diff --git a/src/mainboard/biostar/am1ml/acpi/sleep.asl b/src/mainboard/biostar/am1ml/acpi/sleep.asl
index 47dd146..fc26c30 100644
--- a/src/mainboard/biostar/am1ml/acpi/sleep.asl
+++ b/src/mainboard/biostar/am1ml/acpi/sleep.asl
@@ -30,9 +30,9 @@
/* DBGO("\n") */
/* Clear wake status structure. */
- Store(0, Index(WKST,0))
- Store(0, Index(WKST,1))
- Store(7, UPWS)
+ WKST [0] = 0
+ WKST [1] = 0
+ UPWS = 7
\_SB.APTS(Arg0)
} /* End Method(\_PTS) */
@@ -56,7 +56,7 @@
/* DBGO("From S") */
/* DBGO(Arg0) */
/* DBGO(" to S0\n") */
- Store(1,USBS)
+ USBS = 1
\_SB.AWAK(Arg0)
diff --git a/src/mainboard/biostar/am1ml/acpi/superio.asl b/src/mainboard/biostar/am1ml/acpi/superio.asl
index a4eda2b..03683b3 100644
--- a/src/mainboard/biostar/am1ml/acpi/superio.asl
+++ b/src/mainboard/biostar/am1ml/acpi/superio.asl
@@ -12,8 +12,8 @@
IRQNoFlags () {12}
})
Method (_STA, 0, NotSerialized) {
- And (FLG0, 0x04, Local0)
- If (LEqual (Local0, 0x04)) {
+ Local0 = FLG0 & 0x04
+ If (Local0 == 0x04) {
Return (0x0F)
} Else {
Return (0x00)
@@ -24,8 +24,8 @@
Device (PS2K) {
Name (_HID, EisaId ("PNP0303"))
Method (_STA, 0, NotSerialized) {
- And (FLG0, 0x04, Local0)
- If (LEqual (Local0, 0x04)) {
+ Local0 = FLG0 & 0x04
+ If (Local0 == 0x04) {
Return (0x0F)
} Else {
Return (0x00)
@@ -42,8 +42,8 @@
Name (_HID, EISAID ("PNP0501"))
Name (_UID, 1)
Method (_STA, 0, NotSerialized) {
- And (FLG0, 0x04, Local0)
- If (LEqual (Local0, 0x04)) {
+ Local0 = FLG0 & 0x04
+ If (Local0 == 0x04) {
Return (0x0F)
} Else {
Return (0x00)
@@ -65,8 +65,8 @@
Name (_HID, EISAID ("PNP0400"))
Name (_UID, 1)
Method (_STA, 0, NotSerialized) {
- And (FLG0, 0x04, Local0)
- If (LEqual (Local0, 0x04)) {
+ Local0 = FLG0 & 0x04
+ If (Local0 == 0x04) {
Return (0x0F)
} Else {
Return (0x00)