diff options
| author | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-30 02:03:22 +0200 |
|---|---|---|
| committer | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-30 02:03:22 +0200 |
| commit | e28334017c94c6928dd7e82436cec171f0243747 (patch) | |
| tree | d2b2ecb96aff656094b2113f83632e3131000a75 /quantum/matrix.c | |
| parent | ccf848917b7e931327f6c4a469877e9d8ef238ea (diff) | |
| parent | 26513b497b8bae5160389c0beac2d45cbb29c50f (diff) | |
| download | qmk_firmware-e28334017c94c6928dd7e82436cec171f0243747.tar.gz qmk_firmware-e28334017c94c6928dd7e82436cec171f0243747.tar.xz | |
Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent
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; } |