summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChromeOS Developer <dparker@chromium.org>2014-02-07 10:37:50 -0800
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-02-08 00:14:44 +0000
commit558292108af63916fb502d2bcdf19bf3407810b0 (patch)
treeb84d63807c01ad3db842a0ea6645ffc2ed86ae7f
parent36d4ecb153518623945f0a8e89e4413938d38869 (diff)
downloadchrome-ec-558292108af63916fb502d2bcdf19bf3407810b0.tar.gz
Fix set2 scancode for volume up media key
Also removes a useless BUILD_ASSERT. BUG=None BRANCH=None TEST=Boot kernel with cmdline arg i8042.direct=1 to force set2 mode. Push volume up/down & power key. Change-Id: I1689f06c5ae690624733c0625ce043cb1462abd0 Original-Change-Id: Ifc735d66b2f707e68b5c59959c47a0e295a7688c Signed-off-by: Dave Parker <dparker@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/185392 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/185315
-rw-r--r--common/keyboard_8042.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c
index ddce39973f..04488ab070 100644
--- a/common/keyboard_8042.c
+++ b/common/keyboard_8042.c
@@ -194,9 +194,8 @@ static const uint16_t button_scancodes[2][KEYBOARD_BUTTON_COUNT] = {
/* Set 1 */
{0xe05e, 0xe02e, 0xe030},
/* Set 2 */
- {0xe037, 0xe021, 0xe033},
+ {0xe037, 0xe021, 0xe032},
};
-BUILD_ASSERT(ARRAY_SIZE(button_scancodes[0]) == KEYBOARD_BUTTON_COUNT);
/*****************************************************************************/
/* Keyboard event log */