summaryrefslogtreecommitdiff
path: root/tmk_core/common/action.h
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-05-24 12:34:08 -0400
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-05-24 12:34:08 -0400
commit48871b9b6b99201abc381ee27cfd94e211ca131a (patch)
treeed5fe45f9f38e364b53a1bac35084782ec6aaf2c /tmk_core/common/action.h
parentc2a3df31239249b2fb65e2552376daac0e49ae61 (diff)
parent287eb7ad148abc8fe3fb014218d71e205fd9131d (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common/action.h')
-rw-r--r--tmk_core/common/action.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/tmk_core/common/action.h b/tmk_core/common/action.h
index 44ec3047ba..e8aa12a7cb 100644
--- a/tmk_core/common/action.h
+++ b/tmk_core/common/action.h
@@ -59,14 +59,15 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt);
void action_function(keyrecord_t *record, uint8_t id, uint8_t opt);
/* keyboard-specific key event (pre)processing */
-void process_action_kb(keyrecord_t *record);
+bool process_record_quantum(keyrecord_t *record);
/* Utilities for actions. */
#if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS)
extern bool disable_action_cache;
#endif
-void process_action_nocache(keyrecord_t *record);
-void process_action(keyrecord_t *record);
+void process_record_nocache(keyrecord_t *record);
+void process_record(keyrecord_t *record);
+void process_action(keyrecord_t *record, action_t action);
void register_code(uint8_t code);
void unregister_code(uint8_t code);
void register_mods(uint8_t mods);