diff options
| author | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2016-04-03 11:14:08 +0200 |
|---|---|---|
| committer | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2016-04-03 11:23:00 +0200 |
| commit | 47dd29513eeec7b7f639bef6df441a905ce8bacb (patch) | |
| tree | 29170847273e786384bd3d7c7781e67dc4335bbb /quantum/matrix.c | |
| parent | 8ef14d09b8451b3f2a77e6f019922eae0ac43642 (diff) | |
| parent | 8d39263d2444f0273327902684c802b218efb7b6 (diff) | |
| download | firmware-47dd29513eeec7b7f639bef6df441a905ce8bacb.tar.gz firmware-47dd29513eeec7b7f639bef6df441a905ce8bacb.tar.bz2 firmware-47dd29513eeec7b7f639bef6df441a905ce8bacb.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into modifier-release-fix
Diffstat (limited to 'quantum/matrix.c')
| -rw-r--r-- | quantum/matrix.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/quantum/matrix.c b/quantum/matrix.c index 95bf4c097..2dab6ae94 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -48,14 +48,14 @@ static void unselect_rows(void); static void select_row(uint8_t row); __attribute__ ((weak)) -void * matrix_init_kb(void) { +void matrix_init_kb(void) { -}; +} __attribute__ ((weak)) -void * matrix_scan_kb(void) { +void matrix_scan_kb(void) { -}; +} inline uint8_t matrix_rows(void) @@ -86,9 +86,7 @@ void matrix_init(void) matrix_debouncing[i] = 0; } - if (matrix_init_kb) { - (*matrix_init_kb)(); - } + matrix_init_kb(); } @@ -152,9 +150,7 @@ uint8_t matrix_scan(void) } #endif - if (matrix_scan_kb) { - (*matrix_scan_kb)(); - } + matrix_scan_kb(); return 1; } |