diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-09-27 16:29:10 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2013-10-01 03:22:22 +0000 |
| commit | 2d798207d2acd07229f126c5242c40492b086d6d (patch) | |
| tree | 330a68572ab5288e684b62f97271deb19cb32d98 | |
| parent | 8fedda848b5f1d93c3a0454bc49242ebf7c25156 (diff) | |
| download | chrome-ec-2d798207d2acd07229f126c5242c40492b086d6d.tar.gz | |
CHERRY-PICK: Wake keyboard task when lid opens
If keyboard scanning is active when the lid closes, it will disable
scanning put the scan task to sleep. We need a corresponding task
wake when the lid opens, or scanning will be stuck off (until
something else happens, like poking the power button).
BUG=chrome-os-partner:22190
BRANCH=peppy
TEST=Hold down a key. Use a magnet to trigger the lid switch. Scanning
should stop while the lid is "closed", and restart when the magnet is
moved to "open" the lid again.
Change-Id: I9ee357077f63626384ba942215f48d4d3658aa14
Original-Change-Id: I0a900f17f65b75cbdb45950cea7f50190d2bf9b1
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/170993
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/171301
Tested-by: Dave Parker <dparker@chromium.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Commit-Queue: Dave Parker <dparker@chromium.org>
| -rw-r--r-- | common/keyboard_scan.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c index 2b7e15b1b2..d11d40af21 100644 --- a/common/keyboard_scan.c +++ b/common/keyboard_scan.c @@ -8,6 +8,7 @@ #include "chipset.h" #include "common.h" #include "console.h" +#include "hooks.h" #include "host_command.h" #include "keyboard_config.h" #include "keyboard_protocol.h" @@ -578,6 +579,18 @@ void keyboard_scan_enable(int enable) } } +#ifdef CONFIG_LID_SWITCH + +static void keyboard_lid_change(void) +{ + /* If lid is open, wake the keyboard task */ + if (lid_is_open()) + task_wake(TASK_ID_KEYSCAN); +} +DECLARE_HOOK(HOOK_LID_CHANGE, keyboard_lid_change, HOOK_PRIO_DEFAULT); + +#endif + /*****************************************************************************/ /* Host commands */ |