tosa keymap-2.6: fix 2.6 kernel keymap

* basically reverted the previous change by Dmitry. Most importantly: Altgr (Fn) key was mapped wrong
* reverted to the previuos hrw maintained keymap-2.6 and clean up
* add new keys: Fn+z backslash, Fn+calerdar braceleft, Fn+contact bracketleft, 
                Fn+Backlight/Rotate asciicircum, Fn+Home grave, Fn+Menu bracketright, Fn+Email braceright
* enhanced directional keys: Fn+* and Shift+*

2 files changed, 118 insertions, 292 deletions

diff --git a/packages/keymaps/files/tosa/keymap-2.6.map b/packages/keymaps/files/tosa/keymap-2.6.map
index f83e4bfe39..8533612121 100644
--- a/packages/keymaps/files/tosa/keymap-2.6.map
+++ b/packages/keymaps/files/tosa/keymap-2.6.map
@@ -1,297 +1,123 @@
 # Default kernel keymap. This uses 7 modifier combinations.
 keymaps 0-2,4-5,8,12
+# Change the above line into
+#       keymaps 0-2,4-6,8,12
+# in case you want the entries
+#       altgr   control keycode  83 = Boot            
+#       altgr   control keycode 111 = Boot            
+# below.
 #
-keycode   1 = Escape           Escape          
-#	alt     keycode   1 = Meta_Escape     
-#keycode   2 = one              exclam          
-#	alt     keycode   2 = Meta_one        
-#keycode   3 = two              at               at              
-#	control	keycode   3 = nul             
-#	shift	control	keycode   3 = nul             
-#	alt	keycode   3 = Meta_two        
-#keycode   4 = three            numbersign      
-#	control keycode   4 = Escape          
-#	alt     keycode   4 = Meta_three      
-#keycode   5 = four             dollar           dollar          
-#	control keycode   5 = Control_backslash
-#	alt     keycode   5 = Meta_four       
-#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
-#	alt     keycode   8 = Meta_seven      
-#keycode   9 = eight            asterisk         bracketleft     
-#	control keycode   9 = Delete          
-#	alt     keycode   9 = Meta_eight      
-#keycode  10 = nine             parenleft        bracketright    
-#	alt     keycode  10 = Meta_nine       
-#keycode  11 = zero             parenright       braceright      
-#	alt     keycode  11 = Meta_zero       
-#keycode  12 = minus            underscore       backslash       
-#	control	keycode  12 = Control_underscore
-#	shift	control	keycode  12 = Control_underscore
-#	alt	keycode  12 = Meta_minus      
-#keycode  13 = equal            plus            
-#	alt     keycode  13 = Meta_equal      
-keycode 14 = BackSpace		BackSpace	
-	altgr	keycode  14 = Delete
-#keycode  14 = Delete           Delete          
-#	control keycode  14 = BackSpace
-#	alt     keycode  14 = Meta_Delete     
-keycode  15 = Tab              Tab             
-	altgr     keycode  15 = Caps_Lock	
-keycode  16 = q               
-	altgr	keycode  16 = one
-keycode  17 = w               
-	altgr	keycode  17 = two
-keycode  18 = e
-	altgr	keycode  18 = three
-#	altgr   keycode  18 = Hex_E   
-keycode  19 = r               
-	altgr	keycode  19 = four
-keycode  20 = t               
-	altgr	keycode  20 = five
-keycode  21 = y               
-	altgr	keycode  21 = six
-keycode  22 = u               
-	altgr	keycode  22 = seven
-keycode  23 = i               
-	altgr	keycode  23 = eight
-keycode  24 = o               
-	altgr	keycode	 24 = nine
-keycode  25 = p               
-	altgr	keycode  25 = zero
-#keycode  26 = bracketleft      braceleft       
-#	control keycode  26 = Escape          
-#	alt     keycode  26 = Meta_bracketleft
-#keycode  27 = bracketright     braceright       asciitilde      
-#	control keycode  27 = Control_bracketright
-#	alt     keycode  27 = Meta_bracketright
-keycode  28 = Return          
-	altgr	keycode  28 = greater
-#	alt     keycode  28 = Meta_Control_m  
-keycode  29 = Control         
-keycode  30 = a
-	altgr	keycode  30 = exclam
-#	altgr   keycode  30 = Hex_A
-keycode  31 = s               
-	altgr	keycode  31 = at
-keycode  32 = d
-	altgr	keycode  32 = numbersign
-#	altgr   keycode  32 = Hex_D   
-keycode  33 = f
-	altgr	keycode  33 = dollar
-#	altgr   keycode  33 = Hex_F               
-keycode  34 = g               
-	altgr	keycode  34 = percent
-keycode  35 = h               
-	altgr	keycode  35 = underscore
-keycode  36 = j               
-	altgr	keycode  36 = ampersand
-keycode  37 = k               
-	altgr	keycode  37 = asterisk
-keycode  38 = l               
-	altgr	keycode  38 = parenleft
-#keycode  39 = semicolon        colon           
-#	alt     keycode  39 = Meta_semicolon  
-keycode  40 = apostrophe       quotedbl        
-	altgr	keycode  40 = asciitilde
-#	control keycode  40 = Control_g       
-#	alt     keycode  40 = Meta_apostrophe 
-#keycode  41 = grave            asciitilde      
-#	control keycode  41 = nul             
-#	alt     keycode  41 = Meta_grave      
-keycode  42 = Shift           
-#keycode  43 = backslash        bar             
-#	control keycode  43 = Control_backslash
-#	alt     keycode  43 = Meta_backslash  
-keycode  44 = z               
-##	alt	keycode 44  = 
-keycode  45 = x               
-	altgr	keycode  45 = Control_x
-keycode  46 = c
-	altgr	keycode  46 = Control_c
-#	altgr   keycode  46 = Hex_C   
-keycode  47 = v               
-	altgr	keycode	 47 = Control_v
-keycode  48 = b
-	altgr	keycode  48 = minus
-#	altgr   keycode  48 = Hex_B
-keycode  49 = n               
-	altgr	keycode  49 = plus
-keycode  50 = m               
-	altgr	keycode  50 = equal
-keycode  51 = comma		semicolon
-	altgr	keycode  51 = parenright
-#keycode  51 = comma            less            
-#	alt     keycode  51 = Meta_comma      
-keycode  52 = period	colon
-	control keycode  52 = Compose         
-	altgr	keycode  52 = less
-#keycode  52 = period           greater         
-#	control keycode  52 = Compose         
-#	alt     keycode  52 = Meta_period     
-keycode  53 = slash            question        
-	altgr	keycode  53 = Num_Lock
-#	control keycode  53 = Delete          
-#	alt     keycode  53 = Meta_slash      
-keycode  54 = Shift           
-#keycode  55 = KP_Multiply     
-#keycode  56 = Alt             
-keycode  57 = space            space           
-	altgr	keycode  57 = bar
-#	control keycode  57 = nul             
-#	alt     keycode  57 = Meta_space      
-#keycode  58 = Caps_Lock       
-#keycode  59 = F1               F11              Console_13      
-#	control keycode  59 = F1              
-#	alt     keycode  59 = Console_1       
-#	control alt     keycode  59 = Console_1       
-#keycode  60 = F2               F12              Console_14      
-#	control keycode  60 = F2              
-#	alt     keycode  60 = Console_2       
-#	control alt     keycode  60 = Console_2       
-#keycode  61 = F3               F13              Console_15      
-#	control keycode  61 = F3              
-#	alt     keycode  61 = Console_3       
-#	control alt     keycode  61 = Console_3       
-#keycode  62 = F4               F14              Console_16      
-#	control keycode  62 = F4              
-#	alt     keycode  62 = Console_4       
-#	control alt     keycode  62 = Console_4       
-#keycode  63 = F5               F15              Console_17      
-#	control keycode  63 = F5              
-#	alt     keycode  63 = Console_5       
-#	control alt     keycode  63 = Console_5       
-#keycode  64 = F6               F16              Console_18      
-#	control keycode  64 = F6              
-#	alt     keycode  64 = Console_6       
-#	control alt     keycode  64 = Console_6       
-#keycode  65 = F7               F17              Console_19      
-#	control keycode  65 = F7              
-#	alt     keycode  65 = Console_7       
-#	control alt     keycode  65 = Console_7       
-#keycode  66 = F8               F18              Console_20      
-#	control keycode  66 = F8              
-#	alt     keycode  66 = Console_8       
-#	control alt     keycode  66 = Console_8       
-#keycode  67 = F9               F19              Console_21      
-#	control keycode  67 = F9              
-#	alt     keycode  67 = Console_9       
-#	control alt     keycode  67 = Console_9       
-#keycode  68 = F10              F20              Console_22      
-#	control keycode  68 = F10             
-#	alt     keycode  68 = Console_10      
-#	control alt     keycode  68 = Console_10      
-#keycode  69 = Num_Lock
-#	shift   keycode  69 = Bare_Num_Lock
-#keycode  70 = Scroll_Lock      Show_Memory      Show_Registers  
-#	control keycode  70 = Show_State      
-#	alt     keycode  70 = Scroll_Lock     
-#keycode  71 = KP_7            
-#	alt     keycode  71 = Ascii_7         
-#	altgr   keycode  71 = Hex_7         
-#keycode  72 = KP_8            
-#	alt     keycode  72 = Ascii_8         
-#	altgr   keycode  72 = Hex_8         
-#keycode  73 = KP_9            
-#	alt     keycode  73 = Ascii_9         
-#	altgr   keycode  73 = Hex_9         
-#keycode  74 = KP_Subtract     
-#keycode  75 = KP_4            
-#	alt     keycode  75 = Ascii_4         
-#	altgr   keycode  75 = Hex_4         
-#keycode  76 = KP_5            
-#	alt     keycode  76 = Ascii_5         
-#	altgr   keycode  76 = Hex_5         
-#keycode  77 = KP_6            
-#	alt     keycode  77 = Ascii_6         
-#	altgr   keycode  77 = Hex_6         
-#keycode  78 = KP_Add          
-#keycode  79 = KP_1            
-#	alt     keycode  79 = Ascii_1         
-#	altgr   keycode  79 = Hex_1         
-#keycode  80 = KP_2            
-#	alt     keycode  80 = Ascii_2         
-#	altgr   keycode  80 = Hex_2         
-#keycode  81 = KP_3            
-#	alt     keycode  81 = Ascii_3         
-#	altgr   keycode  81 = Hex_3         
-#keycode  82 = KP_0            
-#	alt     keycode  82 = Ascii_0         
-#	altgr   keycode  82 = Hex_0         
-#keycode  83 = KP_Period       
-##	altgr   control keycode  83 = Boot            
-#	control alt     keycode  83 = Boot            
-#keycode  84 = Last_Console    
-#keycode  85 =
-#keycode  86 = less             greater          bar             
-#	alt     keycode  86 = Meta_less       
-#keycode  87 = F11              F11              Console_23      
-#	control keycode  87 = F11             
-#	alt     keycode  87 = Console_11      
-#	control alt     keycode  87 = Console_11      
-#keycode  88 = F12              F12              Console_24      
-#	control keycode  88 = F12             
-#	alt     keycode  88 = Console_12      
-#	control alt     keycode  88 = Console_12      
-#keycode  89 =
-#keycode  90 =
-keycode  91 = space
-#keycode  91 =
-keycode  92 = Return
-#keycode  92 =
-#keycode  93 =
-#keycode  94 =
-#keycode  95 =
-#keycode  96 = KP_Enter        
-#keycode  97 = Control         
-#keycode  98 = KP_Divide       
-#keycode  99 = Control_backslash
-#	control keycode  99 = Control_backslash
-#	alt     keycode  99 = Control_backslash
-keycode 100 = AltGr           
-#keycode 101 = Break           
-#keycode 102 = Find            
-keycode 103 = Up              
-	altgr	keycode  103 = Prior
-	shift   keycode  104 = Scroll_Backward 
-#keycode 104 = Prior           
-#	shift   keycode 104 = Scroll_Backward 
-keycode 105 = Left            
-	altgr	keycode  105 = Decr_Console
-keycode 106 = Right           
-	altgr	keycode  106 = Incr_Console
-#keycode 107 = Select          
-keycode 108 = Down            
-	altgr	keycode  108 = Next
-	shift   keycode  108 = Scroll_Forward  
-#keycode 109 = Next            
-#	shift   keycode 109 = Scroll_Forward  
-#keycode 110 = Insert          
-#keycode 111 = Remove          
-##	altgr   control keycode 111 = Boot            
-#	control alt     keycode 111 = Boot            
-#keycode 112 = Macro           
-#keycode 113 = F13             
-#keycode 114 = F14             
-#keycode 115 = Help            
-#keycode 116 = Do              
-#keycode 117 = F17             
-#keycode 118 = KP_MinPlus      
-#keycode 119 = Pause           
-#keycode 120 =
-#keycode 121 =
-#keycode 122 =
-#keycode 123 =
-#keycode 124 =
-#keycode 125 =
-#keycode 126 =
-#keycode 127 =
+keycode    1 =
+keycode   14 = BackSpace
+       altgr   keycode   14 = Delete
+keycode   15 = Tab
+       altgr   keycode   15 = Caps_Lock
+keycode   16 = q
+       altgr   keycode   16 = one
+keycode   17 = w
+       altgr   keycode   17 = two
+keycode   18 = e
+       altgr   keycode   18 = three
+keycode   19 = r
+       altgr   keycode   19 = four
+keycode   20 = t
+       altgr   keycode   20 = five
+keycode   21 = y
+       altgr   keycode   21 = six
+keycode   22 = u
+       altgr   keycode   22 = seven
+keycode   23 = i
+       altgr   keycode   23 = eight
+keycode   24 = o
+       altgr   keycode   24 = nine
+keycode   25 = p
+       altgr   keycode   25 = zero
+keycode   26 =
+keycode   27 =
+keycode   28 = Return
+       altgr   keycode   28 = greater
+keycode   29 = Control
+keycode   30 = a
+       altgr   keycode   30 = exclam
+keycode   31 = s
+       altgr   keycode   31 = at
+keycode   32 = d
+       altgr   keycode   32 = numbersign
+keycode   33 = f
+       altgr   keycode   33 = dollar
+keycode   34 = g
+       altgr   keycode   34 = percent
+keycode   35 = h
+       altgr   keycode   35 = underscore
+keycode   36 = j             
+       altgr   keycode   36 = ampersand
+keycode   37 = k
+       altgr   keycode   37 = asterisk
+keycode   38 = l
+       altgr   keycode   38 = parenleft
+keycode   39 =
+keycode   40 = apostrophe     quotedbl
+       altgr   keycode   40 = asciitilde
+keycode   41 =
+keycode   42 = Shift
+keycode   43 =
+keycode   44 = z
+       altgr   keycode   44 = backslash 
+keycode   45 = x
+keycode   46 = c
+       altgr   keycode   46 = Control_c
+keycode   47 = v
+       altgr   keycode	 47 = Control_v
+keycode   48 = b
+       altgr   keycode   48 = minus
+keycode   49 = n
+       altgr   keycode   49 = plus
+keycode   50 = m
+       altgr   keycode   50 = equal
+keycode   51 = comma          semicolon
+       altgr   keycode   51 = parenright
+keycode   52 = period	      colon
+       altgr   keycode   52 = less
+       control keycode   52 = Compose
+keycode   53 = slash          question
+       altgr   keycode   53 = Num_Lock
+keycode   54 = Shift
+keycode   55 = 
+keycode   56 = Alt
+keycode   57 = space          space
+       altgr   keycode   57 = bar
+keycode   58 =
+keycode   59 = F9             # Calendar    
+       altgr   keycode   59 = braceleft
+keycode   60 = F10            # Contact
+       altgr   keycode   60 = bracketleft
+keycode   61 = AltGr          # Fn
+keycode   62 = Escape         # Cancel
+keycode   63 = space          # Bulleye
+keycode   64 = Control        # Dot 
+keycode   65 = F15            # Backlight/Rotate
+       altgr   keycode   65 = asciicircum
+keycode   66 = F24            # Rec
+keycode   67 = F12            # Home
+       altgr   keycode   67 = grave
+keycode   68 = F13            # Email 
+       altgr   keycode   68 = braceright
+keycode   79 = F15
+keycode   80 = F16
+keycode   82 = F17
+keycode   87 = Return         # OK
+keycode   88 = F11            # Menu
+       altgr   keycode   88 = bracketright
+keycode   97 = Control
+keycode   99 = F12
+keycode  103 = Up             Scroll_Backward 
+       altgr   keycode  103 = PageUp
+keycode  105 = Left           Prior
+       altgr   keycode  105 = Decr_Console
+keycode  106 = Right          Next
+       altgr   keycode  106 = Incr_Console
+keycode  108 = Down           Scroll_Forward 
+       altgr   keycode  108 = PageDown
 string F1 = "\033[[A"
 string F2 = "\033[[B"
 string F3 = "\033[[C"
diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb
index c4d22d4b13..89b1cfacde 100644
--- a/packages/keymaps/keymaps_1.0.bb
+++ b/packages/keymaps/keymaps_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 RDEPENDS = "initscripts console-tools"
 LICENSE = "GPL"
 PACKAGE_ARCH = "${MACHINE}"
-PR = "r19"
+PR = "r20"
 
 inherit update-rc.d