diff options
author | Randall Spangler <rspangler@chromium.org> | 2013-07-23 14:03:44 -0700 |
---|---|---|
committer | ChromeBot <chrome-bot@google.com> | 2013-07-23 17:37:54 -0700 |
commit | 8b816367803f9574a2176a6c21c1021512f0b5ec (patch) | |
tree | 7ea96a6da7e037654ec0ab4260e51472ba3701f2 /common | |
parent | cb1f7306b34507b3d9481cd4327271b2227747b8 (diff) | |
download | chrome-ec-8b816367803f9574a2176a6c21c1021512f0b5ec.tar.gz |
Clean up and document keyboard config options
No functional changes, just renaming config options.
BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all platforms
Change-Id: Ie811066a26eeaf2a5b2002b934e25b660d29058d
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/63109
Reviewed-by: Vic Yang <victoryang@chromium.org>
Diffstat (limited to 'common')
-rw-r--r-- | common/keyboard_8042.c | 2 | ||||
-rw-r--r-- | common/keyboard_scan.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c index 723b091c90..5cccc1dd82 100644 --- a/common/keyboard_8042.c +++ b/common/keyboard_8042.c @@ -28,7 +28,7 @@ #define CPUTS(outstr) cputs(CC_KEYBOARD, outstr) #define CPRINTF(format, args...) cprintf(CC_KEYBOARD, format, ## args) -#ifdef CONFIG_KEYBOARD_DEBUG_MORE +#ifdef CONFIG_KEYBOARD_DEBUG #define CPUTS5(outstr) cputs(CC_KEYBOARD, outstr) #define CPRINTF5(format, args...) cprintf(CC_KEYBOARD, format, ## args) #else diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c index 95394272ed..76db0b58f9 100644 --- a/common/keyboard_scan.c +++ b/common/keyboard_scan.c @@ -26,7 +26,8 @@ #define SCAN_TIME_COUNT 32 /* Number of last scan times to track */ -#ifndef CONFIG_CUSTOM_KEYSCAN +#ifndef CONFIG_KEYBOARD_BOARD_CONFIG +/* Use default keyboard scan config, because board didn't supply one */ struct keyboard_scan_config keyscan_config = { .output_settle_us = 50, .debounce_down_us = 9 * MSEC, |