summaryrefslogtreecommitdiff
path: root/keyboard/hhkb_qmk
diff options
context:
space:
mode:
authorAlex Johnstone <alexjj@gmail.com>2016-03-25 11:16:33 -0700
committerAlex Johnstone <alexjj@gmail.com>2016-03-25 11:16:33 -0700
commit2d9037491271677f6642ec162b6a8be3ebb47e78 (patch)
treed3847db7e2b68c11f704e9635bc832ac7ec7a1e9 /keyboard/hhkb_qmk
parentfb6dc7499f51688ec245826842300780273203c6 (diff)
parentc9aec8bc246fe45a6486a5ef7a9ef1302e4e16ad (diff)
Merge pull request #3 from jackhumbert/master
Pull upstream
Diffstat (limited to 'keyboard/hhkb_qmk')
-rw-r--r--keyboard/hhkb_qmk/hhkb_qmk.c8
-rw-r--r--keyboard/hhkb_qmk/hhkb_qmk.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/keyboard/hhkb_qmk/hhkb_qmk.c b/keyboard/hhkb_qmk/hhkb_qmk.c
index 9c90e6eb44..36dc3f29db 100644
--- a/keyboard/hhkb_qmk/hhkb_qmk.c
+++ b/keyboard/hhkb_qmk/hhkb_qmk.c
@@ -1,16 +1,16 @@
#include "hhkb_qmk.h"
__attribute__ ((weak))
-void * matrix_init_user(void) {
+void matrix_init_user(void) {
// leave these blank
};
__attribute__ ((weak))
-void * matrix_scan_user(void) {
+void matrix_scan_user(void) {
// leave these blank
};
-void * matrix_init_kb(void) {
+void matrix_init_kb(void) {
// put your keyboard start-up code here
// runs once when the firmware starts up
@@ -19,7 +19,7 @@ void * matrix_init_kb(void) {
}
};
-void * matrix_scan_kb(void) {
+void matrix_scan_kb(void) {
// put your looping keyboard code here
// runs every cycle (a lot)
diff --git a/keyboard/hhkb_qmk/hhkb_qmk.h b/keyboard/hhkb_qmk/hhkb_qmk.h
index f6bf20f43b..1bac33c2de 100644
--- a/keyboard/hhkb_qmk/hhkb_qmk.h
+++ b/keyboard/hhkb_qmk/hhkb_qmk.h
@@ -24,7 +24,7 @@
{ K70, K71, K72, K73, K74, K75, K76, KC_NO } \
}
-void * matrix_init_user(void);
-void * matrix_scan_user(void);
+void matrix_init_user(void);
+void matrix_scan_user(void);
#endif