Remove keymap read code from project directories

diff --git a/converter/adb_usb/Makefile b/converter/adb_usb/Makefile
index 76e10950c0c70826c239a013cc1f791672823247..21fc26b526201e777240175ac81e62e44fc4e169 100644 (file)
--- a/converter/adb_usb/Makefile
+++ b/converter/adb_usb/Makefile
@@ -48,8 +48,7 @@ TMK_DIR = ../../tmk_core
 TARGET_DIR = .
 
 # project specific files
-SRC =  keymap_common.c \
-       matrix.c \
+SRC =  matrix.c \
        led.c \
        adb.c
 

diff --git a/converter/adb_usb/Makefile.rev1 b/converter/adb_usb/Makefile.rev1
index 1cd539b6e6d822363b20dab4051ca7fee38b5481..c986210bd8f9461b297da85c669aa777abca7046 100644 (file)
--- a/converter/adb_usb/Makefile.rev1
+++ b/converter/adb_usb/Makefile.rev1
@@ -48,8 +48,7 @@ TMK_DIR = ../../tmk_core
 TARGET_DIR = .
 
 # project specific files
-SRC =  keymap_common.c \
-       matrix.c \
+SRC =  matrix.c \
        led.c \
        adb.c
 

diff --git a/converter/adb_usb/Makefile.teensy b/converter/adb_usb/Makefile.teensy
index d97f0eb33d6f9e2c8f18d1d3fa92cc680bcbdb18..59eaad51341805e676e0c50cfdb9bf03113a4c47 100644 (file)
--- a/converter/adb_usb/Makefile.teensy
+++ b/converter/adb_usb/Makefile.teensy
@@ -48,8 +48,7 @@ TMK_DIR = ../../tmk_core
 TARGET_DIR = .
 
 # project specific files
-SRC =  keymap_common.c \
-       matrix.c \
+SRC =  matrix.c \
        led.c \
        adb.c
 

diff --git a/converter/adb_usb/config.h b/converter/adb_usb/config.h
index 5ce5c22159481f81b3b58c498d8fb8464d3d7fd0..3500188d3581990b0b4b2a3252596fa05ef5504f 100644 (file)
--- a/converter/adb_usb/config.h
+++ b/converter/adb_usb/config.h
@@ -40,10 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 
-/* legacy keymap support */
-#define USE_LEGACY_KEYMAP
-
-
 /* ADB port setting */
 #define ADB_PORT        PORTD
 #define ADB_PIN         PIND

diff --git a/converter/adb_usb/keymap_common.c b/converter/adb_usb/keymap_common.c
deleted file mode 100644 (file)
index 55a1379..0000000
--- a/converter/adb_usb/keymap_common.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2011,2012,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/>.
-*/
-#include "keymap_common.h"
-
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) };
-}

diff --git a/converter/adb_usb/keymap_common.h b/converter/adb_usb/keymap_common.h
index e9d5b6517ae0cbffa0bb0f8bd0f83a90745f6ac2..49581d790bd6fb1139c97d943c16d67ca411ac30 100644 (file)
--- a/converter/adb_usb/keymap_common.h
+++ b/converter/adb_usb/keymap_common.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "action.h"
 #include "action_macro.h"
@@ -29,10 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 
 
-extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-extern const action_t fn_actions[];
-
-
 /* Common layout: ANSI+ISO
  * ,---.   .---------------. ,---------------. ,---------------. ,-----------. ,---------------.
  * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|Pwr|

diff --git a/converter/adb_usb/keymap_plain.c b/converter/adb_usb/keymap_plain.c
index 2f11f86a25b72a248bf1942228ca76adb950c852..b7a80f5717106d1419330535f4200767e780e18b 100644 (file)
--- a/converter/adb_usb/keymap_plain.c
+++ b/converter/adb_usb/keymap_plain.c
@@ -36,7 +36,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-const uint16_t PROGMEM fn_actions[] = {
+const action_t PROGMEM fn_actions[] = {
     [0] = ACTION_LAYER_TAP_KEY(1, KC_GRV),
     [1] = ACTION_LAYER_TAP_KEY(1, KC_BSLS),
 };

diff --git a/converter/ibm4704_usb/Makefile b/converter/ibm4704_usb/Makefile
index 79f17ec0d6e8cd24c9213f133460f275410f87ab..c73bcfd50c4bab9c9ea5ba3e18088ebaa8dea54f 100644 (file)
--- a/converter/ibm4704_usb/Makefile
+++ b/converter/ibm4704_usb/Makefile
@@ -8,8 +8,7 @@ TMK_DIR = ../../tmk_core
 TARGET_DIR = .
 
 # project specific files
-SRC =  keymap_common.c \
-       matrix.c \
+SRC =  matrix.c \
        led.c \
        protocol/ibm4704.c
 

diff --git a/converter/ibm4704_usb/keymap_common.c b/converter/ibm4704_usb/keymap_common.c
deleted file mode 100644 (file)
index 55a1379..0000000
--- a/converter/ibm4704_usb/keymap_common.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2011,2012,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/>.
-*/
-#include "keymap_common.h"
-
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) };
-}

diff --git a/converter/ibm4704_usb/keymap_common.h b/converter/ibm4704_usb/keymap_common.h
index 55e26de278a31e99c9a3fb68263d697aab8121bb..ea0ec942b9a50638290efe718c9deb38f6bfdd49 100644 (file)
--- a/converter/ibm4704_usb/keymap_common.h
+++ b/converter/ibm4704_usb/keymap_common.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "action.h"
 #include "action_macro.h"
