summaryrefslogtreecommitdiff
path: root/keyboard/jd45
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-03-22 17:29:31 -0400
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-03-22 17:29:31 -0400
commita4ff9f256738cf637553e7840d53f778d791fb6f (patch)
tree91d327587401e69843eecb353e97a3119aa9939b /keyboard/jd45
parente36a441274e9e494e1d8e38df1901f3acf9def27 (diff)
parent403d756ad56de18488e3d048e849c55e77a20b32 (diff)
downloadqmk_firmware-a4ff9f256738cf637553e7840d53f778d791fb6f.tar.gz
qmk_firmware-a4ff9f256738cf637553e7840d53f778d791fb6f.zip
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/jd45')
-rw-r--r--keyboard/jd45/jd45.c8
-rw-r--r--keyboard/jd45/jd45.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/keyboard/jd45/jd45.c b/keyboard/jd45/jd45.c
index d05714f07b..bc3fcd3ddf 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 f07bd5e139..d0ca1a88d0 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