From 432c4f64d21b282dbf74618b931c1894d93fbe75 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 15 Sep 2020 12:37:43 -0600 Subject: [PATCH] Remove unnecessary keymap function --- src/board/system76/addw2/include/board/keymap.h | 3 --- src/board/system76/bonw14/include/board/keymap.h | 3 --- src/board/system76/common/kbscan.c | 5 ++++- src/board/system76/common/keymap.c | 13 ------------- src/board/system76/darp5/include/board/keymap.h | 3 --- src/board/system76/galp3-c/include/board/keymap.h | 3 --- src/board/system76/gaze15/include/board/keymap.h | 3 --- src/board/system76/lemp9/include/board/keymap.h | 3 --- src/board/system76/oryp5/include/board/keymap.h | 3 --- src/board/system76/oryp6/include/board/keymap.h | 3 --- 10 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 src/board/system76/common/keymap.c diff --git a/src/board/system76/addw2/include/board/keymap.h b/src/board/system76/addw2/include/board/keymap.h index d66d3a1..3365d34 100644 --- a/src/board/system76/addw2/include/board/keymap.h +++ b/src/board/system76/addw2/include/board/keymap.h @@ -46,7 +46,4 @@ // Keymap extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; -// Get a keycode from the keymap -uint16_t keymap(int output, int input, int layer); - #endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/bonw14/include/board/keymap.h b/src/board/system76/bonw14/include/board/keymap.h index 431330b..a6f9984 100644 --- a/src/board/system76/bonw14/include/board/keymap.h +++ b/src/board/system76/bonw14/include/board/keymap.h @@ -48,7 +48,4 @@ // Keymap extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; -// Get a keycode from the keymap -uint16_t keymap(int output, int input, int layer); - #endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/common/kbscan.c b/src/board/system76/common/kbscan.c index 0842500..cb80401 100644 --- a/src/board/system76/common/kbscan.c +++ b/src/board/system76/common/kbscan.c @@ -311,7 +311,10 @@ void kbscan_event(void) { kbscan_last_layer[i][j] = kbscan_layer; } uint8_t key_layer = kbscan_last_layer[i][j]; - uint16_t key = keymap(i, j, key_layer); + uint16_t key = 0; + if (key_layer < KM_LAY) {; + key = KEYMAP[key_layer][i][j]; + } if (key) { DEBUG("KB %d, %d, %d = 0x%04X, %d\n", i, j, key_layer, key, new_b); if(!kbscan_press(key, new_b, &layer)){ diff --git a/src/board/system76/common/keymap.c b/src/board/system76/common/keymap.c deleted file mode 100644 index 9d5d16b..0000000 --- a/src/board/system76/common/keymap.c +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -#include -#include - -uint16_t keymap(int output, int input, int layer) { - if (output < KM_OUT && input < KM_IN && layer < KM_LAY) { - return KEYMAP[layer][output][input]; - } else { - return 0; - } -} - diff --git a/src/board/system76/darp5/include/board/keymap.h b/src/board/system76/darp5/include/board/keymap.h index d66d3a1..3365d34 100644 --- a/src/board/system76/darp5/include/board/keymap.h +++ b/src/board/system76/darp5/include/board/keymap.h @@ -46,7 +46,4 @@ // Keymap extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; -// Get a keycode from the keymap -uint16_t keymap(int output, int input, int layer); - #endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/galp3-c/include/board/keymap.h b/src/board/system76/galp3-c/include/board/keymap.h index 8203feb..2a21a4d 100644 --- a/src/board/system76/galp3-c/include/board/keymap.h +++ b/src/board/system76/galp3-c/include/board/keymap.h @@ -44,7 +44,4 @@ // Keymap extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; -// Get a keycode from the keymap -uint16_t keymap(int output, int input, int layer); - #endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/gaze15/include/board/keymap.h b/src/board/system76/gaze15/include/board/keymap.h index d66d3a1..3365d34 100644 --- a/src/board/system76/gaze15/include/board/keymap.h +++ b/src/board/system76/gaze15/include/board/keymap.h @@ -46,7 +46,4 @@ // Keymap extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; -// Get a keycode from the keymap -uint16_t keymap(int output, int input, int layer); - #endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/lemp9/include/board/keymap.h b/src/board/system76/lemp9/include/board/keymap.h index 8c90c37..439c260 100644 --- a/src/board/system76/lemp9/include/board/keymap.h +++ b/src/board/system76/lemp9/include/board/keymap.h @@ -45,7 +45,4 @@ // Keymap extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; -// Get a keycode from the keymap -uint16_t keymap(int output, int input, int layer); - #endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/oryp5/include/board/keymap.h b/src/board/system76/oryp5/include/board/keymap.h index d66d3a1..3365d34 100644 --- a/src/board/system76/oryp5/include/board/keymap.h +++ b/src/board/system76/oryp5/include/board/keymap.h @@ -46,7 +46,4 @@ // Keymap extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; -// Get a keycode from the keymap -uint16_t keymap(int output, int input, int layer); - #endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/oryp6/include/board/keymap.h b/src/board/system76/oryp6/include/board/keymap.h index d66d3a1..3365d34 100644 --- a/src/board/system76/oryp6/include/board/keymap.h +++ b/src/board/system76/oryp6/include/board/keymap.h @@ -46,7 +46,4 @@ // Keymap extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; -// Get a keycode from the keymap -uint16_t keymap(int output, int input, int layer); - #endif // _BOARD_KEYMAP_H