@@ -29,11 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 
 
-// 32*8(256) byte array which converts PS/2 code into USB code
-extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-extern const action_t fn_actions[];
-
-
 /* 107-key */
 #define KEYMAP( \
     K46,K64,     K00,K18,K19,K1A,K10,K11,K12,K08,K09,K0A,K0F,K1F,K0D,K0C,K0E,   K6A,K6B,K6C,    K47,K48,K49,K4A, \

diff --git a/converter/m0110_usb/Makefile b/converter/m0110_usb/Makefile
index e836456326a0b97f5fdb8f2c06c4eef12a63bba5..5007824d8467eab75c9e864fe307f98083e20568 100644 (file)
--- a/converter/m0110_usb/Makefile
+++ b/converter/m0110_usb/Makefile
@@ -10,7 +10,6 @@ TARGET_DIR = .
 # keyboard dependent files
 SRC =  matrix.c \
        led.c \
-       keymap_common.c \
        m0110.c
 
 # To use own keymap file run make like: make keymap=hasu

diff --git a/converter/m0110_usb/Makefile.teensy b/converter/m0110_usb/Makefile.teensy
index 394b66050878fff90cea1106bdc074a9c84b94f4..d08c3f44b86963c1267f0d15d0b9ce83a116da98 100644 (file)
--- a/converter/m0110_usb/Makefile.teensy
+++ b/converter/m0110_usb/Makefile.teensy
@@ -10,7 +10,6 @@ TARGET_DIR = .
 # keyboard dependent files
 SRC =  matrix.c \
        led.c \
-       keymap_common.c \
        m0110.c
 
 # To use own keymap file run make like: make keymap=hasu

diff --git a/converter/m0110_usb/Makefile.tmk_rev1 b/converter/m0110_usb/Makefile.tmk_rev1
index f36fcc4b5dee9b2d502d79ab741d4e43a164650f..cf10c788395cb400c03462c8e16c0d800e5f2ea9 100644 (file)
--- a/converter/m0110_usb/Makefile.tmk_rev1
+++ b/converter/m0110_usb/Makefile.tmk_rev1
@@ -10,7 +10,6 @@ TARGET_DIR = .
 # keyboard dependent files
 SRC =  matrix.c \
        led.c \
-       keymap_common.c \
        m0110.c
 
 # To use own keymap file run make like: make keymap=hasu

diff --git a/converter/m0110_usb/Makefile.tmk_rev2 b/converter/m0110_usb/Makefile.tmk_rev2
index e836456326a0b97f5fdb8f2c06c4eef12a63bba5..5007824d8467eab75c9e864fe307f98083e20568 100644 (file)
--- a/converter/m0110_usb/Makefile.tmk_rev2
+++ b/converter/m0110_usb/Makefile.tmk_rev2
@@ -10,7 +10,6 @@ TARGET_DIR = .
 # keyboard dependent files
 SRC =  matrix.c \
        led.c \
-       keymap_common.c \
        m0110.c
 
 # To use own keymap file run make like: make keymap=hasu

