summaryrefslogtreecommitdiff
path: root/board/mithrax/keyboard.c
diff options
context:
space:
mode:
authorTom Hughes <tomhughes@chromium.org>2022-09-21 14:08:36 -0700
committerTom Hughes <tomhughes@chromium.org>2022-09-22 12:59:38 -0700
commitc453fd704268ef72de871b0c5ac7a989de662334 (patch)
treefcf6ce5810f9ff9e3c8cce434812dd75492269ed /board/mithrax/keyboard.c
parent6c1587ca70f558b4f96b3f0b18ad8b027d3ba99d (diff)
parent28712dae9d7ed1e694f7622cc083afa71090d4d5 (diff)
downloadchrome-ec-c453fd704268ef72de871b0c5ac7a989de662334.tar.gz
Merge remote-tracking branch cros/main into firmware-fpmcu-dartmonkey-releasefirmware-fpmcu-dartmonkey-release
Generated by: ./util/update_release_branch.py --board dartmonkey --relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-fpmcu-dartmonkey-release Relevant changes: git log --oneline 6c1587ca70..28712dae9d -- board/nocturne_fp board/dartmonkey common/fpsensor docs/fingerprint driver/fingerprint util/getversion.sh ded9307b79 util/getversion.sh: Fix version when not in a git repo 956055e692 board: change Google USB vendor info 71b2ef709d Update license boilerplate text in source code files 33e11afda0 Revert "fpsensor: Build fpsensor source file with C++" c8d0360723 fpsensor: Build fpsensor source file with C++ bc113abd53 fpsensor: Fix g++ compiler error 150a58a0dc fpsensor: Fix fp_set_sensor_mode return type b33b5ce85b fpsensor: Remove nested designators for C++ compatibility 2e864b2539 tree-wide: const-ify argv for console commands 56d8b360f9 test: Add test for get ikm failure when seed not set 3a3d6c3690 test: Add test for fpsensor trivial key failure 233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256 0a041b285b docs/fingerprint: Typo correction c03fab67e2 docs/fingerprint: Fix the path of fputils.py 0b5d4baf5a util/getversion.sh: Fix empty file list handling 6e128fe760 FPMCU dev board environment with Satlab 3eb29b6aa5 builtin: Move ssize_t to sys/types.h 345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release c25ffdb316 common: Conditionally support printf %l and %i modifiers 9a3c514b45 test: Add a test to check if the debugger is connected 54e603413f Move standard library tests to their own file 43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release 25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format 4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format 738de2b575 trng: Rename rand to trng_rand 14b8270edd docs/fingerprint: Update dragonclaw power numbers 0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format a0751778f4 board/nocturne_fp/ro_workarounds.c: Format with clang-format 5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format 6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format 58f0246dbe board/nocturne_fp/board_ro.c: Format with clang-format 7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format 21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format 98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format 84e53a65da board/nocturne_fp/board.h: Format with clang-format 73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format 0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format 1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format dca9d74321 Revert "trng: Rename rand to trng_rand" a6b0b3554f trng: Rename rand to trng_rand 28d0b75b70 third_party/boringssl: Remove unused header BRANCH=None BUG=b:244387210 b:242720240 b:215613183 b:242720910 b:236386294 BUG=b:234181908 b:244781166 b:234781655 b:234143158 b:234181908 BUG=b:237344361 b:236025198 b:234181908 b:180945056 chromium:1098010 BUG=b:246424843 b:234181908 b:131913998 TEST=`make -j buildall` TEST=./util/run_device_tests.py --board dartmonkey Test "aes": PASSED Test "cec": PASSED Test "cortexm_fpu": PASSED Test "crc": PASSED Test "flash_physical": PASSED Test "flash_write_protect": PASSED Test "fpsensor_hw": PASSED Test "fpsensor_spi_ro": PASSED Test "fpsensor_spi_rw": PASSED Test "fpsensor_uart_ro": PASSED Test "fpsensor_uart_rw": PASSED Test "mpu_ro": PASSED Test "mpu_rw": PASSED Test "mutex": PASSED Test "pingpong": PASSED Test "printf": PASSED Test "queue": PASSED Test "rollback_region0": PASSED Test "rollback_region1": PASSED Test "rollback_entropy": PASSED Test "rtc": PASSED Test "sha256": PASSED Test "sha256_unrolled": PASSED Test "static_if": PASSED Test "stdlib": PASSED Test "system_is_locked_wp_on": PASSED Test "system_is_locked_wp_off": PASSED Test "timer_dos": PASSED Test "utils": PASSED Test "utils_str": PASSED Test "panic_data_dartmonkey_v2.0.2887": PASSED Test "panic_data_nocturne_fp_v2.2.64": PASSED Test "panic_data_nami_fp_v2.2.144": PASSED Force-Relevant-Builds: all Signed-off-by: Tom Hughes <tomhughes@chromium.org> Change-Id: I2c312583a709fedae8fe11d92c22328c3b634bc7
Diffstat (limited to 'board/mithrax/keyboard.c')
-rw-r--r--board/mithrax/keyboard.c173
1 files changed, 24 insertions, 149 deletions
diff --git a/board/mithrax/keyboard.c b/board/mithrax/keyboard.c
index 6534c7bc63..36830958f5 100644
--- a/board/mithrax/keyboard.c
+++ b/board/mithrax/keyboard.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* Copyright 2022 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
@@ -61,145 +61,20 @@ const uint8_t rgbkbd_count = ARRAY_SIZE(rgbkbds);
const uint8_t rgbkbd_hsize = RGB_GRID0_COL;
const uint8_t rgbkbd_vsize = RGB_GRID0_ROW;
-#define LED(x, y) RGBKBD_COORD((x), (y))
-#define DELM RGBKBD_DELM
+enum ec_rgbkbd_type rgbkbd_type;
+#define LED(x, y) RGBKBD_COORD((x), (y))
+#define DELM RGBKBD_DELM
+
const uint8_t rgbkbd_map[] = {
- DELM, /* 0: (null) */
- LED(0, 0), DELM, /* 1: ~ ` */
- LED(0, 0), DELM, /* 2: ! 1 */
- LED(0, 0), DELM, /* 3: @ 2 */
- LED(0, 0), DELM, /* 4: # 3 */
- LED(1, 0), DELM, /* 5: $ 4 */
- LED(1, 0), DELM, /* 6: % 5 */
- LED(1, 0), DELM, /* 7: ^ 6 */
- LED(2, 0), DELM, /* 8: & 7 */
- LED(2, 0), DELM, /* 9: * 8 */
- LED(2, 0), DELM, /* 10: ( 9 */
- LED(2, 0), DELM, /* 11: ) 0 */
- LED(2, 0), DELM, /* 12: _ - */
- LED(3, 0), DELM, /* 13: + = */
- DELM, /* 14: (null) */
- LED(3, 0), DELM, /* 15: backspace */
- LED(0, 0), DELM, /* 16: tab */
- LED(0, 0), DELM, /* 17: q */
- LED(0, 0), DELM, /* 18: w */
- LED(0, 0), DELM, /* 19: e */
- LED(1, 0), DELM, /* 20: r */
- LED(1, 0), DELM, /* 21: t */
- LED(1, 0), DELM, /* 22: y */
- LED(2, 0), DELM, /* 23: u */
- LED(2, 0), DELM, /* 24: i */
- LED(2, 0), DELM, /* 25: o */
- LED(2, 0), DELM, /* 26: p */
- LED(2, 0), DELM, /* 27: [ { */
- LED(3, 0), DELM, /* 28: ] } */
- LED(3, 0), DELM, /* 29: \ | */
- LED(0, 0), DELM, /* 30: caps lock */
- LED(0, 0), DELM, /* 31: a */
- LED(0, 0), DELM, /* 32: s */
- LED(0, 0), DELM, /* 33: d */
- LED(1, 0), DELM, /* 34: f */
- LED(1, 0), DELM, /* 35: g */
- LED(1, 0), DELM, /* 36: h */
- LED(2, 0), DELM, /* 37: j */
- LED(2, 0), DELM, /* 38: k */
- LED(2, 0), DELM, /* 39: l */
- LED(3, 0), DELM, /* 40: ; : */
- LED(3, 0), DELM, /* 41: " ' */
- DELM, /* 42: (null) */
- LED(3, 0), DELM, /* 43: enter */
- LED(0, 0), DELM, /* 44: L-shift */
- DELM, /* 45: (null) */
- LED(0, 0), DELM, /* 46: z */
- LED(0, 0), DELM, /* 47: x */
- LED(0, 0), DELM, /* 48: c */
- LED(1, 0), DELM, /* 49: v */
- LED(1, 0), DELM, /* 50: b */
- LED(1, 0), DELM, /* 51: n */
- LED(2, 0), DELM, /* 52: m */
- LED(2, 0), DELM, /* 53: , < */
- LED(2, 0), DELM, /* 54: . > */
- LED(3, 0), DELM, /* 55: / ? */
- DELM, /* 56: (null) */
- LED(3, 0), DELM, /* 57: R-shift */
- LED(0, 0), DELM, /* 58: L-ctrl */
- LED(3, 0), DELM, /* 59: power */
- LED(0, 0), DELM, /* 60: L-alt */
- LED(0, 0), LED(1, 0),
- LED(2, 0), DELM, /* 61: space */
- LED(2, 0), DELM, /* 62: R-alt */
- DELM, /* 63: (null) */
- LED(2, 0), DELM, /* 64: R-ctrl */
- DELM, /* 65: (null) */
- DELM, /* 66: (null) */
- DELM, /* 67: (null) */
- DELM, /* 68: (null) */
- DELM, /* 69: (null) */
- DELM, /* 70: (null) */
- DELM, /* 71: (null) */
- DELM, /* 72: (null) */
- DELM, /* 73: (null) */
- DELM, /* 74: (null) */
- DELM, /* 75: (null) */
- DELM, /* 76: delete */
- DELM, /* 77: (null) */
- DELM, /* 78: (null) */
- LED(3, 0), DELM, /* 79: left */
- DELM, /* 80: home */
- DELM, /* 81: end */
- DELM, /* 82: (null) */
- LED(3, 0), DELM, /* 83: up */
- LED(3, 0), DELM, /* 84: down */
- DELM, /* 85: page up */
- DELM, /* 86: page down */
- DELM, /* 87: (null) */
- DELM, /* 88: (null) */
- LED(3, 0), DELM, /* 89: right */
- DELM, /* 90: (null) */
- DELM, /* 91: numpad 7 */
- DELM, /* 92: numpad 4 */
- DELM, /* 93: numpad 1 */
- DELM, /* 94: (null) */
- DELM, /* 95: numpad / */
- DELM, /* 96: numpad 8 */
- DELM, /* 97: numpad 5 */
- DELM, /* 98: numpad 2 */
- DELM, /* 99: numpad 0 */
- DELM, /* 100: numpad * */
- DELM, /* 101: numpad 9 */
- DELM, /* 102: numpad 6 */
- DELM, /* 103: numpad 3 */
- DELM, /* 104: numpad . */
- DELM, /* 105: numpad - */
- DELM, /* 106: numpad + */
- DELM, /* 107: (null) */
- DELM, /* 108: numpad enter */
- DELM, /* 109: (null) */
- LED(0, 0), DELM, /* 110: esc */
- LED(0, 0), DELM, /* T1: back */
- LED(0, 0), DELM, /* T2: refresh */
- LED(1, 0), DELM, /* T3: full screen */
- LED(1, 0), DELM, /* T4: overview */
- LED(1, 0), DELM, /* T5: snapshot */
- LED(2, 0), DELM, /* T6: brightness down */
- LED(2, 0), DELM, /* T7: brightness up */
- LED(2, 0), DELM, /* T8: mute */
- LED(2, 0), DELM, /* T9: volume down */
- LED(3, 0), DELM, /* T10: volume up */
- DELM, /* T11: (null) */
- DELM, /* T12: (null) */
- DELM, /* T13: (null) */
- DELM, /* T14: (null) */
- DELM, /* T15: (null) */
- DELM, /* 126: (null) */
- DELM, /* 127: (null) */
+ DELM, LED(0, 0), DELM, LED(1, 0), DELM,
+ LED(2, 0), DELM, LED(3, 0), DELM, DELM,
};
#undef LED
#undef DELM
const size_t rgbkbd_map_size = ARRAY_SIZE(rgbkbd_map);
-__override const struct ec_response_keybd_config
-*board_vivaldi_keybd_config(void)
+__override const struct ec_response_keybd_config *
+board_vivaldi_keybd_config(void)
{
return &mithrax_kb;
}
@@ -213,20 +88,20 @@ __override const struct key {
uint8_t row;
uint8_t col;
} vivaldi_keys[] = {
- {.row = 4, .col = 2}, /* T1 */
- {.row = 3, .col = 2}, /* T2 */
- {.row = 2, .col = 2}, /* T3 */
- {.row = 1, .col = 2}, /* T4 */
- {.row = 4, .col = 4}, /* T5 */
- {.row = 3, .col = 4}, /* T6 */
- {.row = 2, .col = 4}, /* T7 */
- {.row = 2, .col = 9}, /* T8 */
- {.row = 1, .col = 9}, /* T9 */
- {.row = 1, .col = 4}, /* T10 */
- {.row = 0, .col = 4}, /* T11 */
- {.row = 1, .col = 5}, /* T12 */
- {.row = 3, .col = 5}, /* T13 */
- {.row = 2, .col = 1}, /* T14 */
- {.row = 0, .col = 1}, /* T15 */
+ { .row = 4, .col = 2 }, /* T1 */
+ { .row = 3, .col = 2 }, /* T2 */
+ { .row = 2, .col = 2 }, /* T3 */
+ { .row = 1, .col = 2 }, /* T4 */
+ { .row = 4, .col = 4 }, /* T5 */
+ { .row = 3, .col = 4 }, /* T6 */
+ { .row = 2, .col = 4 }, /* T7 */
+ { .row = 2, .col = 9 }, /* T8 */
+ { .row = 1, .col = 9 }, /* T9 */
+ { .row = 1, .col = 4 }, /* T10 */
+ { .row = 0, .col = 4 }, /* T11 */
+ { .row = 1, .col = 5 }, /* T12 */
+ { .row = 3, .col = 5 }, /* T13 */
+ { .row = 2, .col = 1 }, /* T14 */
+ { .row = 0, .col = 1 }, /* T15 */
};
BUILD_ASSERT(ARRAY_SIZE(vivaldi_keys) == MAX_TOP_ROW_KEYS);