sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/ec: Improve code formatting

Browse Source 
Change-Id: I93b71ca577c973046d1651d92665168b329eda1b
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/16503
Tested-by: build bot (Jenkins)
Reviewed-by: Alexander Couzens <lynxis@fe80.eu>
Reviewed-by: Omar Pakker
This commit is contained in:
Elyes HAOUAS 2016-09-05 19:55:34 +02:00 committed by Patrick Georgi
parent 112ab91837
commit b933109594
9 changed files with 204 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ec/compal/ene932/acpi/ec.asl
View File

@ -32,7 +32,7 @@ Device (EC0)
Offset(0x00), Offset(0x00),
, 1, // Reserved ; 00h.0 , 1, // Reserved ; 00h.0
LCDS, 1, // 1= BACKLIGHT ON , 0= BACKLIGHT OFF ; 00h.1 LCDS, 1, // 1= BACKLIGHT ON , 0= BACKLIGHT OFF ; 00h.1
, 6, // Reserved ; 00h.2 ~ 00h.6 , 6, // Reserved ; 00h.2 ~ 00h.6
HTBN, 8, // HOTKEY_BUTTON_NUMBER ; 01h For ABO Hot Key Function HTBN, 8, // HOTKEY_BUTTON_NUMBER ; 01h For ABO Hot Key Function
HTBT, 8, // HOTKEY_BUTTON_TYPE ; 02h For ABO Hot Key Function HTBT, 8, // HOTKEY_BUTTON_TYPE ; 02h For ABO Hot Key Function
LMEN, 1, // Launch Manager enable .(1=Enable ) ; 03h.0, Lauanch manage LMEN, 1, // Launch Manager enable .(1=Enable ) ; 03h.0, Lauanch manage
@ -212,9 +212,9 @@ Device (EC0)
// 101 : CPT // 101 : CPT
, 1, // Reserved ; C0h.7 , 1, // Reserved ; C0h.7
BST0, 8, // Battery Status ; C1h BST0, 8, // Battery Status ; C1h
// Bit0 : Discharging // Bit0 : Discharging
// Bit1 : Charging // Bit1 : Charging
// Bit2 : Discharg and Critical Low // Bit2 : Discharg and Critical Low
// Bit3-7 : Reserved // Bit3-7 : Reserved
BRC0, 16, // Batt Remaining Capacity ; C2h, C3h BRC0, 16, // Batt Remaining Capacity ; C2h, C3h
BSN0, 16, // Batt Serial Number ; C4h, C5h BSN0, 16, // Batt Serial Number ; C4h, C5h

2
src/ec/compal/ene932/ec.c
View File

@ -144,7 +144,7 @@ static struct device_operations ops = {
}; };
static struct pnp_info pnp_dev_info[] = { static struct pnp_info pnp_dev_info[] = {
{ &ops, 0, 0, { 0, 0 }, } { &ops, 0, 0, { 0, 0 }, }
}; };
static void enable_dev(struct device *dev) static void enable_dev(struct device *dev)

2
src/ec/google/chromeec/acpi/ec.asl
View File

@ -448,7 +448,7 @@ Device (EC0)
#endif #endif
#ifdef EC_ENABLE_KEYBOARD_BACKLIGHT #ifdef EC_ENABLE_KEYBOARD_BACKLIGHT
#include "keyboard_backlight.asl" #include "keyboard_backlight.asl"
#endif #endif
#ifdef EC_ENABLE_PD_MCU_DEVICE #ifdef EC_ENABLE_PD_MCU_DEVICE

364
src/ec/lenovo/h8/acpi/ec.asl
View File

