diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-03-29 10:41:51 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-03-29 15:39:32 -0700 |
| commit | 49b9c0faa93129d35f674f12efde27b8d4e9006c (patch) | |
| tree | 42b487979f15f694242b9b9a2924e30b2537907e /common | |
| parent | c2b9d1d8c25072a98247509a6e9fcc826a683255 (diff) | |
| download | chrome-ec-49b9c0faa93129d35f674f12efde27b8d4e9006c.tar.gz | |
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>
Diffstat (limited to 'common')
| -rw-r--r-- | common/build.mk | 2 | ||||
| -rw-r--r-- | common/keyboard_8042.c | 8 | ||||
| -rw-r--r-- | common/mock_i8042.c | 2 |
3 files changed, 6 insertions, 6 deletions
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) |