Change in coreboot[master]: ec/roda/it8518: Convert to ASL 2.0 syntax - coreboot-gerrit

6 Oct 2020

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46105 )
Change subject: ec/roda/it8518: Convert to ASL 2.0 syntax
......................................................................
ec/roda/it8518: Convert to ASL 2.0 syntax
Change-Id: I4ecf7256c5bf8ff7160ad3d6f426c9f37babe69b
Signed-off-by: Elyes HAOUAS ehaouas@noos.fr
---
M src/ec/roda/it8518/acpi/ac.asl
M src/ec/roda/it8518/acpi/battery.asl
M src/ec/roda/it8518/acpi/ec.asl
M src/ec/roda/it8518/acpi/lid.asl
4 files changed, 70 insertions(+), 70 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/46105/1

diff --git a/src/ec/roda/it8518/acpi/ac.asl b/src/ec/roda/it8518/acpi/ac.asl
index c46bf20..cb4af37 100644
--- a/src/ec/roda/it8518/acpi/ac.asl
+++ b/src/ec/roda/it8518/acpi/ac.asl
@@ -9,8 +9,8 @@
Method (_PSR, 0, NotSerialized)  // _PSR: Power Source
    {
-		Store ("-----> AC: _PSR", Debug)
-		Store ("<----- AC: _PSR", Debug)
+		Debug = "-----> AC: _PSR"
+		Debug = "<----- AC: _PSR"
    	Return (PWRS)
    }
 }
diff --git a/src/ec/roda/it8518/acpi/battery.asl b/src/ec/roda/it8518/acpi/battery.asl
index 04fe769..35123fd 100644
--- a/src/ec/roda/it8518/acpi/battery.asl
+++ b/src/ec/roda/it8518/acpi/battery.asl
@@ -42,68 +42,68 @@
    // Battery Slot Status
    Method (_STA, 0, Serialized)
    {
-		Store ("-----> BAT0: _STA", Debug)
+		Debug = "-----> BAT0: _STA"
-		Store (0x0F, Local0)
+		Local0 = 0x0F
-		Store (ECPS, Local1)
-		And (Local1, 0x02, Local1)
-		If (LEqual (Local1, 0x02))
+		Local1 = ECPS
+		Local1 &= 0x02
+		If (Local1 == 0x02)
    	{
-			Store (0x1F, Local0)
+			Local0 = 0x1F
    	}
-		Store ("<----- BAT0: _STA", Debug)
+		Debug = "<----- BAT0: _STA"
Return (Local0)
    }
Method (_BIF, 0, Serialized)
    {
-		Store ("-----> BAT0: _BIF", Debug)
+		Debug = "-----> BAT0: _BIF"
-		Store (B0FC, Index (PBIF, 0x02))
-		Store (Divide (Multiply (B0FC, 6), 100), Index (PBIF, 0x05))
-		Store (Divide (Multiply (B0FC, 3), 100), Index (PBIF, 0x06))
+		PBIF [2] = B0FC
+		PBIF [5] = (B0FC * 6) / 100
+		PBIF [6] = (B0FC * 3) / 100
-		Store ("<----- BAT0: _BIF", Debug)
+		Debug = "<----- BAT0: _BIF"
Return (PBIF)
    }
