3 files changed, 82 insertions, 17 deletions

diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES
index 26567d3e53..6b248e9324 100644
--- a/uisimulator/buttonmap/SOURCES
+++ b/uisimulator/buttonmap/SOURCES
@@ -57,8 +57,10 @@ gogear-hdd6330.c
 onda-vx747.c
 #elif CONFIG_KEYPAD == ONDAVX777_PAD
 onda-vx777.c
-#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
-samsung-yh820_yh92x.c
+#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD
+samsung-yh820.c
+#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+samsung-yh92x.c
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 pbell-vibe500.c
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
diff --git a/uisimulator/buttonmap/samsung-yh820.c b/uisimulator/buttonmap/samsung-yh820.c
new file mode 100644
index 0000000000..02836fe8f4
--- /dev/null
+++ b/uisimulator/buttonmap/samsung-yh820.c
@@ -0,0 +1,78 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2009 Mark Arigo
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+
+#include <SDL.h>
+#include "config.h"
+#include "button.h"
+#include "buttonmap.h"
+
+int key_to_button(int keyboard_button)
+{
+    int new_btn = BUTTON_NONE;
+    switch (keyboard_button)
+    {
+        case SDLK_KP4:
+        case SDLK_LEFT:
+            new_btn = BUTTON_LEFT;
+            break;
+        case SDLK_KP6:
+        case SDLK_RIGHT:
+            new_btn = BUTTON_RIGHT;
+            break;
+        case SDLK_KP8:
+        case SDLK_UP:
+            new_btn = BUTTON_UP;
+            break;
+        case SDLK_KP2:
+        case SDLK_DOWN:
+            new_btn = BUTTON_DOWN;
+            break;
+        case SDLK_KP5:
+        case SDLK_KP_ENTER:
+            new_btn = BUTTON_PLAY;
+            break;
+        case SDLK_KP9:
+        case SDLK_PAGEUP:
+            new_btn = BUTTON_FFWD;
+            break;
+        case SDLK_KP7:
+        case SDLK_PAGEDOWN:
+            new_btn = BUTTON_REW;
+            break;
+        case SDLK_KP_PLUS:
+            new_btn = BUTTON_REC;
+            break;
+    }
+    return new_btn;
+}
+
+struct button_map bm[] = {
+    { SDLK_KP_PLUS, 330,  53, 23, "Record" },
+    { SDLK_KP7,     132, 208, 21, "Left" },
+    { SDLK_KP5,     182, 210, 18, "Play" },
+    { SDLK_KP9,     234, 211, 22, "Right" },
+    { SDLK_KP8,     182, 260, 15, "Up" },
+    { SDLK_KP4,     122, 277, 29, "Menu" },
+    { SDLK_KP6,     238, 276, 25, "Select" },
+    { SDLK_KP2,     183, 321, 24, "Down" },
+    { 0, 0, 0, 0, "None" }
+};
diff --git a/uisimulator/buttonmap/samsung-yh820_yh92x.c b/uisimulator/buttonmap/samsung-yh92x.c
index 0f12c77df3..995f9c8a7e 100644
--- a/uisimulator/buttonmap/samsung-yh820_yh92x.c
+++ b/uisimulator/buttonmap/samsung-yh92x.c
@@ -54,11 +54,7 @@ int key_to_button(int keyboard_button)
         case SDLK_PAGEUP:
             new_btn = BUTTON_FFWD;
             break;
-#ifdef SAMSUNG_YH820
-        case SDLK_KP7:
-#else
         case SDLK_KP3:
-#endif
         case SDLK_PAGEDOWN:
             new_btn = BUTTON_REW;
             break;
@@ -70,16 +66,6 @@ int key_to_button(int keyboard_button)
 }
 
 struct button_map bm[] = {  
-#if defined (SAMSUNG_YH820)
-    { SDLK_KP_PLUS, 330,  53, 23, "Record" },
-    { SDLK_KP7,     132, 208, 21, "Left" },
-    { SDLK_KP5,     182, 210, 18, "Play" },
-    { SDLK_KP9,     234, 211, 22, "Right" },
-    { SDLK_KP8,     182, 260, 15, "Up" },
-    { SDLK_KP4,     122, 277, 29, "Menu" },
-    { SDLK_KP6,     238, 276, 25, "Select" },
-    { SDLK_KP2,     183, 321, 24, "Down" },
-#elif defined (SAMSUNG_YH920) || defined (SAMSUNG_YH925)
     { SDLK_KP9,     370,  32, 15, "FF" },
     { SDLK_KP5,     369,  84, 25, "Play" },
     { SDLK_KP5,     367, 125, 27, "Play" },
@@ -89,6 +75,5 @@ struct button_map bm[] = {
     { SDLK_KP8,     204, 226, 27, "Up" },
     { SDLK_KP6,     257, 250, 34, "Select" },
     { SDLK_KP2,     205, 294, 35, "Down" },
-#endif
     { 0, 0, 0, 0, "None" }
 };