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.

diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c
index a567d9166fd174b20f82a5e2685ea6c771e82e55..a8f2a5f2c958da280ed690620abb9918c12a0949 100644 (file)
--- a/users/konstantin/konstantin.c
+++ b/users/konstantin/konstantin.c
@@ -14,13 +14,6 @@ void eeconfig_init_user(void) {
   eeconfig_init_keymap();
 }
 
-__attribute__((weak))
-void matrix_init_keymap(void) {}
-
-void matrix_init_user(void) {
-  matrix_init_keymap();
-}
-
 __attribute__((weak))
 void keyboard_post_init_keymap(void) {}
 
@@ -28,13 +21,6 @@ void keyboard_post_init_user(void) {
   keyboard_post_init_keymap();
 }
 
-__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 db90c4ef69e4530bb56c9925549d5989041060d5..d4e0e189910c474a226e083b9f0c20c1ead17a97 100644 (file)
--- 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);