Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/62332 )
Change subject: ec/starlabs/merlin: Add spaces to adhere to coding style ......................................................................
ec/starlabs/merlin: Add spaces to adhere to coding style
Signed-off-by: Sean Rhodes sean@starlabs.systems Change-Id: I0e965513d5888398834cab8c8445e97372f2b115 Reviewed-on: https://review.coreboot.org/c/coreboot/+/62332 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Elyes Haouas ehaouas@noos.fr Reviewed-by: Andy Pont andy.pont@sdcsystems.com Reviewed-by: Paul Menzel paulepanter@mailbox.org --- M src/ec/starlabs/merlin/acpi/ac.asl M src/ec/starlabs/merlin/acpi/battery.asl M src/ec/starlabs/merlin/acpi/ec.asl M src/ec/starlabs/merlin/acpi/hid.asl M src/ec/starlabs/merlin/acpi/lid.asl 5 files changed, 23 insertions(+), 24 deletions(-)
Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Elyes Haouas: Looks good to me, approved Andy Pont: Looks good to me, but someone else must approve
diff --git a/src/ec/starlabs/merlin/acpi/ac.asl b/src/ec/starlabs/merlin/acpi/ac.asl index 808d575..847f872e 100644 --- a/src/ec/starlabs/merlin/acpi/ac.asl +++ b/src/ec/starlabs/merlin/acpi/ac.asl @@ -10,7 +10,7 @@ Method (_PSR, 0) { PWRS = ECPS & 0x01 - Return(PWRS) + Return (PWRS) } Method (_PCL, 0) { diff --git a/src/ec/starlabs/merlin/acpi/battery.asl b/src/ec/starlabs/merlin/acpi/battery.asl index b428458..abdcc5b 100644 --- a/src/ec/starlabs/merlin/acpi/battery.asl +++ b/src/ec/starlabs/merlin/acpi/battery.asl @@ -9,13 +9,13 @@ // Battery Status // 0x80 BIT1 0x01 = Present // 0x80 BIT1 0x00 = Not Present - If(ECPS & 0x02) + If (ECPS & 0x02) { - Return(0x1F) + Return (0x1F) } - Return(0x0F) + Return (0x0F) } - Name (BPKG, Package(13) + Name (BPKG, Package (13) { 1, // 0: Power Unit 0xFFFFFFFF, // 1: Design Capacity @@ -36,20 +36,20 @@ BPKG[1] = B1DC BPKG[2] = B1FC BPKG[4] = B1DV - If(B1FC) + If (B1FC) { BPKG[5] = B1FC / 10 BPKG[6] = B1FC / 100 BPKG[7] = B1DC / 100 } - Return(BPKG) + Return (BPKG) } Name (PKG1, Package (4) { - 0xFFFFFFFF, // Battery State - 0xFFFFFFFF, // Battery Present Rate - 0xFFFFFFFF, // Battery Remaining Capacity - 0xFFFFFFFF, // Battery Present Voltage + 0xFFFFFFFF, // Battery State + 0xFFFFFFFF, // Battery Present Rate + 0xFFFFFFFF, // Battery Remaining Capacity + 0xFFFFFFFF, // Battery Present Voltage }) Method (_BST, 0, NotSerialized) { @@ -57,7 +57,7 @@ PKG1[1] = B1PR PKG1[2] = B1RC PKG1[3] = B1PV - Return(PKG1) + Return (PKG1) } Method (_PCL, 0, NotSerialized) { diff --git a/src/ec/starlabs/merlin/acpi/ec.asl b/src/ec/starlabs/merlin/acpi/ec.asl index c540c03..4e9c658 100644 --- a/src/ec/starlabs/merlin/acpi/ec.asl +++ b/src/ec/starlabs/merlin/acpi/ec.asl @@ -39,7 +39,7 @@ Name (PVOL, 0x00) Mutex (ECMT, 0x00)
- Name(BFFR, ResourceTemplate() + Name (BFFR, ResourceTemplate() { IO(Decode16, 0x0062, 0x0062, 0x00, 0x01) IO(Decode16, 0x0066, 0x0066, 0x00, 0x01) @@ -47,8 +47,7 @@
Method (_CRS, 0, Serialized) { - - Return(BFFR) + Return (BFFR) }
Method (_STA, 0, NotSerialized) @@ -98,7 +97,7 @@ Release (ECMT) } } - Return(0) // Return in case Arg0 doesn't exist + Return (0) // Return in case Arg0 doesn't exist }
// ECWR (Embedded Controller Write Method) diff --git a/src/ec/starlabs/merlin/acpi/hid.asl b/src/ec/starlabs/merlin/acpi/hid.asl index 5449807..a9de7da 100644 --- a/src/ec/starlabs/merlin/acpi/hid.asl +++ b/src/ec/starlabs/merlin/acpi/hid.asl @@ -26,7 +26,7 @@ // Output: // Package containing a complete HID Descriptor information. // - Name(DPKG, Package(4) + Name (DPKG, Package(4) { 0x11111111, 0x22222222, @@ -35,7 +35,7 @@ }) Method (HDDM, 0, Serialized) { - Return(DPKG) + Return (DPKG) } // // HID Driver Event Method - Called by HID Driver to get the specific @@ -54,9 +54,9 @@ // Simple Mode is hardcoded for now. Return Simple Mode HID Index Value. If (HMDE == 0x00) { - Return(HIDX) + Return (HIDX) } - Return(HMDE) + Return (HMDE) } // // HID Driver Mode Method - Called by HID Driver during initialization to get @@ -71,7 +71,7 @@ // Method (HDMM, 0, Serialized) { - Return(HMDE) // Return Mode of operation. + Return (HMDE) // Return Mode of operation. } // // HID Driver Status Method - called by HID Driver to report platform readiness status. @@ -196,7 +196,7 @@ // Method (BTNC, 0, Serialized) // HID Button Capabilities Method { - Return(0x1F) + Return (0x1F) }
// @@ -253,7 +253,7 @@ // Method (HEEC, 0, Serialized) { // It's possible to return (\HEB2) - Return(0x00) + Return (0x00) } // // HIDD _DSM diff --git a/src/ec/starlabs/merlin/acpi/lid.asl b/src/ec/starlabs/merlin/acpi/lid.asl index 8b0edb5..936eeed 100644 --- a/src/ec/starlabs/merlin/acpi/lid.asl +++ b/src/ec/starlabs/merlin/acpi/lid.asl @@ -7,7 +7,7 @@ { Return (0x0F) } - Method (_LID,0) + Method (_LID, 0) { // 0x00 == Closed // 0x01 == Open