summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis Yung-Chieh Lo <yjlou@chromium.org>2013-02-10 23:07:40 +0800
committerYung-chieh Lo <yjlou@chromium.org>2013-12-10 01:02:56 +0000
commit8ff700725b011f8cd492d0a77ebb4ff7f1e7e2f3 (patch)
tree45227c106325966e147b1e69568ce4dc6d10eff8
parent6302224905dd3706fa1f39f130f1c7bf26c64b32 (diff)
downloadchrome-ec-8ff700725b011f8cd492d0a77ebb4ff7f1e7e2f3.tar.gz
Change the I8042_CMD_ENABLE (0xf4) for keystroke (not for KBC).
Old code treat following commands as the same: 1. I8042_CMD_ENABLE in include/i8042_protocol.h 2. I8042_ENA_KB (0xae) in include/i8042_protocol.h 3. bit 4 of command byte, see I8042_KBD_DIS in include/i8042_protocol.h New code changes 1 in keystroke_enabled variable. Signed-off-by: Yung-Chieh Lo <yjlou@chromium.org> BUG=chrome-os-partner:17005,chrome-os-partner:17810 BRANCH=link TEST=Tested vincent's script with following scenario: 1. not-workarounded kernel: PASS more than 2767, 2946, and 7300 loops. 2. workarounded kernel: PASS more than 5000 loops. Original-Change-Id: I879a1b1f0186594e4b9dd7fc4320232ebab4a1e1 Reviewed-on: https://gerrit.chromium.org/gerrit/43006 Commit-Queue: Yung-Chieh Lo <yjlou@chromium.org> Reviewed-by: Yung-Chieh Lo <yjlou@chromium.org> Tested-by: Yung-Chieh Lo <yjlou@chromium.org> (cherry picked from commit c1b16d21e6315d6de9f697ff5a41eca288f4f754) Change-Id: I38ddcf00147041c0f87bcd37b9b672b1a6d0cc9a Reviewed-on: https://chromium-review.googlesource.com/179400 Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Yung-chieh Lo <yjlou@chromium.org> Commit-Queue: Yung-chieh Lo <yjlou@chromium.org> Tested-by: Yung-chieh Lo <yjlou@chromium.org>
-rw-r--r--common/keyboard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/keyboard.c b/common/keyboard.c
index b7e1047a8c..7a01d67856 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -705,7 +705,7 @@ void keyboard_set_power_button(int pressed)
return;
code_set = acting_code_set(scancode_set);
- if (keyboard_enabled) {
+ if (keystroke_enabled) {
i8042_send_to_host(
(code_set == SCANCODE_SET_2 && !pressed) ? 3 : 2,
code[code_set - SCANCODE_SET_1][pressed]);