imx233/fuze+: add fuze+ to the simulator framework

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30602 a1c6a512-1295-4272-9138-f99709370657

8 files changed, 111 insertions, 14 deletions

diff --git a/firmware/target/arm/imx233/adc-imx233.c b/firmware/target/arm/imx233/adc-imx233.c
index 4f183ac531..d0c4868ad3 100644
--- a/firmware/target/arm/imx233/adc-imx233.c
+++ b/firmware/target/arm/imx233/adc-imx233.c
@@ -22,6 +22,8 @@
 #include "config.h"
 #include "adc.h"
 #include "adc-target.h"
+#include "system.h"
+#include "adc-imx233.h"
 
 /* dedicate two channels to temperature sensing
  * dedicate channel 7 to battery
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c
index 8a99d19323..757ec72519 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c
@@ -19,6 +19,7 @@
  *
  ****************************************************************************/
 #include "adc-target.h"
+#include "adc-imx233.h"
 
 int imx233_adc_mapping[] =
 {
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/adc-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/adc-target.h
index ea0102d5c1..b7fa5edc86 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/adc-target.h
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/adc-target.h
@@ -21,10 +21,6 @@
 #ifndef _ADC_TARGET_H_
 #define _ADC_TARGET_H_
 
-#include "system.h"
-#include "lradc-imx233.h"
-#include "adc-imx233.h"
-
 #define NUM_ADC_CHANNELS    4
 
 #define ADC_BATTERY         0
diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h
index db777e7821..d76ef124bf 100644
--- a/firmware/target/hosted/sdl/sim-ui-defines.h
+++ b/firmware/target/hosted/sdl/sim-ui-defines.h
@@ -287,6 +287,14 @@
 #define UI_LCD_POSX                 39 /* x position of lcd */
 #define UI_LCD_POSY                 38 /* y position of lcd */
 
+#elif defined(SANSA_FUZEPLUS)
+#define UI_TITLE                    "Sansa Fuze+"
+#define UI_WIDTH                    323 /* width of GUI window */
+#define UI_HEIGHT                   595 /* height of GUI window */
+#define UI_LCD_POSX                 44 /* x position of lcd */
+#define UI_LCD_POSY                 47 /* y position of lcd */
+
+
 #elif defined(SANSA_FUZE) || defined(SANSA_FUZEV2)
 #ifdef SANSA_FUZE
 #define UI_TITLE                    "Sansa Fuze"
diff --git a/uisimulator/bitmaps/UI-sansafuzeplus.bmp b/uisimulator/bitmaps/UI-sansafuzeplus.bmp
new file mode 100644
index 0000000000..e706f54905
--- /dev/null
+++ b/uisimulator/bitmaps/UI-sansafuzeplus.bmp
diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES
index c9955d408f..4a2c8ff2e1 100644
--- a/uisimulator/buttonmap/SOURCES
+++ b/uisimulator/buttonmap/SOURCES
@@ -65,5 +65,7 @@ pbell-vibe500.c
 mpio-hd200.c
 #elif CONFIG_KEYPAD == MPIO_HD300_PAD
 mpio-hd300.c
+#elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
+sansa-fuzeplus.c
 #endif
 #endif /* SIMULATOR */
diff --git a/uisimulator/buttonmap/sansa-fuze.c b/uisimulator/buttonmap/sansa-fuze.c
index fcd935946e..c6378c3d6c 100644
--- a/uisimulator/buttonmap/sansa-fuze.c
+++ b/uisimulator/buttonmap/sansa-fuze.c
@@ -77,15 +77,15 @@ int key_to_button(int keyboard_button)
 }
 
 struct button_map bm[] = {
-    { SDLK_KP8,          70, 265, 35, "Scroll Back" },
-    { SDLK_KP9,         141, 255, 31, "Play" },
-    { SDLK_KP_MULTIPLY, 228, 267, 18, "Home" },
-    { SDLK_LEFT,         69, 329, 31, "Left" },
-    { SDLK_SPACE,       141, 330, 20, "Select" },
-    { SDLK_RIGHT,       214, 331, 23, "Right" },
-    { SDLK_KP3,         142, 406, 30, "Menu" },
-    { SDLK_DOWN,        221, 384, 24, "Scroll Fwd" },
-    { SDLK_KP_MINUS,    270, 299, 25, "Power" },
-    { SDLK_h,           269, 358, 26, "Hold" },
+    { SDLK_KP7, 70, 400, 15, "Back" },
+    { SDLK_KP9, 258, 400, 15, "Play/Pause" },
+    { SDLK_KP5, 162, 476, 15, "Select" },
+    { SDLK_KP8, 162, 407, 35, "Up" },
+    { SDLK_KP2, 162, 546, 35, "Down" },
+    { SDLK_KP6, 233, 546, 35, "Right" },
+    { SDLK_KP4, 92, 476, 35, "Left" },
+    { SDLK_KP_MINUS, 20, 190, 20, "Volume-" },
+    { SDLK_KP_PLUS, 20, 130, 20, "Volume+" },
+    { SDLK_KP1, 160, 15, 15, "Power" },
     { 0, 0, 0, 0, "None" }
 };
diff --git a/uisimulator/buttonmap/sansa-fuzeplus.c b/uisimulator/buttonmap/sansa-fuzeplus.c
new file mode 100644
index 0000000000..bd78274a03
--- /dev/null
+++ b/uisimulator/buttonmap/sansa-fuzeplus.c
@@ -0,0 +1,88 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2011 by Amaury Pouly
+ *
+ * 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 "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_PAGEUP:
+        case SDLK_KP9:
+            new_btn = BUTTON_PLAYPAUSE;
+            break;
+        case SDLK_INSERT:
+        case SDLK_KP7:
+            new_btn = BUTTON_BACK;
+            break;
+        case SDLK_KP5:
+        case SDLK_SPACE:
+        case SDLK_KP_ENTER:
+        case SDLK_RETURN:
+            new_btn = BUTTON_SELECT;
+            break;
+        case SDLK_KP_PLUS:
+            new_btn = BUTTON_VOL_UP;
+            break;
+        case SDLK_KP_MINUS:
+            new_btn = BUTTON_VOL_DOWN;
+            break;
+        case SDLK_HOME:
+        case SDLK_KP1:
+            new_btn = BUTTON_POWER;
+            break;
+    }
+    return new_btn;
+}
+
+struct button_map bm[] = {
+    { SDLK_KP8,          70, 265, 35, "Scroll Back" },
+    { SDLK_KP9,         141, 255, 31, "Play" },
+    { SDLK_KP_MULTIPLY, 228, 267, 18, "Home" },
+    { SDLK_LEFT,         69, 329, 31, "Left" },
+    { SDLK_SPACE,       141, 330, 20, "Select" },
+    { SDLK_RIGHT,       214, 331, 23, "Right" },
+    { SDLK_KP3,         142, 406, 30, "Menu" },
+    { SDLK_DOWN,        221, 384, 24, "Scroll Fwd" },
+    { SDLK_KP_MINUS,    270, 299, 25, "Power" },
+    { SDLK_h,           269, 358, 26, "Hold" },
+    { 0, 0, 0, 0, "None" }
+};