sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary keymap function

Browse Source
This commit is contained in:
Jeremy Soller
2020-09-15 12:37:43 -06:00
committed by Jeremy Soller
parent f36b38a7b2
commit 432c4f64d2
10 changed files with 4 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/board/system76/addw2/include/board/keymap.h
View File

@ -46,7 +46,4 @@
// Keymap // Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; 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 #endif // _BOARD_KEYMAP_H

3
src/board/system76/bonw14/include/board/keymap.h
View File

@ -48,7 +48,4 @@
// Keymap // Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; 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 #endif // _BOARD_KEYMAP_H

5
src/board/system76/common/kbscan.c
View File

@ -311,7 +311,10 @@ void kbscan_event(void) {
kbscan_last_layer[i][j] = kbscan_layer; kbscan_last_layer[i][j] = kbscan_layer;
} }
uint8_t key_layer = kbscan_last_layer[i][j]; 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) { if (key) {
DEBUG("KB %d, %d, %d = 0x%04X, %d\n", i, j, key_layer, key, new_b); DEBUG("KB %d, %d, %d = 0x%04X, %d\n", i, j, key_layer, key, new_b);
if(!kbscan_press(key, new_b, &layer)){ if(!kbscan_press(key, new_b, &layer)){

13
src/board/system76/common/keymap.c
View File

@ -1,13 +0,0 @@
// SPDX-License-Identifier: GPL-3.0-only
#include <board/keymap.h>
#include <common/debug.h>
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;
}
}

3
src/board/system76/darp5/include/board/keymap.h
View File

@ -46,7 +46,4 @@
// Keymap // Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; 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 #endif // _BOARD_KEYMAP_H

3
src/board/system76/galp3-c/include/board/keymap.h
View File

@ -44,7 +44,4 @@
// Keymap // Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; 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 #endif // _BOARD_KEYMAP_H

3
src/board/system76/gaze15/include/board/keymap.h
View File

@ -46,7 +46,4 @@
// Keymap // Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; 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 #endif // _BOARD_KEYMAP_H

3
src/board/system76/lemp9/include/board/keymap.h
View File

@ -45,7 +45,4 @@
// Keymap // Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; 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 #endif // _BOARD_KEYMAP_H

3
src/board/system76/oryp5/include/board/keymap.h
View File

@ -46,7 +46,4 @@
// Keymap // Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; 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 #endif // _BOARD_KEYMAP_H

3
src/board/system76/oryp6/include/board/keymap.h
View File

@ -46,7 +46,4 @@
// Keymap // Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN]; 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 #endif // _BOARD_KEYMAP_H