From 10f33a3e484e24065ed5eaab1c56c35156bace89 Mon Sep 17 00:00:00 2001 From: tmk Date: Sun, 31 Mar 2013 22:47:19 +0900 Subject: Remove ACT_KEYMAP and ACT_OVERLAY - Remove ACT_OVERLAY - Rename ACT_KEYMAP to ACT_LAYER - Add ACT_LAYER_BITOP --- common/layer_switch.h | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) (limited to 'common/layer_switch.h') diff --git a/common/layer_switch.h b/common/layer_switch.h index eb4cf61ba..423dafb5b 100644 --- a/common/layer_switch.h +++ b/common/layer_switch.h @@ -22,11 +22,6 @@ along with this program. If not, see . #include "action.h" -/* overlays are asigned at layer 16-31 */ -#define OVERLAY_BIT 0x10 -#define OVERLAY_MASK 0x0F - - /* * Default Layer */ @@ -38,7 +33,7 @@ void default_layer_set(uint8_t layer); /* * Keymap Layer */ -#ifndef NO_ACTION_KEYMAP +#ifndef NO_ACTION_LAYER extern uint16_t keymap_stat; /* return current active layer */ uint8_t keymap_get_layer(void); @@ -69,41 +64,6 @@ void keymap_debug(void); #endif -/* - * Overlay Layer - */ -#ifndef NO_ACTION_OVERLAY -extern uint16_t overlay_stat; -/* return current active layer */ -uint8_t overlay_get_layer(void); -void overlay_clear(void); -void overlay_set(uint16_t stat); -void overlay_move(uint8_t layer); -void overlay_on(uint8_t layer); -void overlay_off(uint8_t layer); -void overlay_invert(uint8_t layer); -/* bitwise operation */ -void overlay_or(uint16_t stat); -void overlay_and(uint16_t stat); -void overlay_xor(uint16_t stat); -void overlay_debug(void); -#else -#define overlay_stat 0 -#define overlay_get_layer() -#define overlay_clear() -#define overlay_set(stat) -#define overlay_move(layer) -#define overlay_on(layer) -#define overlay_off(layer) -#define overlay_invert(layer) -#define overlay_or(stat) -#define overlay_and(stat) -#define overlay_xor(stat) -#define overlay_debug() -#endif - - - /* return action depending on current layer status */ action_t layer_switch_get_action(key_t key); -- cgit v1.2.3