Fix keymaps for the HP Jornada 6xx. Includes updates

and new ones.

Signed-off-by: Alex Ferguson <thoughtmonster@gmail.com>
Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>

8 files changed, 261 insertions, 28 deletions

diff --git a/recipes/keymaps/files/jornada6xx/keymap b/recipes/keymaps/files/jornada6xx/keymap
new file mode 100755
index 0000000000..6d871f01b6
--- /dev/null
+++ b/recipes/keymaps/files/jornada6xx/keymap
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+echo "Loading Keymap..."
+
+if [ ! -f "/etc/keymap-default.map" ]
+then
+	# User has not set a default.
+	# Note that 620/660 machines need a different keymap.
+	cat /proc/cpuinfo | grep SH7708 >/dev/null
+	if [ $? = 0 ]
+	then
+		loadkeys /etc/keymap-uk-620-660.map
+	else
+		loadkeys /etc/keymap-uk.map
+	fi
+else
+	# User has set a default
+	loadkeys /etc/keymap-default.map
+fi
diff --git a/recipes/keymaps/files/jornada6xx/keymap-br.map b/recipes/keymaps/files/jornada6xx/keymap-br.map
index 8bc0f0fab6..4ba655791b 100644..100755
--- a/recipes/keymaps/files/jornada6xx/keymap-br.map
+++ b/recipes/keymaps/files/jornada6xx/keymap-br.map
@@ -68,11 +68,8 @@ keycode  27 = bracketleft braceleft
 	AltGr	keycode	 27 = ordfeminine
 keycode  28 = Return          
 	alt	keycode  28 = Meta_Control_m  
-keycode  29 = F11             
-	shift	keycode  29 = F21
-	altgr	keycode  29 = Console_23      
-	alt	keycode  29 = Console_11      
-	control	alt	keycode  29 = Console_11      
+keycode  29 = Control         
+	altgr	keycode  29 = Num_Lock
 keycode  30 = a
 	AltGr	keycode	 30 = degree
 keycode  31 = s               
@@ -91,6 +88,11 @@ keycode  39 = +ccedilla	       +Ccedilla
 keycode  40 = dead_tilde       dead_circumflex 
 	shift control	keycode  40 = Control_asciicircum    
 	alt	keycode  40 = Meta_apostrophe
+keycode  41 = F11             
+	shift	keycode  41 = F21
+	altgr	keycode  41 = Console_23      
+	alt	keycode  41 = Console_11      
+	control	alt	keycode  41 = Console_11      
 keycode  42 = Shift           
 	altgr	keycode  42 = Caps_Lock
 keycode  43 = bracketright braceright
@@ -165,8 +167,6 @@ keycode  72 = Up
 	shift	keycode  72 = Scroll_Backward           
 	altgr	keycode  72 = Scroll_Backward           
 	alt	keycode  72 = Prior 
-keycode  74 = Control         
-	altgr	keycode  74 = Num_Lock
 keycode  75 = Left
 	altgr	keycode  75 = Decr_Console
 	alt	keycode  75 = Find      
diff --git a/recipes/keymaps/files/jornada6xx/keymap-de.map b/recipes/keymaps/files/jornada6xx/keymap-de.map
index 4f6f53a74c..7e3eea4c19 100644..100755
--- a/recipes/keymaps/files/jornada6xx/keymap-de.map
+++ b/recipes/keymaps/files/jornada6xx/keymap-de.map
@@ -148,9 +148,9 @@ keycode  27 = plus             asterisk         asciitilde
 keycode  28 = Return          
 	shift	altgr	keycode  28 = VoidSymbol      
 	alt	keycode  28 = Meta_Control_m  
-keycode  29 = F11		F23      
-	control	keycode  29 = Control_asciicircum
-	control	alt	keycode  29 = Meta_Control_asciicircum    
+keycode  29 = Control        
+	shift	keycode  29 = Compose         
+	shift	altgr	keycode  29 = VoidSymbol      
 keycode  30 = +a              
 	shift	keycode  30 = +A              
 	shift	altgr	keycode  30 = VoidSymbol      
@@ -243,6 +243,9 @@ keycode  38 = +l
 	control	alt	keycode  38 = Meta_Control_l  
 keycode  39 = +odiaeresis      +Odiaeresis     
 keycode  40 = +adiaeresis      +Adiaeresis     
+keycode  41 = F11		F23      
+	control	keycode  41 = Control_asciicircum
+	control	alt	keycode  41 = Meta_Control_asciicircum    
 keycode  42 = Shift		Shift		Caps_Lock           
 	shift	altgr	keycode  42 = VoidSymbol      
 	control	keycode  42 = Compose         