Method (_BST, 0, Serialized)
    {
-		Store ("-----> BAT0: _BST", Debug)
+		Debug = "-----> BAT0: _BST"
-		Store (B0ST, Local0)
-		And (Local0, 0x40, Local0)
-		If (LEqual (Local0, 0x40))
+		Local0 = B0ST
+		Local0 &= 0x40
+		If (Local0 == 0x40)
    	{
-			If (LEqual (PWRS, 1))
+			If (PWRS == 1)
    		{
-				Store (0x00, Index (PBST, 0x00))
+				PBST [0] = 0x00
    		}
    		Else
    		{
-				Store (0x01, Index (PBST, 0x00))
+				PBST [0] = 0x01
    		}
    	}
    	Else
    	{
-			Store (0x02, Index (PBST, 0x00))
+			PBST [0] = 0x02
    	}
-		Store (B0AC, Local1)
-		If (LGreaterEqual (Local1, 0x8000))
+		Local1 = B0AC
+		If (Local1 >= 0x8000)
    	{
-			Subtract (0x00010000, Local1, Local1)
+			Local1 = 0x00010000 - Local1
    	}
-		Store (Local1, Index (PBST, 0x01))
-		Store (B0RC, Index (PBST, 0x02))
-		Store (B0VT, Index (PBST, 0x03))
+		PBST [1] = Local1
+		PBST [2] = B0RC
+		PBST [3] = B0VT
-		Store ("<----- BAT0: _BST", Debug)
+		Debug = "<----- BAT0: _BST"
Return (PBST)
    }
diff --git a/src/ec/roda/it8518/acpi/ec.asl b/src/ec/roda/it8518/acpi/ec.asl
index d500084..df6dc2d 100644
--- a/src/ec/roda/it8518/acpi/ec.asl
+++ b/src/ec/roda/it8518/acpi/ec.asl
@@ -52,42 +52,42 @@
Method (_REG, 2, NotSerialized)
    {
-		Store ("-----> EC: _REG", Debug)
+		Debug = "-----> EC: _REG"
-		Store (0x01, ECOS)
+		ECOS = 0x01
-		Store ("<----- EC: _REG", Debug)
+		Debug = "<----- EC: _REG"
    }
Method (_Q29, 0, NotSerialized)		// _Qxx: EC Query
    {
-		Store ("-----> EC: _Q29", Debug)
+		Debug = "-----> EC: _Q29"
-		Store (1, PWRS)
+		PWRS = 1
    	Notify (AC, 0x80)
    	Notify (AC, 0x00)
    	Notify (BAT0, 0x00)
    	Notify (BAT0, 0x80)
-		Store ("<----- EC: _Q29", Debug)
+		Debug = "<----- EC: _Q29"
    }
Method (_Q31, 0, NotSerialized)		// _Qxx: EC Query
    {
-		Store ("-----> EC: _Q31", Debug)
+		Debug = "-----> EC: _Q31"
-		Store (0, PWRS)
+		PWRS = 0
    	Notify (AC, 0x80)
    	Notify (AC, 0x00)
    	Notify (BAT0, 0x00)
    	Notify (BAT0, 0x80)
-		Store ("<----- EC: _Q31", Debug)
+		Debug = "<----- EC: _Q31"
    }
Method (_Q32, 0, NotSerialized)		// _Qxx: EC Query
    {
-		Store ("-----> EC: _Q32", Debug)
+		Debug = "-----> EC: _Q32"
Sleep (2500)
    	Notify (BAT0, 0x00)
@@ -95,12 +95,12 @@
    	Notify (BAT0, 0x81)
    	Notify (BAT0, 0x82)
-		Store ("<----- EC: _Q32", Debug)
+		Debug = "<----- EC: _Q32"
    }
Method (_Q33, 0, NotSerialized)		// _Qxx: EC Query
    {
-		Store ("-----> EC: _Q33", Debug)
+		Debug = "-----> EC: _Q33"
Sleep (2500)
    	Notify (BAT0, 0x00)
@@ -108,87 +108,87 @@
    	Notify (BAT0, 0x81)
    	Notify (BAT0, 0x82)
-		Store ("<---- EC: _Q33", Debug)
+		Debug "<---- EC: _Q33"
    }
Method (_Q36, 0, NotSerialized)		// _Qxx: EC Query
    {
-		Store ("-----> EC: _Q36", Debug)
+		Debug = "-----> EC: _Q36"
Notify (BAT0, 0x80)
-		Store ("<----- EC: _Q36", Debug)
+		Debug = "<----- EC: _Q36"
    }
