diff options
| author | Alex Johnstone <alexjj@gmail.com> | 2016-03-25 19:16:33 +0100 |
|---|---|---|
| committer | Alex Johnstone <alexjj@gmail.com> | 2016-03-25 19:16:33 +0100 |
| commit | 2d9037491271677f6642ec162b6a8be3ebb47e78 (patch) | |
| tree | d3847db7e2b68c11f704e9635bc832ac7ec7a1e9 /keyboard/ergodox_ez/matrix.c | |
| parent | fb6dc7499f51688ec245826842300780273203c6 (diff) | |
| parent | c9aec8bc246fe45a6486a5ef7a9ef1302e4e16ad (diff) | |
| download | qmk_firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.tar.gz qmk_firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.tar.xz | |
Merge pull request #3 from jackhumbert/master
Pull upstream
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; } |