summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-03-05 15:41:21 +0900
committertmk <nobody@nowhere>2013-03-05 15:41:21 +0900
commit5808317b694004c43a6e0f76e9715415cce19a25 (patch)
tree9814dbe96eecbb940a710505feb82125a483dc2d /common
parent633d9aa53e3fc2b9fa9f01475cba9c151ab31d9a (diff)
Fix keymap for new framework
Diffstat (limited to 'common')
-rw-r--r--common/keymap.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/common/keymap.c b/common/keymap.c
index f72be57794..aa8d944a79 100644
--- a/common/keymap.c
+++ b/common/keymap.c
@@ -38,12 +38,6 @@ action_t action_for_key(uint8_t layer, key_t key)
return keycode_to_action(keycode);
}
}
-
-__attribute__ ((weak))
-const prog_macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { return MACRO_NONE; }
-
-__attribute__ ((weak))
-void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {}
#else
/*
* legacy keymap support
@@ -71,13 +65,17 @@ action_t action_for_key(uint8_t layer, key_t key)
return keycode_to_action(keycode);
}
}
-/* not used for legacy keymap */
-void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-}
#endif
+__attribute__ ((weak))
+const prog_macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { return MACRO_NONE; }
+
+__attribute__ ((weak))
+void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {}
+
+
+
/* translates keycode to action */
static action_t keycode_to_action(uint8_t keycode)