Rename I8042CMD task to KEYPROTO

Since it's really the keyboard protocol task, not just handling i8042 commands. For consistency across keyboard protocols. No functional changes, just renaming. BUG=chrome-os-partner:18360 BRANCH=none TEST=boot link and type on keyboard Change-Id: I800a691a344f82bf582693cae865414b7d5d382a Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/46885 Reviewed-by: Bill Richardson <wfrichar@chromium.org>
2025-12-28 02:35:28 +00:00 · 2013-03-29 10:41:51 -07:00
parent c2b9d1d8c2
commit 49b9c0faa9
11 changed files with 15 additions and 15 deletions
--- 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) \
--- 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

--- 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
--- 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;

--- 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)
--- 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) \
--- 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) \
--- 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) \
--- 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) \
--- 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) \
--- 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) \