@ -27,13 +27,13 @@ Device(EC)
Field (ERAM, ByteAcc, NoLock, Preserve) Field (ERAM, ByteAcc, NoLock, Preserve)
{ {
Offset (0x02), Offset (0x02),
DKR1, 1, /* Dock register 1 */ DKR1, 1, /* Dock register 1 */
Offset (0x05), Offset (0x05),
HSPA, 1, HSPA, 1,
Offset (0x0C), Offset (0x0C),
LEDS, 8, /* LED state */ LEDS, 8, /* LED state */
Offset (0x1a), Offset (0x1a),
DKR2, 1, /* Dock register 2 */ DKR2, 1, /* Dock register 2 */
Offset (0x2a), Offset (0x2a),
EVNT, 8, /* write will trigger EC event */ EVNT, 8, /* write will trigger EC event */
Offset (0x3a), Offset (0x3a),
@ -56,7 +56,7 @@ Device(EC)
PAGE, 8, /* Information Page Selector */ PAGE, 8, /* Information Page Selector */
Offset (0xfe), Offset (0xfe),
, 4, , 4,
DKR3, 1 /* Dock register 3 */ DKR3, 1 /* Dock register 3 */
} }
Method (_CRS, 0) Method (_CRS, 0)
@ -140,226 +140,226 @@ Device(EC)
Store(0x50, EVNT) Store(0x50, EVNT)
} }
Method(_Q2A, 0, NotSerialized) Method(_Q2A, 0, NotSerialized)
{ {
Notify(^LID, 0x80) Notify(^LID, 0x80)
} }
Method(_Q2B, 0, NotSerialized) Method(_Q2B, 0, NotSerialized)
{ {
Notify(^LID, 0x80) Notify(^LID, 0x80)
} }
/* IBM proprietary buttons. */ /* IBM proprietary buttons. */
Method (_Q10, 0, NotSerialized) Method (_Q10, 0, NotSerialized)
{ {
^HKEY.RHK (0x01) ^HKEY.RHK (0x01)
} }
Method (_Q11, 0, NotSerialized) Method (_Q11, 0, NotSerialized)
{ {
^HKEY.RHK (0x02) ^HKEY.RHK (0x02)
} }
Method (_Q12, 0, NotSerialized) Method (_Q12, 0, NotSerialized)
{ {
^HKEY.RHK (0x03) ^HKEY.RHK (0x03)
} }
Method (_Q64, 0, NotSerialized) Method (_Q64, 0, NotSerialized)
{ {
^HKEY.RHK (0x05) ^HKEY.RHK (0x05)
} }
Method (_Q65, 0, NotSerialized) Method (_Q65, 0, NotSerialized)
{ {
^HKEY.RHK (0x06) ^HKEY.RHK (0x06)
} }
Method (_Q17, 0, NotSerialized) Method (_Q17, 0, NotSerialized)
{ {
^HKEY.RHK (0x08) ^HKEY.RHK (0x08)
} }
Method (_Q66, 0, NotSerialized) Method (_Q66, 0, NotSerialized)
{ {
^HKEY.RHK (0x0A) ^HKEY.RHK (0x0A)
} }
Method (_Q6A, 0, NotSerialized) Method (_Q6A, 0, NotSerialized)
{ {
^HKEY.RHK (0x1B) ^HKEY.RHK (0x1B)
} }
Method (_Q1A, 0, NotSerialized) Method (_Q1A, 0, NotSerialized)
{ {
^HKEY.RHK (0x0B) ^HKEY.RHK (0x0B)
} }
Method (_Q1B, 0, NotSerialized) Method (_Q1B, 0, NotSerialized)
{ {
^HKEY.RHK (0x0C) ^HKEY.RHK (0x0C)
} }
Method (_Q62, 0, NotSerialized) Method (_Q62, 0, NotSerialized)
{ {
^HKEY.RHK (0x0D) ^HKEY.RHK (0x0D)
} }
Method (_Q60, 0, NotSerialized) Method (_Q60, 0, NotSerialized)
{ {
^HKEY.RHK (0x0E) ^HKEY.RHK (0x0E)
} }
Method (_Q61, 0, NotSerialized) Method (_Q61, 0, NotSerialized)
{ {
^HKEY.RHK (0x0F) ^HKEY.RHK (0x0F)
} }
Method (_Q1F, 0, NotSerialized) Method (_Q1F, 0, NotSerialized)
{ {
^HKEY.RHK (0x12) ^HKEY.RHK (0x12)
} }
Method (_Q67, 0, NotSerialized) Method (_Q67, 0, NotSerialized)
{ {
^HKEY.RHK (0x13) ^HKEY.RHK (0x13)
} }
Method (_Q63, 0, NotSerialized) Method (_Q63, 0, NotSerialized)
{ {
^HKEY.RHK (0x14) ^HKEY.RHK (0x14)
} }
Method (_Q19, 0, NotSerialized) Method (_Q19, 0, NotSerialized)
{ {
^HKEY.RHK (0x18) ^HKEY.RHK (0x18)
} }
Method (_Q1C, 0, NotSerialized) Method (_Q1C, 0, NotSerialized)
{ {
^HKEY.RHK (0x19) ^HKEY.RHK (0x19)
} }
Method (_Q1D, 0, NotSerialized) Method (_Q1D, 0, NotSerialized)
{ {
^HKEY.RHK (0x1A) ^HKEY.RHK (0x1A)
} }
Method (_Q5C, 0, NotSerialized) Method (_Q5C, 0, NotSerialized)
{ {
^HKEY.RTAB (0xB) ^HKEY.RTAB (0xB)
} }
Method (_Q5D, 0, NotSerialized) Method (_Q5D, 0, NotSerialized)
{ {
^HKEY.RTAB (0xC) ^HKEY.RTAB (0xC)
} }
Method (_Q5E, 0, NotSerialized) Method (_Q5E, 0, NotSerialized)
{ {
^HKEY.RTAB (0x9) ^HKEY.RTAB (0x9)
} }
Method (_Q5F, 0, NotSerialized) Method (_Q5F, 0, NotSerialized)
{ {
^HKEY.RTAB (0xA) ^HKEY.RTAB (0xA)
} }
Device (HKEY) Device (HKEY)
{ {
Name (_HID, EisaId ("IBM0068")) Name (_HID, EisaId ("IBM0068"))
Name (BTN, 0) Name (BTN, 0)
Name (BTAB, 0) Name (BTAB, 0)
/* MASK */ /* MASK */
Name (DHKN, 0x080C) Name (DHKN, 0x080C)
/* Effective Mask */ /* Effective Mask */
Name (EMSK, 0) Name (EMSK, 0)
/* Effective Mask for tablet */ /* Effective Mask for tablet */
Name (ETAB, 0) Name (ETAB, 0)
/* Device enabled. */ /* Device enabled. */
Name (EN, 0) Name (EN, 0)
Method (_STA, 0, NotSerialized) Method (_STA, 0, NotSerialized)
{ {
Return (0x0F) Return (0x0F)
} }
/* Retrieve event. */ /* Retrieve event. */
Method (MHKP, 0, NotSerialized) Method (MHKP, 0, NotSerialized)
{ {
Store (BTN, Local0) Store (BTN, Local0)
If (LNotEqual (Local0, Zero)) { If (LNotEqual (Local0, Zero)) {
Store (Zero, BTN) Store (Zero, BTN)
Add (Local0, 0x1000, Local0) Add (Local0, 0x1000, Local0)
Return (Local0) Return (Local0)
} }
Store (BTAB, Local0) Store (BTAB, Local0)
If (LNotEqual (Local0, Zero)) { If (LNotEqual (Local0, Zero)) {
Store (Zero, BTAB) Store (Zero, BTAB)
Add (Local0, 0x5000, Local0) Add (Local0, 0x5000, Local0)
Return (Local0) Return (Local0)
} }
Return (Zero) Return (Zero)
} }
/* Report event */ /* Report event */
Method (RHK, 1, NotSerialized) { Method (RHK, 1, NotSerialized) {
ShiftLeft (One, Subtract (Arg0, 1), Local0) ShiftLeft (One, Subtract (Arg0, 1), Local0)
If (And (EMSK, Local0)) { If (And (EMSK, Local0)) {
Store (Arg0, BTN) Store (Arg0, BTN)
Notify (HKEY, 0x80) Notify (HKEY, 0x80)
} }
} }
/* Report tablet */ /* Report tablet */
Method (RTAB, 1, NotSerialized) { Method (RTAB, 1, NotSerialized) {
ShiftLeft (One, Subtract (Arg0, 1), Local0) ShiftLeft (One, Subtract (Arg0, 1), Local0)
If (And (ETAB, Local0)) { If (And (ETAB, Local0)) {
Store (Arg0, BTAB) Store (Arg0, BTAB)
Notify (HKEY, 0x80) Notify (HKEY, 0x80)
} }
} }
/* Enable/disable all events. */ /* Enable/disable all events. */
Method (MHKC, 1, NotSerialized) { Method (MHKC, 1, NotSerialized) {
If (Arg0) { If (Arg0) {
Store (DHKN, EMSK) Store (DHKN, EMSK)
Store (Ones, ETAB) Store (Ones, ETAB)
} }
Else Else
{ {
Store (Zero, EMSK) Store (Zero, EMSK)
Store (Zero, ETAB) Store (Zero, ETAB)
} }
Store (Arg0, EN) Store (Arg0, EN)
} }
/* Enable/disable event. */ /* Enable/disable event. */
Method (MHKM, 2, NotSerialized) { Method (MHKM, 2, NotSerialized) {
If (LLessEqual (Arg0, 0x20)) { If (LLessEqual (Arg0, 0x20)) {
ShiftLeft (One, Subtract (Arg0, 1), Local0) ShiftLeft (One, Subtract (Arg0, 1), Local0)
If (Arg1) If (Arg1)
{ {
Or (DHKN, Local0, DHKN) Or (DHKN, Local0, DHKN)
} }
Else Else
{ {
And (DHKN, Not (Local0), DHKN) And (DHKN, Not (Local0), DHKN)
} }
If (EN) If (EN)
{ {
Store (DHKN, EMSK) Store (DHKN, EMSK)
} }
} }
} }
/* Mask hotkey all. */ /* Mask hotkey all. */
Method (MHKA, 0, NotSerialized) Method (MHKA, 0, NotSerialized)
{ {
Return (0x07FFFFFF) Return (0x07FFFFFF)
} }
/* Version */ /* Version */
Method (MHKV, 0, NotSerialized) Method (MHKV, 0, NotSerialized)
{ {
Return (0x0100) Return (0x0100)
} }
} }
#include "ac.asl" #include "ac.asl"
#include "battery.asl" #include "battery.asl"

