diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-03-22 17:29:31 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-03-22 17:29:31 -0400 |
| commit | a4ff9f256738cf637553e7840d53f778d791fb6f (patch) | |
| tree | 91d327587401e69843eecb353e97a3119aa9939b /keyboard/ergodox_ez/matrix.c | |
| parent | e36a441274e9e494e1d8e38df1901f3acf9def27 (diff) | |
| parent | 403d756ad56de18488e3d048e849c55e77a20b32 (diff) | |
| download | qmk_firmware-a4ff9f256738cf637553e7840d53f778d791fb6f.tar.gz qmk_firmware-a4ff9f256738cf637553e7840d53f778d791fb6f.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
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 3e1d69444b..c4f5b179f0 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; } |