diff options
| author | tmk <nobody@nowhere> | 2014-11-24 15:14:52 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-11-24 15:14:52 +0900 |
| commit | e2077cad45f1736e878e317c43bd94117c61b5e0 (patch) | |
| tree | cddad806a3408e05bc29310254c564ee94e3e710 | |
| parent | a9963960459662c0775d8d2f1f5bbc738b7f4ddd (diff) | |
| download | qmk_firmware-e2077cad45f1736e878e317c43bd94117c61b5e0.tar.gz qmk_firmware-e2077cad45f1736e878e317c43bd94117c61b5e0.zip | |
Change key_t to keypos_t
| -rw-r--r-- | converter/adb_usb/keymap_common.c | 2 | ||||
| -rw-r--r-- | converter/ascii_usb/keymap.c | 2 | ||||
| -rw-r--r-- | converter/ibm4704_usb/keymap_common.c | 2 | ||||
| -rw-r--r-- | converter/m0110_usb/keymap.c | 2 | ||||
| -rw-r--r-- | converter/m0110_usb/keymap_common.c | 2 | ||||
| -rw-r--r-- | converter/next_usb/keymap.c | 2 | ||||
| -rw-r--r-- | converter/pc98_usb/keymap.c | 2 | ||||
| -rw-r--r-- | converter/serialmouse_usb/keymap.c | 2 | ||||
| -rw-r--r-- | converter/serialmouse_usb/keymap_common.c | 2 | ||||
| -rw-r--r-- | converter/terminal_bluefruit/keymap.c | 2 | ||||
| -rw-r--r-- | keyboard/gh60/keymap_common.c | 2 | ||||
| -rw-r--r-- | keyboard/hid_liber/keymap.c | 2 | ||||
| -rw-r--r-- | keyboard/kitten_paw/keymap.c | 2 | ||||
| -rw-r--r-- | keyboard/kmac/keymap.c | 2 | ||||
| -rw-r--r-- | keyboard/lightpad/keymap.c | 2 | ||||
| -rw-r--r-- | keyboard/lightsaber/keymap.c | 2 | ||||
| -rw-r--r-- | keyboard/onekey/keymap.c | 2 | ||||
| -rw-r--r-- | keyboard/phantom/keymap.c | 2 |
18 files changed, 18 insertions, 18 deletions
diff --git a/converter/adb_usb/keymap_common.c b/converter/adb_usb/keymap_common.c index 241d2e33b..55a13793c 100644 --- a/converter/adb_usb/keymap_common.c +++ b/converter/adb_usb/keymap_common.c | |||
| @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | /* translates key to keycode */ | 20 | /* translates key to keycode */ |
| 21 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 21 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 22 | { | 22 | { |
| 23 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 23 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
| 24 | } | 24 | } |
diff --git a/converter/ascii_usb/keymap.c b/converter/ascii_usb/keymap.c index 5c13beaff..a0c61ce8d 100644 --- a/converter/ascii_usb/keymap.c +++ b/converter/ascii_usb/keymap.c | |||
| @@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 30 | // Keymap is not used. See matrix.c. | 30 | // Keymap is not used. See matrix.c. |
| 31 | 31 | ||
| 32 | /* translates key to keycode */ | 32 | /* translates key to keycode */ |
| 33 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 33 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 34 | { | 34 | { |
| 35 | return KC_NO; | 35 | return KC_NO; |
| 36 | } | 36 | } |
diff --git a/converter/ibm4704_usb/keymap_common.c b/converter/ibm4704_usb/keymap_common.c index 241d2e33b..55a13793c 100644 --- a/converter/ibm4704_usb/keymap_common.c +++ b/converter/ibm4704_usb/keymap_common.c | |||
| @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | /* translates key to keycode */ | 20 | /* translates key to keycode */ |
| 21 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 21 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 22 | { | 22 | { |
| 23 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 23 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
| 24 | } | 24 | } |
diff --git a/converter/m0110_usb/keymap.c b/converter/m0110_usb/keymap.c index 031c881b7..4570dd283 100644 --- a/converter/m0110_usb/keymap.c +++ b/converter/m0110_usb/keymap.c | |||
| @@ -209,7 +209,7 @@ static const uint16_t fn_actions[] PROGMEM = { | |||
| 209 | 209 | ||
| 210 | 210 | ||
| 211 | /* translates key to keycode */ | 211 | /* translates key to keycode */ |
| 212 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 212 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 213 | { | 213 | { |
| 214 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 214 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
| 215 | } | 215 | } |
diff --git a/converter/m0110_usb/keymap_common.c b/converter/m0110_usb/keymap_common.c index bad18c91a..4ac2d7178 100644 --- a/converter/m0110_usb/keymap_common.c +++ b/converter/m0110_usb/keymap_common.c | |||
| @@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | /* translates key to keycode */ | 25 | /* translates key to keycode */ |
| 26 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 26 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 27 | { | 27 | { |
| 28 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 28 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
| 29 | } | 29 | } |
diff --git a/converter/next_usb/keymap.c b/converter/next_usb/keymap.c index d844f8a4e..3a5107548 100644 --- a/converter/next_usb/keymap.c +++ b/converter/next_usb/keymap.c | |||
| @@ -165,7 +165,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 165 | }; | 165 | }; |
| 166 | 166 | ||
| 167 | /* translates key to keycode */ | 167 | /* translates key to keycode */ |
| 168 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 168 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 169 | { | 169 | { |
| 170 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 170 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
| 171 | } | 171 | } |
diff --git a/converter/pc98_usb/keymap.c b/converter/pc98_usb/keymap.c index 7420e24ac..8922ea7ba 100644 --- a/converter/pc98_usb/keymap.c +++ b/converter/pc98_usb/keymap.c | |||
| @@ -185,7 +185,7 @@ static const uint16_t PROGMEM fn_actions[] = { | |||
| 185 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) | 185 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) |
| 186 | 186 | ||
| 187 | /* translates key to keycode */ | 187 | /* translates key to keycode */ |
| 188 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 188 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 189 | { | 189 | { |
| 190 | if (layer < KEYMAPS_SIZE) { | 190 | if (layer < KEYMAPS_SIZE) { |
| 191 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 191 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
diff --git a/converter/serialmouse_usb/keymap.c b/converter/serialmouse_usb/keymap.c index de8f75c2a..cb78b4d19 100644 --- a/converter/serialmouse_usb/keymap.c +++ b/converter/serialmouse_usb/keymap.c | |||
| @@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | /* translates key to keycode */ | 22 | /* translates key to keycode */ |
| 23 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 23 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 24 | { | 24 | { |
| 25 | return KC_NO; | 25 | return KC_NO; |
| 26 | } | 26 | } |
diff --git a/converter/serialmouse_usb/keymap_common.c b/converter/serialmouse_usb/keymap_common.c index 241d2e33b..55a13793c 100644 --- a/converter/serialmouse_usb/keymap_common.c +++ b/converter/serialmouse_usb/keymap_common.c | |||
| @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | /* translates key to keycode */ | 20 | /* translates key to keycode */ |
| 21 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 21 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 22 | { | 22 | { |
| 23 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 23 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
| 24 | } | 24 | } |
diff --git a/converter/terminal_bluefruit/keymap.c b/converter/terminal_bluefruit/keymap.c index 716590a45..8acd8cfb3 100644 --- a/converter/terminal_bluefruit/keymap.c +++ b/converter/terminal_bluefruit/keymap.c | |||
| @@ -214,7 +214,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 214 | } | 214 | } |
| 215 | */ | 215 | */ |
| 216 | 216 | ||
| 217 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 217 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 218 | { | 218 | { |
| 219 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 219 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
| 220 | } | 220 | } |
diff --git a/keyboard/gh60/keymap_common.c b/keyboard/gh60/keymap_common.c index 7b6379f6b..fdb1769e1 100644 --- a/keyboard/gh60/keymap_common.c +++ b/keyboard/gh60/keymap_common.c | |||
| @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | /* translates key to keycode */ | 20 | /* translates key to keycode */ |
| 21 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 21 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 22 | { | 22 | { |
| 23 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 23 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
| 24 | } | 24 | } |
diff --git a/keyboard/hid_liber/keymap.c b/keyboard/hid_liber/keymap.c index f17d3762b..433a62097 100644 --- a/keyboard/hid_liber/keymap.c +++ b/keyboard/hid_liber/keymap.c | |||
| @@ -103,7 +103,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 103 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) | 103 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) |
| 104 | 104 | ||
| 105 | /* translates key to keycode */ | 105 | /* translates key to keycode */ |
| 106 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 106 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 107 | { | 107 | { |
| 108 | if (layer < KEYMAPS_SIZE) { | 108 | if (layer < KEYMAPS_SIZE) { |
| 109 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 109 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
diff --git a/keyboard/kitten_paw/keymap.c b/keyboard/kitten_paw/keymap.c index 23db421f9..e9ad9efe1 100644 --- a/keyboard/kitten_paw/keymap.c +++ b/keyboard/kitten_paw/keymap.c | |||
| @@ -80,7 +80,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 80 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) | 80 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) |
| 81 | 81 | ||
| 82 | /* translates key to keycode */ | 82 | /* translates key to keycode */ |
| 83 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 83 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 84 | { | 84 | { |
| 85 | if (layer < KEYMAPS_SIZE) { | 85 | if (layer < KEYMAPS_SIZE) { |
| 86 | return pgm_read_byte(&keymaps[(layer)][(key.col)][(key.row)]); | 86 | return pgm_read_byte(&keymaps[(layer)][(key.col)][(key.row)]); |
diff --git a/keyboard/kmac/keymap.c b/keyboard/kmac/keymap.c index 5474b1b65..1ffa60387 100644 --- a/keyboard/kmac/keymap.c +++ b/keyboard/kmac/keymap.c | |||
| @@ -74,7 +74,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 74 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) | 74 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) |
| 75 | 75 | ||
| 76 | /* translates key to keycode */ | 76 | /* translates key to keycode */ |
| 77 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 77 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 78 | { | 78 | { |
| 79 | if (layer < KEYMAPS_SIZE) { | 79 | if (layer < KEYMAPS_SIZE) { |
| 80 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 80 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
diff --git a/keyboard/lightpad/keymap.c b/keyboard/lightpad/keymap.c index 6d078230b..2ca79a81b 100644 --- a/keyboard/lightpad/keymap.c +++ b/keyboard/lightpad/keymap.c | |||
| @@ -50,7 +50,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 50 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) | 50 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) |
| 51 | 51 | ||
| 52 | /* translates key to keycode */ | 52 | /* translates key to keycode */ |
| 53 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 53 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 54 | { | 54 | { |
| 55 | if (layer < KEYMAPS_SIZE) { | 55 | if (layer < KEYMAPS_SIZE) { |
| 56 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 56 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
diff --git a/keyboard/lightsaber/keymap.c b/keyboard/lightsaber/keymap.c index 398e51ec4..477da9d86 100644 --- a/keyboard/lightsaber/keymap.c +++ b/keyboard/lightsaber/keymap.c | |||
| @@ -54,7 +54,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 54 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) | 54 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) |
| 55 | 55 | ||
| 56 | /* translates key to keycode */ | 56 | /* translates key to keycode */ |
| 57 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 57 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 58 | { | 58 | { |
| 59 | if (layer < KEYMAPS_SIZE) { | 59 | if (layer < KEYMAPS_SIZE) { |
| 60 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 60 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
diff --git a/keyboard/onekey/keymap.c b/keyboard/onekey/keymap.c index 90f195c2b..dce4e9191 100644 --- a/keyboard/onekey/keymap.c +++ b/keyboard/onekey/keymap.c | |||
| @@ -43,7 +43,7 @@ static const uint16_t PROGMEM fn_actions[] = { | |||
| 43 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) | 43 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) |
| 44 | 44 | ||
| 45 | /* translates key to keycode */ | 45 | /* translates key to keycode */ |
| 46 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 46 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 47 | { | 47 | { |
| 48 | if (layer < KEYMAPS_SIZE) { | 48 | if (layer < KEYMAPS_SIZE) { |
| 49 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 49 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
diff --git a/keyboard/phantom/keymap.c b/keyboard/phantom/keymap.c index 1899874dd..a040434f2 100644 --- a/keyboard/phantom/keymap.c +++ b/keyboard/phantom/keymap.c | |||
| @@ -128,7 +128,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 128 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) | 128 | #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) |
| 129 | 129 | ||
| 130 | /* translates key to keycode */ | 130 | /* translates key to keycode */ |
| 131 | uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | 131 | uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 132 | { | 132 | { |
| 133 | if (layer < KEYMAPS_SIZE) { | 133 | if (layer < KEYMAPS_SIZE) { |
| 134 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 134 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
