summaryrefslogtreecommitdiff
path: root/quantum/template/template.c
diff options
context:
space:
mode:
authorErez Zukerman <bulk@ezuk.org>2016-03-22 21:30:25 +0200
committerErez Zukerman <bulk@ezuk.org>2016-03-22 21:30:25 +0200
commit403d756ad56de18488e3d048e849c55e77a20b32 (patch)
treeb02cd9a378a29d9b8cde07a7d97b46c24e74a3b1 /quantum/template/template.c
parent7f0d77e08c6b5d75a1f912051e6d2928d66e7c3b (diff)
parentbaeffd99da5603cd5156bbcf0cd45ae62711858f (diff)
Merge pull request #190 from yoyoerx/function_pointers
Addressing void* return warning & coding style
Diffstat (limited to 'quantum/template/template.c')
-rw-r--r--quantum/template/template.c26
1 files changed, 10 insertions, 16 deletions
diff --git a/quantum/template/template.c b/quantum/template/template.c
index 7be7dfc3d1..7dcd67cfcf 100644
--- a/quantum/template/template.c
+++ b/quantum/template/template.c
@@ -1,29 +1,23 @@
#include "%KEYBOARD%.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
+ matrix_init_user();
+}
- if (matrix_init_user) {
- (*matrix_init_user)();
- }
-};
-
-void * matrix_scan_kb(void) {
+void matrix_scan_kb(void) {
// put your looping keyboard code here
// runs every cycle (a lot)
-
- if (matrix_scan_user) {
- (*matrix_scan_user)();
- }
-}; \ No newline at end of file
+ matrix_scan_user();
+} \ No newline at end of file