@@ -370,9 +373,6 @@ keycode  66 = F8               F20              Console_20
 keycode  72 = Up
 	alt	keycode  72 = Prior           
 	shift	alt	keycode  72 = Scroll_Backward      
-keycode  74 = Control        
-	shift	keycode  74 = Compose         
-	shift	altgr	keycode  74 = VoidSymbol      
 keycode  75 = KP_4            
 	altgr	keycode  75 = Hex_4           
 	shift	altgr	keycode  75 = VoidSymbol      
diff --git a/recipes/keymaps/files/jornada6xx/keymap-dr_en.map b/recipes/keymaps/files/jornada6xx/keymap-dr_en.map
new file mode 100755
index 0000000000..ff0c2c16d4
--- /dev/null
+++ b/recipes/keymaps/files/jornada6xx/keymap-dr_en.map
@@ -0,0 +1,213 @@
+# keymap-dr_en.map keymap by DSchmitt, based on
+# the UK-English keymap for Jornada 6xx devices.
+# This is for the "Dutch Railway" 680e
+#
+# This was hacked together using "showkey" on
+# the command line, and a LOT of patience...
+#
+# If you find a problem (other than the grey
+# non-english altgr keycodes not working :P)
+# you can PM me @ Zamiel on the jlime board.
+#
+
+keycode   1 = Escape           Escape         
+   alt   keycode   1 = Meta_Escape     
+keycode   2 = one              exclam      asciitilde
+   alt   keycode   2 = Meta_one
+keycode   3 = two              at      grave
+   alt   keycode   3 = Meta_two
+keycode   4 = three            numbersign     
+   alt   keycode   4 = Meta_three     
+   altgr   keycode   4 = pound
+keycode   5 = four             dollar
+   control   keycode   5 = Control_backslash
+   alt   keycode   5 = Meta_four       
+   altgr   keycode   5 = currency
+keycode   6 = five             percent         
+   control   keycode   6 = Control_bracketright
+   alt   keycode   6 = Meta_five       
+keycode   7 = six              asciicircum     
+   control   keycode   7 = Control_asciicircum
+   alt   keycode   7 = Meta_six       
+keycode   8 = seven            ampersand        braceleft
+   control   keycode   8 = Control_underscore
+   altgr   keycode   8 = KP_7     
+keycode   9 = eight            asterisk         bracketleft
+   control   keycode   9 = Delete
+   altgr   keycode   9 = KP_8     
+keycode  10 = nine             parenleft        bracketright   
+   altgr   keycode  10 = KP_9       
+keycode  11 = zero             parenright       braceright     
+   altgr   keycode  11 = KP_Divide       
+keycode    12 = minus      underscore
+keycode  13 = equal            plus           
+   alt   keycode  13 = Meta_equal     
+keycode  14 = Delete           Delete         
+   control   keycode  14 = BackSpace       
+   alt   keycode  14 = Meta_Delete     
+keycode  15 = Tab              Tab             
+   alt   keycode  15 = Meta_Tab       
+keycode  16 = q               
+keycode  17 = w               
+keycode  18 = e
+   Shift   keycode  18 = E
+keycode  19 = r               
+keycode  20 = t               
+keycode  21 = y               
+keycode  22 = u               
+   altgr   keycode  22 = KP_4
+keycode  23 = i               
+   altgr   keycode  23 = KP_5
+keycode  24 = o
+   altgr   keycode  24 = KP_6
+keycode 25 = p
+   altgr   keycode  25 = KP_Multiply
+keycode 26 = bracketleft braceleft
+keycode 27 = bracketright braceright
+AltGr keycode 26 = braceright
+keycode  28 = Return         
+alt   keycode  28 = Meta_Control_m 
+keycode  29 = Control         
+altgr   keycode  29 = Num_Lock
+keycode  30 = a
+keycode  31 = s               
+keycode  32 = d
+keycode  33 = f
+keycode  34 = g               
+keycode  35 = h               
+keycode  36 = j               
+   altgr   keycode  36 = KP_1
+keycode  37 = k               
+   altgr   keycode  37 = KP_2
+keycode  38 = l               
+   altgr   keycode  38 = KP_3
+keycode  39 = semicolon        colon           bracketleft
+   altgr   keycode  39 = KP_Subtract
+keycode  40 = apostrophe   quotedbl   
+   alt   keycode  40 = Meta_equal     
+keycode  41 = F11             
+   shift   keycode  41 = F21
+   altgr   keycode  41 = Console_23     
+   alt   keycode  41 = Console_11     
+   control   alt   keycode  41 = Console_11     
+keycode  42 = Shift           
+   altgr   keycode  42 = Caps_Lock
+keycode  43 =   backslash   bar
+keycode  44 = z               
+keycode  45 = x               
+keycode  46 = c
+keycode  47 = v               
+keycode  48 = b
+keycode  49 = n               
+   altgr   keycode  49 = KP_0
+keycode  50 = m               
+   altgr   keycode  50 = KP_Comma
+keycode  51 = comma            less           
+   altgr   keycode  51 = KP_Period     
+keycode  52 = period           greater         
+   control   keycode  52 = Compose         
+   altgr   keycode  52 = KP_Add     
+keycode    53 = slash   question       
+keycode  54 = Shift
+keycode  56 = Alt             
+keycode  57 = space            space           
+   alt   keycode  57 = Meta_space     
+keycode  58 = F9             
+   shift   keycode  58 = F19             
+   altgr   keycode  58 = Console_21     
+   alt   keycode  58 = Console_9       
+   control   alt   keycode  58 = Console_9       
+keycode  59 = F1             
+   altgr   keycode  59 = Console_13     
+   alt   keycode  59 = Console_1       
+   control   alt   keycode  59 = Console_1
+keycode  60 = F2             
+   shift   keycode  60 = F12             
+   altgr   keycode  60 = Console_14     
+   alt   keycode  60 = Console_2       
+   control   alt   keycode  60 = Console_2       
+keycode  61 = F3             
+   shift   keycode  61 = F13             
+   altgr   keycode  61 = Console_15     
+   alt   keycode  61 = Console_3       
+   control   alt   keycode  61 = Console_3       
+keycode  62 = F4             
+   shift   keycode  62 = F14             
+   altgr   keycode  62 = Console_16     
+   alt   keycode  62 = Console_4       
+   control   alt   keycode  62 = Console_4       
+keycode  63 = F5             
+   shift   keycode  63 = F15             
+   altgr   keycode  63 = Console_17     
+   alt   keycode  63 = Console_5       
+   control   alt   keycode  63 = Console_5       
+keycode  64 = F6             
+   shift   keycode  64 = F16             
+   altgr   keycode  64 = Console_18     
+   alt   keycode  64 = Console_6       
+   control   alt   keycode  64 = Console_6       
+keycode  65 = F7             
+   shift   keycode  65 = F17             
+   altgr   keycode  65 = Console_19     
+   alt   keycode  65 = Console_7       
+   control   alt   keycode  65 = Console_7       
+keycode  66 = F8             
+   shift   keycode  66 = F18             
+   altgr   keycode  66 = Console_20     
+   alt   keycode  66 = Console_8       
+   control   alt   keycode  66 = Console_8       
+keycode  72 = Up
+   shift   keycode  72 = Scroll_Backward           
+   altgr   keycode  72 = Scroll_Backward           
+   alt   keycode  72 = Prior
+keycode  75 = Left
+   altgr   keycode  75 = Decr_Console
+   alt   keycode  75 = Find     
+keycode  77 = Right
+   altgr   keycode  77 = Incr_Console
+   alt   keycode  77 = Select         
+keycode  80 = Down
+   shift   keycode  80 = Scroll_Forward
+   altgr   keycode  80 = Scroll_Forward
+   alt   keycode  80 = Next         
+keycode  83 = Remove   Remove      Meta_Delete
+   alt   keycode  83 = Meta_Delete           
+keycode 112 = F10             
+   shift   keycode 112 = F20             
+   altgr   keycode 112 = Console_22     
+   alt   keycode 112 = Console_10     
+   control   alt   keycode 112 = Console_10     
+keycode 115 = slash   question       
+   control   keycode  115 = Delete         
+   alt   keycode  115 = Meta_slash     
+keycode 115 = AltGr
+keycode 123 = grave   tilde
+keycode 219 = Insert
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17"
+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"
+string F16 = "\033[29"
+string F17 = "\033[31"
+string F18 = "\033[32"
+string F19 = "\033[33"
+string F20 = "\033[34"
+string Find = "\033[1"
+string Insert = "\033[2"
+string Remove = "\033[3"
+string Select = "\033[4"
+string Prior = "\033[5"
+string Next = "\033[6"
+string Macro = "\033[M"
+string Pause = "\033[P"
diff --git a/recipes/keymaps/files/jornada6xx/keymap-sp.map b/recipes/keymaps/files/jornada6xx/keymap-sp.map
index 2e5d7388f0..ba05387743 100644..100755
--- a/recipes/keymaps/files/jornada6xx/keymap-sp.map
+++ b/recipes/keymaps/files/jornada6xx/keymap-sp.map
@@ -60,10 +60,8 @@ keycode  26 = dead_acute
         shift   keycode  26 = dead_diaeresis
 keycode  27 = plus             asterisk         asciitilde      
 keycode  28 = Return          
