From e2077cad45f1736e878e317c43bd94117c61b5e0 Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 24 Nov 2014 15:14:52 +0900 Subject: [PATCH] Change key_t to keypos_t --- converter/adb_usb/keymap_common.c | 2 +- converter/ascii_usb/keymap.c | 2 +- converter/ibm4704_usb/keymap_common.c | 2 +- converter/m0110_usb/keymap.c | 2 +- converter/m0110_usb/keymap_common.c | 2 +- converter/next_usb/keymap.c | 2 +- converter/pc98_usb/keymap.c | 2 +- converter/serialmouse_usb/keymap.c | 2 +- converter/serialmouse_usb/keymap_common.c | 2 +- converter/terminal_bluefruit/keymap.c | 2 +- keyboard/gh60/keymap_common.c | 2 +- keyboard/hid_liber/keymap.c | 2 +- keyboard/kitten_paw/keymap.c | 2 +- keyboard/kmac/keymap.c | 2 +- keyboard/lightpad/keymap.c | 2 +- keyboard/lightsaber/keymap.c | 2 +- keyboard/onekey/keymap.c | 2 +- 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 241d2e33b1607d99b32a5efe3606927642366606..55a13793cbbb696db8efcecc73b0c9b0a1c6a63a 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 . /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); } diff --git a/converter/ascii_usb/keymap.c b/converter/ascii_usb/keymap.c index 5c13beaffae99018291cd5cd380ff2fe57c03384..a0c61ce8de41f741a728b76571940c91e64919b4 100644 --- a/converter/ascii_usb/keymap.c +++ b/converter/ascii_usb/keymap.c @@ -30,7 +30,7 @@ along with this program. If not, see . // Keymap is not used. See matrix.c. /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { return KC_NO; } diff --git a/converter/ibm4704_usb/keymap_common.c b/converter/ibm4704_usb/keymap_common.c index 241d2e33b1607d99b32a5efe3606927642366606..55a13793cbbb696db8efcecc73b0c9b0a1c6a63a 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 . /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); } diff --git a/converter/m0110_usb/keymap.c b/converter/m0110_usb/keymap.c index 031c881b7285254743845b786d766ff2c3f81a7a..4570dd283287949fe9dd73ffc5c213fae71bccae 100644 --- a/converter/m0110_usb/keymap.c +++ b/converter/m0110_usb/keymap.c @@ -209,7 +209,7 @@ static const uint16_t fn_actions[] PROGMEM = { /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); } diff --git a/converter/m0110_usb/keymap_common.c b/converter/m0110_usb/keymap_common.c index bad18c91a854fdb320142ba907478a14ad53a2c4..4ac2d71783cb0692db8db0fbc6f9afa98d1ef86e 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 . /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); } diff --git a/converter/next_usb/keymap.c b/converter/next_usb/keymap.c index d844f8a4e25b28d7c787e503810f72936a9b1e71..3a510754838a6da3d10da213d02945964713a396 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] = { }; /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); } diff --git a/converter/pc98_usb/keymap.c b/converter/pc98_usb/keymap.c index 7420e24ac833c248eebee7920103390e6c2bb5cd..8922ea7baba87fc0ad385351603204bb7e96b918 100644 --- a/converter/pc98_usb/keymap.c +++ b/converter/pc98_usb/keymap.c @@ -185,7 +185,7 @@ static const uint16_t PROGMEM fn_actions[] = { #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +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)]); diff --git a/converter/serialmouse_usb/keymap.c b/converter/serialmouse_usb/keymap.c index de8f75c2af8a1324e5c4028b7afd9eb9e5ea5b82..cb78b4d195d7f486f2112a18593901fd8f5fa313 100644 --- a/converter/serialmouse_usb/keymap.c +++ b/converter/serialmouse_usb/keymap.c @@ -20,7 +20,7 @@ along with this program. If not, see . /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { return KC_NO; } diff --git a/converter/serialmouse_usb/keymap_common.c b/converter/serialmouse_usb/keymap_common.c index 241d2e33b1607d99b32a5efe3606927642366606..55a13793cbbb696db8efcecc73b0c9b0a1c6a63a 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 . /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); } diff --git a/converter/terminal_bluefruit/keymap.c b/converter/terminal_bluefruit/keymap.c index 716590a4564febb1b318476ac0d454213a8481fe..8acd8cfb33ffd3af762fb4c8f8c4c123a75f07d2 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) } */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); } diff --git a/keyboard/gh60/keymap_common.c b/keyboard/gh60/keymap_common.c index 7b6379f6b6550ace7f9c8e841823621e756f4fda..fdb1769e1c0ea10d3f7ecaa52624367138d572f0 100644 --- a/keyboard/gh60/keymap_common.c +++ b/keyboard/gh60/keymap_common.c @@ -18,7 +18,7 @@ along with this program. If not, see . /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); } diff --git a/keyboard/hid_liber/keymap.c b/keyboard/hid_liber/keymap.c index f17d3762b9422a524592838e6ce83047a8a43592..433a620975928550c45dd8e5b941c150903ef0ec 100644 --- a/keyboard/hid_liber/keymap.c +++ b/keyboard/hid_liber/keymap.c @@ -103,7 +103,7 @@ along with this program. If not, see . #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +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)]); diff --git a/keyboard/kitten_paw/keymap.c b/keyboard/kitten_paw/keymap.c index 23db421f9bf4a3f6581816b5acde92e338d99545..e9ad9efe1af5bdf9ca46669b1d92d2a182133870 100644 --- a/keyboard/kitten_paw/keymap.c +++ b/keyboard/kitten_paw/keymap.c @@ -80,7 +80,7 @@ along with this program. If not, see . #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { if (layer < KEYMAPS_SIZE) { return pgm_read_byte(&keymaps[(layer)][(key.col)][(key.row)]); diff --git a/keyboard/kmac/keymap.c b/keyboard/kmac/keymap.c index 5474b1b65e95c4a7e6d84129eb26d62d45c10b10..1ffa60387e83511efec9bd7876c473934e15f35b 100644 --- a/keyboard/kmac/keymap.c +++ b/keyboard/kmac/keymap.c @@ -74,7 +74,7 @@ along with this program. If not, see . #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +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)]); diff --git a/keyboard/lightpad/keymap.c b/keyboard/lightpad/keymap.c index 6d078230bb7f2b78e4cec168eb0171fc9c18804a..2ca79a81b5ef47a4f506c2ec944b0601cb2b79ec 100644 --- a/keyboard/lightpad/keymap.c +++ b/keyboard/lightpad/keymap.c @@ -50,7 +50,7 @@ along with this program. If not, see . #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +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)]); diff --git a/keyboard/lightsaber/keymap.c b/keyboard/lightsaber/keymap.c index 398e51ec4a5ef793cef1dabab57c31395b4b1256..477da9d865caa70682c09690cb78da20979296e3 100644 --- a/keyboard/lightsaber/keymap.c +++ b/keyboard/lightsaber/keymap.c @@ -54,7 +54,7 @@ along with this program. If not, see . #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +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)]); diff --git a/keyboard/onekey/keymap.c b/keyboard/onekey/keymap.c index 90f195c2b75566dc0705f889d5af6d8caf8423a4..dce4e9191e788aa96bfab3cdda8964338f6da517 100644 --- a/keyboard/onekey/keymap.c +++ b/keyboard/onekey/keymap.c @@ -43,7 +43,7 @@ static const uint16_t PROGMEM fn_actions[] = { #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +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)]); diff --git a/keyboard/phantom/keymap.c b/keyboard/phantom/keymap.c index 1899874dd7e6ce545a143a0efcffdd7fd21efbf5..a040434f2478113b6c242f7b35c7708d2247b4cf 100644 --- a/keyboard/phantom/keymap.c +++ b/keyboard/phantom/keymap.c @@ -128,7 +128,7 @@ along with this program. If not, see . #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +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)]);