summaryrefslogtreecommitdiff
path: root/tmk_core/common
diff options
context:
space:
mode:
authortmk <hasu@tmk-kbd.com>2015-05-21 20:30:10 +0900
committertmk <hasu@tmk-kbd.com>2015-05-21 20:30:10 +0900
commit5b46031658a69104526ef43284acd943ba21b772 (patch)
tree3826189b067ab42791118155ec484c128a7a0be0 /tmk_core/common
parent32abfacbc730be45ae5696688d9d8db3fb25dc01 (diff)
Revert "Make action_for_key a weak symbol"
This reverts commit c17b8a599e3ec3b0a327bcd66082541f2517ab30. The commit made compile error and its intention is unclear.
Diffstat (limited to 'tmk_core/common')
-rw-r--r--tmk_core/common/action.h1
-rw-r--r--tmk_core/common/keymap.c5
2 files changed, 0 insertions, 6 deletions
diff --git a/tmk_core/common/action.h b/tmk_core/common/action.h
index e76161c17f..8a4736d7bc 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 a43ca460f2..9f4fab5216 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: