From 59997e56e0ec08ab7412238e032c5ae60a0be642 Mon Sep 17 00:00:00 2001
From: David-John Willis <John.Willis@Distant-earth.com>
Date: Tue, 2 Mar 2010 15:14:59 +0000
Subject: [PATCH] keymaps: Add latest version of the omap3-pandora keymap
 extension.

---
 .../omap3-pandora/keymap-extension-2.6.map    | 40 ++++++++++++++++---
 recipes/keymaps/keymaps_1.0.bb                |  2 +-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/recipes/keymaps/files/omap3-pandora/keymap-extension-2.6.map b/recipes/keymaps/files/omap3-pandora/keymap-extension-2.6.map
index 9c8c42c336..873193c61d 100644
--- a/recipes/keymaps/files/omap3-pandora/keymap-extension-2.6.map
+++ b/recipes/keymaps/files/omap3-pandora/keymap-extension-2.6.map
@@ -1,6 +1,6 @@
 #     1,     2,       4,   8
 # Shift, AltGr, Control, Alt
-keymaps 0,1
+keymaps 0,1,4,8
 
 # Special keys.
 
@@ -25,7 +25,7 @@ keycode  8 = seven              ampersand
 keycode  9 = eight              asterisk
 keycode  10 = nine              bracketleft
 keycode  11 = zero              bracketright
-keycode  14 = BackSpace         Delete
+keycode  14 = BackSpace         Remove
 
 # Fn stuff
 
@@ -60,8 +60,36 @@ keycode  26 = parenleft
 # Fn-R
 keycode  27 = parenright
 
+# Listing these here in short notation gives us modifier keys
+
+keycode  16 = +q
+keycode  17 = +w
+keycode  18 = +e
+keycode  19 = +r
+keycode  20 = +t
+keycode  21 = +y
+keycode  22 = +u
+keycode  23 = +i
+keycode  24 = +o
+keycode  25 = +p
+keycode  30 = +a
+keycode  31 = +s
+keycode  32 = +d
+keycode  33 = +f
+keycode  34 = +g
+keycode  35 = +h
+keycode  36 = +j
+keycode  37 = +k
+keycode  38 = +l
+keycode  44 = +z
+keycode  45 = +x
+keycode  46 = +c
+keycode  47 = +v
+keycode  48 = +b
+keycode  49 = +n
+keycode  50 = +m
+
 # DPad - URDL
-#Control Alt keycode 103 = Prior
-#Control Alt keycode 106 = Incr_Console
-#Control Alt keycode 108 = Next
-#Control Alt keycode 105 = Decr_Console
+
+alt keycode 106 = Incr_Console
+alt keycode 105 = Decr_Console
diff --git a/recipes/keymaps/keymaps_1.0.bb b/recipes/keymaps/keymaps_1.0.bb
index afddf97cb8..d95da4320b 100644
--- a/recipes/keymaps/keymaps_1.0.bb
+++ b/recipes/keymaps/keymaps_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 RDEPENDS_${PN} = "initscripts console-tools"
 LICENSE = "GPL"
 PACKAGE_ARCH = "${MACHINE}"
-PR = "r24"
+PR = "r25"
 
 inherit update-rc.d
 
-- 
2.39.2