diff --git a/converter/m0110_usb/keymap_common.c b/converter/m0110_usb/keymap_common.c
deleted file mode 100644 (file)
index 4ac2d71..0000000
--- a/converter/m0110_usb/keymap_common.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2011,2012,2014 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/>.
-*/
-#include <stdint.h>
-#include <avr/pgmspace.h>
-#include "action.h"
-#include "keycode.h"
-#include "keymap.h"
-#include "keymap_common.h"
-
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-}
-
-/* translates Fn index to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    action_t action;
-    action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]);
-    return action;
-}

diff --git a/converter/m0110_usb/keymap_common.h b/converter/m0110_usb/keymap_common.h
index 42df5cce513f59ce6a6538631b53ae9754b5f2db..4f7e88fbae6ca80ec4f1f259c378e13634157d17 100644 (file)
--- a/converter/m0110_usb/keymap_common.h
+++ b/converter/m0110_usb/keymap_common.h
@@ -15,15 +15,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <stdint.h>
-#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "keymap.h"
 
 
-extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-extern const action_t fn_actions[];
-
-
 /* Common layout for M0110 and M0110A
  * This keymap works with both keyboards. As you can see, the M0110A is 
  * a superset of M0110 keyboard, only one exception is 'Enter'(34) of M0110

diff --git a/converter/news_usb/keymap.c b/converter/news_usb/keymap.c
index 058f2914bd8f6884f4f57ee72042bd25f0046f53..5e6c2b5d29de4d5e18c78617b5609edfd9728724 100644 (file)
--- a/converter/news_usb/keymap.c
+++ b/converter/news_usb/keymap.c
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "util.h"
 #include "keymap.h"
@@ -56,7 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 // Assign Fn key(0-7) to a layer to which switch with the Fn key pressed.
-static const uint8_t PROGMEM fn_layer[] = {
+const uint8_t PROGMEM fn_layer[] = {
     0,              // Fn0
     0,              // Fn1
     0,              // Fn2
@@ -69,7 +68,7 @@ static const uint8_t PROGMEM fn_layer[] = {
 
 // Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer.
 // See layer.c for details.
-static const uint8_t PROGMEM fn_keycode[] = {
+const uint8_t PROGMEM fn_keycode[] = {
     KC_NO,          // Fn0
     KC_NO,          // Fn1
     KC_NO,          // Fn2
@@ -81,7 +80,7 @@ static const uint8_t PROGMEM fn_keycode[] = {
 };
 
 
-static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 0: default
      * ,---.   ,------------------------, ,------------------------. ,---------.
      * |Pow|   | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10| | F11| F12| ,-----------.
@@ -107,19 +106,3 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LALT,CAPS,LALT,          SPC,      ERAS,                    RALT,RGUI,RCTL,   PGDN,   TAB, LEFT,DOWN,RGHT
     ),
 };
-
-
-uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
-{
-    return pgm_read_byte(&keymaps[(layer)][(row)][(col)]);
-}
-
-uint8_t keymap_fn_layer(uint8_t index)
-{
-    return pgm_read_byte(&fn_layer[index]);
-}
-
-uint8_t keymap_fn_keycode(uint8_t index)
-{
-    return pgm_read_byte(&fn_keycode[index]);
-}

diff --git a/converter/next_usb/keymap.c b/converter/next_usb/keymap.c
index 3f2131aa5e4a74ab4a44085ce8be45e21d8ab855..90700da556deccbddcccb08ebc47f80945facf24 100644 (file)
--- a/converter/next_usb/keymap.c
+++ b/converter/next_usb/keymap.c
@@ -50,7 +50,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "print.h"
 #include "debug.h"
@@ -59,7 +58,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "keycode.h"
 
 // 32*8(256) byte array which converts PS/2 code into USB code
-static const action_t PROGMEM fn_actions[] = {
+const action_t PROGMEM fn_actions[] = {
     ACTION_LAYER_MOMENTARY(1),                  // FN0 - left command key
     ACTION_LAYER_MOMENTARY(1),                  // FN1 - right command key
     ACTION_KEY(KC_BSLS),                        // FN2 - number pad slash & backslash
@@ -116,7 +115,7 @@ static const action_t PROGMEM fn_actions[] = {
 }
 
 
-static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     
     /* Layer 0: default
      * ,-----------------------------------------------------------. ,-----------. ,---------------.
@@ -163,15 +162,3 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     
     )
 };
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) };
-}

diff --git a/converter/pc98_usb/keymap.c b/converter/pc98_usb/keymap.c
index c9ea5b0b43e8cbed10a532cc30b65b78077e127e..e56a72f19ffe13260b3bcce178309cf773a66f58 100644 (file)
--- a/converter/pc98_usb/keymap.c
+++ b/converter/pc98_usb/keymap.c
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "action.h"
 #include "action_macro.h"
@@ -72,7 +71,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 
-static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /*
   ,---------------------------------------------------------------.
   | 60| 61| 62| 63| 64| 65| 66| 67| 68| 69| 6A| 6B| 36| 37| 3F| 3E|
@@ -114,7 +113,6 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
               LGUI, LALT, LCTL, LSFT,      SPC,      SPC,   RALT
     ),
 };
-static const uint8_t PROGMEM overlays[][MATRIX_ROWS][MATRIX_COLS] = {};
 
 /*
  * Macro definition
@@ -163,7 +161,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
 /*
  * Fn actions
  */
-static const action_t PROGMEM fn_actions[] = {
+const action_t PROGMEM fn_actions[] = {
     ACTION_LAYER_TAP_TOGGLE(0),                  // FN0
     ACTION_LAYER_TAP_KEY(1, KC_SLASH),           // FN1
     ACTION_LAYER_TAP_KEY(2, KC_SCLN),            // FN2
@@ -172,37 +170,3 @@ static const action_t PROGMEM fn_actions[] = {
     ACTION_MACRO(RBRACKET),                      // FN5
     ACTION_MACRO(DUMMY),                         // FN6
 };
-
-
-
-
-
-
-/*
- * No need to edit.
- */
-#define KEYMAPS_SIZE    (sizeof(keymaps) / sizeof(keymaps[0]))
-#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    if (layer < KEYMAPS_SIZE) {
-        return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-    } else {
-        // fall back to layer 0
-        return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]);
-    }
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    action_t action;
-    if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) {
-        action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]);
-    } else {
-        action.code = ACTION_NO;
-    }
-    return action;
-}

diff --git a/converter/ps2_usb/Makefile b/converter/ps2_usb/Makefile
index 51b22256610aa238c9b89872d7cb83150c43862e..dd03426485d7e6a52260dddffaad6777dbdafb92 100644 (file)
--- a/converter/ps2_usb/Makefile
+++ b/converter/ps2_usb/Makefile
@@ -11,8 +11,7 @@ TMK_DIR = ../../tmk_core
 TARGET_DIR = .
 
 # project specific files
-SRC =  keymap_common.c \
-       matrix.c \
+SRC =  matrix.c \
        led.c
 
 ifdef KEYMAP

diff --git a/converter/ps2_usb/Makefile.mbed b/converter/ps2_usb/Makefile.mbed
index bbd9bd45b56d3163120bc6f520fef32bd5b9a2c9..9ca9f5fa946979f889b95b9d35d536b12a0c1438 100644 (file)
--- a/converter/ps2_usb/Makefile.mbed
+++ b/converter/ps2_usb/Makefile.mbed
@@ -10,7 +10,6 @@ OBJDIR = ./build
 OBJECTS = \
        $(OBJDIR)/protocol/ps2_busywait.o \
        $(OBJDIR)/protocol/ps2_io_mbed.o \
