merge of 29e6764d0920c0357aa34e6e348e962da7fd316f

     and f10f5c840e362f84286526ff42c23d83c7c73e62

3 files changed, 109 insertions, 43 deletions

diff --git a/packages/keymaps/files/poodle/keymap-2.6.map b/packages/keymaps/files/poodle/keymap-2.6.map
index 17485ac4a3..68533bb93c 100644
--- a/packages/keymaps/files/poodle/keymap-2.6.map
+++ b/packages/keymaps/files/poodle/keymap-2.6.map
@@ -1,58 +1,57 @@
 keymaps 0-2,4,8,12
 
 # 	      Default 		Shift 		AltGr 		Control 	Alt 		Ctrl+Alt 	
-keycode  59 = Control		Control		Control		Control		Control		Control		
-keycode  60 = Alt		Alt		Alt		Alt		Alt		Alt		
-keycode  62 = Escape
-keycode  63 = Return
+keycode  29 = SControl	# Calendar	
+keycode  60 = SAlt	# Address
+keycode  63 = Return		
 keycode  68 = F13 	# Mail
-keycode  87 = Return
+keycode  87 = Return		
 keycode  88 = F11 	# Menu
 keycode 102 = F12	# Home
-keycode 103 = Up
-keycode 105 = Left		VoidSymbol	Decr_Console	
-keycode 106 = Right		VoidSymbol	Incr_Console	
-keycode 108 = Down
+keycode 103 = Up		Up		Prior
+keycode 105 = Left		Left		Decr_Console	
+keycode 106 = Right		Right		Incr_Console	
+keycode 108 = Down		Down		Next
+keycode 116 = Escape		
 
-keycode   1 = Escape 		Escape 		          
 keycode  14 = BackSpace		BackSpace	Delete
 keycode  15 = Tab		backslash       Caps_Lock
-keycode  28 = Return         	VoidSymbol	greater
-keycode  29 = AltGr 		AltGr		AltGr		AltGr		AltGr		AltGr		
+keycode  28 = Return         	Return		greater	
 keycode  40 = apostrophe       	quotedbl        tilde
-keycode  42 = Shift		
+keycode  42 = SShift		
 keycode  51 = comma            	semicolon	parenright
 keycode  52 = period		colon		less
 keycode  53 = slash		question	Num_Lock
-keycode  54 = Shift 
-keycode  57 = space		space		bar
+keycode  54 = SShift 
+keycode  57 = space		bar		bar
+keycode  67 = SAltGr
 
-keycode  16 = q                 Q		one		Control_q	Meta_q
-keycode  17 = w               	W		two		Control_w	Meta_w
-keycode  18 = e               	E		three		Control_e	Meta_e
-keycode  19 = r               	R		four		Control_r	Meta_r
-keycode  20 = t               	T		five		Control_t	Meta_t
-keycode  21 = y               	Y		six		Control_y	Meta_y
-keycode  22 = u               	U		seven		Control_u	Meta_u
-keycode  23 = i               	I		eight		Control_i	Meta_i
-keycode  24 = o               	O		nine		Control_o	Meta_o
-keycode  25 = p               	P		zero		Control_p	Meta_p
-keycode  30 = a            	A		exclam   	Control_a	Meta_a
-keycode  31 = s               	S		at		Control_s	Meta_s
-keycode  32 = d			D		numbersign	Control_d	Meta_d
-keycode  33 = f			F		dollar		Control_f	Meta_f
-keycode  34 = g               	G		percent		Control_g	Meta_g
-keycode  35 = h               	H		underscore	Control_h	Meta_h
-keycode  36 = j               	J		ampersand	Control_j	Meta_j
-keycode  37 = k               	K		asterisk	Control_k	Meta_k
-keycode  38 = l               	L		parenleft	Control_l	Meta_l
-keycode  44 = z               	Z		VoidSymbol	Control_z	Meta_z
-keycode  45 = x               	X		Control_x	Control_x	Meta_x
-keycode  46 = c               	C		Control_c	Control_c	Meta_c
-keycode  47 = v               	V		Control_v	Control_v	Meta_v
-keycode  48 = b			B		minus		Control_b	Meta_b
-keycode  49 = n               	N		plus		Control_n	Meta_n
-keycode  50 = m               	M		equal		Control_m	Meta_m
+keycode  16 = +q                +Q		one		Control_q	Meta_q
+keycode  17 = +w               	+W		two		Control_w	Meta_w
+keycode  18 = +e               	+E		three		Control_e	Meta_e
+keycode  19 = +r               	+R		four		Control_r	Meta_r
+keycode  20 = +t               	+T		five		Control_t	Meta_t
+keycode  21 = +y               	+Y		six		Control_y	Meta_y
+keycode  22 = +u               	+U		seven		Control_u	Meta_u
+keycode  23 = +i               	+I		eight		Control_i	Meta_i
+keycode  24 = +o               	+O		nine		Control_o	Meta_o
+keycode  25 = +p               	+P		zero		Control_p	Meta_p
+keycode  30 = +a            	+A		exclam   	Control_a	Meta_a
+keycode  31 = +s               	+S		at		Control_s	Meta_s
+keycode  32 = +d		+D		numbersign	Control_d	Meta_d
+keycode  33 = +f		+F		dollar		Control_f	Meta_f
+keycode  34 = +g               	+G		percent		Control_g	Meta_g
+keycode  35 = +h               	+H		underscore	Control_h	Meta_h
+keycode  36 = +j               	+J		ampersand	Control_j	Meta_j
+keycode  37 = +k               	+K		asterisk	Control_k	Meta_k
+keycode  38 = +l               	+L		parenleft	Control_l	Meta_l
+keycode  44 = +z               	+Z		VoidSymbol	Control_z	Meta_z
+keycode  45 = +x               	+X		Control_x	Control_x	Meta_x
+keycode  46 = +c               	+C		Control_c	Control_c	Meta_c
+keycode  47 = +v               	+V		Control_v	Control_v	Meta_v
+keycode  48 = +b		+B		minus		Control_b	Meta_b
+keycode  49 = +n               	+N		plus		Control_n	Meta_n
+keycode  50 = +m               	+M		equal		Control_m	Meta_m
 		
 string F1 = "\033[[A"
 string F2 = "\033[[B"