-keycode  29 = F11
-         alt    keycode 29 = Console_11      
-         shift  keycode 29 = F12      
-         shift alt    keycode 29 = Console_12      
+keycode  29 = Control
+         AltGr keycode 29 = Num_Lock
 keycode  30 = +a              
 	shift	keycode  30 = +A              
 keycode  31 = +s              
@@ -87,6 +85,10 @@ keycode  39 = +0244
 keycode  40 = braceleft          
          shift keycode 40 = bracketleft
          AltGr keycode 40 = dead_circumflex         
+keycode  41 = F11
+         alt    keycode 41 = Console_11      
+         shift  keycode 41 = F12      
+         shift alt    keycode 41 = Console_12      
 keycode  42 = Shift         
          AltGr keycode 42 = Caps_Lock         
 keycode  43 = braceright      
@@ -133,8 +135,6 @@ keycode  66 = F8
 keycode  72 = Up
          alt    keycode 72 = PageUp
          shift alt    keycode 72 = Scroll_Backward
-keycode  74 = Control
-         AltGr keycode 74 = Num_Lock
 keycode  75 = Left            
          alt    keycode  75 = Home           
 keycode  77 = Right            
diff --git a/recipes/keymaps/files/jornada6xx/keymap-620lx-660lx.map b/recipes/keymaps/files/jornada6xx/keymap-uk-620-660.map
index 454a1dae68..454a1dae68 100644..100755
--- a/recipes/keymaps/files/jornada6xx/keymap-620lx-660lx.map
+++ b/recipes/keymaps/files/jornada6xx/keymap-uk-620-660.map
diff --git a/recipes/keymaps/files/jornada6xx/keymap-uk.map b/recipes/keymaps/files/jornada6xx/keymap-uk.map
index 6bb959801c..14c8399afd 100644..100755
--- a/recipes/keymaps/files/jornada6xx/keymap-uk.map
+++ b/recipes/keymaps/files/jornada6xx/keymap-uk.map
@@ -65,11 +65,8 @@ keycode  26 = backslash	bar
 		AltGr keycode 26 = braceright 
 keycode  28 = Return          
 	alt	keycode  28 = Meta_Control_m  