-       $(OBJDIR)/./keymap_common.o \
        $(OBJDIR)/./matrix.o \
        $(OBJDIR)/./led.o \
        $(OBJDIR)/./main.o

diff --git a/converter/ps2_usb/Makefile.pjrc b/converter/ps2_usb/Makefile.pjrc
index 64319aca887f2538d111ad92f8b4ac717d2534c8..88ee387db5a7847a789cc9b74e100bdd4c3c8f6d 100644 (file)
--- a/converter/ps2_usb/Makefile.pjrc
+++ b/converter/ps2_usb/Makefile.pjrc
@@ -8,8 +8,7 @@ TMK_DIR = ../../tmk_core
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =   keymap_common.c \
-       matrix.c \
+SRC =   matrix.c \
        led.c
 
 ifdef KEYMAP

diff --git a/converter/ps2_usb/Makefile.tmk_rev1 b/converter/ps2_usb/Makefile.tmk_rev1
index 6aaef499692192a1ab44b614df6504331f3e8db3..644845f91c533a72a9e873146186a0dd74a2fe05 100644 (file)
--- a/converter/ps2_usb/Makefile.tmk_rev1
+++ b/converter/ps2_usb/Makefile.tmk_rev1
@@ -12,8 +12,7 @@ TMK_DIR = ../../tmk_core
 TARGET_DIR = .
 
 # project specific files
-SRC =  keymap_common.c \
-       matrix.c \
+SRC =  matrix.c \
        led.c
 
 ifdef KEYMAP

diff --git a/converter/ps2_usb/Makefile.tmk_rev2 b/converter/ps2_usb/Makefile.tmk_rev2
index 5049a22703ca8bebe95a88b2c438774571945cba..8324328022b3a29804f1ff8d55bd5351738b2cdd 100644 (file)
--- a/converter/ps2_usb/Makefile.tmk_rev2
+++ b/converter/ps2_usb/Makefile.tmk_rev2
@@ -12,8 +12,7 @@ TMK_DIR = ../../tmk_core
 TARGET_DIR = .
 
 # project specific files
-SRC =  keymap_common.c \
-       matrix.c \
+SRC =  matrix.c \
        led.c
 
 ifdef KEYMAP

diff --git a/converter/ps2_usb/Makefile.vusb b/converter/ps2_usb/Makefile.vusb
index 1f2c209a6c1b982e54e39f7b132723fa1a56627f..79c11639ea1a74e3a7bd115d409d51900b6710b5 100644 (file)
--- a/converter/ps2_usb/Makefile.vusb
+++ b/converter/ps2_usb/Makefile.vusb
@@ -8,8 +8,7 @@ TMK_DIR = ../../tmk_core
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC = keymap_common.c \
-       matrix.c \
+SRC =  matrix.c \
        led.c
 
 ifdef KEYMAP

diff --git a/converter/ps2_usb/keymap_common.c b/converter/ps2_usb/keymap_common.c
deleted file mode 100644 (file)
index e344fb4..0000000
--- a/converter/ps2_usb/keymap_common.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2011,2012,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/>.
-*/
-#include "keymap_common.h"
-#include "progmem.h"
-
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) };
-}

diff --git a/converter/ps2_usb/keymap_common.h b/converter/ps2_usb/keymap_common.h
index a24fa75629bec5b01dfd143c36f4e2623ab8d9b4..6e612e6034661e4b29477f66a86d18566734117c 100644 (file)
--- a/converter/ps2_usb/keymap_common.h
+++ b/converter/ps2_usb/keymap_common.h
@@ -28,11 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 
 
-// 32*8(256) byte array which converts PS/2 code into USB code
-extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-extern const action_t fn_actions[];
-
-
 /* All keys */
 #define KEYMAP_ALL( \
     K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07,     KFC,K7E,KFE,                   \

diff --git a/converter/sun_usb/keymap.c b/converter/sun_usb/keymap.c
index 3d724a52013aef6f0b6bb72604e719957544a67d..f94fe5c722205e3cb4c68035eef2dfc56c7136bd 100644 (file)
--- a/converter/sun_usb/keymap.c
+++ b/converter/sun_usb/keymap.c
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "util.h"
 #include "keymap.h"
