diff options
| author | Vic Yang <victoryang@chromium.org> | 2013-06-16 22:36:07 +0800 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-06-18 10:31:09 -0700 |
| commit | 7381c7c5f6ff5581523e2a3d8eccda0b2d3b2830 (patch) | |
| tree | 7ca870ccab3537f1a4aeb67fdaccf69eb877325a /include/keyboard_config.h | |
| parent | 80aa9604d26de0dadd79a3380420d91c40e9c87c (diff) | |
| download | chrome-ec-7381c7c5f6ff5581523e2a3d8eccda0b2d3b2830.tar.gz | |
More keyboard scan test
BUG=chrome-os-partner:19236
TEST=Pass the test
BRANCH=None
Change-Id: Ie0b0657c0bca2ec459cc8b04d9e06199b70414d9
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/58795
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'include/keyboard_config.h')
| -rw-r--r-- | include/keyboard_config.h | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/include/keyboard_config.h b/include/keyboard_config.h index ff2eded50c..ae70bf7352 100644 --- a/include/keyboard_config.h +++ b/include/keyboard_config.h @@ -14,22 +14,32 @@ #define KEYBOARD_COLS 13 #define KEYBOARD_ROWS 8 +#define KEYBOARD_ROW_TO_MASK(r) (1 << (r)) + /* Columns and masks for keys we particularly care about */ -#define KEYBOARD_COL_DOWN 11 -#define KEYBOARD_MASK_DOWN 0x40 +#define KEYBOARD_COL_DOWN 11 +#define KEYBOARD_ROW_DOWN 6 +#define KEYBOARD_MASK_DOWN KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_DOWN) #define KEYBOARD_COL_ESC 1 -#define KEYBOARD_MASK_ESC 0x02 +#define KEYBOARD_ROW_ESC 1 +#define KEYBOARD_MASK_ESC KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_ESC) #define KEYBOARD_COL_KEY_H 6 -#define KEYBOARD_MASK_KEY_H 0x02 +#define KEYBOARD_ROW_KEY_H 1 +#define KEYBOARD_MASK_KEY_H KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_KEY_H) #define KEYBOARD_COL_KEY_R 3 -#define KEYBOARD_MASK_KEY_R 0x80 +#define KEYBOARD_ROW_KEY_R 7 +#define KEYBOARD_MASK_KEY_R KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_KEY_R) #define KEYBOARD_COL_LEFT_ALT 10 -#define KEYBOARD_MASK_LEFT_ALT 0x40 +#define KEYBOARD_ROW_LEFT_ALT 6 +#define KEYBOARD_MASK_LEFT_ALT KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_LEFT_ALT) #define KEYBOARD_COL_REFRESH 2 -#define KEYBOARD_MASK_REFRESH 0x04 +#define KEYBOARD_ROW_REFRESH 2 +#define KEYBOARD_MASK_REFRESH KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_REFRESH) #define KEYBOARD_COL_RIGHT_ALT 10 -#define KEYBOARD_MASK_RIGHT_ALT 0x01 +#define KEYBOARD_ROW_RIGHT_ALT 0 +#define KEYBOARD_MASK_RIGHT_ALT KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_RIGHT_ALT) #define KEYBOARD_COL_VOL_UP 4 -#define KEYBOARD_MASK_VOL_UP 0x01 +#define KEYBOARD_ROW_VOL_UP 0 +#define KEYBOARD_MASK_VOL_UP KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_VOL_UP) #endif /* __CROS_EC_KEYBOARD_CONFIG_H */ |