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

kbscan: Use u8 for array access

Browse Source 
The index will never be negative and will never exceed 255. Change them
from i16 to u8 so SDCC will generate more efficient code.

Signed-off-by: Tim Crawford <tcrawford@system76.com>
This commit is contained in:
Tim Crawford
2021-08-02 11:56:47 -06:00
committed by Jeremy Soller
parent 571316a4ea
commit 458cb000f3
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,11 +30,11 @@ uint8_t kbscan_matrix[KM_OUT] = { 0 };
uint8_t sci_extra = 0; uint8_t sci_extra = 0;
static inline bool matrix_position_is_esc(int16_t row, int16_t col) { static inline bool matrix_position_is_esc(uint8_t row, uint8_t col) {
return (row == MATRIX_ESC_OUTPUT) && (col == MATRIX_ESC_INPUT); return (row == MATRIX_ESC_OUTPUT) && (col == MATRIX_ESC_INPUT);
} }
static inline bool matrix_position_is_fn(int16_t row, int16_t col) { 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);
} }
@ -60,7 +60,7 @@ void kbscan_init(void) {
// Debounce time in milliseconds // Debounce time in milliseconds
#define DEBOUNCE_DELAY 15 #define DEBOUNCE_DELAY 15
static uint8_t kbscan_get_row(int16_t i) { static uint8_t kbscan_get_row(uint8_t i) {
// Report all keys as released when lid is closed // Report all keys as released when lid is closed
if (!lid_state) { if (!lid_state) {
return 0; return 0;
@ -118,7 +118,7 @@ static uint8_t kbscan_get_row(int16_t i) {
} }
#if KM_NKEY #if KM_NKEY
static bool kbscan_has_ghost_in_row(int16_t row, uint8_t rowdata) { static bool kbscan_has_ghost_in_row(uint8_t row, uint8_t rowdata) {
// Use arguments // Use arguments
row = row; row = row;
rowdata = rowdata; rowdata = rowdata;
@ -129,7 +129,7 @@ static inline bool popcount_more_than_one(uint8_t rowdata) {
return rowdata & (rowdata - 1); return rowdata & (rowdata - 1);
} }
static uint8_t kbscan_get_real_keys(int16_t row, uint8_t rowdata) { static uint8_t kbscan_get_real_keys(uint8_t row, uint8_t rowdata) {
// Remove any "active" blanks from the matrix. // Remove any "active" blanks from the matrix.
uint8_t realdata = 0; uint8_t realdata = 0;
for (uint8_t col = 0; col < KM_IN; col++) { for (uint8_t col = 0; col < KM_IN; col++) {
@ -143,7 +143,7 @@ static uint8_t kbscan_get_real_keys(int16_t row, uint8_t rowdata) {
return realdata; return realdata;
} }
static bool kbscan_has_ghost_in_row(int16_t row, uint8_t rowdata) { static bool kbscan_has_ghost_in_row(uint8_t row, uint8_t rowdata) {
rowdata = kbscan_get_real_keys(row, rowdata); rowdata = kbscan_get_real_keys(row, rowdata);
// No ghosts exist when less than 2 keys in the row are active. // No ghosts exist when less than 2 keys in the row are active.
@ -152,7 +152,7 @@ static bool kbscan_has_ghost_in_row(int16_t row, uint8_t rowdata) {
} }
// Check against other rows to see if more than one column matches. // Check against other rows to see if more than one column matches.
for (int16_t i = 0; i < KM_OUT; i++) { for (uint8_t i = 0; i < KM_OUT; i++) {
uint8_t otherrow = kbscan_get_real_keys(i, kbscan_get_row(i)); uint8_t otherrow = kbscan_get_real_keys(i, kbscan_get_row(i));
if (i != row && popcount_more_than_one(otherrow & rowdata)) { if (i != row && popcount_more_than_one(otherrow & rowdata)) {
return true; return true;
@ -315,8 +315,7 @@ void kbscan_event(void) {
} }
} }
int16_t i; for (uint8_t i = 0; i < KM_OUT; i++) {
for (i = 0; i < KM_OUT; i++) {
uint8_t new = kbscan_get_row(i); uint8_t new = kbscan_get_row(i);
uint8_t last = kbscan_matrix[i]; uint8_t last = kbscan_matrix[i];
if (new != last) { if (new != last) {
@ -331,8 +330,7 @@ void kbscan_event(void) {
} }
// A key was pressed or released // A key was pressed or released
int16_t j; for (uint8_t j = 0; j < KM_IN; j++) {
for (j = 0; j < KM_IN; j++) {
bool new_b = new & BIT(j); bool new_b = new & BIT(j);
bool last_b = last & BIT(j); bool last_b = last & BIT(j);
if (new_b != last_b) { if (new_b != last_b) {