@@ -87,7 +86,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 // Assign Fn key(0-7) to a layer to which switch with the Fn key pressed.
-static const uint8_t PROGMEM fn_layer[] = {
+const uint8_t PROGMEM fn_layer[] = {
     2,              // Fn0
     3,              // Fn1
     4,              // Fn2
@@ -100,7 +99,7 @@ static const uint8_t PROGMEM fn_layer[] = {
 
 // Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer.
 // See layer.c for details.
-static const uint8_t PROGMEM fn_keycode[] = {
+const uint8_t PROGMEM fn_keycode[] = {
     KC_NO,          // Fn0
     KC_SCLN,        // Fn1
     KC_SLSH,        // Fn2
@@ -112,7 +111,7 @@ static const uint8_t PROGMEM fn_keycode[] = {
 };
 
 
-static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /*
     KEYMAP(
          HELP,       F1, F2, F3, F4,         F5, F6, F7, F8,         F9, F10,F11,F12,   PSCR,SLCK,PAUS,  MUTE,VOLD,VOLU,PWR,
@@ -174,19 +173,3 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         CAPS,LALT,LGUI,            BTN1,             RGUI,RALT,NO,  LEFT,DOWN,RGHT
     ),
 };
-
-
-uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
-{
-    return pgm_read_byte(&keymaps[(layer)][(row)][(col)]);
-}
-
-uint8_t keymap_fn_layer(uint8_t index)
-{
-    return pgm_read_byte(&fn_layer[index]);
-}
-
-uint8_t keymap_fn_keycode(uint8_t index)
-{
-    return pgm_read_byte(&fn_keycode[index]);
-}

diff --git a/converter/sun_usb/keymap_sun3.c b/converter/sun_usb/keymap_sun3.c
index 273cd9442f2f70fa0d1d9fd56a851bf0e88042ba..217aa79ae78454275693afa759c3085a55d3acc6 100644 (file)
--- a/converter/sun_usb/keymap_sun3.c
+++ b/converter/sun_usb/keymap_sun3.c
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "util.h"
 #include "keymap.h"
@@ -155,19 +154,3 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     */
 };
-
-
-uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
-{
-    return pgm_read_byte(&keymaps[(layer)][(row)][(col)]);
-}
-
-uint8_t keymap_fn_layer(uint8_t index)
-{
-    return pgm_read_byte(&fn_layer[index]);
-}
-
-uint8_t keymap_fn_keycode(uint8_t index)
-{
-    return pgm_read_byte(&fn_keycode[index]);
-}

diff --git a/converter/terminal_usb/keymap.c b/converter/terminal_usb/keymap.c
index 8ca66b5e6a103eeb65137e6886d298c56132ffc0..5a3ee6ff6826f1270fc8ce7c27daea067f5129c7 100644 (file)
--- a/converter/terminal_usb/keymap.c
+++ b/converter/terminal_usb/keymap.c
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "print.h"
 #include "debug.h"
@@ -102,7 +101,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 }
 
 // Assign Fn key(0-7) to a layer to which switch with the Fn key pressed.
-static const uint8_t PROGMEM fn_layer[] = {
+const uint8_t PROGMEM fn_layer[] = {
     0,              // Fn0
     0,              // Fn1
     0,              // Fn2
@@ -115,7 +114,7 @@ static const uint8_t PROGMEM fn_layer[] = {
 
 // Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer.
 // See layer.c for details.
-static const uint8_t PROGMEM fn_keycode[] = {
+const uint8_t PROGMEM fn_keycode[] = {
     KC_NO,          // Fn0
     KC_NO,          // Fn1
     KC_NO,          // Fn2
@@ -127,7 +126,7 @@ static const uint8_t PROGMEM fn_keycode[] = {
 };
 
 
-static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 0: default
      * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
      * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
@@ -198,19 +197,3 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 */
 };
-
-
-uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
-{
-    return pgm_read_byte(&keymaps[(layer)][(row)][(col)]);
-}
-
-uint8_t keymap_fn_layer(uint8_t index)
-{
-    return pgm_read_byte(&fn_layer[index]);
-}
-
-uint8_t keymap_fn_keycode(uint8_t index)
-{
-    return pgm_read_byte(&fn_keycode[index]);
-}

diff --git a/converter/usb_usb/Makefile b/converter/usb_usb/Makefile
index 5abb49d79fc7fc8c9383b77073c17b34093e08ea..a4ac27b28a47ce615d97a2e73c1be64f93be448e 100644 (file)
--- a/converter/usb_usb/Makefile
+++ b/converter/usb_usb/Makefile
@@ -108,9 +108,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 #OPT_DEFS += -DNO_ACTION_LAYER
 #OPT_DEFS += -DNO_ACTION_MACRO
 
-SRC =  \
-       keymap_common.c \
-       usb_usb.cpp \
+SRC =  usb_usb.cpp \
        main.cpp
 
 ifdef KEYMAP

diff --git a/converter/usb_usb/keymap_common.c b/converter/usb_usb/keymap_common.c
deleted file mode 100644 (file)
index 8ab5ba9..0000000
--- a/converter/usb_usb/keymap_common.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2014 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/>.
-*/
-#include "keymap_common.h"
-#include "progmem.h"
-
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) };
-}

diff --git a/converter/usb_usb/keymap_common.h b/converter/usb_usb/keymap_common.h
index a3234f5b36722cd1d4fd06426f7075f01af06d99..3284264f63e936e27a9f15dbf4cb14faf58e3ac3 100644 (file)
--- a/converter/usb_usb/keymap_common.h
+++ b/converter/usb_usb/keymap_common.h
@@ -28,10 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 
 
-extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-extern const action_t fn_actions[];
-
-
 /*         ,---------------. ,---------------. ,---------------.
  *         |F13|F14|F15|F16| |F17|F18|F19|F20| |F21|F22|F23|F24|
  * ,---.   |---------------| |---------------| |---------------| ,-----------. ,---------------. ,-------.

diff --git a/converter/x68k_usb/keymap.c b/converter/x68k_usb/keymap.c
index 836752bf6dcaa0b18e2a05657cee359e1157210a..4d6a1261070544e3059eb8b56720a89fae9e9708 100644 (file)
--- a/converter/x68k_usb/keymap.c
+++ b/converter/x68k_usb/keymap.c
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "action.h"
 #include "util.h"
@@ -72,7 +71,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 }
 
 
-static const uint16_t fn_actions[] PROGMEM = {
+const action_t fn_actions[] PROGMEM = {
     [0] = ACTION_FUNCTION(0),   // toggle all LEDs
 };
 
@@ -92,7 +91,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
 }
 
 
-static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* X68000 Keyboard Scan codes
     ,---. ,---.    ,-------------------,    ,-------------------.  ,-----------. ,---------------.
     | 61| | 62|    | 63| 64| 65| 66| 67|    | 68| 69| 6A| 6B| 6C|  | 5A| 5B| 5C| | 5D| 52| 53| 54|
@@ -128,16 +127,3 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          LGUI,LALT,MHEN,     SPC,      HENK,KANA,APP, ZKHK,                       F14,      F15,      P0,  PCMM,PDOT
     ),
 };
-
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) };
-}

diff --git a/converter/xt_usb/Makefile b/converter/xt_usb/Makefile
index cd8230cb2b38ed2c5db69f8d09d0a368a4e29ef5..6fc29cbf065c0743c4ef0ca5492fde909c572056 100644 (file)
--- a/converter/xt_usb/Makefile
+++ b/converter/xt_usb/Makefile
@@ -11,8 +11,7 @@ TMK_DIR = ../../tmk_core
 TARGET_DIR = .
 
 # project specific files
-SRC =  keymap_common.c \
-       matrix.c \
+SRC =  matrix.c \
        led.c
 
 ifdef KEYMAP

diff --git a/converter/xt_usb/keymap_common.c b/converter/xt_usb/keymap_common.c
deleted file mode 100644 (file)
index e344fb4..0000000
--- a/converter/xt_usb/keymap_common.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2011,2012,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/>.
-*/
-#include "keymap_common.h"
-#include "progmem.h"
-
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) };
-}

diff --git a/converter/xt_usb/keymap_common.h b/converter/xt_usb/keymap_common.h
index b9de6a868a26c66df73bd5bed1b3bc3b375a6ac9..9953c93825bab7c380baf719f8ed768e46457324 100644 (file)
--- a/converter/xt_usb/keymap_common.h
+++ b/converter/xt_usb/keymap_common.h
@@ -28,10 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 
 
-// 32*8(256) byte array which converts PS/2 code into USB code
-extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-extern const uint16_t fn_actions[];
-
 /* All keys */
 #define KEYMAP_ALL( \
     K00,    K02,K03,K04,K05,K06,K07,K08,K09,K0A,K0B,K0C,K0D, K0E,K0F,K0G,                   \

diff --git a/converter/xt_usb/keymap_jis.c b/converter/xt_usb/keymap_jis.c
index 02585150fbc9adde63c7c03d316bb95b669f8e39..b430b907cb3f4612362450f631ec0b4ce16114f9 100644 (file)
--- a/converter/xt_usb/keymap_jis.c
+++ b/converter/xt_usb/keymap_jis.c
@@ -30,5 +30,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-const uint16_t PROGMEM fn_actions[] = {
+const action_t PROGMEM fn_actions[] = {
 };

diff --git a/converter/xt_usb/keymap_plain.c b/converter/xt_usb/keymap_plain.c
index 51b2fddb5b2e98e8b0fdf289589a47db07cdf87b..ecb13d7d9e426624e54a1380b9e7639e24009adb 100644 (file)
--- a/converter/xt_usb/keymap_plain.c
+++ b/converter/xt_usb/keymap_plain.c
@@ -28,5 +28,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-const uint16_t PROGMEM fn_actions[] = {
+const action_t PROGMEM fn_actions[] = {
 };

diff --git a/converter/xt_usb/keymap_spacefn.c b/converter/xt_usb/keymap_spacefn.c
index bffd2bc606f0403b56968400bdeda21ff1eaaab1..8f087a8591bf42d4a409ec33edad1222d9017010 100644 (file)
--- a/converter/xt_usb/keymap_spacefn.c
+++ b/converter/xt_usb/keymap_spacefn.c
@@ -54,7 +54,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-const uint16_t PROGMEM fn_actions[] = {
+const action_t PROGMEM fn_actions[] = {
     [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE),
     [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV),    // tilde
 };

diff --git a/keyboard/alps64/Makefile b/keyboard/alps64/Makefile
index c82c126be097fb5765808c5ac4c9a08c59f8e0ec..97d23ae067d6799853d460ea2b537a6d42913ccb 100644 (file)
--- a/keyboard/alps64/Makefile
+++ b/keyboard/alps64/Makefile
@@ -120,7 +120,6 @@ ifdef ACTIONMAP_ENABLE
     KEYMAP_FILE = actionmap
 else
     KEYMAP_FILE = keymap
-    SRC := keymap_common.c $(SRC)
 endif
 ifdef KEYMAP
     SRC := $(KEYMAP_FILE)_$(KEYMAP).c $(SRC)

diff --git a/keyboard/alps64/actionmap_hasu.c b/keyboard/alps64/actionmap_hasu.c
index 4259720df8a714e4c320fc8c4524592124e82460..5eb434219145279e0ce41e7ae77ad7f70326ac62 100644 (file)
--- a/keyboard/alps64/actionmap_hasu.c
+++ b/keyboard/alps64/actionmap_hasu.c
@@ -1,4 +1,3 @@
-#include <avr/pgmspace.h>
 #include "actionmap.h"
 #include "action_code.h"
 #include "actionmap_common.h"

diff --git a/keyboard/alps64/actionmap_plain.c b/keyboard/alps64/actionmap_plain.c
index de8fa99275967b188332ecd922bf3334cab02216..58ffbaaae5d6fdd4ec762311944edea40ffe94aa 100644 (file)
--- a/keyboard/alps64/actionmap_plain.c
+++ b/keyboard/alps64/actionmap_plain.c
@@ -1,4 +1,3 @@
-#include <avr/pgmspace.h>
 #include "actionmap.h"
 #include "action_code.h"
 #include "actionmap_common.h"

diff --git a/keyboard/alps64/keymap_common.c b/keyboard/alps64/keymap_common.c
deleted file mode 100644 (file)
index fdb1769..0000000
--- a/keyboard/alps64/keymap_common.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2012,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/>.
-*/
-#include "keymap_common.h"
-
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) };
-}

diff --git a/keyboard/alps64/keymap_common.h b/keyboard/alps64/keymap_common.h
index bfd6ccbd76d57c9a7aa41fa043ae031073d6c651..17418783f681700bbe11d427521845de84d4de4b 100644 (file)
--- a/keyboard/alps64/keymap_common.h
+++ b/keyboard/alps64/keymap_common.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "action.h"
 #include "action_macro.h"
@@ -30,10 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 
 
-extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-extern const action_t fn_actions[];
-
-
 /* Alps64 keymap definition macro */
 #define KEYMAP( \
     K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \

diff --git a/keyboard/gh60/Makefile b/keyboard/gh60/Makefile
index 083b87c30aff129bc315ad5a30fcbf90639acb9e..b72019b1832d559274b8a8279e576f4922f86376 100644 (file)
--- a/keyboard/gh60/Makefile
+++ b/keyboard/gh60/Makefile
@@ -48,8 +48,7 @@ TMK_DIR = ../../tmk_core
 TARGET_DIR = .
 
 # project specific files
-SRC =  keymap_common.c \
-       matrix.c \
+SRC =  matrix.c \
        led.c
 
 ifdef KEYMAP

diff --git a/keyboard/gh60/keymap_common.c b/keyboard/gh60/keymap_common.c
deleted file mode 100644 (file)
index fdb1769..0000000
--- a/keyboard/gh60/keymap_common.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2012,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/>.
-*/
-#include "keymap_common.h"
-
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) };
-}

