Skip to contentSkip to conversation

Keymap fix for f-sample and p2-sample.

PATCH In review Vivek Kutal 2 participants 2 messages Aug 27, 2007 – Aug 31, 2007

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP1 support
lore
Share & tools
lore

Vivek Kutal

author
#0 lore raw

PATCH 1/1 Keymap fix for f-sample and p2-sample.

Hi,
The git tree is broken for p2-sample and f-sample , this patch
fixes it.

Signed-off-by Vivek Kutal <[email protected]>
---
 arch/arm/mach-omap1/board-fsample.c  |   14 ++++++--------
 arch/arm/mach-omap1/board-perseus2.c |   14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-omap1/board-fsample.c
index f65baa9..d5f6ea1 100644

arch/arm/mach-omap1/board-fsample.c +6 -8
@@ -40,31 +40,29 @@ static int fsample_keymap[] = {
     KEY(0,1,KEY_RIGHT),
     KEY(0,2,KEY_LEFT),
     KEY(0,3,KEY_DOWN),
-    KEY(0,4,KEY_CENTER),
-    KEY(0,5,KEY_0_5),
-    KEY(1,0,KEY_SOFT2),
+    KEY(0,4,KEY_ENTER),
+    KEY(1,0,KEY_F10),
     KEY(1,1,KEY_SEND),
     KEY(1,2,KEY_END),
     KEY(1,3,KEY_VOLUMEDOWN),
     KEY(1,4,KEY_VOLUMEUP),
     KEY(1,5,KEY_RECORD),
-    KEY(2,0,KEY_SOFT1),
+    KEY(2,0,KEY_F9),
     KEY(2,1,KEY_3),
     KEY(2,2,KEY_6),
     KEY(2,3,KEY_9),
-    KEY(2,4,KEY_SHARP),
-    KEY(2,5,KEY_2_5),
+    KEY(2,4,KEY_KPDOT),
     KEY(3,0,KEY_BACK),
     KEY(3,1,KEY_2),
     KEY(3,2,KEY_5),
     KEY(3,3,KEY_8),
     KEY(3,4,KEY_0),
-    KEY(3,5,KEY_HEADSETHOOK),
+    KEY(3,5,KEY_KPSLASH),
     KEY(4,0,KEY_HOME),
     KEY(4,1,KEY_1),
     KEY(4,2,KEY_4),
     KEY(4,3,KEY_7),
-    KEY(4,4,KEY_STAR),
+    KEY(4,4,KEY_KPASTERISK),
     KEY(4,5,KEY_POWER),
     0
 };
(quoted diff) +0 -0

b/arch/arm/mach-omap1/board-perseus2.c
index 2dec048..e9e352e 100644

arch/arm/mach-omap1/board-perseus2.c +6 -8
@@ -39,31 +39,29 @@ static int p2_keymap[] = {
     KEY(0,1,KEY_RIGHT),
     KEY(0,2,KEY_LEFT),
     KEY(0,3,KEY_DOWN),
-    KEY(0,4,KEY_CENTER),
-    KEY(0,5,KEY_0_5),
-    KEY(1,0,KEY_SOFT2),
+    KEY(0,4,KEY_ENTER),
+    KEY(1,0,KEY_F10),
     KEY(1,1,KEY_SEND),
     KEY(1,2,KEY_END),
     KEY(1,3,KEY_VOLUMEDOWN),
     KEY(1,4,KEY_VOLUMEUP),
     KEY(1,5,KEY_RECORD),
-    KEY(2,0,KEY_SOFT1),
+    KEY(2,0,KEY_F9),
     KEY(2,1,KEY_3),
     KEY(2,2,KEY_6),
     KEY(2,3,KEY_9),
-    KEY(2,4,KEY_SHARP),
-    KEY(2,5,KEY_2_5),
+    KEY(2,4,KEY_KPDOT),
     KEY(3,0,KEY_BACK),
     KEY(3,1,KEY_2),
     KEY(3,2,KEY_5),
     KEY(3,3,KEY_8),
     KEY(3,4,KEY_0),
-    KEY(3,5,KEY_HEADSETHOOK),
+    KEY(3,5,KEY_KPSLASH),
     KEY(4,0,KEY_HOME),
     KEY(4,1,KEY_1),
     KEY(4,2,KEY_4),
     KEY(4,3,KEY_7),
-    KEY(4,4,KEY_STAR),
+    KEY(4,4,KEY_KPASTERISK),
     KEY(4,5,KEY_POWER),
     0
 };
Signature · 1 line
1.4.4.2
Quoted 1 line

