Date:2009-09-26 20:17:50 (3 years 8 months ago)
Author:Xiangfu Liu
Commit:8392a48a0b44ff40d7dc95c87be2b5f6a23c041e
Message:cleanup modifier keys driver
Files: target/linux/xburst/patches-2.6.31/500-RedUpPoint-modifier-keys-work.patch (1 diff)
target/linux/xburst/patches-2.6.31/500-modifier-keys.patch (1 diff)
target/linux/xburst/patches-2.6.31/510-Fn-modifier-keys-work.patch (1 diff)

Change Details

target/linux/xburst/patches-2.6.31/500-RedUpPoint-modifier-keys-work.patch
1diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
2index 04024d2..33b1181 100644
3+++ b/arch/mips/jz4740/platform.c
4@@ -265,9 +265,10 @@ static struct platform_device jz_nand_device = {
5  */
6
7 #define KEY_QI_QI KEY_F13
8-#define KEY_QI_UPRED KEY_F14
9+#define KEY_QI_UPRED KEY_RIGHTCTRL
10 #define KEY_QI_VOLUP KEY_F15
11 #define KEY_QI_VOLDOWN KEY_F16
12+#define KEY_QI_FN KEY_F17
13
14 static const uint32_t qi_lb60_keymap[] = {
15     KEY(0, 0, KEY_F1), /* S2 */
16@@ -330,7 +331,7 @@ static const uint32_t qi_lb60_keymap[] = {
17 #ifndef KEEP_UART_ALIVE
18     KEY(7, 0, KEY_LEFTSHIFT), /* S58 */
19     KEY(7, 1, KEY_LEFTALT), /* S59 */
20- KEY(7, 2, KEY_FN), /* S60 */
21+ KEY(7, 2, KEY_QI_FN), /* S60 */
22 #endif
23 };
24
25diff --git a/drivers/char/defkeymap.map b/drivers/char/defkeymap.map
26index 50b30ca..25d05b4 100644
27+++ b/drivers/char/defkeymap.map
28@@ -45,24 +45,34 @@ keycode 12 = minus underscore backslash
29     control keycode 12 = Control_underscore
30     shift control keycode 12 = Control_underscore
31     alt keycode 12 = Meta_minus
32-keycode 13 = equal plus
33+keycode 13 = equal plus
34     alt keycode 13 = Meta_equal
35+ altgr keycode 13 = asciitilde
36 keycode 14 = Delete Delete
37     control keycode 14 = BackSpace
38     alt keycode 14 = Meta_Delete
39 keycode 15 = Tab Tab
40     alt keycode 15 = Meta_Tab
41 keycode 16 = q
42+ altgr keycode 16 = exclam
43 keycode 17 = w
44+ altgr keycode 17 = at
45 keycode 18 = e
46- altgr keycode 18 = Hex_E
47+ altgr keycode 18 = numbersign
48 keycode 19 = r
49+ altgr keycode 19 = dollar
50 keycode 20 = t
51+ altgr keycode 20 = percent
52 keycode 21 = y
53+ altgr keycode 21 = asciicircum
54 keycode 22 = u
55+ altgr keycode 22 = ampersand
56 keycode 23 = i
57+ altgr keycode 23 = asterisk
58 keycode 24 = o
59+ altgr keycode 24 = parenleft
60 keycode 25 = p
61+ altgr keycode 25 = parenright
62 keycode 26 = bracketleft braceleft
63     control keycode 26 = Escape
64     alt keycode 26 = Meta_bracketleft
65@@ -73,17 +83,23 @@ keycode 28 = Return
66     alt keycode 28 = Meta_Control_m
67 keycode 29 = Control
68 keycode 30 = a
69- altgr keycode 30 = Hex_A
70+ altgr keycode 30 = F100
71 keycode 31 = s
72+ altgr keycode 31 = F101
73 keycode 32 = d
74- altgr keycode 32 = Hex_D
75+ altgr keycode 32 = F102
76 keycode 33 = f
77- altgr keycode 33 = Hex_F
78+ altgr keycode 33 = minus
79 keycode 34 = g
80+ altgr keycode 34 = underscore
81 keycode 35 = h
82+ altgr keycode 35 = braceleft
83 keycode 36 = j
84+ altgr keycode 36 = bracketleft
85 keycode 37 = k
86+ altgr keycode 37 = bracketright
87 keycode 38 = l
88+ altgr keycode 38 = braceright
89 keycode 39 = semicolon colon
90     alt keycode 39 = Meta_semicolon
91 keycode 40 = apostrophe quotedbl
92@@ -97,19 +113,23 @@ keycode 43 = backslash bar
93     control keycode 43 = Control_backslash
94     alt keycode 43 = Meta_backslash
95 keycode 44 = z
96+ altgr keycode 43 = nine
97 keycode 45 = x
98+ altgr keycode 43 = zero
99 keycode 46 = c
100     altgr keycode 46 = Hex_C
101 keycode 47 = v
102 keycode 48 = b
103     altgr keycode 48 = Hex_B
104 keycode 49 = n
105+ altgr keycode 49 = less
106 keycode 50 = m
107+ altgr keycode 50 = greater
108 keycode 51 = comma less
109- alt keycode 51 = Meta_comma
110+ altgr keycode 51 = apostrophe
111 keycode 52 = period greater
112     control keycode 52 = Compose
113- alt keycode 52 = Meta_period
114+ altgr keycode 52 = quotedbl
115 keycode 53 = slash question
116     control keycode 53 = Delete
117     alt keycode 53 = Meta_slash
118@@ -120,35 +140,35 @@ keycode 57 = space space
119     control keycode 57 = nul
120     alt keycode 57 = Meta_space
121 keycode 58 = Caps_Lock
122-keycode 59 = F1 F11 Console_13
123+keycode 59 = F1 F11 one
124     control keycode 59 = F1
125     alt keycode 59 = Console_1
126     control alt keycode 59 = Console_1
127-keycode 60 = F2 F12 Console_14
128+keycode 60 = F2 F12 two
129     control keycode 60 = F2
130     alt keycode 60 = Console_2
131     control alt keycode 60 = Console_2
132-keycode 61 = F3 F13 Console_15
133+keycode 61 = F3 F13 three
134     control keycode 61 = F3
135     alt keycode 61 = Console_3
136     control alt keycode 61 = Console_3
137-keycode 62 = F4 F14 Console_16
138+keycode 62 = F4 F14 four
139     control keycode 62 = F4
140     alt keycode 62 = Console_4
141     control alt keycode 62 = Console_4
142-keycode 63 = F5 F15 Console_17
143+keycode 63 = F5 F15 five
144     control keycode 63 = F5
145     alt keycode 63 = Console_5
146     control alt keycode 63 = Console_5
147-keycode 64 = F6 F16 Console_18
148+keycode 64 = F6 F16 six
149     control keycode 64 = F6
150     alt keycode 64 = Console_6
151     control alt keycode 64 = Console_6
152-keycode 65 = F7 F17 Console_19
153+keycode 65 = F7 F17 seven
154     control keycode 65 = F7
155     alt keycode 65 = Console_7
156     control alt keycode 65 = Console_7
157-keycode 66 = F8 F18 Console_20
158+keycode 66 = F8 F18 eight
159     control keycode 66 = F8
160     alt keycode 66 = Console_8
161     control alt keycode 66 = Console_8
162@@ -220,7 +240,7 @@ keycode 93 =
163 keycode 94 =
164 keycode 95 =
165 keycode 96 = KP_Enter
166-keycode 97 = Control
167+keycode 97 = AltGr
168 keycode 98 = KP_Divide
169 keycode 99 = Control_backslash
170     control keycode 99 = Control_backslash
171@@ -279,6 +299,9 @@ string F17 = "\033[31~"
172 string F18 = "\033[32~"
173 string F19 = "\033[33~"
174 string F20 = "\033[34~"
175+string F100 = "°"
176+string F101 = "¨"
177+string F102 = "¿"
178 string Find = "\033[1~"
179 string Insert = "\033[2~"
180 string Remove = "\033[3~"
target/linux/xburst/patches-2.6.31/500-modifier-keys.patch
1diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
2index 4575a50..dc7a832 100644
3--- a/arch/mips/jz4740/platform.c
4@@ -264,10 +264,11 @@ static struct platform_device jz_nand_device = {
5  * don't define this. the keyboard and keyboard both work
6  */
7
8-#define KEY_QI_QI KEY_F13
9-#define KEY_QI_UPRED KEY_F14
10+#define KEY_QI_QI KEY_F13
11+#define KEY_QI_UPRED KEY_RIGHTSHIFT
12 #define KEY_QI_VOLUP KEY_F15
13 #define KEY_QI_VOLDOWN KEY_F16
14+#define KEY_QI_FN KEY_RIGHTCTRL
15
16 static const uint32_t qi_lb60_keymap[] = {
17     KEY(0, 0, KEY_F1), /* S2 */
18@@ -330,7 +331,7 @@ static const uint32_t qi_lb60_keymap[] = {
19 #ifndef KEEP_UART_ALIVE
20     KEY(7, 0, KEY_LEFTSHIFT), /* S58 */
21     KEY(7, 1, KEY_LEFTALT), /* S59 */
22- KEY(7, 2, KEY_FN), /* S60 */
23+ KEY(7, 2, KEY_QI_FN), /* S60 */
24 #endif
25 };
26
27diff --git a/drivers/char/defkeymap.map b/drivers/char/defkeymap.map
28index 50b30ca..153f026 100644
29--- a/drivers/char/defkeymap.map
30@@ -1,5 +1,5 @@
31 # Default kernel keymap. This uses 7 modifier combinations.
32-keymaps 0-2,4-5,8,12
33+keymaps 0-2,4-5,8,12,128
34 # Change the above line into
35 # keymaps 0-2,4-6,8,12
36 # in case you want the entries
37@@ -45,24 +45,38 @@ keycode 12 = minus underscore backslash
38     control keycode 12 = Control_underscore
39     shift control keycode 12 = Control_underscore
40     alt keycode 12 = Meta_minus
41-keycode 13 = equal plus
42+keycode 13 = equal plus
43     alt keycode 13 = Meta_equal
44+ altgr keycode 13 = asciitilde
45+ ctrlr keycode 13 = three
46 keycode 14 = Delete Delete
47     control keycode 14 = BackSpace
48     alt keycode 14 = Meta_Delete
49 keycode 15 = Tab Tab
50     alt keycode 15 = Meta_Tab
51 keycode 16 = q
52+ altgr keycode 16 = exclam
53 keycode 17 = w
54+ altgr keycode 17 = at
55 keycode 18 = e
56- altgr keycode 18 = Hex_E
57+ altgr keycode 18 = numbersign
58 keycode 19 = r
59+ altgr keycode 19 = dollar
60 keycode 20 = t
61+ altgr keycode 20 = percent
62 keycode 21 = y
63+ altgr keycode 21 = asciicircum
64 keycode 22 = u
65+ altgr keycode 22 = ampersand
66+ ctrlr keycode 22 = seven
67 keycode 23 = i
68+ altgr keycode 23 = asterisk
69+ ctrlr keycode 23 = eight
70 keycode 24 = o
71+ altgr keycode 24 = parenleft
72+ ctrlr keycode 24 = nine
73 keycode 25 = p
74+ altgr keycode 25 = parenright
75 keycode 26 = bracketleft braceleft
76     control keycode 26 = Escape
77     alt keycode 26 = Meta_bracketleft
78@@ -73,17 +87,26 @@ keycode 28 = Return
79     alt keycode 28 = Meta_Control_m
80 keycode 29 = Control
81 keycode 30 = a
82- altgr keycode 30 = Hex_A
83+ altgr keycode 30 = U+00B0
84 keycode 31 = s
85+ altgr keycode 31 = U+00A8
86 keycode 32 = d
87- altgr keycode 32 = Hex_D
88+ altgr keycode 32 = U+20AC
89 keycode 33 = f
90- altgr keycode 33 = Hex_F
91+ altgr keycode 33 = minus
92 keycode 34 = g
93+ altgr keycode 34 = underscore
94 keycode 35 = h
95+ altgr keycode 35 = braceleft
96 keycode 36 = j
97+ altgr keycode 36 = bracketleft
98+ ctrlr keycode 36 = four
99 keycode 37 = k
100+ altgr keycode 37 = bracketright
101+ ctrlr keycode 37 = five
102 keycode 38 = l
103+ altgr keycode 38 = braceright
104+ ctrlr keycode 38 = six
105 keycode 39 = semicolon colon
106     alt keycode 39 = Meta_semicolon
107 keycode 40 = apostrophe quotedbl
108@@ -97,58 +120,65 @@ keycode 43 = backslash bar
109     control keycode 43 = Control_backslash
110     alt keycode 43 = Meta_backslash
111 keycode 44 = z
112+ altgr keycode 44 = nine
113 keycode 45 = x
114+ altgr keycode 45 = zero
115 keycode 46 = c
116     altgr keycode 46 = Hex_C
117 keycode 47 = v
118 keycode 48 = b
119     altgr keycode 48 = Hex_B
120 keycode 49 = n
121+ altgr keycode 49 = less
122+ ctrlr keycode 49 = one
123 keycode 50 = m
124+ altgr keycode 50 = greater
125+ ctrlr keycode 50 = two
126 keycode 51 = comma less
127- alt keycode 51 = Meta_comma
128+ altgr keycode 51 = apostrophe
129 keycode 52 = period greater
130     control keycode 52 = Compose
131- alt keycode 52 = Meta_period
132+ altgr keycode 52 = quotedbl
133 keycode 53 = slash question
134     control keycode 53 = Delete
135     alt keycode 53 = Meta_slash
136-keycode 54 = Shift
137+ ctrlr keycode 53 = zero
138+keycode 54 = AltGr
139 keycode 55 = KP_Multiply
140 keycode 56 = Alt
141 keycode 57 = space space
142     control keycode 57 = nul
143     alt keycode 57 = Meta_space
144 keycode 58 = Caps_Lock
145-keycode 59 = F1 F11 Console_13
146+keycode 59 = F1 F11 one
147     control keycode 59 = F1
148     alt keycode 59 = Console_1
149     control alt keycode 59 = Console_1
150-keycode 60 = F2 F12 Console_14
151+keycode 60 = F2 F12 two
152     control keycode 60 = F2
153     alt keycode 60 = Console_2
154     control alt keycode 60 = Console_2
155-keycode 61 = F3 F13 Console_15
156+keycode 61 = F3 F13 three
157     control keycode 61 = F3
158     alt keycode 61 = Console_3
159     control alt keycode 61 = Console_3
160-keycode 62 = F4 F14 Console_16
161+keycode 62 = F4 F14 four
162     control keycode 62 = F4
163     alt keycode 62 = Console_4
164     control alt keycode 62 = Console_4
165-keycode 63 = F5 F15 Console_17
166+keycode 63 = F5 F15 five
167     control keycode 63 = F5
168     alt keycode 63 = Console_5
169     control alt keycode 63 = Console_5
170-keycode 64 = F6 F16 Console_18
171+keycode 64 = F6 F16 six
172     control keycode 64 = F6
173     alt keycode 64 = Console_6
174     control alt keycode 64 = Console_6
175-keycode 65 = F7 F17 Console_19
176+keycode 65 = F7 F17 seven
177     control keycode 65 = F7
178     alt keycode 65 = Console_7
179     control alt keycode 65 = Console_7
180-keycode 66 = F8 F18 Console_20
181+keycode 66 = F8 F18 eight
182     control keycode 66 = F8
183     alt keycode 66 = Console_8
184     control alt keycode 66 = Console_8
185@@ -220,7 +250,7 @@ keycode 93 =
186 keycode 94 =
187 keycode 95 =
188 keycode 96 = KP_Enter
189-keycode 97 = Control
190+keycode 97 = CtrlR
191 keycode 98 = KP_Divide
192 keycode 99 = Control_backslash
193     control keycode 99 = Control_backslash
target/linux/xburst/patches-2.6.31/510-Fn-modifier-keys-work.patch
1diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
2index 33b1181..de6a739 100644
3+++ b/arch/mips/jz4740/platform.c
4@@ -264,11 +264,11 @@ static struct platform_device jz_nand_device = {
5  * don't define this. the keyboard and keyboard both work
6  */
7
8-#define KEY_QI_QI KEY_F13
9-#define KEY_QI_UPRED KEY_RIGHTCTRL
10+#define KEY_QI_QI KEY_F13
11+#define KEY_QI_UPRED KEY_RIGHTSHIFT
12 #define KEY_QI_VOLUP KEY_F15
13 #define KEY_QI_VOLDOWN KEY_F16
14-#define KEY_QI_FN KEY_F17
15+#define KEY_QI_FN KEY_RIGHTCTRL
16
17 static const uint32_t qi_lb60_keymap[] = {
18     KEY(0, 0, KEY_F1), /* S2 */
19diff --git a/drivers/char/defkeymap.map b/drivers/char/defkeymap.map
20index 25d05b4..153f026 100644
21+++ b/drivers/char/defkeymap.map
22@@ -1,5 +1,5 @@
23 # Default kernel keymap. This uses 7 modifier combinations.
24-keymaps 0-2,4-5,8,12
25+keymaps 0-2,4-5,8,12,128
26 # Change the above line into
27 # keymaps 0-2,4-6,8,12
28 # in case you want the entries
29@@ -48,6 +48,7 @@ keycode 12 = minus underscore backslash
30 keycode 13 = equal plus
31     alt keycode 13 = Meta_equal
32     altgr keycode 13 = asciitilde
33+ ctrlr keycode 13 = three
34 keycode 14 = Delete Delete
35     control keycode 14 = BackSpace
36     alt keycode 14 = Meta_Delete
37@@ -67,10 +68,13 @@ keycode 21 = y
38     altgr keycode 21 = asciicircum
39 keycode 22 = u
40     altgr keycode 22 = ampersand
41+ ctrlr keycode 22 = seven
42 keycode 23 = i
43     altgr keycode 23 = asterisk
44+ ctrlr keycode 23 = eight
45 keycode 24 = o
46     altgr keycode 24 = parenleft
47+ ctrlr keycode 24 = nine
48 keycode 25 = p
49     altgr keycode 25 = parenright
50 keycode 26 = bracketleft braceleft
51@@ -83,11 +87,11 @@ keycode 28 = Return
52     alt keycode 28 = Meta_Control_m
53 keycode 29 = Control
54 keycode 30 = a
55- altgr keycode 30 = F100
56+ altgr keycode 30 = U+00B0
57 keycode 31 = s
58- altgr keycode 31 = F101
59+ altgr keycode 31 = U+00A8
60 keycode 32 = d
61- altgr keycode 32 = F102
62+ altgr keycode 32 = U+20AC
63 keycode 33 = f
64     altgr keycode 33 = minus
65 keycode 34 = g
66@@ -96,10 +100,13 @@ keycode 35 = h
67     altgr keycode 35 = braceleft
68 keycode 36 = j
69     altgr keycode 36 = bracketleft
70+ ctrlr keycode 36 = four
71 keycode 37 = k
72     altgr keycode 37 = bracketright
73+ ctrlr keycode 37 = five
74 keycode 38 = l
75     altgr keycode 38 = braceright
76+ ctrlr keycode 38 = six
77 keycode 39 = semicolon colon
78     alt keycode 39 = Meta_semicolon
79 keycode 40 = apostrophe quotedbl
80@@ -113,9 +120,9 @@ keycode 43 = backslash bar
81     control keycode 43 = Control_backslash
82     alt keycode 43 = Meta_backslash
83 keycode 44 = z
84- altgr keycode 43 = nine
85+ altgr keycode 44 = nine
86 keycode 45 = x
87- altgr keycode 43 = zero
88+ altgr keycode 45 = zero
89 keycode 46 = c
90     altgr keycode 46 = Hex_C
91 keycode 47 = v
92@@ -123,8 +130,10 @@ keycode 48 = b
93     altgr keycode 48 = Hex_B
94 keycode 49 = n
95     altgr keycode 49 = less
96+ ctrlr keycode 49 = one
97 keycode 50 = m
98     altgr keycode 50 = greater
99+ ctrlr keycode 50 = two
100 keycode 51 = comma less
101     altgr keycode 51 = apostrophe
102 keycode 52 = period greater
103@@ -133,7 +142,8 @@ keycode 52 = period greater
104 keycode 53 = slash question
105     control keycode 53 = Delete
106     alt keycode 53 = Meta_slash
107-keycode 54 = Shift
108+ ctrlr keycode 53 = zero
109+keycode 54 = AltGr
110 keycode 55 = KP_Multiply
111 keycode 56 = Alt
112 keycode 57 = space space
113@@ -240,7 +250,7 @@ keycode 93 =
114 keycode 94 =
115 keycode 95 =
116 keycode 96 = KP_Enter
117-keycode 97 = AltGr
118+keycode 97 = CtrlR
119 keycode 98 = KP_Divide
120 keycode 99 = Control_backslash
121     control keycode 99 = Control_backslash
122@@ -299,9 +309,6 @@ string F17 = "\033[31~"
123 string F18 = "\033[32~"
124 string F19 = "\033[33~"
125 string F20 = "\033[34~"
126-string F100 = "°"
127-string F101 = "¨"
128-string F102 = "¿"
129 string Find = "\033[1~"
130 string Insert = "\033[2~"
131 string Remove = "\033[3~"

Archive Download the corresponding diff file

Branches:
backfire
history
master
release_2010-11-17
release_2010-12-14
release_2011-02-23
release_2011-05-28
release_2011-08-27
release_2011-11-13
release_2012-03-18
release_2012-04-09
release_2012-10-11
uclibc_nptl



interactive