diff --git a/keyboard/gh60/keymap_common.h b/keyboard/gh60/keymap_common.h
index 471905e7ba3edf6e8f5e3627730e1b74dbbc31f6..7dbdf4b9c34387840d272cceed6c0f4eb4a0ea1a 100644 (file)
--- a/keyboard/gh60/keymap_common.h
+++ b/keyboard/gh60/keymap_common.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "action.h"
 #include "action_macro.h"
@@ -30,10 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 
 
-extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-extern const action_t fn_actions[];
-
-
 /* GH60 keymap definition macro
  * K2C, K31 and  K3C are extra keys for ISO
  */

diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile
index 5a179bd24da994f5a75eb6c543255ce5d7605ab9..8e15df1992128287c5e79b8e4ce8cb2d19ab3ead 100644 (file)
--- a/keyboard/hhkb/Makefile
+++ b/keyboard/hhkb/Makefile
@@ -49,8 +49,7 @@ TARGET_DIR = .
 
 
 # List C source files here. (C dependencies are automatically generated.)
-SRC += keymap_common.c \
-       matrix.c \
+SRC += matrix.c \
        led.c
 
 CONFIG_H = config.h

diff --git a/keyboard/hhkb/Makefile.pjrc b/keyboard/hhkb/Makefile.pjrc
index 7d0f8c3a9c097c2e6abd2e1c95efe5710921b341..e2d3a57090d21b69d7c1f00754facbb4ff669125 100644 (file)
--- a/keyboard/hhkb/Makefile.pjrc
+++ b/keyboard/hhkb/Makefile.pjrc
@@ -13,8 +13,7 @@ TMK_DIR = ../../tmk_core
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =   keymap_common.c \
-       matrix.c \
+SRC =   matrix.c \
        led.c
 
 ifdef KEYMAP