From 6197fcf5401bb9bec192dce9eb31115d5ff0e53f Mon Sep 17 00:00:00 2001

From: Vivek Kutal <[email protected]>
Date: Fri, 24 Aug 2007 19:13:41 +0530
Subject: [PATCH] Keymap fix for f-sample and p2-sample.

Signed-off-by Vivek Kutal <[email protected]>
---
 arch/arm/mach-omap1/board-fsample.c  |   14 ++++++--------
 arch/arm/mach-omap1/board-perseus2.c |   14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)
arch/arm/mach-omap1/board-fsample.c +6 -8
index f65baa9..d5f6ea1 100644
@@ -40,31 +40,29 @@ static int fsample_keymap[] = {
 	KEY(0,1,KEY_RIGHT),
 	KEY(0,2,KEY_LEFT),
 	KEY(0,3,KEY_DOWN),
-	KEY(0,4,KEY_CENTER),
-	KEY(0,5,KEY_0_5),
-	KEY(1,0,KEY_SOFT2),
+	KEY(0,4,KEY_ENTER),
+	KEY(1,0,KEY_F10),
 	KEY(1,1,KEY_SEND),
 	KEY(1,2,KEY_END),
 	KEY(1,3,KEY_VOLUMEDOWN),
 	KEY(1,4,KEY_VOLUMEUP),
 	KEY(1,5,KEY_RECORD),
-	KEY(2,0,KEY_SOFT1),
+	KEY(2,0,KEY_F9),
 	KEY(2,1,KEY_3),
 	KEY(2,2,KEY_6),
 	KEY(2,3,KEY_9),
-	KEY(2,4,KEY_SHARP),
-	KEY(2,5,KEY_2_5),
+	KEY(2,4,KEY_KPDOT),
 	KEY(3,0,KEY_BACK),
 	KEY(3,1,KEY_2),
 	KEY(3,2,KEY_5),
 	KEY(3,3,KEY_8),
 	KEY(3,4,KEY_0),
-	KEY(3,5,KEY_HEADSETHOOK),
+	KEY(3,5,KEY_KPSLASH),
 	KEY(4,0,KEY_HOME),
 	KEY(4,1,KEY_1),
 	KEY(4,2,KEY_4),
 	KEY(4,3,KEY_7),
-	KEY(4,4,KEY_STAR),
+	KEY(4,4,KEY_KPASTERISK),
 	KEY(4,5,KEY_POWER),
 	0
 };
arch/arm/mach-omap1/board-perseus2.c +6 -8
index 2dec048..e9e352e 100644
@@ -39,31 +39,29 @@ static int p2_keymap[] = {
 	KEY(0,1,KEY_RIGHT),
 	KEY(0,2,KEY_LEFT),
 	KEY(0,3,KEY_DOWN),
-	KEY(0,4,KEY_CENTER),
-	KEY(0,5,KEY_0_5),
-	KEY(1,0,KEY_SOFT2),
+	KEY(0,4,KEY_ENTER),
+	KEY(1,0,KEY_F10),
 	KEY(1,1,KEY_SEND),
 	KEY(1,2,KEY_END),
 	KEY(1,3,KEY_VOLUMEDOWN),
 	KEY(1,4,KEY_VOLUMEUP),
 	KEY(1,5,KEY_RECORD),
-	KEY(2,0,KEY_SOFT1),
+	KEY(2,0,KEY_F9),
 	KEY(2,1,KEY_3),
 	KEY(2,2,KEY_6),
 	KEY(2,3,KEY_9),
-	KEY(2,4,KEY_SHARP),
-	KEY(2,5,KEY_2_5),
+	KEY(2,4,KEY_KPDOT),
 	KEY(3,0,KEY_BACK),
 	KEY(3,1,KEY_2),
 	KEY(3,2,KEY_5),
 	KEY(3,3,KEY_8),
 	KEY(3,4,KEY_0),
-	KEY(3,5,KEY_HEADSETHOOK),
+	KEY(3,5,KEY_KPSLASH),
 	KEY(4,0,KEY_HOME),
 	KEY(4,1,KEY_1),
 	KEY(4,2,KEY_4),
 	KEY(4,3,KEY_7),
-	KEY(4,4,KEY_STAR),
+	KEY(4,4,KEY_KPASTERISK),
 	KEY(4,5,KEY_POWER),
 	0
 };
Signature · 1 line
1.4.4.2
reviewer
#1 lore raw
Quoted 3 lines · Vivek Kutal

Hi,
The git tree is broken for p2-sample and f-sample , this patch fixes
it.

Thanks, pushing today.

Tony