diff --git a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/board-qi_lb60.c b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/board-qi_lb60.c index 800441716..969f71e2f 100644 --- a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/board-qi_lb60.c +++ b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/board-qi_lb60.c @@ -127,8 +127,8 @@ static struct jz_nand_platform_data qi_lb60_nand_pdata = { #define KEY_QI_QI KEY_F13 #define KEY_QI_UPRED KEY_RIGHTALT -#define KEY_QI_VOLUP KEY_VOLUMEUP -#define KEY_QI_VOLDOWN KEY_VOLUMEDOWN +#define KEY_QI_VOLUP KEY_F11 +#define KEY_QI_VOLDOWN KEY_F12 #define KEY_QI_FN KEY_LEFTCTRL static const uint32_t qi_lb60_keymap[] = { diff --git a/target/linux/xburst/files-2.6.32/drivers/char/defkeymap.c_shipped b/target/linux/xburst/files-2.6.32/drivers/char/defkeymap.c_shipped index fca8d595a..2610e535b 100644 --- a/target/linux/xburst/files-2.6.32/drivers/char/defkeymap.c_shipped +++ b/target/linux/xburst/files-2.6.32/drivers/char/defkeymap.c_shipped @@ -51,8 +51,8 @@ static u_short shift_map[NR_KEYS] = { 0xf703, 0xf020, 0xf207, 0xf10a, 0xf10b, 0xf10c, 0xf10d, 0xf10e, 0xf10f, 0xf110, 0xf111, 0xf112, 0xf113, 0xf213, 0xf203, 0xf307, 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf03e, 0xf10a, - 0xf10b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf03e, 0xf20b, + 0xf20a, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, 0xf20b, 0xf601, 0xf602, 0xf117, 0xf600, 0xf20a, 0xf115, 0xf116, 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, @@ -86,8 +86,8 @@ static u_short altgr_map[NR_KEYS] = { 0xf703, 0xf200, 0xf207, 0xf031, 0xf032, 0xf033, 0xf034, 0xf035, 0xf036, 0xf037, 0xf038, 0xf514, 0xf515, 0xf208, 0xf202, 0xf911, 0xf912, 0xf913, 0xf30b, 0xf90e, 0xf90f, 0xf910, 0xf30a, 0xf90b, - 0xf90c, 0xf90d, 0xf90a, 0xf310, 0xf206, 0xf200, 0xf07c, 0xf516, - 0xf517, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf90c, 0xf90d, 0xf90a, 0xf310, 0xf206, 0xf200, 0xf07c, 0xf118, + 0xf119, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, @@ -324,8 +324,6 @@ char func_buf[] = { '\033', '[', '1', '9', '~', 0, '\033', '[', '2', '0', '~', 0, '\033', '[', '2', '1', '~', 0, - '\033', '[', '2', '3', '~', 0, - '\033', '[', '2', '4', '~', 0, '\033', '[', '2', '5', '~', 0, '\033', '[', '2', '6', '~', 0, '\033', '[', '2', '8', '~', 0, @@ -359,6 +357,8 @@ char *func_table[MAX_NR_FUNC] = { func_buf + 37, func_buf + 43, func_buf + 49, + 0, + 0, func_buf + 55, func_buf + 61, func_buf + 67, @@ -368,17 +368,15 @@ char *func_table[MAX_NR_FUNC] = { func_buf + 91, func_buf + 97, func_buf + 103, - func_buf + 109, - func_buf + 115, - func_buf + 120, - func_buf + 125, - func_buf + 130, - func_buf + 135, - func_buf + 140, - func_buf + 145, + func_buf + 108, + func_buf + 113, + func_buf + 118, + func_buf + 123, + func_buf + 128, + func_buf + 133, 0, 0, - func_buf + 149, + func_buf + 137, 0, }; diff --git a/target/linux/xburst/patches-2.6.32/500-modifier-keys.patch b/target/linux/xburst/patches-2.6.32/500-modifier-keys.patch index 9a42684b7..ab836fc7b 100644 --- a/target/linux/xburst/patches-2.6.32/500-modifier-keys.patch +++ b/target/linux/xburst/patches-2.6.32/500-modifier-keys.patch @@ -1,12 +1,16 @@ From d76e6b85f28891eecded962793fb8a02cdf26f39 Mon Sep 17 00:00:00 2001 + From: Lars-Peter Clausen -Date: Mon, 11 Jan 2010 04:29:51 +0100 + Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/500-modifier-keys.patch - --- - drivers/char/defkeymap.map | 74 +++++++++++++++++++++++++++++++------------- - 1 files changed, 52 insertions(+), 22 deletions(-) + drivers/char/defkeymap.map | 80 ++++++++++++++++++++++++++++++-------------- + 1 files changed, 54 insertions(+), 26 deletions(-) + + +diff --git a/drivers/char/defkeymap.map b/drivers/char/defkeymap.map +index 50b30ca..d395c16 100644 --- a/drivers/char/defkeymap.map +++ b/drivers/char/defkeymap.map @@ -1,5 +1,5 @@ @@ -16,7 +20,7 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/500-mo # Change the above line into # keymaps 0-2,4-6,8,12 # in case you want the entries -@@ -45,24 +45,38 @@ keycode 12 = minus underscor +@@ -45,24 +45,38 @@ keycode 12 = minus underscore backslash control keycode 12 = Control_underscore shift control keycode 12 = Control_underscore alt keycode 12 = Meta_minus @@ -58,7 +62,7 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/500-mo keycode 26 = bracketleft braceleft control keycode 26 = Escape alt keycode 26 = Meta_bracketleft -@@ -71,19 +85,28 @@ keycode 27 = bracketright bracerigh +@@ -71,19 +85,28 @@ keycode 27 = bracketright braceright asciitilde alt keycode 27 = Meta_bracketright keycode 28 = Return alt keycode 28 = Meta_Control_m @@ -91,7 +95,7 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/500-mo keycode 39 = semicolon colon alt keycode 39 = Meta_semicolon keycode 40 = apostrophe quotedbl -@@ -97,58 +120,65 @@ keycode 43 = backslash bar +@@ -97,58 +120,65 @@ keycode 43 = backslash bar control keycode 43 = Control_backslash alt keycode 43 = Meta_backslash keycode 44 = z @@ -170,6 +174,20 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/500-mo control keycode 66 = F8 alt keycode 66 = Console_8 control alt keycode 66 = Console_8 +@@ -204,11 +234,11 @@ keycode 84 = Last_Console + keycode 85 = + keycode 86 = less greater bar + alt keycode 86 = Meta_less +-keycode 87 = F11 F11 Console_23 ++keycode 87 = F11 Scroll_Backward Prior + control keycode 87 = F11 + alt keycode 87 = Console_11 + control alt keycode 87 = Console_11 +-keycode 88 = F12 F12 Console_24 ++keycode 88 = F12 Scroll_Forward Next + control keycode 88 = F12 + alt keycode 88 = Console_12 + control alt keycode 88 = Console_12 @@ -220,7 +250,7 @@ keycode 93 = keycode 94 = keycode 95 = @@ -179,3 +197,12 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/500-mo keycode 98 = KP_Divide keycode 99 = Control_backslash control keycode 99 = Control_backslash +@@ -269,8 +299,6 @@ string F7 = "\033[18~" + string F8 = "\033[19~" + string F9 = "\033[20~" + string F10 = "\033[21~" +-string F11 = "\033[23~" +-string F12 = "\033[24~" + string F13 = "\033[25~" + string F14 = "\033[26~" + string F15 = "\033[28~"