From c6d88d27956c4b76f8819fcdb076bf94a8f55868 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 2 Apr 2013 17:44:24 +0900
Subject: Rename file layer_switch to action_layer

---
 common/action.c       |   2 +-
 common/action_layer.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++
 common/action_layer.h |  77 ++++++++++++++++++++++++++++
 common/command.c      |   2 +-
 common/keymap.c       |   2 +-
 common/layer_switch.c | 135 --------------------------------------------------
 common/layer_switch.h |  77 ----------------------------
 7 files changed, 215 insertions(+), 215 deletions(-)
 create mode 100644 common/action_layer.c
 create mode 100644 common/action_layer.h
 delete mode 100644 common/layer_switch.c
 delete mode 100644 common/layer_switch.h

(limited to 'common')

diff --git a/common/action.c b/common/action.c
index 596831d4de..158522dd03 100644
--- a/common/action.c
+++ b/common/action.c
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "command.h"
 #include "debug.h"
 #include "led.h"
-#include "layer_switch.h"
+#include "action_layer.h"
 #include "action_tapping.h"
 #include "action_oneshot.h"
 #include "action_macro.h"
diff --git a/common/action_layer.c b/common/action_layer.c
new file mode 100644
index 0000000000..3413c53e65
--- /dev/null
+++ b/common/action_layer.c
@@ -0,0 +1,135 @@
+#include <stdint.h>
+#include "keyboard.h"
+#include "action.h"
+#include "debug.h"
+#include "util.h"
+#include "action_layer.h"
+
+
+/* 
+ * Default Layer State
+ */
+uint32_t default_layer_state = 0;
+
+static void default_layer_state_set(uint32_t state)
+{
+    debug("default_layer_state: ");
+    default_layer_debug(); debug(" to ");
+    default_layer_state = state;
+    default_layer_debug(); debug("\n");
+    clear_keyboard_but_mods(); // To avoid stuck keys
+}
+
+void default_layer_debug(void)
+{
+    debug_hex32(default_layer_state);
+    debug("("); debug_dec(biton32(default_layer_state)); debug(")");
+}
+
+void default_layer_set(uint8_t layer)
+{
+    default_layer_state_set(1UL<<layer);
+}
+
+#ifndef NO_ACTION_LAYER
+void default_layer_or(uint32_t state)
+{
+    default_layer_state_set(default_layer_state | state);
+}
+void default_layer_and(uint32_t state)
+{
+    default_layer_state_set(default_layer_state & state);
+}
+void default_layer_xor(uint32_t state)
+{
+    default_layer_state_set(default_layer_state ^ state);
+}
+#endif
+
+
+#ifndef NO_ACTION_LAYER
+/* 
+ * Keymap Layer State
+ */
+uint32_t layer_state = 0;
+
+static void layer_state_set(uint32_t state)
+{
+    debug("layer_state: ");
+    layer_debug(); debug(" to ");
+    layer_state = state;
+    layer_debug(); debug("\n");
+    clear_keyboard_but_mods(); // To avoid stuck keys
+}
+
+void layer_clear(void)
+{
+    layer_state_set(0);
+}
+
+void layer_move(uint8_t layer)
+{
+    layer_state_set(1UL<<layer);
+}
+
+void layer_on(uint8_t layer)
+{
+    layer_state_set(layer_state | (1UL<<layer));
+}
+
+void layer_off(uint8_t layer)
+{
+    layer_state_set(layer_state & ~(1UL<<layer));
+}
+
+void layer_invert(uint8_t layer)
+{
+    layer_state_set(layer_state ^ (1UL<<layer));
+}
+
+void layer_or(uint32_t state)
+{
+    layer_state_set(layer_state | state);
+}
+void layer_and(uint32_t state)
+{
+    layer_state_set(layer_state & state);
+}
+void layer_xor(uint32_t state)
+{
+    layer_state_set(layer_state ^ state);
+}
+
+void layer_debug(void)
+{
+    debug_hex32(layer_state);
+    debug("("); debug_dec(biton32(layer_state)); debug(")");
+}
+#endif
+
+
+
+action_t layer_switch_get_action(key_t key)
+{
+    action_t action;
+    action.code = ACTION_TRANSPARENT;
+
+#ifndef NO_ACTION_LAYER
+    uint32_t layers = layer_state | default_layer_state;
+    /* check top layer first */
+    for (int8_t i = 31; i >= 0; i--) {
+        if (layers & (1UL<<i)) {
+            action = action_for_key(i, key);
+            if (action.code != ACTION_TRANSPARENT) {
+                return action;
+            }
+        }
+    }
+    /* fall back to layer 0 */
+    action = action_for_key(0, key);
+    return action;
+#else
+    action = action_for_key(biton32(default_layer_state), key);
+    return action;
+#endif
+}
diff --git a/common/action_layer.h b/common/action_layer.h
new file mode 100644
index 0000000000..23f8a00bb7
--- /dev/null
+++ b/common/action_layer.h
@@ -0,0 +1,77 @@
+/*
+Copyright 2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef ACTION_LAYER_H
+#define ACTION_LAYER_H
+
+#include <stdint.h>
+#include "keyboard.h"
+#include "action.h"
+
+
+/*
+ * Default Layer
+ */
+extern uint32_t default_layer_state;
+void default_layer_debug(void);
+void default_layer_set(uint8_t layer);
+
+#ifndef NO_ACTION_LAYER
+/* bitwise operation */
+void default_layer_or(uint32_t state);
+void default_layer_and(uint32_t state);
+void default_layer_xor(uint32_t state);
+#else
+#define default_layer_or(state)
+#define default_layer_and(state)
+#define default_layer_xor(state)
+#endif
+
+
+/*
+ * Keymap Layer
+ */
+#ifndef NO_ACTION_LAYER
+extern uint32_t layer_state;
+void layer_debug(void);
+void layer_clear(void);
+void layer_move(uint8_t layer);
+void layer_on(uint8_t layer);
+void layer_off(uint8_t layer);
+void layer_invert(uint8_t layer);
+/* bitwise operation */
+void layer_or(uint32_t state);
+void layer_and(uint32_t state);
+void layer_xor(uint32_t state);
+#else
+#define layer_state             0
+#define layer_clear()
+#define layer_move(layer)
+#define layer_on(layer)
+#define layer_off(layer)
+#define layer_invert(layer)
+
+#define layer_or(state)
+#define layer_and(state)
+#define layer_xor(state)
+#define layer_debug()
+#endif
+
+
+/* return action depending on current layer status */
+action_t layer_switch_get_action(key_t key);
+
+#endif
diff --git a/common/command.c b/common/command.c
index c954ff02f4..dc06c6da35 100644
--- a/common/command.c
+++ b/common/command.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "timer.h"
 #include "keyboard.h"
 #include "bootloader.h"
