mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-28 22:49:43 +02:00
183 lines
6.7 KiB
Diff
183 lines
6.7 KiB
Diff
diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
|
||
index 04024d2..33b1181 100644
|
||
--- a/arch/mips/jz4740/platform.c
|
||
+++ b/arch/mips/jz4740/platform.c
|
||
@@ -265,9 +265,10 @@ static struct platform_device jz_nand_device = {
|
||
*/
|
||
|
||
#define KEY_QI_QI KEY_F13
|
||
-#define KEY_QI_UPRED KEY_F14
|
||
+#define KEY_QI_UPRED KEY_RIGHTCTRL
|
||
#define KEY_QI_VOLUP KEY_F15
|
||
#define KEY_QI_VOLDOWN KEY_F16
|
||
+#define KEY_QI_FN KEY_F17
|
||
|
||
static const uint32_t qi_lb60_keymap[] = {
|
||
KEY(0, 0, KEY_F1), /* S2 */
|
||
@@ -330,7 +331,7 @@ static const uint32_t qi_lb60_keymap[] = {
|
||
#ifndef KEEP_UART_ALIVE
|
||
KEY(7, 0, KEY_LEFTSHIFT), /* S58 */
|
||
KEY(7, 1, KEY_LEFTALT), /* S59 */
|
||
- KEY(7, 2, KEY_FN), /* S60 */
|
||
+ KEY(7, 2, KEY_QI_FN), /* S60 */
|
||
#endif
|
||
};
|
||
|
||
diff --git a/drivers/char/defkeymap.map b/drivers/char/defkeymap.map
|
||
index 50b30ca..25d05b4 100644
|
||
--- a/drivers/char/defkeymap.map
|
||
+++ b/drivers/char/defkeymap.map
|
||
@@ -45,24 +45,34 @@ keycode 12 = minus underscore backslash
|
||
control keycode 12 = Control_underscore
|
||
shift control keycode 12 = Control_underscore
|
||
alt keycode 12 = Meta_minus
|
||
-keycode 13 = equal plus
|
||
+keycode 13 = equal plus
|
||
alt keycode 13 = Meta_equal
|
||
+ altgr keycode 13 = asciitilde
|
||
keycode 14 = Delete Delete
|
||
control keycode 14 = BackSpace
|
||
alt keycode 14 = Meta_Delete
|
||
keycode 15 = Tab Tab
|
||
alt keycode 15 = Meta_Tab
|
||
keycode 16 = q
|
||
+ altgr keycode 16 = exclam
|
||
keycode 17 = w
|
||
+ altgr keycode 17 = at
|
||
keycode 18 = e
|
||
- altgr keycode 18 = Hex_E
|
||
+ altgr keycode 18 = numbersign
|
||
keycode 19 = r
|
||
+ altgr keycode 19 = dollar
|
||
keycode 20 = t
|
||
+ altgr keycode 20 = percent
|
||
keycode 21 = y
|
||
+ altgr keycode 21 = asciicircum
|
||
keycode 22 = u
|
||
+ altgr keycode 22 = ampersand
|
||
keycode 23 = i
|
||
+ altgr keycode 23 = asterisk
|
||
keycode 24 = o
|
||
+ altgr keycode 24 = parenleft
|
||
keycode 25 = p
|
||
+ altgr keycode 25 = parenright
|
||
keycode 26 = bracketleft braceleft
|
||
control keycode 26 = Escape
|
||
alt keycode 26 = Meta_bracketleft
|
||
@@ -73,17 +83,23 @@ keycode 28 = Return
|
||
alt keycode 28 = Meta_Control_m
|
||
keycode 29 = Control
|
||
keycode 30 = a
|
||
- altgr keycode 30 = Hex_A
|
||
+ altgr keycode 30 = F100
|
||
keycode 31 = s
|
||
+ altgr keycode 31 = F101
|
||
keycode 32 = d
|
||
- altgr keycode 32 = Hex_D
|
||
+ altgr keycode 32 = F102
|
||
keycode 33 = f
|
||
- altgr keycode 33 = Hex_F
|
||
+ altgr keycode 33 = minus
|
||
keycode 34 = g
|
||
+ altgr keycode 34 = underscore
|
||
keycode 35 = h
|
||
+ altgr keycode 35 = braceleft
|
||
keycode 36 = j
|
||
+ altgr keycode 36 = bracketleft
|
||
keycode 37 = k
|
||
+ altgr keycode 37 = bracketright
|
||
keycode 38 = l
|
||
+ altgr keycode 38 = braceright
|
||
keycode 39 = semicolon colon
|
||
alt keycode 39 = Meta_semicolon
|
||
keycode 40 = apostrophe quotedbl
|
||
@@ -97,19 +113,23 @@ keycode 43 = backslash bar
|
||
control keycode 43 = Control_backslash
|
||
alt keycode 43 = Meta_backslash
|
||
keycode 44 = z
|
||
+ altgr keycode 43 = nine
|
||
keycode 45 = x
|
||
+ altgr keycode 43 = zero
|
||
keycode 46 = c
|
||
altgr keycode 46 = Hex_C
|
||
keycode 47 = v
|
||
keycode 48 = b
|
||
altgr keycode 48 = Hex_B
|
||
keycode 49 = n
|
||
+ altgr keycode 49 = less
|
||
keycode 50 = m
|
||
+ altgr keycode 50 = greater
|
||
keycode 51 = comma less
|
||
- alt keycode 51 = Meta_comma
|
||
+ altgr keycode 51 = apostrophe
|
||
keycode 52 = period greater
|
||
control keycode 52 = Compose
|
||
- alt keycode 52 = Meta_period
|
||
+ altgr keycode 52 = quotedbl
|
||
keycode 53 = slash question
|
||
control keycode 53 = Delete
|
||
alt keycode 53 = Meta_slash
|
||
@@ -120,35 +140,35 @@ keycode 57 = space space
|
||
control keycode 57 = nul
|
||
alt keycode 57 = Meta_space
|
||
keycode 58 = Caps_Lock
|
||
-keycode 59 = F1 F11 Console_13
|
||
+keycode 59 = F1 F11 one
|
||
control keycode 59 = F1
|
||
alt keycode 59 = Console_1
|
||
control alt keycode 59 = Console_1
|
||
-keycode 60 = F2 F12 Console_14
|
||
+keycode 60 = F2 F12 two
|
||
control keycode 60 = F2
|
||
alt keycode 60 = Console_2
|
||
control alt keycode 60 = Console_2
|
||
-keycode 61 = F3 F13 Console_15
|
||
+keycode 61 = F3 F13 three
|
||
control keycode 61 = F3
|
||
alt keycode 61 = Console_3
|
||
control alt keycode 61 = Console_3
|
||
-keycode 62 = F4 F14 Console_16
|
||
+keycode 62 = F4 F14 four
|
||
control keycode 62 = F4
|
||
alt keycode 62 = Console_4
|
||
control alt keycode 62 = Console_4
|
||
-keycode 63 = F5 F15 Console_17
|
||
+keycode 63 = F5 F15 five
|
||
control keycode 63 = F5
|
||
alt keycode 63 = Console_5
|
||
control alt keycode 63 = Console_5
|
||
-keycode 64 = F6 F16 Console_18
|
||
+keycode 64 = F6 F16 six
|
||
control keycode 64 = F6
|
||
alt keycode 64 = Console_6
|
||
control alt keycode 64 = Console_6
|
||
-keycode 65 = F7 F17 Console_19
|
||
+keycode 65 = F7 F17 seven
|
||
control keycode 65 = F7
|
||
alt keycode 65 = Console_7
|
||
control alt keycode 65 = Console_7
|
||
-keycode 66 = F8 F18 Console_20
|
||
+keycode 66 = F8 F18 eight
|
||
control keycode 66 = F8
|
||
alt keycode 66 = Console_8
|
||
control alt keycode 66 = Console_8
|
||
@@ -220,7 +240,7 @@ keycode 93 =
|
||
keycode 94 =
|
||
keycode 95 =
|
||
keycode 96 = KP_Enter
|
||
-keycode 97 = Control
|
||
+keycode 97 = AltGr
|
||
keycode 98 = KP_Divide
|
||
keycode 99 = Control_backslash
|
||
control keycode 99 = Control_backslash
|
||
@@ -279,6 +299,9 @@ string F17 = "\033[31~"
|
||
string F18 = "\033[32~"
|
||
string F19 = "\033[33~"
|
||
string F20 = "\033[34~"
|
||
+string F100 = "<22>"
|
||
+string F101 = "<22>"
|
||
+string F102 = "<22>"
|
||
string Find = "\033[1~"
|
||
string Insert = "\033[2~"
|
||
string Remove = "\033[3~"
|