summaryrefslogtreecommitdiffstats
path: root/keyboard
diff options
context:
space:
mode:
authorNorberto Monarrez <monarrez.norberto@gmail.com>2016-03-23 18:42:34 +0100
committerNorberto Monarrez <monarrez.norberto@gmail.com>2016-03-23 18:42:34 +0100
commita5a40a0703b209df91d5115126073e41b5676ec7 (patch)
tree591a465b57d1e0e75de501b3801aed8b61734d6f /keyboard
parent95b00321420533a1ea34a046f4cb1acaac16bf46 (diff)
downloadqmk_firmware-a5a40a0703b209df91d5115126073e41b5676ec7.tar.gz
qmk_firmware-a5a40a0703b209df91d5115126073e41b5676ec7.tar.xz
Edited to work with jackhumbert/qmk_firmware pull #190
Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/Bantam44/Bantam44.c24
-rw-r--r--keyboard/Bantam44/Bantam44.h4
2 files changed, 12 insertions, 16 deletions
diff --git a/keyboard/Bantam44/Bantam44.c b/keyboard/Bantam44/Bantam44.c
index cfd8730a0..ad91401ee 100644
--- a/keyboard/Bantam44/Bantam44.c
+++ b/keyboard/Bantam44/Bantam44.c
@@ -1,29 +1,25 @@
#include "Bantam44.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
- if (matrix_init_user) {
- (*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
diff --git a/keyboard/Bantam44/Bantam44.h b/keyboard/Bantam44/Bantam44.h
index 0170b871d..fa5b9df9e 100644
--- a/keyboard/Bantam44/Bantam44.h
+++ b/keyboard/Bantam44/Bantam44.h
@@ -23,7 +23,7 @@
{ K30, K31, K32, KC_NO, K33, KC_NO, K34, KC_NO, K35, K36, K37, K38 }, \
}
-void * matrix_init_user(void);
-void * matrix_scan_user(void);
+void matrix_init_user(void);
+void matrix_scan_user(void);
#endif