diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-03-30 00:45:48 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-03-30 00:45:48 -0400 |
| commit | e7377dc24b4aaf97f9c48ef7db78b7b6cbabe748 (patch) | |
| tree | 7774668076bb8c8d2331028bb540510c078e60be /keyboard/ergodox_ez/matrix.c | |
| parent | b8ac5095708b5023f5e3e375b22534f8b395741f (diff) | |
| parent | 4a676746a6d8c9b47956f863ead335e995677c53 (diff) | |
| download | firmware-e7377dc24b4aaf97f9c48ef7db78b7b6cbabe748.tar.gz firmware-e7377dc24b4aaf97f9c48ef7db78b7b6cbabe748.tar.bz2 firmware-e7377dc24b4aaf97f9c48ef7db78b7b6cbabe748.zip | |
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
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; } |