diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-10-24 10:19:55 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2013-10-30 23:10:13 +0000 |
| commit | d16a246ea9c7d5982d4eb932c09310146ab3463e (patch) | |
| tree | 780645ec6acc8496e367d5a34f9cc23020a650c9 /include | |
| parent | e48a9d9c2143695cdd7a35ab06d6a6d5820efd9b (diff) | |
| download | chrome-ec-d16a246ea9c7d5982d4eb932c09310146ab3463e.tar.gz | |
cleanup: mkbp keyboard module
Rather than compile it by default for host-based tests, only compile
it for the few tests that actually use it. Since those (and all
boards) now only use if if they also have a keyscan task, we can get
rid of the #ifdefs in keyboard_mkbp.c as well.
And remove a TODO we'll never do...
BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all boards; pass unit tests. These pass:
util/make_all.sh
make BOARD=pit tests
Change-Id: I44d1806cfb375027a7ed0b33a5e9bdbbed8ccddc
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/174513
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.h | 5 | ||||
| -rw-r--r-- | include/keyboard_mkbp.h | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/config.h b/include/config.h index 05f085f180..345a606c5e 100644 --- a/include/config.h +++ b/include/config.h @@ -774,6 +774,11 @@ */ #endif +#ifndef HAS_TASK_KEYSCAN +#undef CONFIG_KEYBOARD_PROTOCOL_8042 +#undef CONFIG_KEYBOARD_PROTOCOL_MKBP +#endif + /*****************************************************************************/ /* * Apply test config overrides last, since tests need to override some of the diff --git a/include/keyboard_mkbp.h b/include/keyboard_mkbp.h index 2fb9fc1273..5ea3c54593 100644 --- a/include/keyboard_mkbp.h +++ b/include/keyboard_mkbp.h @@ -20,6 +20,10 @@ int keyboard_fifo_add(const uint8_t *buffp); /** * Send KEY_BATTERY keystroke. */ +#ifdef CONFIG_KEYBOARD_PROTOCOL_MKBP void keyboard_send_battery_key(void); +#else +static inline void keyboard_send_battery_key(void) { } +#endif #endif /* __CROS_EC_KEYBOARD_MKBP_H */ |