From 8a81986191ba797a8501cd7b3f8a0e9b58b5b30e Mon Sep 17 00:00:00 2001 From: tmk Date: Fri, 19 Oct 2012 15:33:02 +0900 Subject: [PATCH] Fix keymap to adjust new keyboard.c. --- converter/adb_usb/keymap.c | 8 ++++---- converter/m0110_usb/keymap.c | 8 ++++---- converter/news_usb/keymap.c | 8 ++++---- converter/ps2_usb/keymap.c | 8 ++++---- converter/ps2_usb/keymap_jis.c | 8 ++++---- converter/terminal_usb/keymap_102.c | 8 ++++---- converter/terminal_usb/keymap_122.c | 8 ++++---- converter/usb_usb/keymap.c | 8 ++++---- converter/x68k_usb/keymap.c | 8 ++++---- keyboard/IIgs_Standard/keymap.c | 8 ++++---- keyboard/hbkb/keymap.c | 8 ++++---- keyboard/macway/keymap.c | 8 ++++---- 12 files changed, 48 insertions(+), 48 deletions(-) diff --git a/converter/adb_usb/keymap.c b/converter/adb_usb/keymap.c index 60e8c99f428..c622dc62385 100644 --- a/converter/adb_usb/keymap.c +++ b/converter/adb_usb/keymap.c @@ -119,12 +119,12 @@ uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col) return KEYCODE(layer, row, col); } -uint8_t keymap_fn_layer(uint8_t fn_bits) +uint8_t keymap_fn_layer(uint8_t index) { - return pgm_read_byte(&fn_layer[biton(fn_bits)]); + return pgm_read_byte(&fn_layer[index]); } -uint8_t keymap_fn_keycode(uint8_t fn_bits) +uint8_t keymap_fn_keycode(uint8_t index) { - return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); + return pgm_read_byte(&fn_keycode[index]); } diff --git a/converter/m0110_usb/keymap.c b/converter/m0110_usb/keymap.c index 5bcb6e67146..4dd419d1b9a 100644 --- a/converter/m0110_usb/keymap.c +++ b/converter/m0110_usb/keymap.c @@ -203,12 +203,12 @@ uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col) return KEYCODE(layer, row, col); } -uint8_t keymap_fn_layer(uint8_t fn_bits) +uint8_t keymap_fn_layer(uint8_t index) { - return pgm_read_byte(&fn_layer[biton(fn_bits)]); + return pgm_read_byte(&fn_layer[index]); } -uint8_t keymap_fn_keycode(uint8_t fn_bits) +uint8_t keymap_fn_keycode(uint8_t index) { - return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); + return pgm_read_byte(&fn_keycode[index]); } diff --git a/converter/news_usb/keymap.c b/converter/news_usb/keymap.c index 19654095c89..6f30d59c18b 100644 --- a/converter/news_usb/keymap.c +++ b/converter/news_usb/keymap.c @@ -114,12 +114,12 @@ 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 fn_bits) +uint8_t keymap_fn_layer(uint8_t index) { - return pgm_read_byte(&fn_layer[biton(fn_bits)]); + return pgm_read_byte(&fn_layer[index]); } -uint8_t keymap_fn_keycode(uint8_t fn_bits) +uint8_t keymap_fn_keycode(uint8_t index) { - return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); + return pgm_read_byte(&fn_keycode[index]); } diff --git a/converter/ps2_usb/keymap.c b/converter/ps2_usb/keymap.c index df3a36b7fb7..c97783fa536 100644 --- a/converter/ps2_usb/keymap.c +++ b/converter/ps2_usb/keymap.c @@ -368,12 +368,12 @@ 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 fn_bits) +uint8_t keymap_fn_layer(uint8_t index) { - return pgm_read_byte(&fn_layer[biton(fn_bits)]); + return pgm_read_byte(&fn_layer[index]); } -uint8_t keymap_fn_keycode(uint8_t fn_bits) +uint8_t keymap_fn_keycode(uint8_t index) { - return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); + return pgm_read_byte(&fn_keycode[index]); } diff --git a/converter/ps2_usb/keymap_jis.c b/converter/ps2_usb/keymap_jis.c index fcf8a2abb4d..866ccd9174d 100644 --- a/converter/ps2_usb/keymap_jis.c +++ b/converter/ps2_usb/keymap_jis.c @@ -286,12 +286,12 @@ 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 fn_bits) +uint8_t keymap_fn_layer(uint8_t index) { - return pgm_read_byte(&fn_layer[biton(fn_bits)]); + return pgm_read_byte(&fn_layer[index]); } -uint8_t keymap_fn_keycode(uint8_t fn_bits) +uint8_t keymap_fn_keycode(uint8_t index) { - return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); + return pgm_read_byte(&fn_keycode[index]); } diff --git a/converter/terminal_usb/keymap_102.c b/converter/terminal_usb/keymap_102.c index 49e1b17c437..e9412b282ce 100644 --- a/converter/terminal_usb/keymap_102.c +++ b/converter/terminal_usb/keymap_102.c @@ -197,12 +197,12 @@ 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 fn_bits) +uint8_t keymap_fn_layer(uint8_t index) { - return pgm_read_byte(&fn_layer[biton(fn_bits)]); + return pgm_read_byte(&fn_layer[index]); } -uint8_t keymap_fn_keycode(uint8_t fn_bits) +uint8_t keymap_fn_keycode(uint8_t index) { - return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); + return pgm_read_byte(&fn_keycode[index]); } diff --git a/converter/terminal_usb/keymap_122.c b/converter/terminal_usb/keymap_122.c index 1b705d1d53b..79ca11c26fe 100644 --- a/converter/terminal_usb/keymap_122.c +++ b/converter/terminal_usb/keymap_122.c @@ -132,12 +132,12 @@ 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 fn_bits) +uint8_t keymap_fn_layer(uint8_t index) { - return pgm_read_byte(&fn_layer[biton(fn_bits)]); + return pgm_read_byte(&fn_layer[index]); } -uint8_t keymap_fn_keycode(uint8_t fn_bits) +uint8_t keymap_fn_keycode(uint8_t index) { - return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); + return pgm_read_byte(&fn_keycode[index]); } diff --git a/converter/usb_usb/keymap.c b/converter/usb_usb/keymap.c index 4ab8c8abcdc..ff166fcf1f5 100644 --- a/converter/usb_usb/keymap.c +++ b/converter/usb_usb/keymap.c @@ -240,12 +240,12 @@ 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 fn_bits) +uint8_t keymap_fn_layer(uint8_t index) { - return pgm_read_byte(&fn_layer[biton(fn_bits)]); + return pgm_read_byte(&fn_layer[index]); } -uint8_t keymap_fn_keycode(uint8_t fn_bits) +uint8_t keymap_fn_keycode(uint8_t index) { - return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); + return pgm_read_byte(&fn_keycode[index]); } diff --git a/converter/x68k_usb/keymap.c b/converter/x68k_usb/keymap.c index 5cd14cb6d1d..90abb396661 100644 --- a/converter/x68k_usb/keymap.c +++ b/converter/x68k_usb/keymap.c @@ -129,12 +129,12 @@ 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 fn_bits) +uint8_t keymap_fn_layer(uint8_t index) { - return pgm_read_byte(&fn_layer[biton(fn_bits)]); + return pgm_read_byte(&fn_layer[index]); } -uint8_t keymap_fn_keycode(uint8_t fn_bits) +uint8_t keymap_fn_keycode(uint8_t index) { - return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); + return pgm_read_byte(&fn_keycode[index]); } diff --git a/keyboard/IIgs_Standard/keymap.c b/keyboard/IIgs_Standard/keymap.c index 722c44af4fb..cd33e223ac8 100644 --- a/keyboard/IIgs_Standard/keymap.c +++ b/keyboard/IIgs_Standard/keymap.c @@ -131,12 +131,12 @@ uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col) return KEYCODE(layer, row, col); } -uint8_t keymap_fn_layer(uint8_t fn_bits) +uint8_t keymap_fn_layer(uint8_t index) { - return pgm_read_byte(&fn_layer[biton(fn_bits)]); + return pgm_read_byte(&fn_layer[index]); } -uint8_t keymap_fn_keycode(uint8_t fn_bits) +uint8_t keymap_fn_keycode(uint8_t index) { - return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); + return pgm_read_byte(&fn_keycode[index]); } diff --git a/keyboard/hbkb/keymap.c b/keyboard/hbkb/keymap.c index 435cf1e95ba..b89bdf8e425 100644 --- a/keyboard/hbkb/keymap.c +++ b/keyboard/hbkb/keymap.c @@ -220,12 +220,12 @@ uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col) return KEYCODE(layer, row, col); } -uint8_t keymap_fn_layer(uint8_t fn_bits) +uint8_t keymap_fn_layer(uint8_t index) { - return pgm_read_byte(&fn_layer[biton(fn_bits)]); + return pgm_read_byte(&fn_layer[index]); } -uint8_t keymap_fn_keycode(uint8_t fn_bits) +uint8_t keymap_fn_keycode(uint8_t index) { - return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); + return pgm_read_byte(&fn_keycode[index]); } diff --git a/keyboard/macway/keymap.c b/keyboard/macway/keymap.c index aa50ba5c86f..b77348494a5 100644 --- a/keyboard/macway/keymap.c +++ b/keyboard/macway/keymap.c @@ -184,12 +184,12 @@ uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col) return KEYCODE(layer, row, col); } -uint8_t keymap_fn_layer(uint8_t fn_bits) +uint8_t keymap_fn_layer(uint8_t index) { - return pgm_read_byte(&fn_layer[biton(fn_bits)]); + return pgm_read_byte(&fn_layer[index]); } -uint8_t keymap_fn_keycode(uint8_t fn_bits) +uint8_t keymap_fn_keycode(uint8_t index) { - return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); + return pgm_read_byte(&fn_keycode[index]); }