diff options
| author | Erez Zukerman <bulk@ezuk.org> | 2016-03-22 21:30:25 +0200 |
|---|---|---|
| committer | Erez Zukerman <bulk@ezuk.org> | 2016-03-22 21:30:25 +0200 |
| commit | 403d756ad56de18488e3d048e849c55e77a20b32 (patch) | |
| tree | b02cd9a378a29d9b8cde07a7d97b46c24e74a3b1 /keyboard/planck | |
| parent | 7f0d77e08c6b5d75a1f912051e6d2928d66e7c3b (diff) | |
| parent | baeffd99da5603cd5156bbcf0cd45ae62711858f (diff) | |
| download | qmk_firmware-403d756ad56de18488e3d048e849c55e77a20b32.tar.gz qmk_firmware-403d756ad56de18488e3d048e849c55e77a20b32.zip | |
Merge pull request #190 from yoyoerx/function_pointers
Addressing void* return warning & coding style
Diffstat (limited to 'keyboard/planck')
| -rw-r--r-- | keyboard/planck/keymaps/lock/keymap.c | 2 | ||||
| -rw-r--r-- | keyboard/planck/planck.c | 24 | ||||
| -rw-r--r-- | keyboard/planck/planck.h | 4 |
3 files changed, 13 insertions, 17 deletions
diff --git a/keyboard/planck/keymaps/lock/keymap.c b/keyboard/planck/keymaps/lock/keymap.c index 9585764629..f1629492ef 100644 --- a/keyboard/planck/keymaps/lock/keymap.c +++ b/keyboard/planck/keymaps/lock/keymap.c @@ -150,7 +150,7 @@ float start_up[][2] = { {440.0*pow(2.0,(64)/12.0), 1000}, }; -void * matrix_init_user(void) { +void matrix_init_user(void) { init_notes(); play_notes(&start_up, 9, false); }
\ No newline at end of file diff --git a/keyboard/planck/planck.c b/keyboard/planck/planck.c index 63ca54761c..fe8731ec7b 100644 --- a/keyboard/planck/planck.c +++ b/keyboard/planck/planck.c @@ -1,16 +1,16 @@ #include "planck.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 @@ -24,13 +24,9 @@ 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) { - if (matrix_scan_user) { - (*matrix_scan_user)(); - } -}; +void matrix_scan_kb(void) { + matrix_scan_user(); +} diff --git a/keyboard/planck/planck.h b/keyboard/planck/planck.h index 00b01b54df..e9566b9228 100644 --- a/keyboard/planck/planck.h +++ b/keyboard/planck/planck.h @@ -40,7 +40,7 @@ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \ } -void * matrix_init_user(void); -void * matrix_scan_user(void); +void matrix_init_user(void); +void matrix_scan_user(void); #endif |