Change in coreboot[master]: mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax
HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45703 )
Change subject: mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax ......................................................................
mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax
Change-Id: Id8b7d3776ab2cc8c487095273582cd013241bd3a Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/mainboard/packardbell/ms2290/acpi/battery.asl 1 file changed, 40 insertions(+), 37 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/45703/1
diff --git a/src/mainboard/packardbell/ms2290/acpi/battery.asl b/src/mainboard/packardbell/ms2290/acpi/battery.asl index 2f46f57..c6e861b 100644 --- a/src/mainboard/packardbell/ms2290/acpi/battery.asl +++ b/src/mainboard/packardbell/ms2290/acpi/battery.asl @@ -8,35 +8,35 @@ Method(BSTA, 4, NotSerialized) { Acquire(ECLK, 0xffff) - Store(0, Local0) + Local0 = 0
- Store(0, PAGE) + PAGE = 0
- Store(BAPR, Local2) + Local2 = BAPR
if (Arg2) // charging { - Or(2, Local0, Local0) + Local0 |= 2
- If (LGreaterEqual (Local2, 0x8000)) { - Store(0, Local2) + If (Local2 == 0x8000) { + Local2 = 0 } }
if (Arg3) // discharging { - Or(1, Local0, Local0) - Subtract(0x10000, Local2, Local2) + Local0 |= 1 + Local2 = 0x10000 - Local2 }
- Store(Local0, Index(Arg1, 0x00)) + Arg1[0] = Local0
- Store(0, PAGE) - Store(BARC, Index(Arg1, 2)) - Store(Local2, Index(Arg1, 1)) + PAGE = 0 + Arg1[2] = BARC + Arg1[1] = Local2
- Store(0, PAGE) - Store(BAVO, Index(Arg1, 3)) + PAGE = 0 + Arg1[3] = BAVO Release(ECLK) Return (Arg1) } @@ -44,37 +44,40 @@ Method(BINF, 2, Serialized) { Acquire(ECLK, 0xffff) - Store(0, PAGE) - Store(BAFC, Local2) - Store(1, PAGE) - Store(BADC, Local1) + PAGE = 0 + Local2 = BAFC + PAGE = 1 + Local1 = BADC
- Store(Local1, Index(Arg0, 1)) // Design Capacity - Store(Local2, Index(Arg0, 2)) // Last full charge capacity - Store(1, PAGE) - Store(BADV, Index(Arg0, 4)) // Design Voltage - Divide (Local2, 20, Local0, Index(Arg0, 5)) // Warning capacity + Arg0[1] = Local1 // Design Capacity + Arg0[2] = Local2 // Last full charge capacity + PAGE = 1 + Arg0[4] = BADV // Design Voltage + Arg0[5] = Local2 / 20 // Warning capacity + Local0 = Local2 - (Arg0[5] * 20) /* FIXME: Local0 not used */
- Store(1, PAGE) - Store (BASN, Local0) + PAGE = 1 + Local0 = BASN Name (SERN, Buffer (0x06) { " " }) - Store (4, Local1) + Local1 = 4 While (Local0) { - Divide (Local0, 0x0A, Local2, Local0) - Add (Local2, 48, Index (SERN, Local1)) - Decrement (Local1) + Local2 = Local0 + Local0 /= 0x0A + Local2 -= (Local0 * 0x0A) + SERN[Local1] = Local2 + 48 + Local1-- } - Store (SERN, Index (Arg0, 10)) // Serial Number + Arg0[10] = SERN // Serial Number
Name (TYPE, Buffer() { 0, 0, 0, 0, 0 }) - Store(4, PAGE) - Store(BATY, TYPE) - Store(TYPE, Index (Arg0, 11)) // Battery type - Store(5, PAGE) - Store(BAOE, Index (Arg0, 12)) // OEM information - Store(2, PAGE) - Store(BANA, Index (Arg0, 9)) // Model number + PAGE = 4 + TYPE = BATY + Arg0[11] = TYPE // Battery type + PAGE = 5 + Arg0[12] = BAOE // OEM information + PAGE = 2 + Arg0[9] = BANA // Model number Release(ECLK) Return (Arg0) }
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45703
to look at the new patch set (#3).
Change subject: mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax ......................................................................
mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax
Change-Id: Id8b7d3776ab2cc8c487095273582cd013241bd3a Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/mainboard/packardbell/ms2290/acpi/battery.asl 1 file changed, 45 insertions(+), 37 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/45703/3
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45703 )
Change subject: mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45703/3/src/mainboard/packardbell/m... File src/mainboard/packardbell/ms2290/acpi/battery.asl:
https://review.coreboot.org/c/coreboot/+/45703/3/src/mainboard/packardbell/m... PS3, Line 60: * So "Local0" is removed from the convertion below to ASL 2.0 'convertion' may be misspelled - perhaps 'conversion'?
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45703
to look at the new patch set (#4).
Change subject: mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax ......................................................................
mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax
Change-Id: Id8b7d3776ab2cc8c487095273582cd013241bd3a Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/mainboard/packardbell/ms2290/acpi/battery.asl 1 file changed, 45 insertions(+), 37 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/45703/4
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45703
to look at the new patch set (#5).
Change subject: mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax ......................................................................
mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax
Change-Id: Id8b7d3776ab2cc8c487095273582cd013241bd3a Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/mainboard/packardbell/ms2290/acpi/battery.asl 1 file changed, 45 insertions(+), 37 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/45703/5
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45703
to look at the new patch set (#6).
Change subject: mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax ......................................................................
mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax
Change-Id: Id8b7d3776ab2cc8c487095273582cd013241bd3a Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/mainboard/packardbell/ms2290/acpi/battery.asl 1 file changed, 45 insertions(+), 37 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/45703/6
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45703 )
Change subject: mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax ......................................................................
Patch Set 6:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45703/6/src/mainboard/packardbell/m... File src/mainboard/packardbell/ms2290/acpi/battery.asl:
https://review.coreboot.org/c/coreboot/+/45703/6/src/mainboard/packardbell/m... PS6, Line 57: /* : * FIXME: in old code "Divide (Local2, 20, Local0, Index(Arg0, 5))" : * the remainder "Local0" is not used. : * So "Local0" is removed from converted code below to ASL 2.0 : */ Fix what? Delete the comment?
Just remove `Local0` in a preceding commit, and explain why it is not used in the commit message.
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45703
to look at the new patch set (#7).
Change subject: mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax ......................................................................
mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax
Change-Id: Id8b7d3776ab2cc8c487095273582cd013241bd3a Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/mainboard/packardbell/ms2290/acpi/battery.asl 1 file changed, 39 insertions(+), 37 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/45703/7
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45703 )
Change subject: mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax ......................................................................
Patch Set 7:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45703/6/src/mainboard/packardbell/m... File src/mainboard/packardbell/ms2290/acpi/battery.asl:
https://review.coreboot.org/c/coreboot/+/45703/6/src/mainboard/packardbell/m... PS6, Line 57: /* : * FIXME: in old code "Divide (Local2, 20, Local0, Index(Arg0, 5))" : * the remainder "Local0" is not used. : * So "Local0" is removed from converted code below to ASL 2.0 : */
Fix what? Delete the comment? […]
Done
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45703 )
Change subject: mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax ......................................................................
Patch Set 7: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/45703/6/src/mainboard/packardbell/m... File src/mainboard/packardbell/ms2290/acpi/battery.asl:
https://review.coreboot.org/c/coreboot/+/45703/6/src/mainboard/packardbell/m... PS6, Line 57: /* : * FIXME: in old code "Divide (Local2, 20, Local0, Index(Arg0, 5))" : * the remainder "Local0" is not used. : * So "Local0" is removed from converted code below to ASL 2.0 : */
Done
Thanks!
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/45703 )
Change subject: mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax ......................................................................
mb/packardbell/ms2290/acpi: Convert 'battery.asl' to ASL 2.0 syntax
Change-Id: Id8b7d3776ab2cc8c487095273582cd013241bd3a Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/coreboot/+/45703 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/packardbell/ms2290/acpi/battery.asl 1 file changed, 39 insertions(+), 37 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/mainboard/packardbell/ms2290/acpi/battery.asl b/src/mainboard/packardbell/ms2290/acpi/battery.asl index 448cb72..1a775bb 100644 --- a/src/mainboard/packardbell/ms2290/acpi/battery.asl +++ b/src/mainboard/packardbell/ms2290/acpi/battery.asl @@ -8,35 +8,35 @@ Method(BSTA, 4, NotSerialized) { Acquire(ECLK, 0xffff) - Store(0, Local0) + Local0 = 0
- Store(0, PAGE) + PAGE = 0
- Store(BAPR, Local2) + Local2 = BAPR
if (Arg2) // charging { - Or(2, Local0, Local0) + Local0 |= 2
- If (LGreaterEqual (Local2, 0x8000)) { - Store(0, Local2) + If (Local2 == 0x8000) { + Local2 = 0 } }
if (Arg3) // discharging { - Or(1, Local0, Local0) - Subtract(0x10000, Local2, Local2) + Local0 |= 1 + Local2 = 0x10000 - Local2 }
- Store(Local0, Index(Arg1, 0x00)) + Arg1[0] = Local0
- Store(0, PAGE) - Store(BARC, Index(Arg1, 2)) - Store(Local2, Index(Arg1, 1)) + PAGE = 0 + Arg1[2] = BARC + Arg1[1] = Local2
- Store(0, PAGE) - Store(BAVO, Index(Arg1, 3)) + PAGE = 0 + Arg1[3] = BAVO Release(ECLK) Return (Arg1) } @@ -44,37 +44,39 @@ Method(BINF, 2, Serialized) { Acquire(ECLK, 0xffff) - Store(0, PAGE) - Store(BAFC, Local2) - Store(1, PAGE) - Store(BADC, Local1) + PAGE = 0 + Local2 = BAFC + PAGE = 1 + Local1 = BADC
- Store(Local1, Index(Arg0, 1)) // Design Capacity - Store(Local2, Index(Arg0, 2)) // Last full charge capacity - Store(1, PAGE) - Store(BADV, Index(Arg0, 4)) // Design Voltage - Divide (Local2, 20, , Index(Arg0, 5)) // Warning capacity + Arg0[1] = Local1 // Design Capacity + Arg0[2] = Local2 // Last full charge capacity + PAGE = 1 + Arg0[4] = BADV // Design Voltage + Arg0[5] = Local2 / 20 // Warning capacity
- Store(1, PAGE) - Store (BASN, Local0) + PAGE = 1 + Local0 = BASN Name (SERN, Buffer (0x06) { " " }) - Store (4, Local1) + Local1 = 4 While (Local0) { - Divide (Local0, 0x0A, Local2, Local0) - Add (Local2, 48, Index (SERN, Local1)) - Decrement (Local1) + Local2 = Local0 + Local0 /= 0x0A + Local2 -= (Local0 * 0x0A) + SERN[Local1] = Local2 + 48 + Local1-- } - Store (SERN, Index (Arg0, 10)) // Serial Number + Arg0[10] = SERN // Serial Number
Name (TYPE, Buffer() { 0, 0, 0, 0, 0 }) - Store(4, PAGE) - Store(BATY, TYPE) - Store(TYPE, Index (Arg0, 11)) // Battery type - Store(5, PAGE) - Store(BAOE, Index (Arg0, 12)) // OEM information - Store(2, PAGE) - Store(BANA, Index (Arg0, 9)) // Model number + PAGE = 4 + TYPE = BATY + Arg0[11] = TYPE // Battery type + PAGE = 5 + Arg0[12] = BAOE // OEM information + PAGE = 2 + Arg0[9] = BANA // Model number Release(ECLK) Return (Arg0) }
-
Angel Pons (Code Review) -
build bot (Jenkins) (Code Review)
-
HAOUAS Elyes (Code Review)
-
Patrick Georgi (Code Review)