diff options
| author | Rajat Jain <rajatja@google.com> | 2020-03-26 21:51:15 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-27 23:43:43 +0000 |
| commit | 4f312996f9d74ebb2ca62cc053564797bd28f8c4 (patch) | |
| tree | 0a5722f50617a92cd291c7bc0c07648d3fe185ca | |
| parent | a849c04ef246554480ce6b048720a38006998d68 (diff) | |
| download | chrome-ec-4f312996f9d74ebb2ca62cc053564797bd28f8c4.tar.gz | |
common/vivaldi: Minor fixups
* Remove trailing "\n" from some debugs
* Rename 2 keys to make it more clear / reader friendly.
* Add a print for keyboard config for top keys on boot.
Signed-off-by: Rajat Jain <rajatja@google.com>
BRANCH=cros/firmware-hatch-12672.B
BUG=b:146589270
TEST=Test on Jinlon
Change-Id: I27691c697bbc26ad9cd5d3516e257110fe163df6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2124013
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
| -rw-r--r-- | common/keyboard_vivaldi.c | 7 | ||||
| -rw-r--r-- | include/keyboard_8042_sharedlib.h | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/common/keyboard_vivaldi.c b/common/keyboard_vivaldi.c index 4f59f5495b..741c15de0f 100644 --- a/common/keyboard_vivaldi.c +++ b/common/keyboard_vivaldi.c @@ -39,13 +39,13 @@ void vivaldi_init(const struct vivaldi_config *keybd) uint8_t row, col, *mask; int key; - cprints(CC_KEYBOARD, "VIVALDI: Num top row keys = %u\n", + cprints(CC_KEYBOARD, "VIVALDI: Num top row keys = %u", keybd->num_top_row_keys); if (keybd->num_top_row_keys > MAX_VIVALDI_KEYS || keybd->num_top_row_keys < 10) cprints(CC_KEYBOARD, - "BAD VIVALDI CONFIG! Some keys may not work\n"); + "BAD VIVALDI CONFIG! Some keys may not work"); for (key = T1; key < MAX_VIVALDI_KEYS; key++) { @@ -60,6 +60,9 @@ void vivaldi_init(const struct vivaldi_config *keybd) /* Populate the scancode */ scancode_set2[col][row] = keybd->scancodes[key]; + cprints(CC_KEYBOARD, + "VIVALDI key-%u (r-%u, c-%u) = scancode-%X", + key, row, col, keybd->scancodes[key]); } else { /* Disable the mask */ *mask &= ~(1 << row); diff --git a/include/keyboard_8042_sharedlib.h b/include/keyboard_8042_sharedlib.h index 69df877218..6ab5eb8df3 100644 --- a/include/keyboard_8042_sharedlib.h +++ b/include/keyboard_8042_sharedlib.h @@ -114,8 +114,8 @@ enum scancode_values { SCANCODE_BACK = 0xe038, /* e06a in codeset 1 */ SCANCODE_REFRESH = 0xe020, /* e067 in codeset 1 */ - SCANCODE_ZOOM = 0xe01d, /* e011 in codeset 1 */ - SCANCODE_SCALE = 0xe024, /* e012 in codeset 1 */ + SCANCODE_FULLSCREEN = 0xe01d, /* e011 in codeset 1 */ + SCANCODE_OVERVIEW = 0xe024, /* e012 in codeset 1 */ SCANCODE_SNIP = 0xe02d, /* e013 in codeset 1 */ SCANCODE_BRIGHTNESS_DOWN = 0xe02c, /* e014 in codeset 1 */ SCANCODE_BRIGHTNESS_UP = 0xe035, /* e015 in codeset 1 */ |