summaryrefslogtreecommitdiff
path: root/keyboard/atomic
diff options
context:
space:
mode:
authoryoyoerx <kevin.wepasnick@gmail.com>2016-03-10 11:28:34 -0500
committeryoyoerx <kevin.wepasnick@gmail.com>2016-03-10 11:28:34 -0500
commit641859df84bf40025b2c14319d1a168a435562e2 (patch)
tree006e8cdd6bef18921b3c4e5cf7cebda67da27779 /keyboard/atomic
parent7d3ebd7b40b96f576fe4608b33f47329c334925b (diff)
Addressed void* return warning in all keymaps
Diffstat (limited to 'keyboard/atomic')
-rw-r--r--keyboard/atomic/atomic.c24
-rw-r--r--keyboard/atomic/atomic.h4
2 files changed, 12 insertions, 16 deletions
diff --git a/keyboard/atomic/atomic.c b/keyboard/atomic/atomic.c
index fa66266a4c..30e8122893 100644
--- a/keyboard/atomic/atomic.c
+++ b/keyboard/atomic/atomic.c
@@ -1,16 +1,16 @@
#include "atomic.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
@@ -25,16 +25,12 @@ void * matrix_init_kb(void) {
DDRE |= (1<<6);
PORTE |= (1<<6);
- 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/atomic/atomic.h b/keyboard/atomic/atomic.h
index 95982ecad1..d8574efa93 100644
--- a/keyboard/atomic/atomic.h
+++ b/keyboard/atomic/atomic.h
@@ -24,7 +24,7 @@
{ K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E } \
}
-void * matrix_init_user(void);
-void * matrix_scan_user(void);
+void matrix_init_user(void);
+void matrix_scan_user(void);
#endif \ No newline at end of file