summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChromeOS Developer <dparker@chromium.org>2014-02-04 13:01:23 -0800
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-02-07 04:13:21 +0000
commit10627870feec074b4241deca8b33494215fd7244 (patch)
tree5608df37d8ef26b94907bc3da9de1d8c10b7412d
parent86eea83ceee8004c6120a759b35cf88745e548a7 (diff)
downloadchrome-ec-10627870feec074b4241deca8b33494215fd7244.tar.gz
Only call button handler if keyboard protocol task defined
This fixes a breakage when building tests. BUG=None BRANCH=None TEST=Manual. Run "make BOARD=clapper tests" and "emerge-clapper chromeos-ec" (having cros_worked on it) Change-Id: Icdfa655b7fc246b103111f957d9c3f9e7f49c736 Signed-off-by: Dave Parker <dparker@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/184931 Reviewed-by: Bernie Thompson <bhthompson@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org> (cherry picked from commit 18baa15cc10d1d0906a47fa60ab3fb1eb2cf484e) Reviewed-on: https://chromium-review.googlesource.com/185244 Tested-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Commit-Queue: Randall Spangler <rspangler@chromium.org>
-rw-r--r--common/button.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/button.c b/common/button.c
index 2e48102dd3..32f2bd255b 100644
--- a/common/button.c
+++ b/common/button.c
@@ -77,8 +77,10 @@ static void button_change_deferred(void)
CPRINTF("[%T Button '%s' was %s]\n",
buttons[i].name, new_pressed ?
"pressed" : "released");
+#ifdef HAS_TASK_KEYPROTO
keyboard_update_button(buttons[i].type,
new_pressed);
+#endif
}
/* Clear the debounce time to stop checking it */