diff options
| author | Aseda Aboagye <aaboagye@google.com> | 2017-07-25 17:22:10 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-07-28 17:45:14 -0700 |
| commit | ea97e2e35e1adac6630ddae5b7cb2091368eeea4 (patch) | |
| tree | 66920db3604d3dd3f7a967f140ebb4fd42264b3f /common | |
| parent | 25aa1c13dd0f46a3444673cffedffe4543404330 (diff) | |
| download | chrome-ec-ea97e2e35e1adac6630ddae5b7cb2091368eeea4.tar.gz | |
MKBP: Add kbpress for boards w/o keyscan tasks.
For FAFT testing with devices without a matrix keyboard but with an EC,
add support for the 'kbpress' command.
BUG=None
BRANCH=None
TEST=Flash fizz EC; verify kbpress works okay.
Change-Id: I202b52a97f3a7e781981b4f58adde4c0a7b60abd
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/585828
Commit-Ready: Aseda Aboagye <aaboagye@chromium.org>
Tested-by: Shelley Chen <shchen@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/keyboard_mkbp.c | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/common/keyboard_mkbp.c b/common/keyboard_mkbp.c index db15522534..785ea65d63 100644 --- a/common/keyboard_mkbp.c +++ b/common/keyboard_mkbp.c @@ -60,6 +60,10 @@ static struct mutex fifo_mutex; /* Button and switch state. */ static uint32_t mkbp_button_state; static uint32_t mkbp_switch_state; +#ifndef HAS_TASK_KEYSCAN +/* Keys simulated-pressed */ +static uint8_t __bss_slow simulated_key[KEYBOARD_COLS]; +#endif /* !defined(HAS_TASK_KEYSCAN) */ /* Config for mkbp protocol; does not include fields from scan config */ struct ec_mkbp_protocol_config { @@ -475,6 +479,66 @@ static int mkbp_get_info(struct host_cmd_handler_args *args) DECLARE_HOST_COMMAND(EC_CMD_MKBP_INFO, mkbp_get_info, EC_VER_MASK(0) | EC_VER_MASK(1)); +#ifndef HAS_TASK_KEYSCAN +/* For boards without a keyscan task, try and simulate keyboard presses. */ +static void simulate_key(int row, int col, int pressed) +{ + if ((simulated_key[col] & (1 << row)) == ((pressed ? 1 : 0) << row)) + return; /* No change */ + + simulated_key[col] &= ~(1 << row); + if (pressed) + simulated_key[col] |= (1 << row); + + keyboard_fifo_add(simulated_key); +} + +static int command_mkbp_keyboard_press(int argc, char **argv) +{ + if (argc == 1) { + int i, j; + + ccputs("Simulated keys:\n"); + for (i = 0; i < KEYBOARD_COLS; ++i) { + if (simulated_key[i] == 0) + continue; + for (j = 0; j < KEYBOARD_ROWS; ++j) + if (simulated_key[i] & (1 << j)) + ccprintf("\t%d %d\n", i, j); + } + + } else if (argc == 3 || argc == 4) { + int r, c, p; + char *e; + + c = strtoi(argv[1], &e, 0); + if (*e || c < 0 || c >= KEYBOARD_COLS) + return EC_ERROR_PARAM1; + + r = strtoi(argv[2], &e, 0); + if (*e || r < 0 || r >= KEYBOARD_ROWS) + return EC_ERROR_PARAM2; + + if (argc == 3) { + /* Simulate a press and release */ + simulate_key(r, c, 1); + simulate_key(r, c, 0); + } else { + p = strtoi(argv[3], &e, 0); + if (*e || p < 0 || p > 1) + return EC_ERROR_PARAM3; + + simulate_key(r, c, p); + } + } + + return EC_SUCCESS; +} +DECLARE_CONSOLE_COMMAND(kbpress, command_mkbp_keyboard_press, + "[col row [0 | 1]]", + "Simulate keypress"); +#endif /* !defined(HAS_TASK_KEYSCAN) */ + #ifdef HAS_TASK_KEYSCAN static void set_keyscan_config(const struct ec_mkbp_config *src, struct ec_mkbp_protocol_config *dst, |