summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--board/link/ec.tasklist2
-rw-r--r--chip/lm4/lpc.c4
-rw-r--r--common/build.mk2
-rw-r--r--common/keyboard_8042.c8
-rw-r--r--common/mock_i8042.c2
-rw-r--r--test/charging.tasklist2
-rw-r--r--test/kb_debounce.tasklist2
-rw-r--r--test/kb_deghost.tasklist2
-rw-r--r--test/power_button.tasklist2
-rw-r--r--test/scancode.tasklist2
-rw-r--r--test/typematic.tasklist2
11 files changed, 15 insertions, 15 deletions
diff --git a/board/link/ec.tasklist b/board/link/ec.tasklist
index 635c2e3d67..f058f08da8 100644
--- a/board/link/ec.tasklist
+++ b/board/link/ec.tasklist
@@ -21,7 +21,7 @@
TASK(CHARGER, charge_state_machine_task, NULL, TASK_STACK_SIZE) \
TASK(THERMAL, thermal_task, NULL, TASK_STACK_SIZE) \
TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
- TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
+ TASK(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \
TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
TASK(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \
TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \
diff --git a/chip/lm4/lpc.c b/chip/lm4/lpc.c
index d1028a5ce0..86b6c34cd7 100644
--- a/chip/lm4/lpc.c
+++ b/chip/lm4/lpc.c
@@ -556,7 +556,7 @@ static void lpc_interrupt(void)
while (LM4_LPC_ST(LPC_CH_PORT80) & LM4_LPC_ST_FRMH)
port_80_write(LPC_POOL_PORT80[0]);
-#ifdef CONFIG_TASK_I8042CMD
+#ifdef CONFIG_TASK_KEYPROTO
/* Handle keyboard interface writes */
st = LM4_LPC_ST(LPC_CH_KEYBOARD);
if (st & LM4_LPC_ST_FRMH)
@@ -564,7 +564,7 @@ static void lpc_interrupt(void)
if (mis & LM4_LPC_INT_MASK(LPC_CH_KEYBOARD, 1)) {
/* Host read data; wake up task to send remaining bytes */
- task_wake(TASK_ID_I8042CMD);
+ task_wake(TASK_ID_KEYPROTO);
}
#endif
diff --git a/common/build.mk b/common/build.mk
index a47e20563a..e377dbfca9 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -21,6 +21,7 @@ common-$(CONFIG_FLASH)+=flash_common.o fmap.o
common-$(CONFIG_I2C)+=i2c_commands.o
common-$(CONFIG_I2C_ARBITRATION)+=i2c_arbitration.o
common-$(CONFIG_IR357x)+=ir357x.o
+common-$(CONFIG_KEYBOARD_PROTOCOL_8042)+=keyboard_8042.o
common-$(CONFIG_KEYBOARD_PROTOCOL_MKBP)+=keyboard_mkbp.o
common-$(CONFIG_KEYBOARD_TEST)+=keyboard_test.o
common-$(CONFIG_LP5562)+=lp5562.o lp5562_battery_led.o
@@ -31,7 +32,6 @@ common-$(CONFIG_SMART_BATTERY)+=smart_battery.o smart_battery_stub.o
common-$(CONFIG_TASK_CHARGER)+=charge_state.o battery_precharge.o
common-$(CONFIG_TASK_CONSOLE)+=console.o
common-$(CONFIG_TASK_HOSTCMD)+=host_command.o host_event_commands.o
-common-$(CONFIG_TASK_I8042CMD)+=keyboard_8042.o
common-$(CONFIG_TASK_KEYSCAN)+=keyboard_scan.o
common-$(CONFIG_TASK_LIGHTBAR)+=lightbar.o
common-$(CONFIG_TASK_THERMAL)+=thermal.o
diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c
index d427cbe5d1..248a51e2b8 100644
--- a/common/keyboard_8042.c
+++ b/common/keyboard_8042.c
@@ -226,7 +226,7 @@ void keyboard_host_write(int data, int is_cmd)
h.type = is_cmd ? HOST_COMMAND : HOST_DATA;
h.byte = data;
queue_add_units(&from_host, &h, 1);
- task_wake(TASK_ID_I8042CMD);
+ task_wake(TASK_ID_KEYPROTO);
}
/**
@@ -267,7 +267,7 @@ static void i8042_send_to_host(int len, const uint8_t *bytes)
mutex_unlock(&to_host_mutex);
/* Wake up the task to move from queue to host */
- task_wake(TASK_ID_I8042CMD);
+ task_wake(TASK_ID_KEYPROTO);
}
/* Change to set 1 if the I8042_XLATE flag is set. */
@@ -411,7 +411,7 @@ void keyboard_state_changed(int row, int col, int is_pressed)
memcpy(typematic_scan_code, scan_code, len);
typematic_len = len;
- task_wake(TASK_ID_I8042CMD);
+ task_wake(TASK_ID_KEYPROTO);
} else {
typematic_len = 0;
}
@@ -859,7 +859,7 @@ void keyboard_set_power_button(int pressed)
}
}
-void i8042_command_task(void)
+void keyboard_protocol_task(void)
{
int wait = -1;
diff --git a/common/mock_i8042.c b/common/mock_i8042.c
index 5fb4b87ef0..dac11e2f1b 100644
--- a/common/mock_i8042.c
+++ b/common/mock_i8042.c
@@ -15,7 +15,7 @@ void keyboard_receive(int data, int is_cmd)
return;
}
-void i8042_command_task(void)
+void keyboard_protocol_task(void)
{
/* Do nothing */
while (1)
diff --git a/test/charging.tasklist b/test/charging.tasklist
index d88924ff00..503b311eff 100644
--- a/test/charging.tasklist
+++ b/test/charging.tasklist
@@ -19,7 +19,7 @@
TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
TASK(CHARGER, charge_state_machine_task, NULL, TASK_STACK_SIZE) \
TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
- TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
+ TASK(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \
TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \
TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/kb_debounce.tasklist b/test/kb_debounce.tasklist
index e145fa5fb3..5426127316 100644
--- a/test/kb_debounce.tasklist
+++ b/test/kb_debounce.tasklist
@@ -17,7 +17,7 @@
TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
- TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
+ TASK(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \
TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \
TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/kb_deghost.tasklist b/test/kb_deghost.tasklist
index 7f23a05429..029c6867c1 100644
--- a/test/kb_deghost.tasklist
+++ b/test/kb_deghost.tasklist
@@ -18,7 +18,7 @@
TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
- TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
+ TASK(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \
TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \
TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/power_button.tasklist b/test/power_button.tasklist
index cfc2b2f74f..49e59b7786 100644
--- a/test/power_button.tasklist
+++ b/test/power_button.tasklist
@@ -18,7 +18,7 @@
TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
- TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
+ TASK(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \
TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \
TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/scancode.tasklist b/test/scancode.tasklist
index 01553b7eef..ac4d539bc8 100644
--- a/test/scancode.tasklist
+++ b/test/scancode.tasklist
@@ -18,7 +18,7 @@
TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
- TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
+ TASK(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \
TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \
TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/typematic.tasklist b/test/typematic.tasklist
index 7f23a05429..029c6867c1 100644
--- a/test/typematic.tasklist
+++ b/test/typematic.tasklist
@@ -18,7 +18,7 @@
TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
- TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
+ TASK(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \
TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \
TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
View Lorry Controller Status