From 5b46031658a69104526ef43284acd943ba21b772 Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 21 May 2015 20:30:10 +0900 Subject: [PATCH] Revert "Make action_for_key a weak symbol" This reverts commit c17b8a599e3ec3b0a327bcd66082541f2517ab30. The commit made compile error and its intention is unclear. --- tmk_core/common/action.h | 1 - tmk_core/common/keymap.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/tmk_core/common/action.h b/tmk_core/common/action.h index e76161c17f5..8a4736d7bc1 100644 --- a/tmk_core/common/action.h +++ b/tmk_core/common/action.h @@ -51,7 +51,6 @@ void action_exec(keyevent_t event); /* action for key */ action_t action_for_key(uint8_t layer, keypos_t key); -action_t action_for_key_default(uint8_t layer, keypos_t key); /* macro */ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt); diff --git a/tmk_core/common/keymap.c b/tmk_core/common/keymap.c index a43ca460f27..9f4fab52166 100644 --- a/tmk_core/common/keymap.c +++ b/tmk_core/common/keymap.c @@ -27,13 +27,8 @@ static action_t keycode_to_action(uint8_t keycode); /* converts key to action */ -__attribute__((__weak__)) action_t action_for_key(uint8_t layer, keypos_t key) { - return action_for_key_default(layer, key); -} - -action_t action_for_key_default(uint8_t layer, keypos_t key) uint8_t keycode = keymap_key_to_keycode(layer, key); switch (keycode) { case KC_FN0 ... KC_FN31: