diff options
author | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-03-24 08:22:21 +0100 |
---|---|---|
committer | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-03-24 08:22:21 +0100 |
commit | 8b883c797fc043def3abe5c367cb9d9a6f11f8fb (patch) | |
tree | fa0d91fd40de1db1ab744bce880a4cbe2bbc8b5e /keyboard/jd45 | |
parent | 55fa66428ca9b75106b8a296ea6095f7b80cc109 (diff) | |
parent | ba058f8b81132bf64b1aa263779629b8a6c18c23 (diff) | |
download | qmk_firmware-8b883c797fc043def3abe5c367cb9d9a6f11f8fb.tar.gz qmk_firmware-8b883c797fc043def3abe5c367cb9d9a6f11f8fb.tar.xz |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/jd45')
-rw-r--r-- | keyboard/jd45/jd45.c | 8 | ||||
-rw-r--r-- | keyboard/jd45/jd45.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/keyboard/jd45/jd45.c b/keyboard/jd45/jd45.c index d05714f07..bc3fcd3dd 100644 --- a/keyboard/jd45/jd45.c +++ b/keyboard/jd45/jd45.c @@ -1,16 +1,16 @@ #include "jd45.h" __attribute__ ((weak)) -void * matrix_init_user(void) { +void matrix_init_user(void) { }; __attribute__ ((weak)) -void * matrix_scan_user(void) { +void matrix_scan_user(void) { }; -void * matrix_init_kb(void) { +void matrix_init_kb(void) { #ifdef BACKLIGHT_ENABLE backlight_init_ports(); #endif @@ -20,7 +20,7 @@ void * matrix_init_kb(void) { } }; -void * matrix_scan_kb(void) { +void matrix_scan_kb(void) { if (matrix_scan_user) { (*matrix_scan_user)(); } diff --git a/keyboard/jd45/jd45.h b/keyboard/jd45/jd45.h index f07bd5e13..d0ca1a88d 100644 --- a/keyboard/jd45/jd45.h +++ b/keyboard/jd45/jd45.h @@ -6,7 +6,7 @@ #include "backlight.h" #include <stddef.h> -void * matrix_init_user(void); -void * matrix_scan_user(void); +void matrix_init_user(void); +void matrix_scan_user(void); #endif |