qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-01-11 21:50:15 +02:00
Code

fix the [issue 50]. correct the acute(grave) key

Browse Source
This commit is contained in:
Xiangfu Liu 2010-03-31 12:53:23 +08:00
parent 8ca0219487
commit 4a2e8be9e7
3 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/linux/xburst/files-2.6.32/arch/mips/jz4740/board-qi_lb60.c
View File

@ -125,11 +125,12 @@ static struct jz_nand_platform_data qi_lb60_nand_pdata = {
* don't define this. the keyboard and keyboard both work * don't define this. the keyboard and keyboard both work
*/ */
#define KEY_QI_QI KEY_F13
#define KEY_QI_UPRED KEY_RIGHTALT
#define KEY_QI_VOLUP KEY_F11 #define KEY_QI_VOLUP KEY_F11
#define KEY_QI_VOLDOWN KEY_F12 #define KEY_QI_VOLDOWN KEY_F12
#define KEY_QI_QI KEY_F13
#define KEY_QI_ACUTE KEY_GRAVE
#define KEY_QI_FN KEY_LEFTCTRL #define KEY_QI_FN KEY_LEFTCTRL
#define KEY_QI_UPRED KEY_RIGHTALT
static const uint32_t qi_lb60_keymap[] = { static const uint32_t qi_lb60_keymap[] = {
KEY(0, 0, KEY_F1), /* S2 */ KEY(0, 0, KEY_F1), /* S2 */
@ -167,7 +168,7 @@ static const uint32_t qi_lb60_keymap[] = {
KEY(4, 0, KEY_TAB), /* S34 */ KEY(4, 0, KEY_TAB), /* S34 */
KEY(4, 1, KEY_CAPSLOCK), /* S35 */ KEY(4, 1, KEY_CAPSLOCK), /* S35 */
KEY(4, 2, KEY_BACKSLASH), /* S36 */ KEY(4, 2, KEY_BACKSLASH), /* S36 */
KEY(4, 3, KEY_APOSTROPHE), /* S37 */ KEY(4, 3, KEY_QI_ACUTE), /* S37 */
KEY(4, 4, KEY_COMMA), /* S38 */ KEY(4, 4, KEY_COMMA), /* S38 */
KEY(4, 5, KEY_DOT), /* S39 */ KEY(4, 5, KEY_DOT), /* S39 */
KEY(4, 6, KEY_SLASH), /* S40 */ KEY(4, 6, KEY_SLASH), /* S40 */

8
target/linux/xburst/files-2.6.32/drivers/char/defkeymap.c_shipped
View File

@ -11,7 +11,7 @@ u_short plain_map[NR_KEYS] = {
0xfb71, 0xfb77, 0xfb65, 0xfb72, 0xfb74, 0xfb79, 0xfb75, 0xfb69, 0xfb71, 0xfb77, 0xfb65, 0xfb72, 0xfb74, 0xfb79, 0xfb75, 0xfb69,
0xfb6f, 0xfb70, 0xf05b, 0xf05d, 0xf201, 0xf706, 0xfb61, 0xfb73, 0xfb6f, 0xfb70, 0xf05b, 0xf05d, 0xf201, 0xf706, 0xfb61, 0xfb73,
0xfb64, 0xfb66, 0xfb67, 0xfb68, 0xfb6a, 0xfb6b, 0xfb6c, 0xf03b, 0xfb64, 0xfb66, 0xfb67, 0xfb68, 0xfb6a, 0xfb6b, 0xfb6c, 0xf03b,
0xf027, 0xf060, 0xf700, 0xf05c, 0xfb7a, 0xfb78, 0xfb63, 0xfb76, 0xf027, 0xf0b4, 0xf700, 0xf05c, 0xfb7a, 0xfb78, 0xfb63, 0xfb76,
0xfb62, 0xfb6e, 0xfb6d, 0xf02c, 0xf02e, 0xf02f, 0xf701, 0xf30c, 0xfb62, 0xfb6e, 0xfb6d, 0xf02c, 0xf02e, 0xf02f, 0xf701, 0xf30c,
0xf703, 0xf020, 0xf207, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104, 0xf703, 0xf020, 0xf207, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104,
0xf105, 0xf106, 0xf107, 0xf108, 0xf109, 0xf208, 0xf209, 0xf307, 0xf105, 0xf106, 0xf107, 0xf108, 0xf109, 0xf208, 0xf209, 0xf307,
@ -46,7 +46,7 @@ static u_short shift_map[NR_KEYS] = {
0xfb51, 0xfb57, 0xfb45, 0xfb52, 0xfb54, 0xfb59, 0xfb55, 0xfb49, 0xfb51, 0xfb57, 0xfb45, 0xfb52, 0xfb54, 0xfb59, 0xfb55, 0xfb49,
0xfb4f, 0xfb50, 0xf07b, 0xf07d, 0xf201, 0xf706, 0xfb41, 0xfb53, 0xfb4f, 0xfb50, 0xf07b, 0xf07d, 0xf201, 0xf706, 0xfb41, 0xfb53,
0xfb44, 0xfb46, 0xfb47, 0xfb48, 0xfb4a, 0xfb4b, 0xfb4c, 0xf03a, 0xfb44, 0xfb46, 0xfb47, 0xfb48, 0xfb4a, 0xfb4b, 0xfb4c, 0xf03a,
0xf022, 0xf07e, 0xf700, 0xf07c, 0xfb5a, 0xfb58, 0xfb43, 0xfb56, 0xf022, 0xf060, 0xf700, 0xf07c, 0xfb5a, 0xfb58, 0xfb43, 0xfb56,
0xfb42, 0xfb4e, 0xfb4d, 0xf03b, 0xf03a, 0xf03f, 0xf701, 0xf30c, 0xfb42, 0xfb4e, 0xfb4d, 0xf03b, 0xf03a, 0xf03f, 0xf701, 0xf30c,
0xf703, 0xf020, 0xf207, 0xf10a, 0xf10b, 0xf10c, 0xf10d, 0xf10e, 0xf703, 0xf020, 0xf207, 0xf10a, 0xf10b, 0xf10c, 0xf10d, 0xf10e,
0xf10f, 0xf110, 0xf111, 0xf112, 0xf113, 0xf213, 0xf203, 0xf307, 0xf10f, 0xf110, 0xf111, 0xf112, 0xf113, 0xf213, 0xf203, 0xf307,
@ -116,7 +116,7 @@ static u_short ctrl_map[NR_KEYS] = {
0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009, 0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009,
0xf00f, 0xf010, 0xf01b, 0xf01d, 0xf201, 0xf706, 0xf001, 0xf013, 0xf00f, 0xf010, 0xf01b, 0xf01d, 0xf201, 0xf706, 0xf001, 0xf013,
0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200, 0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200,
0xf007, 0xf000, 0xf700, 0xf01c, 0xf01a, 0xf018, 0xf003, 0xf016, 0xf007, 0xf200, 0xf700, 0xf01c, 0xf01a, 0xf018, 0xf003, 0xf016,
0xf002, 0xf00e, 0xf00d, 0xf200, 0xf20e, 0xf07f, 0xf701, 0xf30c, 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf20e, 0xf07f, 0xf701, 0xf30c,
0xf703, 0xf000, 0xf207, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104, 0xf703, 0xf000, 0xf207, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104,
0xf105, 0xf106, 0xf107, 0xf108, 0xf109, 0xf208, 0xf204, 0xf307, 0xf105, 0xf106, 0xf107, 0xf108, 0xf109, 0xf208, 0xf204, 0xf307,
@ -186,7 +186,7 @@ static u_short alt_map[NR_KEYS] = {
0xf871, 0xf877, 0xf865, 0xf872, 0xf874, 0xf879, 0xf875, 0xf869, 0xf871, 0xf877, 0xf865, 0xf872, 0xf874, 0xf879, 0xf875, 0xf869,
0xf86f, 0xf870, 0xf85b, 0xf85d, 0xf80d, 0xf706, 0xf861, 0xf873, 0xf86f, 0xf870, 0xf85b, 0xf85d, 0xf80d, 0xf706, 0xf861, 0xf873,
0xf864, 0xf866, 0xf867, 0xf868, 0xf86a, 0xf86b, 0xf86c, 0xf83b, 0xf864, 0xf866, 0xf867, 0xf868, 0xf86a, 0xf86b, 0xf86c, 0xf83b,
0xf827, 0xf860, 0xf700, 0xf85c, 0xf87a, 0xf878, 0xf863, 0xf876, 0xf827, 0xf200, 0xf700, 0xf85c, 0xf87a, 0xf878, 0xf863, 0xf876,
0xf862, 0xf86e, 0xf86d, 0xf200, 0xf200, 0xf82f, 0xf701, 0xf30c, 0xf862, 0xf86e, 0xf86d, 0xf200, 0xf200, 0xf82f, 0xf701, 0xf30c,
0xf703, 0xf820, 0xf207, 0xf500, 0xf501, 0xf502, 0xf503, 0xf504, 0xf703, 0xf820, 0xf207, 0xf500, 0xf501, 0xf502, 0xf503, 0xf504,
0xf505, 0xf506, 0xf507, 0xf508, 0xf509, 0xf208, 0xf209, 0xf907, 0xf505, 0xf506, 0xf507, 0xf508, 0xf509, 0xf208, 0xf209, 0xf907,

27
target/linux/xburst/patches-2.6.32/500-modifier-keys.patch
View File

@ -9,10 +9,10 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/500-mo
1 files changed, 54 insertions(+), 26 deletions(-) 1 files changed, 54 insertions(+), 26 deletions(-)
diff --git a/drivers/char/defkeymap.map b/drivers/char/defkeymap.map Index: b/drivers/char/defkeymap.map
index 50b30ca..d395c16 100644 ===================================================================
--- a/drivers/char/defkeymap.map --- a/drivers/char/defkeymap.map 2010-03-15 23:52:04.000000000 +0800
+++ b/drivers/char/defkeymap.map +++ b/drivers/char/defkeymap.map 2010-03-31 12:36:18.641363691 +0800
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
# Default kernel keymap. This uses 7 modifier combinations. # Default kernel keymap. This uses 7 modifier combinations.
-keymaps 0-2,4-5,8,12 -keymaps 0-2,4-5,8,12
@ -20,7 +20,7 @@ index 50b30ca..d395c16 100644
# Change the above line into # Change the above line into
# keymaps 0-2,4-6,8,12 # keymaps 0-2,4-6,8,12
# in case you want the entries # in case you want the entries
@@ -45,24 +45,38 @@ keycode 12 = minus underscore backslash @@ -45,24 +45,38 @@
control keycode 12 = Control_underscore control keycode 12 = Control_underscore
shift control keycode 12 = Control_underscore shift control keycode 12 = Control_underscore
alt keycode 12 = Meta_minus alt keycode 12 = Meta_minus
@ -62,7 +62,7 @@ index 50b30ca..d395c16 100644
keycode 26 = bracketleft braceleft keycode 26 = bracketleft braceleft
control keycode 26 = Escape control keycode 26 = Escape
alt keycode 26 = Meta_bracketleft alt keycode 26 = Meta_bracketleft
@@ -71,19 +85,28 @@ keycode 27 = bracketright braceright asciitilde @@ -71,84 +85,98 @@
alt keycode 27 = Meta_bracketright alt keycode 27 = Meta_bracketright
keycode 28 = Return keycode 28 = Return
alt keycode 28 = Meta_Control_m alt keycode 28 = Meta_Control_m
@ -95,7 +95,14 @@ index 50b30ca..d395c16 100644
keycode 39 = semicolon colon keycode 39 = semicolon colon
alt keycode 39 = Meta_semicolon alt keycode 39 = Meta_semicolon
keycode 40 = apostrophe quotedbl keycode 40 = apostrophe quotedbl
@@ -97,58 +120,65 @@ keycode 43 = backslash bar control keycode 40 = Control_g
alt keycode 40 = Meta_apostrophe
-keycode 41 = grave asciitilde
- control keycode 41 = nul
- alt keycode 41 = Meta_grave
+keycode 41 = U+00B4 grave
keycode 42 = Shift
keycode 43 = backslash bar
control keycode 43 = Control_backslash control keycode 43 = Control_backslash
alt keycode 43 = Meta_backslash alt keycode 43 = Meta_backslash
keycode 44 = z keycode 44 = z
@ -174,7 +181,7 @@ index 50b30ca..d395c16 100644
control keycode 66 = F8 control keycode 66 = F8
alt keycode 66 = Console_8 alt keycode 66 = Console_8
control alt keycode 66 = Console_8 control alt keycode 66 = Console_8
@@ -204,11 +234,11 @@ keycode 84 = Last_Console @@ -204,11 +232,11 @@
keycode 85 = keycode 85 =
keycode 86 = less greater bar keycode 86 = less greater bar
alt keycode 86 = Meta_less alt keycode 86 = Meta_less
@ -188,7 +195,7 @@ index 50b30ca..d395c16 100644
control keycode 88 = F12 control keycode 88 = F12
alt keycode 88 = Console_12 alt keycode 88 = Console_12
control alt keycode 88 = Console_12 control alt keycode 88 = Console_12
@@ -220,7 +250,7 @@ keycode 93 = @@ -220,7 +248,7 @@
keycode 94 = keycode 94 =
keycode 95 = keycode 95 =
keycode 96 = KP_Enter keycode 96 = KP_Enter
@ -197,7 +204,7 @@ index 50b30ca..d395c16 100644
keycode 98 = KP_Divide keycode 98 = KP_Divide
keycode 99 = Control_backslash keycode 99 = Control_backslash
control keycode 99 = Control_backslash control keycode 99 = Control_backslash
@@ -269,8 +299,6 @@ string F7 = "\033[18~" @@ -269,8 +297,6 @@
string F8 = "\033[19~" string F8 = "\033[19~"
string F9 = "\033[20~" string F9 = "\033[20~"
string F10 = "\033[21~" string F10 = "\033[21~"