diff options
| author | Wei-Han Chen <stimim@google.com> | 2018-06-07 18:05:59 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-07-19 02:52:11 -0700 |
| commit | 776e73442a9cf77363c65e6f9250d1ffc9039c46 (patch) | |
| tree | fce21f74e500a5358645f7a69937929f6cbbcf42 /board/hammer | |
| parent | d2e7d0421d0bef3d7d76c873937a5d95c7858193 (diff) | |
| download | chrome-ec-776e73442a9cf77363c65e6f9250d1ffc9039c46.tar.gz | |
driver/touchpad_st.c: support heat map
BRANCH=none
BUG=b:70482333
TEST=`make BOARD=whiskers` works w/ & w/o CONFIG_USB_ISOCHRONOUS
Signed-off-by: Wei-Han Chen <stimim@chromium.org>
Change-Id: Ia05e778d9795a09ea6edceddd839992859d75050
Reviewed-on: https://chromium-review.googlesource.com/958897
Commit-Ready: Wei-Han Chen <stimim@chromium.org>
Tested-by: Wei-Han Chen <stimim@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
Diffstat (limited to 'board/hammer')
| -rw-r--r-- | board/hammer/board.c | 3 | ||||
| -rw-r--r-- | board/hammer/board.h | 3 | ||||
| -rw-r--r-- | board/hammer/ec.tasklist | 8 |
3 files changed, 14 insertions, 0 deletions
diff --git a/board/hammer/board.c b/board/hammer/board.c index 80910fbf16..b91d775437 100644 --- a/board/hammer/board.c +++ b/board/hammer/board.c @@ -60,6 +60,9 @@ const void *const usb_strings[] = { USB_STRING_DESC(CROS_EC_SECTION ":" CROS_EC_VERSION32), [USB_STR_I2C_NAME] = USB_STRING_DESC("I2C"), [USB_STR_UPDATE_NAME] = USB_STRING_DESC("Firmware update"), +#ifdef CONFIG_USB_ISOCHRONOUS + [USB_STR_HEATMAP_NAME] = USB_STRING_DESC("Heatmap"), +#endif }; BUILD_ASSERT(ARRAY_SIZE(usb_strings) == USB_STR_COUNT); diff --git a/board/hammer/board.h b/board/hammer/board.h index 0eb75112fb..6f1b00558a 100644 --- a/board/hammer/board.h +++ b/board/hammer/board.h @@ -340,6 +340,9 @@ enum usb_strings { USB_STR_VERSION, USB_STR_I2C_NAME, USB_STR_UPDATE_NAME, +#ifdef CONFIG_USB_ISOCHRONOUS + USB_STR_HEATMAP_NAME, +#endif USB_STR_COUNT }; diff --git a/board/hammer/ec.tasklist b/board/hammer/ec.tasklist index cfa7ddfcf2..2997a05bc3 100644 --- a/board/hammer/ec.tasklist +++ b/board/hammer/ec.tasklist @@ -25,6 +25,14 @@ TASK_ALWAYS (CONSOLE, console_task, NULL, 1024) \ TASK_ALWAYS_RW(ECCOMM, ec_ec_comm_slave_task, NULL, TASK_STACK_SIZE) \ TASK_NOTEST_RW(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) +#elif defined(BOARD_WHISKERS) && defined(CONFIG_USB_ISOCHRONOUS) +#define CONFIG_TASK_LIST \ + TASK_ALWAYS_RO(RWSIG, rwsig_task, NULL, 1280) \ + TASK_ALWAYS (HOOKS, hook_task, NULL, 2048) \ + TASK_ALWAYS_RW(TOUCHPAD, touchpad_task, NULL, LARGER_TASK_STACK_SIZE) \ + TASK_ALWAYS_RW(HEATMAP, heatmap_task, NULL, TASK_STACK_SIZE) \ + TASK_ALWAYS (CONSOLE, console_task, NULL, 1024) \ + TASK_NOTEST_RW(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) #else #define CONFIG_TASK_LIST \ TASK_ALWAYS_RO(RWSIG, rwsig_task, NULL, 1280) \ |