diff options
author | Konstantin Đorđević <vomindoraan@gmail.com> | 2019-02-18 00:44:31 +0100 |
---|---|---|
committer | Konstantin Đorđević <vomindoraan@gmail.com> | 2019-03-02 15:15:57 +0100 |
commit | f09a237a07f2a3a341f6c6972d2f87eec3235254 (patch) | |
tree | 6113e4b1bfc79832ae754b76c97156243dd81943 /users | |
parent | 784e2af062a9ef0c6d1a4ef7fcc20df79ad4fab1 (diff) | |
download | qmk_firmware-f09a237a07f2a3a341f6c6972d2f87eec3235254.tar.gz qmk_firmware-f09a237a07f2a3a341f6c6972d2f87eec3235254.zip |
Remove most _keymap and _user definitions in userspace
Some keyboards misuse _user functions by defining them in the base files
instead of the corresponding _kb functions (especially led_set_user and
matrix_init_user). Until this is fixed (#5148), I've removed definitions
in my userspace that could cause linking collisions.
Diffstat (limited to 'users')
-rw-r--r-- | users/konstantin/konstantin.c | 49 | ||||
-rw-r--r-- | users/konstantin/konstantin.h | 8 |
2 files changed, 0 insertions, 57 deletions
diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c index a567d9166f..a8f2a5f2c9 100644 --- a/users/konstantin/konstantin.c +++ b/users/konstantin/konstantin.c @@ -15,13 +15,6 @@ void eeconfig_init_user(void) { } __attribute__((weak)) -void matrix_init_keymap(void) {} - -void matrix_init_user(void) { - matrix_init_keymap(); -} - -__attribute__((weak)) void keyboard_post_init_keymap(void) {} void keyboard_post_init_user(void) { @@ -29,13 +22,6 @@ void keyboard_post_init_user(void) { } __attribute__((weak)) -void matrix_scan_keymap(void) {} - -void matrix_scan_user(void) { - matrix_scan_keymap(); -} - -__attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; } @@ -122,38 +108,3 @@ uint32_t layer_state_set_keymap(uint32_t state) { uint32_t layer_state_set_user(uint32_t state) { return layer_state_set_keymap(state); } - -__attribute__((weak)) -void led_set_keymap(uint8_t usb_led) {} - -void led_set_user(uint8_t usb_led) { - led_set_keymap(usb_led); -} - -__attribute__((weak)) -void suspend_power_down_keymap(void) {} - -void suspend_power_down_user(void) { - suspend_power_down_keymap(); -} - -__attribute__((weak)) -void suspend_wakeup_init_keymap(void) {} - -void suspend_wakeup_init_user(void) { - suspend_wakeup_init_keymap(); -} - -__attribute__((weak)) -void startup_keymap(void) {} - -void startup_user(void) { // Currently not called anywhere - startup_keymap(); -} - -__attribute__((weak)) -void shutdown_keymap(void) {} - -void shutdown_user(void) { - shutdown_keymap(); -} diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h index db90c4ef69..d4e0e18991 100644 --- a/users/konstantin/konstantin.h +++ b/users/konstantin/konstantin.h @@ -71,15 +71,7 @@ enum layers_user { void keyboard_pre_init_keymap(void); void eeconfig_init_keymap(void); -void matrix_init_keymap(void); void keyboard_post_init_keymap(void); -void matrix_scan_keymap(void); bool process_record_keymap(uint16_t keycode, keyrecord_t *record); uint32_t layer_state_set_keymap(uint32_t state); -void led_set_keymap(uint8_t usb_led); - -void suspend_power_down_keymap(void); -void suspend_wakeup_init_keymap(void); -void startup_keymap(void); -void shutdown_keymap(void); |