~ruther/qmk_firmware

f09a237a07f2a3a341f6c6972d2f87eec3235254 — Konstantin Đorđević 6 years ago 784e2af
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.
2 files changed, 0 insertions(+), 57 deletions(-)

M users/konstantin/konstantin.c
M users/konstantin/konstantin.h
M users/konstantin/konstantin.c => users/konstantin/konstantin.c +0 -49
@@ 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();
}

M users/konstantin/konstantin.h => users/konstantin/konstantin.h +0 -8
@@ 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);