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

kbscan: Disable reading columns at init

Browse Source 
The functionality is split into a separate function to optimize the use
case for each.

Signed-off-by: Tim Crawford <tcrawford@system76.com>
This commit is contained in:
Tim Crawford
2024-01-02 09:37:17 -07:00
committed by Tim Crawford
parent 11b1e724b5
commit 0e1a748b16
1 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,9 +23,6 @@
// Debounce time in milliseconds // Debounce time in milliseconds
#define DEBOUNCE_DELAY 10 #define DEBOUNCE_DELAY 10
// Deselect all columns for reading
#define KBSCAN_MATRIX_NONE 0xFF
bool kbscan_fn_held = false; bool kbscan_fn_held = false;
bool kbscan_esc_held = false; bool kbscan_esc_held = false;
@ -45,6 +42,27 @@ static inline bool matrix_position_is_fn(uint8_t row, uint8_t col) {
return (row == MATRIX_FN_OUTPUT) && (col == MATRIX_FN_INPUT); return (row == MATRIX_FN_OUTPUT) && (col == MATRIX_FN_INPUT);
} }
// Assert the specified column for reading the row.
static void kbscan_set_column(uint8_t col) {
// Assert the specific bit corresponding to the column.
uint32_t colbit = ~BIT(col);
KSOL = colbit & 0xFF;
KSOH1 = (colbit >> 8) & 0xFF;
KSOH2 = (colbit >> 16) & 0x03;
// Wait for matrix to stabilize
delay_ticks(20);
}
// Disable reading from all columns.
static void kbscan_disable_reading(void) {
KSOL = 0xFF;
KSOH1 = 0xFF;
KSOH2 = 0x3;
// No need to wait for matrix to stabilize as a read won't happen.
}
// Initialize the Keyboard Matrix Scan Controller in KBS (Normal) mode for // Initialize the Keyboard Matrix Scan Controller in KBS (Normal) mode for
// reading keyboard input. // reading keyboard input.
void kbscan_init(void) { void kbscan_init(void) {
@ -53,10 +71,8 @@ void kbscan_init(void) {
KSOCTRL = BIT(2) | BIT(0); KSOCTRL = BIT(2) | BIT(0);
KSOHGCTRL = 0; KSOHGCTRL = 0;
KSOLGCTRL = 0; KSOLGCTRL = 0;
// XXX: Still set outputs low?
KSOL = 0; kbscan_disable_reading();
KSOH1 = 0;
KSOH2 = 0;
// KSI[7:0]: Enable pull-up, set to KBS mode // KSI[7:0]: Enable pull-up, set to KBS mode
KSICTRLR = BIT(2); KSICTRLR = BIT(2);
@ -74,25 +90,6 @@ static inline uint8_t kbscan_get_row(void) {
return ~KSI; return ~KSI;
} }
// Assert the specified column for reading the row.
static void kbscan_set_column(uint8_t col) {
if (col == KBSCAN_MATRIX_NONE) {
// Disable reading from all columns
KSOL = 0xFF;
KSOH1 = 0xFF;
KSOH2 = 0x3;
} else {
// Assert the specific bit corresponding to the column
uint32_t colbit = ~BIT(col);
KSOL = colbit & 0xFF;
KSOH1 = (colbit >> 8) & 0xFF;
KSOH2 = (colbit >> 16) & 0x03;
}
// Wait for matrix to stabilize
delay_ticks(20);
}
#if KM_NKEY #if KM_NKEY
static bool kbscan_row_has_ghost(uint8_t *matrix, uint8_t col) { static bool kbscan_row_has_ghost(uint8_t *matrix, uint8_t col) {
(void)matrix; (void)matrix;
@ -314,8 +311,7 @@ void kbscan_event(void) {
kbscan_set_column(i); kbscan_set_column(i);
matrix_curr[i] = kbscan_get_row(); matrix_curr[i] = kbscan_get_row();
} }
// Disable reading any keys kbscan_disable_reading();
kbscan_set_column(KBSCAN_MATRIX_NONE);
for (uint8_t i = 0; i < KM_OUT; i++) { for (uint8_t i = 0; i < KM_OUT; i++) {
uint8_t new = matrix_curr[i]; uint8_t new = matrix_curr[i];