summaryrefslogtreecommitdiff
path: root/src/ec/google
diff options
context:
space:
mode:
Diffstat (limited to 'src/ec/google')
-rw-r--r--src/ec/google/chromeec/acpi/battery.asl12
-rw-r--r--src/ec/google/wilco/acpi/battery.asl2
-rw-r--r--src/ec/google/wilco/acpi/ec.asl8
-rw-r--r--src/ec/google/wilco/acpi/event.asl2
-rw-r--r--src/ec/google/wilco/acpi/privacy.asl4
-rw-r--r--src/ec/google/wilco/acpi/ucsi.asl10
-rw-r--r--src/ec/google/wilco/acpi/vbtn.asl4
7 files changed, 21 insertions, 21 deletions
diff --git a/src/ec/google/chromeec/acpi/battery.asl b/src/ec/google/chromeec/acpi/battery.asl
index 013a5e7c7b..a0b05f370a 100644
--- a/src/ec/google/chromeec/acpi/battery.asl
+++ b/src/ec/google/chromeec/acpi/battery.asl
@@ -7,7 +7,7 @@ Mutex (BATM, 0)
// Wait for desired battery index to be presented in shared memory
// Arg0 = battery index
-// Returns Zero on success, One on error.
+// Returns Zero on success, 1 on error.
Method (BTSW, 1)
{
#ifdef EC_ENABLE_SECOND_BATTERY_DEVICE
@@ -15,7 +15,7 @@ Method (BTSW, 1)
Return (Zero)
}
If (Arg0 >= BTCN) {
- Return (One)
+ Return (1)
}
\_SB.PCI0.LPCB.EC0.BTID = Arg0
Local0 = 5 // Timeout 5 msec
@@ -25,12 +25,12 @@ Method (BTSW, 1)
Local0--
If (Local0 == 0)
{
- Return (One)
+ Return (1)
}
}
#else
If (Arg0 != 0) {
- Return (One)
+ Return (1)
}
#endif
Return (Zero)
@@ -285,7 +285,7 @@ Device (BAT0)
// Method to enable full battery workaround
Method (BFWE)
{
- BFWK = One
+ BFWK = 1
}
// Method to disable full battery workaround
@@ -375,7 +375,7 @@ Device (BAT1)
// Method to enable full battery workaround
Method (BFWE)
{
- BFWK = One
+ BFWK = 1
}
// Method to disable full battery workaround
diff --git a/src/ec/google/wilco/acpi/battery.asl b/src/ec/google/wilco/acpi/battery.asl
index 023507273f..d6b765578a 100644
--- a/src/ec/google/wilco/acpi/battery.asl
+++ b/src/ec/google/wilco/acpi/battery.asl
@@ -41,7 +41,7 @@ Method (BSTR, 1, Serialized)
W (SSEL, Arg0)
/* Fill buffer until NUL or max string length is read */
- Name (IBUF, Buffer (Local0 + One) {})
+ Name (IBUF, Buffer (Local0 + 1) {})
For (Local1 = Zero, Local1 < Local0, Local1++) {
Local2 = R (BSBS)
If (!Local2) {
diff --git a/src/ec/google/wilco/acpi/ec.asl b/src/ec/google/wilco/acpi/ec.asl
index d552604406..b858b0cd8d 100644
--- a/src/ec/google/wilco/acpi/ec.asl
+++ b/src/ec/google/wilco/acpi/ec.asl
@@ -36,13 +36,13 @@ Device (EC0)
W (ERDY, Arg1)
/* Indicate that the OS supports S0ix */
- W (CSOS, One)
+ W (CSOS, 1)
/* Tell EC to stop emulating PS/2 mouse */
W (PS2M, Zero)
/* Enable DPTF support if enabled in devicetree */
- If (\DPTE == One) {
+ If (\DPTE == 1) {
W (DWST, Arg1)
}
@@ -146,7 +146,7 @@ Device (EC0)
If (Arg0) {
Printf ("EC Enter S0ix")
- W (CSEX, One)
+ W (CSEX, 1)
/*
* Read back from EC RAM after enabling S0ix
@@ -158,7 +158,7 @@ Device (EC0)
W (CSEX, Zero)
/* If UCSI event happened during S0ix send it now. */
- If (^UCEP == One) {
+ If (^UCEP == 1) {
^_Q79 ()
}
}
diff --git a/src/ec/google/wilco/acpi/event.asl b/src/ec/google/wilco/acpi/event.asl
index 4e24ee32de..47c2ecdaab 100644
--- a/src/ec/google/wilco/acpi/event.asl
+++ b/src/ec/google/wilco/acpi/event.asl
@@ -145,6 +145,6 @@ Method (_Q79, 0, Serialized)
^UCEP = Zero
} Else {
Printf ("EC _Q79 UCSI Event Masked in S0ix")
- ^UCEP = One
+ ^UCEP = 1
}
}
diff --git a/src/ec/google/wilco/acpi/privacy.asl b/src/ec/google/wilco/acpi/privacy.asl
index cc14b2179e..74e65596c9 100644
--- a/src/ec/google/wilco/acpi/privacy.asl
+++ b/src/ec/google/wilco/acpi/privacy.asl
@@ -13,13 +13,13 @@ Method (GPVX, 0, Serialized)
Return (Zero)
}
- Return (One)
+ Return (1)
}
/* Enable Privacy Screen */
Method (EPVX, 0, Serialized)
{
- W (EPCT, One)
+ W (EPCT, 1)
}
/* Disable Privacy Screen */
diff --git a/src/ec/google/wilco/acpi/ucsi.asl b/src/ec/google/wilco/acpi/ucsi.asl
index 1cf6394f53..6c33e1867a 100644
--- a/src/ec/google/wilco/acpi/ucsi.asl
+++ b/src/ec/google/wilco/acpi/ucsi.asl
@@ -5,7 +5,7 @@ Device (UCSI)
Name (_HID, "GOOG000E")
Name (_CID, EisaId ("PNP0CA0"))
Name (_DDN, "Wilco EC UCSI")
- Name (_UID, One)
+ Name (_UID, 1)
Name (_STA, 0xb)
/* Value written to EC control register to start UCSI command */
@@ -69,16 +69,16 @@ Device (UCSI)
Method (_DSM, 4, Serialized)
{
If (Arg0 != ToUUID ("6f8398c2-7ca4-11e4-ad36-631042b5008f")) {
- Return (Buffer (One) { Zero })
+ Return (Buffer (1) { Zero })
}
Switch (ToInteger (Arg2))
{
Case (Zero)
{
- Return (Buffer (One) { 0x07 })
+ Return (Buffer (1) { 0x07 })
}
- Case (One)
+ Case (1)
{
/* Write Message Out */
W (^^UMO0, ^MGO0)
@@ -138,6 +138,6 @@ Device (UCSI)
^CCI3 = R (^^UCI3)
}
}
- Return (Buffer (One) { Zero })
+ Return (Buffer (1) { Zero })
}
}
diff --git a/src/ec/google/wilco/acpi/vbtn.asl b/src/ec/google/wilco/acpi/vbtn.asl
index bc9dd3410c..622d5910bc 100644
--- a/src/ec/google/wilco/acpi/vbtn.asl
+++ b/src/ec/google/wilco/acpi/vbtn.asl
@@ -30,7 +30,7 @@ Name (VLAP, 0xcd) /* Laptop Mode */
Device (VBTN)
{
Name (_HID, "INT33D6")
- Name (_UID, One)
+ Name (_UID, 1)
Name (_DDN, "Intel Virtual Button Driver")
/*
@@ -70,7 +70,7 @@ Device (VBTO)
{
Name (_HID, "INT33D3")
Name (_CID, "PNP0C60")
- Name (_UID, One)
+ Name (_UID, 1)
Name (_DDN, "Laptop/tablet mode indicator driver")
Method (_STA, 0)