HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46203 )
Change subject: mb/lenovo/x200: Convert to ASL 2.0 syntax ......................................................................
mb/lenovo/x200: Convert to ASL 2.0 syntax
Change-Id: I0767afcb0ffdd6f9a8d83209955d42d9e89325e9 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/mainboard/lenovo/x200/acpi/dock.asl M src/mainboard/lenovo/x200/acpi/gpe.asl M src/mainboard/lenovo/x200/acpi/platform.asl 3 files changed, 23 insertions(+), 24 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/46203/1
diff --git a/src/mainboard/lenovo/x200/acpi/dock.asl b/src/mainboard/lenovo/x200/acpi/dock.asl index b612f06..ba8f46e 100644 --- a/src/mainboard/lenovo/x200/acpi/dock.asl +++ b/src/mainboard/lenovo/x200/acpi/dock.asl @@ -12,14 +12,14 @@ { if (Arg0) { /* connect dock */ - Store (1, \GP28) - Store (1, _SB.PCI0.LPCB.EC.DKR1) + \GP28 = 1 + _SB.PCI0.LPCB.EC.DKR1 = 1 } else { /* disconnect dock */ - Store (0, \GP28) - Store (0, _SB.PCI0.LPCB.EC.DKR1) + \GP28 = 0 + _SB.PCI0.LPCB.EC.DKR1 = 0 } - Xor(Arg0, _SB.PCI0.LPCB.EC.DKR1, Local0) + Local0 = Arg0 ^ _SB.PCI0.LPCB.EC.DKR1 Return (Local0) }
@@ -32,16 +32,15 @@ /* Returns 0x7 (dock absent) or 0x3 (dock present) */ Method(GGID, 0, NotSerialized) { - Store(G_ID, Local0) - if (LEqual(Local0, 0xFFFFFFFF)) + Local0 = G_ID + if (Local0 == 0xFFFFFFFF) { - Store(Or (Or (GP02, ShiftLeft(GP03, 1)), - ShiftLeft(GP04, 2)), Local0) - If (LEqual(Local0, 0x00)) + Local0 = GP02 | (GP03 << 1) | (GP04 << 2) + If (Local0 == 0x00) { - Store(0x03, Local0) + Local0 = 0x03 } - Store(Local0, G_ID) + G_ID = Local0 } return (Local0) } @@ -68,8 +67,8 @@ /* Undock button on dock */ Method(_Q50, 0, NotSerialized) { - Store(_SB.DOCK.GGID (), Local0) - if (LNotEqual(Local0, 0x07)) + Local0 = _SB.DOCK.GGID () + if (Local0 != 0x07) { Notify(_SB.DOCK, 3) } @@ -83,16 +82,16 @@ /* Unplug power: only disconnect dock on force eject */ Method(_Q5A, 0, NotSerialized) { - Store(_SB.DOCK.GGID (), Local0) - if (LEqual(Local0, 0x07)) + Local0 = _SB.DOCK.GGID () + if (Local0 == 0x07) { Notify(_SB.DOCK, 3) } - if (LEqual(Local0, 0x03)) + if (Local0 == 0x03) { Sleep(0x64) - Store(DKR1, Local1) - if (LEqual(Local1, 1)) + Local1 = DKR1 + if (Local1 == 1) { Notify(_SB.DOCK, 0) } diff --git a/src/mainboard/lenovo/x200/acpi/gpe.asl b/src/mainboard/lenovo/x200/acpi/gpe.asl index 62e7b37..9984636 100644 --- a/src/mainboard/lenovo/x200/acpi/gpe.asl +++ b/src/mainboard/lenovo/x200/acpi/gpe.asl @@ -5,8 +5,8 @@ Method(_L18, 0, NotSerialized) { /* Read EC register to clear wake status */ - Store(_SB.PCI0.LPCB.EC.WAKE, Local0) + Local0 = _SB.PCI0.LPCB.EC.WAKE /* So that we don't get a warning that Local0 is unused. */ - Increment (Local0) + Local0++ } } diff --git a/src/mainboard/lenovo/x200/acpi/platform.asl b/src/mainboard/lenovo/x200/acpi/platform.asl index 10cadf2..95e594c 100644 --- a/src/mainboard/lenovo/x200/acpi/platform.asl +++ b/src/mainboard/lenovo/x200/acpi/platform.asl @@ -26,12 +26,12 @@ // was inserted while a sleep state was active.
// Are we going to S3? - If (LEqual(Arg0, 3)) { + If (Arg0 == 3) { // .. }
// Are we going to S4? - If (LEqual(Arg0, 4)) { + If (Arg0 == 4) { // .. }
@@ -65,7 +65,7 @@ * running: Windows XP SP1 needs to have C-State coordination * enabled in SMM. */ - If (LAnd(LEqual(OSYS, 2001), MPEN)) { + If ((OSYS == 2001) && MPEN) { // TRAP(61) // TODO }
Hello build bot (Jenkins), Alexander Couzens, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46203
to look at the new patch set (#2).
Change subject: mb/lenovo/x200: Convert to ASL 2.0 syntax ......................................................................
mb/lenovo/x200: Convert to ASL 2.0 syntax
Change-Id: I0767afcb0ffdd6f9a8d83209955d42d9e89325e9 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/mainboard/lenovo/x200/acpi/dock.asl M src/mainboard/lenovo/x200/acpi/gpe.asl M src/mainboard/lenovo/x200/acpi/platform.asl 3 files changed, 22 insertions(+), 23 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/46203/2
Hello build bot (Jenkins), Alexander Couzens, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46203
to look at the new patch set (#3).
Change subject: mb/lenovo/x200: Convert to ASL 2.0 syntax ......................................................................
mb/lenovo/x200: Convert to ASL 2.0 syntax
Generated 'build/dsdt.dsl' are identical.
Change-Id: I0767afcb0ffdd6f9a8d83209955d42d9e89325e9 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/mainboard/lenovo/x200/acpi/dock.asl M src/mainboard/lenovo/x200/acpi/gpe.asl M src/mainboard/lenovo/x200/acpi/platform.asl 3 files changed, 22 insertions(+), 23 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/46203/3
Attention is currently required from: HAOUAS Elyes. Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46203 )
Change subject: mb/lenovo/x200: Convert to ASL 2.0 syntax ......................................................................
Patch Set 3: Code-Review+2
Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46203 )
Change subject: mb/lenovo/x200: Convert to ASL 2.0 syntax ......................................................................
mb/lenovo/x200: Convert to ASL 2.0 syntax
Generated 'build/dsdt.dsl' are identical.
Change-Id: I0767afcb0ffdd6f9a8d83209955d42d9e89325e9 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/coreboot/+/46203 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Michael Niewöhner foss@mniewoehner.de --- M src/mainboard/lenovo/x200/acpi/dock.asl M src/mainboard/lenovo/x200/acpi/gpe.asl M src/mainboard/lenovo/x200/acpi/platform.asl 3 files changed, 22 insertions(+), 23 deletions(-)
Approvals: build bot (Jenkins): Verified Michael Niewöhner: Looks good to me, approved
diff --git a/src/mainboard/lenovo/x200/acpi/dock.asl b/src/mainboard/lenovo/x200/acpi/dock.asl index b612f06..ba8f46e 100644 --- a/src/mainboard/lenovo/x200/acpi/dock.asl +++ b/src/mainboard/lenovo/x200/acpi/dock.asl @@ -12,14 +12,14 @@ { if (Arg0) { /* connect dock */ - Store (1, \GP28) - Store (1, _SB.PCI0.LPCB.EC.DKR1) + \GP28 = 1 + _SB.PCI0.LPCB.EC.DKR1 = 1 } else { /* disconnect dock */ - Store (0, \GP28) - Store (0, _SB.PCI0.LPCB.EC.DKR1) + \GP28 = 0 + _SB.PCI0.LPCB.EC.DKR1 = 0 } - Xor(Arg0, _SB.PCI0.LPCB.EC.DKR1, Local0) + Local0 = Arg0 ^ _SB.PCI0.LPCB.EC.DKR1 Return (Local0) }
@@ -32,16 +32,15 @@ /* Returns 0x7 (dock absent) or 0x3 (dock present) */ Method(GGID, 0, NotSerialized) { - Store(G_ID, Local0) - if (LEqual(Local0, 0xFFFFFFFF)) + Local0 = G_ID + if (Local0 == 0xFFFFFFFF) { - Store(Or (Or (GP02, ShiftLeft(GP03, 1)), - ShiftLeft(GP04, 2)), Local0) - If (LEqual(Local0, 0x00)) + Local0 = GP02 | (GP03 << 1) | (GP04 << 2) + If (Local0 == 0x00) { - Store(0x03, Local0) + Local0 = 0x03 } - Store(Local0, G_ID) + G_ID = Local0 } return (Local0) } @@ -68,8 +67,8 @@ /* Undock button on dock */ Method(_Q50, 0, NotSerialized) { - Store(_SB.DOCK.GGID (), Local0) - if (LNotEqual(Local0, 0x07)) + Local0 = _SB.DOCK.GGID () + if (Local0 != 0x07) { Notify(_SB.DOCK, 3) } @@ -83,16 +82,16 @@ /* Unplug power: only disconnect dock on force eject */ Method(_Q5A, 0, NotSerialized) { - Store(_SB.DOCK.GGID (), Local0) - if (LEqual(Local0, 0x07)) + Local0 = _SB.DOCK.GGID () + if (Local0 == 0x07) { Notify(_SB.DOCK, 3) } - if (LEqual(Local0, 0x03)) + if (Local0 == 0x03) { Sleep(0x64) - Store(DKR1, Local1) - if (LEqual(Local1, 1)) + Local1 = DKR1 + if (Local1 == 1) { Notify(_SB.DOCK, 0) } diff --git a/src/mainboard/lenovo/x200/acpi/gpe.asl b/src/mainboard/lenovo/x200/acpi/gpe.asl index 62e7b37..9984636 100644 --- a/src/mainboard/lenovo/x200/acpi/gpe.asl +++ b/src/mainboard/lenovo/x200/acpi/gpe.asl @@ -5,8 +5,8 @@ Method(_L18, 0, NotSerialized) { /* Read EC register to clear wake status */ - Store(_SB.PCI0.LPCB.EC.WAKE, Local0) + Local0 = _SB.PCI0.LPCB.EC.WAKE /* So that we don't get a warning that Local0 is unused. */ - Increment (Local0) + Local0++ } } diff --git a/src/mainboard/lenovo/x200/acpi/platform.asl b/src/mainboard/lenovo/x200/acpi/platform.asl index 3d2805d..aa29248 100644 --- a/src/mainboard/lenovo/x200/acpi/platform.asl +++ b/src/mainboard/lenovo/x200/acpi/platform.asl @@ -26,12 +26,12 @@ // was inserted while a sleep state was active.
// Are we going to S3? - If (LEqual(Arg0, 3)) { + If (Arg0 == 3) { // .. }
// Are we going to S4? - If (LEqual(Arg0, 4)) { + If (Arg0 == 4) { // .. }
-
HAOUAS Elyes (Code Review) -
Michael Niewöhner (Code Review)