Fix keymap to adjust new keyboard.c.

diff --git a/converter/adb_usb/keymap.c b/converter/adb_usb/keymap.c
index 60e8c99f428d949ace412a54ce9f4da344d7b2fd..c622dc62385fe58a32d12c5b44900abf53bcaa7a 100644 (file)
--- 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 5bcb6e671463e09c6f104ab2438215a8f23e4929..4dd419d1b9a74359afee25d4684da9469bd75ac8 100644 (file)
--- 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 19654095c8978766fefef6b09dbafb171acfc774..6f30d59c18b9813b368b6830db6f5d615a82ab88 100644 (file)
--- 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 df3a36b7fb76da42bf3adb3bade4f522a69960c5..c97783fa53664993393206cc10e395f294dc3ccb 100644 (file)
--- 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 fcf8a2abb4de6b4541a5ab2578a428cf3899f397..866ccd9174d9c8bd2204ca2b4c1e507e0c18d149 100644 (file)
--- 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 49e1b17c437606b1030fb0552baeccd0ce604195..e9412b282cebfde70436a35363e69e54b2b77dbd 100644 (file)
--- 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 1b705d1d53ba2f352e8dae8077d793a0211e48c0..79ca11c26fe2e19b669e208b895d49b28a2df986 100644 (file)
--- 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 4ab8c8abcdc41ef7f570ecfb40598c1c7f42d76d..ff166fcf1f5611deae23cd354fdd9a8e83bce4fe 100644 (file)
--- 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 5cd14cb6d1dc74d0a10da172a3a69dd719c25efc..90abb396661c2c5e23bb728cf915e81f5c1e7f95 100644 (file)
--- 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 722c44af4fbc99bc6a1b6192bc84c92e54a7c5ac..cd33e223ac827f797f98458d6c29f29d69214e13 100644 (file)
--- 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);\r
 }\r
 \r
-uint8_t keymap_fn_layer(uint8_t fn_bits)\r
+uint8_t keymap_fn_layer(uint8_t index)\r
 {\r
-    return pgm_read_byte(&fn_layer[biton(fn_bits)]);\r
+    return pgm_read_byte(&fn_layer[index]);\r
 }\r
 \r
-uint8_t keymap_fn_keycode(uint8_t fn_bits)\r
+uint8_t keymap_fn_keycode(uint8_t index)\r
 {\r
-    return pgm_read_byte(&fn_keycode[(biton(fn_bits))]);\r
+    return pgm_read_byte(&fn_keycode[index]);\r
 }\r

diff --git a/keyboard/hbkb/keymap.c b/keyboard/hbkb/keymap.c
index 435cf1e95babe72772eeb361562747be0aaf1579..b89bdf8e4251e780aa372530f296a4a26935f4c0 100644 (file)
--- 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 aa50ba5c86ff863ee4dec0f2cf78bf35d555c44a..b77348494a55f34330bd10cfbedbabcbbe260e2d 100644 (file)
--- 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]);
 }