qi-hardware/openwrt-packages
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-packages.git synced 2024-11-22 16:37:30 +02:00
Code

liballegro: change the keybord driver fix to tread RCONTROL as before (as CTRL)

Browse Source
This commit is contained in:
David Kühling 2011-06-19 12:29:22 +02:00
parent d8162a7f3a
commit 026792a075
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
liballegro/patches/060-fix-keyboard-drv.patch
View File

@ -1,7 +1,7 @@
Index: allegro-4.4.2/src/linux/lkeybd.c Index: allegro-4.4.2/src/linux/lkeybd.c
=================================================================== ===================================================================
--- allegro-4.4.2.orig/src/linux/lkeybd.c 2011-06-16 13:35:57.000000000 +0200 --- allegro-4.4.2.orig/src/linux/lkeybd.c 2011-06-19 11:32:20.000000000 +0200
+++ allegro-4.4.2/src/linux/lkeybd.c 2011-06-16 20:27:40.000000000 +0200 +++ allegro-4.4.2/src/linux/lkeybd.c 2011-06-19 11:32:31.000000000 +0200
@@ -143,7 +143,10 @@ @@ -143,7 +143,10 @@
/* convert Allegro format scancodes into key_shifts flag bits */ /* convert Allegro format scancodes into key_shifts flag bits */
static unsigned short modifier_table[__allegro_KEY_MAX - __allegro_KEY_MODIFIERS] = static unsigned short modifier_table[__allegro_KEY_MAX - __allegro_KEY_MODIFIERS] =
@ -14,18 +14,15 @@ Index: allegro-4.4.2/src/linux/lkeybd.c
__allegro_KB_CTRL_FLAG, __allegro_KB_ALT_FLAG, __allegro_KB_ALT_FLAG, __allegro_KB_CTRL_FLAG, __allegro_KB_ALT_FLAG, __allegro_KB_ALT_FLAG,
__allegro_KB_LWIN_FLAG, __allegro_KB_RWIN_FLAG, __allegro_KB_MENU_FLAG, __allegro_KB_LWIN_FLAG, __allegro_KB_RWIN_FLAG, __allegro_KB_MENU_FLAG,
__allegro_KB_SCROLOCK_FLAG, __allegro_KB_NUMLOCK_FLAG, __allegro_KB_CAPSLOCK_FLAG __allegro_KB_SCROLOCK_FLAG, __allegro_KB_NUMLOCK_FLAG, __allegro_KB_CAPSLOCK_FLAG
@@ -204,9 +207,13 @@ @@ -204,7 +207,10 @@
map = 0; map = 0;
if (key[__allegro_KEY_LSHIFT] || key[__allegro_KEY_RSHIFT]) map |= 1; if (key[__allegro_KEY_LSHIFT] || key[__allegro_KEY_RSHIFT]) map |= 1;
if (key[__allegro_KEY_ALTGR]) map |= 2; if (key[__allegro_KEY_ALTGR]) map |= 2;
- if (key[__allegro_KEY_LCONTROL] || key[__allegro_KEY_RCONTROL]) map |= 4; - if (key[__allegro_KEY_LCONTROL] || key[__allegro_KEY_RCONTROL]) map |= 4;
+ /* if (key[__allegro_KEY_LCONTROL] || key[__allegro_KEY_RCONTROL]) map |= 4; */ +
+ /* fixes for nanonote's keyboard: LCONTROL is 'Fn' modifier */
+ if (key[__allegro_KEY_LCONTROL]) map |= (1<<6);
+ if (key[__allegro_KEY_RCONTROL]) map |= 4;
if (key[__allegro_KEY_ALT]) map |= 8; if (key[__allegro_KEY_ALT]) map |= 8;
+ /* fixes for nanonote's keyboard */
+ if (key[__allegro_KEY_LCONTROL]) map |= (1<<6);
+ if (key[__allegro_KEY_RCONTROL]) map |= (1<<7);
+
/* Map scancode to type and value */ /* Map scancode to type and value */
kbe.kb_table = map;
kbe.kb_index = code;