diff --git a/keyboard/hhkb/Makefile.rn42 b/keyboard/hhkb/Makefile.rn42
index 8cb44352619ce26a7839483b19c964782ae785ee..aae99ee9a426323ab5485525fdc6b41c8193a70d 100644 (file)
--- a/keyboard/hhkb/Makefile.rn42
+++ b/keyboard/hhkb/Makefile.rn42
@@ -49,8 +49,7 @@ TARGET_DIR = .
 
 
 # List C source files here. (C dependencies are automatically generated.)
-SRC += keymap_common.c \
-       matrix.c \
+SRC += matrix.c \
        led.c
 
 CONFIG_H = config_rn42.h

diff --git a/keyboard/hhkb/keymap_common.c b/keyboard/hhkb/keymap_common.c
deleted file mode 100644 (file)
index e938fb6..0000000
--- a/keyboard/hhkb/keymap_common.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2012,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/>.
-*/
-#include <stdint.h>
-#include "action.h"
-#include <avr/pgmspace.h>
-#include "keymap_common.h"
-
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) };
-}

diff --git a/keyboard/hhkb/keymap_common.h b/keyboard/hhkb/keymap_common.h
index 741ab21e139bb57533424c65b2625ccb56a5be13..97e2e098644f109351ef1ca5a11abc687fa7b5df 100644 (file)
--- a/keyboard/hhkb/keymap_common.h
+++ b/keyboard/hhkb/keymap_common.h
@@ -32,10 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 
 
-extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-extern const action_t fn_actions[];
-
-
 #define KEYMAP( \
     K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \
     K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52, \