2
src/ec/lenovo/h8/acpi/lid.asl
View File

@ -16,7 +16,7 @@
Field(ERAM, ByteAcc, NoLock, Preserve) Field(ERAM, ByteAcc, NoLock, Preserve)
{ {
Offset (0x32), Offset (0x32),
, 2, , 2,
WKLD, 1, WKLD, 1,
Offset (0x46), Offset (0x46),

2
src/ec/lenovo/h8/acpi/sleepbutton.asl
View File

@ -25,7 +25,7 @@ Field(ERAM, ByteAcc, NoLock, Preserve)
Device(SLPB) Device(SLPB)
{ {
Name (_HID, EisaId ("PNP0C0E")) Name (_HID, EisaId ("PNP0C0E"))
Method(_PRW, 0, NotSerialized) Method(_PRW, 0, NotSerialized)
{ {
Return (Package() { 0x18, 0x03 }) Return (Package() { 0x18, 0x03 })

20
src/ec/lenovo/h8/acpi/thermal.asl
View File

@ -23,11 +23,11 @@ Scope(\_TZ)
Multiply(Arg0, 10, Local0) Multiply(Arg0, 10, Local0)
Add (Local0, 2732, Local0) Add (Local0, 2732, Local0)
if (LLessEqual(Local0, 2732)) { if (LLessEqual(Local0, 2732)) {
Return (3000) Return (3000)
} }
if (LGreater(Local0, 4012)) { if (LGreater(Local0, 4012)) {
Return (3000) Return (3000)
} }
Return (Local0) Return (Local0)
} }
@ -39,10 +39,10 @@ Scope(\_TZ)
} }
Method(_TMP) { Method(_TMP) {
#if defined (EC_LENOVO_H8_ME_WORKAROUND) #if defined (EC_LENOVO_H8_ME_WORKAROUND)
/* Avoid tripping alarm if ME isn't booted at all yet */ /* Avoid tripping alarm if ME isn't booted at all yet */
If (LAnd (LNot (MEB1), LEqual (\_SB.PCI0.LPCB.EC.TMP0, 128))) { If (LAnd (LNot (MEB1), LEqual (\_SB.PCI0.LPCB.EC.TMP0, 128))) {
Return (C2K(40)) Return (C2K(40))
} }
Store (1, MEB1) Store (1, MEB1)
#endif #endif
Return (C2K(\_SB.PCI0.LPCB.EC.TMP0)) Return (C2K(\_SB.PCI0.LPCB.EC.TMP0))
@ -61,10 +61,10 @@ Scope(\_TZ)
Method(_TMP) { Method(_TMP) {
#if defined (EC_LENOVO_H8_ME_WORKAROUND) #if defined (EC_LENOVO_H8_ME_WORKAROUND)
/* Avoid tripping alarm if ME isn't booted at all yet */ /* Avoid tripping alarm if ME isn't booted at all yet */
If (LAnd (LNot (MEB2), LEqual (\_SB.PCI0.LPCB.EC.TMP1, 128))) { If (LAnd (LNot (MEB2), LEqual (\_SB.PCI0.LPCB.EC.TMP1, 128))) {
Return (C2K(40)) Return (C2K(40))
} }
Store (1, MEB2) Store (1, MEB2)
#endif #endif
Return (C2K(\_SB.PCI0.LPCB.EC.TMP1)) Return (C2K(\_SB.PCI0.LPCB.EC.TMP1))

2
src/ec/quanta/ene_kb3940q/ec.c
View File

@ -154,7 +154,7 @@ static struct device_operations ops = {
}; };
static struct pnp_info pnp_dev_info[] = { static struct pnp_info pnp_dev_info[] = {
{ &ops, 0, 0, { 0, 0 }, } { &ops, 0, 0, { 0, 0 }, }
}; };
static void enable_dev(struct device *dev) static void enable_dev(struct device *dev)

6
src/ec/quanta/it8518/ec.c
View File

@ -131,10 +131,10 @@ u8 ec_it8518_get_event(void)
{ {
u8 cmd = 0; u8 cmd = 0;
u8 status = inb(EC_SC); u8 status = inb(EC_SC);
if (status & SCI_EVT) { if (status & SCI_EVT) {
ec_write_cmd(QR_EC); ec_write_cmd(QR_EC);
cmd = ec_read_ob(); cmd = ec_read_ob();
} else if ( status & SMI_EVT) { } else if (status & SMI_EVT) {
ec_kbc_write_cmd(EC_KBD_SMI_EVENT); ec_kbc_write_cmd(EC_KBD_SMI_EVENT);
cmd = ec_kbc_read_ob(); cmd = ec_kbc_read_ob();
} }
@ -167,7 +167,7 @@ static struct device_operations ops = {
}; };
static struct pnp_info pnp_dev_info[] = { static struct pnp_info pnp_dev_info[] = {
{ &ops, 0, 0, { 0, 0 }, } { &ops, 0, 0, { 0, 0 }, }
}; };
static void enable_dev(struct device *dev) static void enable_dev(struct device *dev)