diff options
| author | Alex Johnstone <alexjj@gmail.com> | 2016-03-25 11:16:33 -0700 |
|---|---|---|
| committer | Alex Johnstone <alexjj@gmail.com> | 2016-03-25 11:16:33 -0700 |
| commit | 2d9037491271677f6642ec162b6a8be3ebb47e78 (patch) | |
| tree | d3847db7e2b68c11f704e9635bc832ac7ec7a1e9 /keyboard/planck/planck.c | |
| parent | fb6dc7499f51688ec245826842300780273203c6 (diff) | |
| parent | c9aec8bc246fe45a6486a5ef7a9ef1302e4e16ad (diff) | |
| download | firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.tar.gz firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.tar.bz2 firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.zip | |
Merge pull request #3 from jackhumbert/master
Pull upstream
Diffstat (limited to 'keyboard/planck/planck.c')
| -rw-r--r-- | keyboard/planck/planck.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/keyboard/planck/planck.c b/keyboard/planck/planck.c index 63ca54761..fe8731ec7 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(); +} |