diff --git a/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch b/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch
new file mode 100644
index 0000000000..365ee1366e
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch
@@ -0,0 +1,66 @@
+--- linux-2.6.16/drivers/input/keyboard/locomokbd.c.orig	2006-05-13 22:53:33.810228656 +0200
++++ linux-2.6.16/drivers/input/keyboard/locomokbd.c	2006-05-13 22:56:56.544408376 +0200
+@@ -45,17 +45,20 @@
+ #define LOCOMOKBD_NUMKEYS	128
+ 
+ 
+-#define LOCOMO_KEY_CALENDER	KEY_F1
+-#define LOCOMO_KEY_ADDRESS	KEY_F2
+-#define LOCOMO_KEY_CANCEL	KEY_F4
+-#define LOCOMO_KEY_CENTER	KEY_F5
+-#define LOCOMO_KEY_MAIL		KEY_F10
+-#define LOCOMO_KEY_OK		KEY_F11
++#define LOCOMO_KEY_CALENDER	KEY_LEFTCTRL
++#define LOCOMO_KEY_ADDRESS	KEY_LEFTALT	/* Needed SysRQ */
++#define LOCOMO_KEY_HOME		KEY_SYSRQ	/* Need that for SysRQ */
+ #define LOCOMO_KEY_MENU		KEY_F12
++#define LOCOMO_KEY_MAIL		KEY_F10
++#define LOCOMO_KEY_OK		KEY_F11		/* Don't hardwire to KP_RETURN */
++#define LOCOMO_KEY_CANCEL	KEY_POWER
++#define LOCOMO_KEY_CENTER	KEY_F5		/* Don't hardwire to KP_RETURN */
++
++#define LOCOMO_KEY_FN		KEY_F9
+ 
+ static unsigned char locomokbd_keycode[LOCOMOKBD_NUMKEYS] = {
+-	0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, KEY_HOME, 0, 0, 0, 0, 0, 0,		/* 0 - 9 */
+-	KEY_HOME, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, KEY_HOME, LOCOMO_KEY_ADDRESS,	/* 10 - 19 */
++	0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, LOCOMO_KEY_HOME, 0, 0, 0, 0, 0, 0,	/* 0 - 9 */
++	0, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, 0, LOCOMO_KEY_ADDRESS,			/* 10 - 19 */
+ 	0, 0, 0, 0, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0,					/* 20 - 29 */
+ 	0, 0, 0, LOCOMO_KEY_CENTER, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0,			/* 30 - 39 */
+ 	0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT,						/* 40 - 49 */
+@@ -65,7 +68,7 @@
+ 	0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J,			/* 80 - 89 */
+ 	KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0,					/* 90 - 99 */
+ 	0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A,			/* 100 - 109 */
+-	KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0,			/* 110 - 119 */
++	KEY_LEFTSHIFT, KEY_TAB, LOCOMO_KEY_FN, 0, 0, 0, 0, 0, 0, 0,			/* 110 - 119 */
+ 	KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0			/* 120 - 128 */
+ };
+ 
+@@ -76,7 +79,7 @@
+ #define	NR_SCANCODES		128
+ 
+ #define KB_DELAY		8
+-#define SCAN_INTERVAL		(HZ/10)
++#define SCAN_INTERVAL		(HZ/20)
+ #define LOCOMOKBD_PRESSED	1
+ 
+ struct locomokbd {
+@@ -146,6 +149,7 @@
+ 	locomokbd_charge_all(membase);
+ 
+ 	num_pressed = 0;
++
+ 	for (col = 0; col < KB_COLS; col++) {
+ 
+ 		locomokbd_activate_col(membase, col);
+@@ -155,7 +159,7 @@
+ 		for (row = 0; row < KB_ROWS; row++) {
+ 			scancode = SCANCODE(col, row);
+ 			if (rowd & KB_ROWMASK(row)) {
+-				/* printk(KERN_ERR "locomokbd: COL [%i] ROW [%i] scancode [%i] keycode [%i]\n",col,row,scancode,locomokbd->keycode[scancode]); */
++				printk(KERN_ERR "locomokbd: ROW [%i] COL [%i] scancode [%i] keycode [%i]\n",row,col,scancode,locomokbd->keycode[scancode]);
+ 				num_pressed += 1;
+ 				input_report_key(locomokbd->input, locomokbd->keycode[scancode], 1);
+ 			} else {
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index 2692cac3f5..3ad68d1a69 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r22"
+PR = "r23"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -93,7 +93,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            file://connectplus-remove-ide-HACK.patch;patch=1 \
            file://24-hostap_cs_id.diff;patch=1 \
            file://hrw-pcmcia-ids-r2.patch;patch=1 \
-	   file://locomo-kbd-hotkeys.patch;patch=1 \	   
+	   file://locomo-kbd-hotkeys.patch;patch=1 \
+	   file://locomo-sysrq+keyrepeat.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-ipaq-pxa270 \
            file://defconfig-collie \