Method (_Q37, 0, NotSerialized)		// _Qxx: EC Query
    {
-		Store ("-----> EC: _Q37", Debug)
+		Debug = "-----> EC: _Q37"
Notify (BAT0, 0x80)
-		Store ("<----- EC: _Q37", Debug)
+		Debug = "<----- EC: _Q37"
    }
Method (_Q43, 0, NotSerialized)		// _Qxx: EC Query
    {
-		Store ("-----> EC: _Q43", Debug)
+		Debug = "-----> EC: _Q43"
-		Store (BRIG, Local0)
-		Increment (Local0)
-		If (LGreater (Local0, 0xAA)) {
-			Store (0xAA, Local0)
+		Local0 = BRIG
+		Local0++
+		If (Local0 > 0xAA) {
+			Local0 = 0xAA
    	}
-		Store (Local0, BRIG)
+		BRIG = Local0
_SB.PCI0.GFX0.INCB ()
-		Store ("<---- EC: _Q43", Debug)
+		Debug = "<---- EC: _Q43"
    }
Method (_Q44, 0, NotSerialized)		// _Qxx: EC Query
    {
-		Store ("-----> EC: _Q44", Debug)
+		Debug = "-----> EC: _Q44"
-		Store (BRIG, Local0)
-		Decrement (Local0)
-		If (LLess (Local0, 0xA0))
+		Local0 = BRIG
+		Local0--
+		If (Local0 < 0xA0)
    	{
-			Store (0xA0, Local0)
+			Local0 = 0xA0
    	}
-		Store (Local0, BRIG)
+		BRIG = Local0
_SB.PCI0.GFX0.DECB ()
-		Store ("<---- EC: _Q44", Debug)
+		Debug = "<---- EC: _Q44"
    }
Method (_Q45, 0, NotSerialized)		// _Qxx: EC Query
    {
-		Store ("-----> EC: _Q45", Debug)
+		Debug = "-----> EC: _Q45"
-		Store (0, LIDS)
+		LIDS = 0
    	Notify (LID, 0x80)
-		Store ("<----- EC: _Q45", Debug)
+		Debug = "<----- EC: _Q45"
    }
Method (_Q46, 0, NotSerialized)		// _Qxx: EC Query
    {
-		Store ("-----> EC: _Q46", Debug)
+		Debug = "-----> EC: _Q46"
-		Store (1, LIDS)
+		LIDS = 1
    	Notify (LID, 0x80)
-		Store ("<----- EC: _Q46", Debug)
+		Debug = "<----- EC: _Q46"
    }
Method (_Q70, 0, NotSerialized)		// _Qxx: EC Query
    {
-		Store ("-----> EC: _Q70", Debug)
+		Debug = "-----> EC: _Q70"
Notify (ALSD, 0x80)
-		Store ("<----- EC: _Q70", Debug)
+		Debug = "<----- EC: _Q70"
    }
#include "battery.asl"
diff --git a/src/ec/roda/it8518/acpi/lid.asl b/src/ec/roda/it8518/acpi/lid.asl
index c30bb4d..b680178 100644
--- a/src/ec/roda/it8518/acpi/lid.asl
+++ b/src/ec/roda/it8518/acpi/lid.asl
@@ -7,8 +7,8 @@
    Name (_HID, EisaId ("PNP0C0D"))  // _HID: Hardware ID
    Method (_LID, 0, NotSerialized)  // _LID: Lid Status
    {
-		Store ("-----> LID0: _LID", Debug)
-		Store ("<----- LID0: _LID", Debug)
+		Debug = "-----> LID0: _LID"
+		Debug = "<----- LID0: _LID"
    	Return (LIDS)
    }
 }
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/46105
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I4ecf7256c5bf8ff7160ad3d6f426c9f37babe69b
Gerrit-Change-Number: 46105
Gerrit-PatchSet: 1
Gerrit-Owner: HAOUAS Elyes ehaouas@noos.fr
Gerrit-MessageType: newchange



    