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

kbscan: Do not read matrix if lid is closed

Browse Source 
Pull the lid check out to the loop to avoid accessing the matrix when we
know we do not need the data. It is left in kbscan (instead of simply
disabling reading) to clear the state of the matrix data.

The lid check for wake is removed as it will never be true.

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

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

@ -81,11 +81,6 @@ void kbscan_init(void) {
// Read the state of the row for the selected column.
static inline uint8_t kbscan_get_row(void) {
// Report all keys as released when lid is closed
if (!lid_state) {
return 0;
}
// Invert KSI for positive logic of pressed keys.
return ~KSI;
}
@ -160,7 +155,7 @@ static void hardware_hotkey(uint16_t key) {
bool kbscan_press(uint16_t key, bool pressed, uint8_t *layer) {
// Wake from sleep on keypress
if (pressed && lid_state && (power_state == POWER_STATE_S3)) {
if (pressed && (power_state == POWER_STATE_S3)) {
pmc_swi();
}
@ -308,8 +303,13 @@ void kbscan_event(void) {
// Read the current state of the hardware matrix
for (uint8_t i = 0; i < KM_OUT; i++) {
kbscan_set_column(i);
matrix_curr[i] = kbscan_get_row();
if (!lid_state) {
// Report all keys as released when lid is closed
matrix_curr[i] = 0;
} else {
kbscan_set_column(i);
matrix_curr[i] = kbscan_get_row();
}
}
kbscan_disable_reading();