-keycode  29 = F11             
-	shift	keycode  29 = F21
-	altgr	keycode  29 = Console_23      
-	alt	keycode  29 = Console_11      
-	control	alt	keycode  29 = Console_11      
+keycode  29 = Control         
+	altgr	keycode  29 = Num_Lock
 keycode  30 = a
 keycode  31 = s               
 keycode  32 = d
@@ -87,7 +84,12 @@ keycode  39 = semicolon        colon           bracketleft
 	alt	keycode  39 = Meta_semicolon
 keycode  40 = apostrophe       quotedbl        bracketright
 	control	keycode  40 = Control_g       
-	alt	keycode  40 = Meta_apostrophe 
+	alt	keycode  40 = Meta_apostrophe
+keycode  41 = F11             
+	shift	keycode  41 = F21
+	altgr	keycode  41 = Console_23      
+	alt	keycode  41 = Console_11      
+	control	alt	keycode  41 = Console_11      
 keycode  42 = Shift           
 	altgr	keycode  42 = Caps_Lock
 keycode  44 = z               
@@ -156,8 +158,6 @@ keycode  72 = Up
 	shift	keycode  72 = Scroll_Backward           
 	altgr	keycode  72 = Scroll_Backward           
 	alt	keycode  72 = Prior 
-keycode  74 = Control         
-	altgr	keycode  74 = Num_Lock
 keycode  75 = Left
 	altgr	keycode  75 = Decr_Console
 	alt	keycode  75 = Find      
diff --git a/recipes/keymaps/keymaps_1.0.bb b/recipes/keymaps/keymaps_1.0.bb
index 3cd1f5a7f1..0c611e31d1 100644
--- a/recipes/keymaps/keymaps_1.0.bb
+++ b/recipes/keymaps/keymaps_1.0.bb
@@ -20,7 +20,8 @@ SRC_URI_append_htcuniversal = " file://keymap-2.6.map"
 SRC_URI_append_qemux86      = " file://keymap-2.6.map"
 SRC_URI_append_omap3-pandora = " file://keymap-extension-2.6.map"
 
-SRC_URI_append_jornada6xx   = " file://keymap-620lx-660lx \
+SRC_URI_append_jornada6xx   = " file://keymap-uk-620-660.map \
+				file://keymap-dr_en.map \
 				file://keymap-br.map \
 				file://keymap-de.map \
 				file://keymap-sp.map \