diff --git a/keyboard/infinity/Makefile b/keyboard/infinity/Makefile
index 052134c3ceafb5dd1baa53e99c9979f7202af9d3..5b3c1fe6f62ccf5440312450e4e77addcb6a747e 100644 (file)
--- a/keyboard/infinity/Makefile
+++ b/keyboard/infinity/Makefile
@@ -9,7 +9,6 @@ OBJDIR = ./build
 
 OBJECTS = \
        $(OBJDIR)/matrix.o \
-       $(OBJDIR)/keymap_common.o \
        $(OBJDIR)/led.o \
        $(OBJDIR)/main.o
 

diff --git a/keyboard/infinity/keymap_common.c b/keyboard/infinity/keymap_common.c
deleted file mode 100644 (file)
index fdb1769..0000000
--- a/keyboard/infinity/keymap_common.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2012,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/>.
-*/
-#include "keymap_common.h"
-
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) };
-}

diff --git a/keyboard/infinity/keymap_common.h b/keyboard/infinity/keymap_common.h
index 77f4fed2f04dbb9248b1c05dcc87109b3f0d35e6..412417a2681e4b6de9866bbcef425c160cf52d8f 100644 (file)
--- a/keyboard/infinity/keymap_common.h
+++ b/keyboard/infinity/keymap_common.h
@@ -29,10 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 
 
-extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-extern const action_t fn_actions[];
-
-
 #ifdef INFINITY_PROTOTYPE
 
 /* Infinity prototype */

diff --git a/keyboard/infinity_chibios/Makefile b/keyboard/infinity_chibios/Makefile
index 9999451c329f62907eef601aca8080197d1e1686..3873239ae7585501c794daeaee57e9058954dd99 100644 (file)
--- a/keyboard/infinity_chibios/Makefile
+++ b/keyboard/infinity_chibios/Makefile
@@ -9,7 +9,6 @@ TARGET_DIR = .
 
 # project specific files
 SRC =  matrix.c \
-       keymap_common.c \
        led.c
 
 ifdef KEYMAP

diff --git a/keyboard/infinity_chibios/keymap_common.c b/keyboard/infinity_chibios/keymap_common.c
deleted file mode 100644 (file)
index 69b170c..0000000
--- a/keyboard/infinity_chibios/keymap_common.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2012,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/>.
-*/
-#include "keymap_common.h"
-
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return keymaps[(layer)][(key.row)][(key.col)];
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    return (action_t){ .code = fn_actions[FN_INDEX(keycode)] };
-}

diff --git a/keyboard/infinity_chibios/keymap_common.h b/keyboard/infinity_chibios/keymap_common.h
index 7d0532778d0ff99b073972bf07f7d76c8c7c9ce8..d958f30f14b6b06c9196d1a0ee5852c6b084c3b7 100644 (file)
--- a/keyboard/infinity_chibios/keymap_common.h
+++ b/keyboard/infinity_chibios/keymap_common.h
@@ -30,10 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 
 
-extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-extern const action_t fn_actions[];
-
-
 #ifdef INFINITY_PROTOTYPE
 
 /* Infinity prototype */

diff --git a/keyboard/onekey/keymap.c b/keyboard/onekey/keymap.c
index 11804bf34cd8d7c2d4942de79ebc67ff8b7a046e..2a43563471802e2145a28d7782cc361abef64724 100644 (file)
--- a/keyboard/onekey/keymap.c
+++ b/keyboard/onekey/keymap.c
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <stdint.h>
 #include <stdbool.h>
-#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "action.h"
 #include "action_macro.h"
@@ -36,31 +35,3 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 static const action_t PROGMEM fn_actions[] = {
 };
-
-
-
-#define KEYMAPS_SIZE    (sizeof(keymaps) / sizeof(keymaps[0]))
-#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    if (layer < KEYMAPS_SIZE) {
-        return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-    } else {
-        // fall back to layer 0
-        return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]);
-    }
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    action_t action;
-    if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) {
-        action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]);
-    } else {
-        action = (action_t)ACTION_NO;
-    }
-    return action;
-}

diff --git a/keyboard/stm32_f103_onekey/keymap_plain.c b/keyboard/stm32_f103_onekey/keymap_plain.c
index 04011a295bb12c4c12a8b07752fb23dc3a781653..5aee2b7fc093319469a6f0d865b6d842985a394e 100644 (file)
--- a/keyboard/stm32_f103_onekey/keymap_plain.c
+++ b/keyboard/stm32_f103_onekey/keymap_plain.c
@@ -40,5 +40,5 @@ uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 /* translates Fn keycode to action */
 action_t keymap_fn_to_action(uint8_t keycode)
 {
-    return (action_t){ .code = fn_actions[FN_INDEX(keycode)] };
+    return fn_actions[FN_INDEX(keycode)];
 }

diff --git a/keyboard/teensy_lc_onekey/keymap_plain.c b/keyboard/teensy_lc_onekey/keymap_plain.c
index 250c6632f2167b733de5f7fa4997312675bed77f..16b05a75eed247de222c78224d123ffa01aedcc5 100644 (file)
--- a/keyboard/teensy_lc_onekey/keymap_plain.c
+++ b/keyboard/teensy_lc_onekey/keymap_plain.c
@@ -40,5 +40,5 @@ uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 /* translates Fn keycode to action */
 action_t keymap_fn_to_action(uint8_t keycode)
 {
-    return (action_t){ .code = fn_actions[FN_INDEX(keycode)] };
+    return fn_actions[FN_INDEX(keycode)];
 }