-#include "layer_switch.h"
+#include "action_layer.h"
 #include "eeconfig.h"
 #include "sleep_led.h"
 #include "led.h"
diff --git a/common/keymap.c b/common/keymap.c
index ace3f49b69..c98ce09b66 100644
--- a/common/keymap.c
+++ b/common/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 #include "report.h"
 #include "keycode.h"
-#include "layer_switch.h"
+#include "action_layer.h"
 #include "action.h"
 #include "action_macro.h"
 #include "debug.h"
diff --git a/common/layer_switch.c b/common/layer_switch.c
deleted file mode 100644
index 9905741f48..0000000000
--- a/common/layer_switch.c
+++ /dev/null
@@ -1,135 +0,0 @@
-#include <stdint.h>
-#include "keyboard.h"
-#include "action.h"
-#include "debug.h"
-#include "util.h"
-#include "layer_switch.h"
-
-
-/* 
- * Default Layer State
- */
-uint32_t default_layer_state = 0;
-
-static void default_layer_state_set(uint32_t state)
-{
-    debug("default_layer_state: ");
-    default_layer_debug(); debug(" to ");
-    default_layer_state = state;
-    default_layer_debug(); debug("\n");
-    clear_keyboard_but_mods(); // To avoid stuck keys
-}
-
-void default_layer_debug(void)
-{
-    debug_hex32(default_layer_state);
-    debug("("); debug_dec(biton32(default_layer_state)); debug(")");
-}
-
-void default_layer_set(uint8_t layer)
-{
-    default_layer_state_set(1UL<<layer);
-}
-
-#ifndef NO_ACTION_LAYER
-void default_layer_or(uint32_t state)
-{
-    default_layer_state_set(default_layer_state | state);
-}
-void default_layer_and(uint32_t state)
-{
-    default_layer_state_set(default_layer_state & state);
-}
-void default_layer_xor(uint32_t state)
-{
-    default_layer_state_set(default_layer_state ^ state);
-}
-#endif
-
-
-#ifndef NO_ACTION_LAYER
-/* 
- * Keymap Layer State
- */
-uint32_t layer_state = 0;
-
-static void layer_state_set(uint32_t state)
-{
-    debug("layer_state: ");
-    layer_debug(); debug(" to ");
-    layer_state = state;
-    layer_debug(); debug("\n");
-    clear_keyboard_but_mods(); // To avoid stuck keys
-}
-
-void layer_clear(void)
-{
-    layer_state_set(0);
-}
-
-void layer_move(uint8_t layer)
-{
-    layer_state_set(1UL<<layer);
-}
-
-void layer_on(uint8_t layer)
-{
-    layer_state_set(layer_state | (1UL<<layer));
-}
-
-void layer_off(uint8_t layer)
-{
-    layer_state_set(layer_state & ~(1UL<<layer));
-}
-
-void layer_invert(uint8_t layer)
-{
-    layer_state_set(layer_state ^ (1UL<<layer));
-}
-
-void layer_or(uint32_t state)
-{
-    layer_state_set(layer_state | state);
-}
-void layer_and(uint32_t state)
-{
-    layer_state_set(layer_state & state);
-}
-void layer_xor(uint32_t state)
-{
-    layer_state_set(layer_state ^ state);
-}
-
-void layer_debug(void)
-{
-    debug_hex32(layer_state);
-    debug("("); debug_dec(biton32(layer_state)); debug(")");
-}
-#endif
-
-
-
-action_t layer_switch_get_action(key_t key)
-{
-    action_t action;
-    action.code = ACTION_TRANSPARENT;
-
-#ifndef NO_ACTION_LAYER
-    uint32_t layers = layer_state | default_layer_state;
-    /* check top layer first */
-    for (int8_t i = 31; i >= 0; i--) {
-        if (layers & (1UL<<i)) {
-            action = action_for_key(i, key);
-            if (action.code != ACTION_TRANSPARENT) {
-                return action;
-            }
-        }
-    }
-    /* fall back to layer 0 */
-    action = action_for_key(0, key);
-    return action;
-#else
-    action = action_for_key(biton32(default_layer_state), key);
-    return action;
-#endif
-}
diff --git a/common/layer_switch.h b/common/layer_switch.h
deleted file mode 100644
index ed8dfb5025..0000000000
--- a/common/layer_switch.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright 2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LAYER_SWITCH_H
-#define LAYER_SWITCH_H
-
-#include <stdint.h>
-#include "keyboard.h"
-#include "action.h"
-
-
-/*
- * Default Layer
- */
-extern uint32_t default_layer_state;
-void default_layer_debug(void);
-void default_layer_set(uint8_t layer);
-
-#ifndef NO_ACTION_LAYER
-/* bitwise operation */
-void default_layer_or(uint32_t state);
-void default_layer_and(uint32_t state);
-void default_layer_xor(uint32_t state);
-#else
-#define default_layer_or(state)
-#define default_layer_and(state)
-#define default_layer_xor(state)
-#endif
-
-
-/*
- * Keymap Layer
- */
-#ifndef NO_ACTION_LAYER
-extern uint32_t layer_state;
-void layer_debug(void);
-void layer_clear(void);
-void layer_move(uint8_t layer);
-void layer_on(uint8_t layer);
-void layer_off(uint8_t layer);
-void layer_invert(uint8_t layer);
-/* bitwise operation */
-void layer_or(uint32_t state);
-void layer_and(uint32_t state);
-void layer_xor(uint32_t state);
-#else
-#define layer_state             0
-#define layer_clear()
-#define layer_move(layer)
-#define layer_on(layer)
-#define layer_off(layer)
-#define layer_invert(layer)
-
-#define layer_or(state)
-#define layer_and(state)
-#define layer_xor(state)
-#define layer_debug()
-#endif
-
-
-/* return action depending on current layer status */
-action_t layer_switch_get_action(key_t key);
-
-#endif
-- 
cgit v1.2.3