Merge remote-tracking branch 'tmk/master' into cub_layout

[max/tmk_keyboard.git] / common / action.h

diff --git a/common/action.h b/common/action.h
index 98c4ef81a664c7e3121cf7564e02a364660a06a5..d57f4a86ff00d09854bcadef412b8f365094f7b2 100644 (file)
--- a/common/action.h
+++ b/common/action.h
@@ -50,7 +50,7 @@ void action_exec(keyevent_t event);
 action_t action_for_key(uint8_t layer, key_t key);
 
 /* macro */
-const prog_macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt);
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt);
 
 /* user defined special function */
 void action_function(keyrecord_t *record, uint8_t id, uint8_t opt);
@@ -59,9 +59,9 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt);
 void process_action(keyrecord_t *record);
 void register_code(uint8_t code);
 void unregister_code(uint8_t code);
-void add_mods(uint8_t mods);
-void del_mods(uint8_t mods);
-void set_mods(uint8_t mods);
+void register_mods(uint8_t mods);
+void unregister_mods(uint8_t mods);
+//void set_mods(uint8_t mods);
 void clear_keyboard(void);
 void clear_keyboard_but_mods(void);
 bool sending_anykey(void);