diff options
| author | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-29 20:03:22 -0400 |
|---|---|---|
| committer | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-29 20:03:22 -0400 |
| commit | e28334017c94c6928dd7e82436cec171f0243747 (patch) | |
| tree | d2b2ecb96aff656094b2113f83632e3131000a75 /keyboard/ergodox_ez/matrix.c | |
| parent | ccf848917b7e931327f6c4a469877e9d8ef238ea (diff) | |
| parent | 26513b497b8bae5160389c0beac2d45cbb29c50f (diff) | |
| download | firmware-e28334017c94c6928dd7e82436cec171f0243747.tar.gz firmware-e28334017c94c6928dd7e82436cec171f0243747.tar.bz2 firmware-e28334017c94c6928dd7e82436cec171f0243747.zip | |
Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent
Diffstat (limited to 'keyboard/ergodox_ez/matrix.c')
| -rw-r--r-- | keyboard/ergodox_ez/matrix.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/keyboard/ergodox_ez/matrix.c b/keyboard/ergodox_ez/matrix.c index 3e1d69444..c4f5b179f 100644 --- a/keyboard/ergodox_ez/matrix.c +++ b/keyboard/ergodox_ez/matrix.c @@ -62,12 +62,12 @@ uint32_t matrix_scan_count; __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) @@ -102,9 +102,7 @@ void matrix_init(void) matrix_scan_count = 0; #endif - if (matrix_init_kb) { - (*matrix_init_kb)(); - } + matrix_init_kb(); } @@ -163,9 +161,7 @@ uint8_t matrix_scan(void) } - if (matrix_scan_kb) { - (*matrix_scan_kb)(); - } + matrix_scan_kb(); return 1; } |