summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorLorenzo Miori <memoryS60@gmail.com>2013-09-10 22:48:34 +0200
committerThomas Martitz <kugel@rockbox.org>2014-02-05 09:56:21 +0100
commite876f4df6d240bd2e319b1e63be95a625f049a97 (patch)
treece2fe1b24650e3be7a6cd2d346d29090a5422a8c /apps
parentb828b9d99bff2acc0e1f543f3176fd4b632cba68 (diff)
downloadrockbox-e876f4df6d240bd2e319b1e63be95a625f049a97.tar.gz
rockbox-e876f4df6d240bd2e319b1e63be95a625f049a97.zip
Samsung YP-R1 target port
This is the basic port to the new target Samsung YP-R1, which runs on a similar platform as YP-R0. Port is usable, although there are still some optimizations that have to be done. Change-Id: If83a8e386369e413581753780c159026d9e41f04
Diffstat (limited to 'apps')
-rw-r--r--apps/SOURCES3
-rw-r--r--apps/audio_path.c2
-rw-r--r--apps/debug_menu.c2
-rw-r--r--apps/keymaps/keymap-ypr1.c171
-rw-r--r--apps/lang/english.lang42
-rw-r--r--apps/plugins/clix.c3
-rw-r--r--apps/plugins/reversi/reversi-gui.h3
7 files changed, 202 insertions, 24 deletions
diff --git a/apps/SOURCES b/apps/SOURCES
index 918ee1e4fc..f0c9462faf 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -302,5 +302,6 @@ keymaps/keymap-nwz.c
keymaps/keymap-ypz5.c
#elif CONFIG_KEYPAD == IHIFI_PAD
keymaps/keymap-ihifi.c
+#elif CONFIG_KEYPAD == SAMSUNG_YPR1_PAD
+keymaps/keymap-ypr1.c
#endif
-
diff --git a/apps/audio_path.c b/apps/audio_path.c
index 9ef748382f..c4a4d1b277 100644
--- a/apps/audio_path.c
+++ b/apps/audio_path.c
@@ -42,7 +42,7 @@
#endif
#endif
-#if ((CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SAMSUNG_YPR0))
+#if ((CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1))
#ifdef AUDIO_CPU_BOOST
static void audio_cpu_boost(bool state)
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 7c399350b2..1007c97414 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -78,7 +78,7 @@
#endif
#include "power.h"
-#if defined(SAMSUNG_YPR0) && defined(CONFIG_TUNER)
+#if (defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1)) && defined(CONFIG_TUNER)
#include "tuner.h"
#include "radio.h"
#endif
diff --git a/apps/keymaps/keymap-ypr1.c b/apps/keymaps/keymap-ypr1.c
new file mode 100644
index 0000000000..d47047912b
--- /dev/null
+++ b/apps/keymaps/keymap-ypr1.c
@@ -0,0 +1,171 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id: keymap-sdl.c 28704 2010-11-29 11:28:53Z teru $
+ *
+ * Copyright (C) 2013 Lorenzo Miori
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/* Button Code Definitions for Samsung YP-R1 target */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "config.h"
+#include "action.h"
+#include "button.h"
+#include "settings.h"
+
+/*
+ * The format of the list is as follows
+ * { Action Code, Button code, Prereq button code }
+ * if there's no need to check the previous button's value, use BUTTON_NONE
+ * Insert LAST_ITEM_IN_LIST at the end of each mapping
+ */
+
+static const struct button_mapping button_context_standard[] = {
+ { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
+
+ LAST_ITEM_IN_LIST
+}; /* button_context_standard */
+
+static const struct button_mapping button_context_wps[] = {
+
+ { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE },
+ { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE },
+ { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_STD_KEYLOCK, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
+ LAST_ITEM_IN_LIST
+}; /* button_context_wps */
+
+static const struct button_mapping button_context_list[] = {
+
+#ifdef HAVE_VOLUME_IN_LIST
+ { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE },
+ { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE },
+ { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+#endif
+
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_list */
+
+static const struct button_mapping button_context_tree[] = {
+ { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE },
+
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
+}; /* button_context_tree */
+
+static const struct button_mapping button_context_settings[] = {
+
+ { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE },
+ { ACTION_SETTINGS_INCREPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE },
+ { ACTION_SETTINGS_DECREPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
+
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE)
+}; /* button_context_settings */
+
+static const struct button_mapping button_context_settings_right_is_inc[] = {
+ { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE },
+ { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_NONE, BUTTON_VOL_UP|BUTTON_REL, BUTTON_VOL_UP },
+
+ { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE },
+ { ACTION_SETTINGS_DECREPEAT,BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_NONE, BUTTON_VOL_DOWN|BUTTON_REL, BUTTON_VOL_DOWN },
+
+ { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
+
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+}; /* button_context_settings_right_is_inc */
+
+static const struct button_mapping button_context_yesno[] = {
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings_yesno */
+
+static const struct button_mapping button_context_colorchooser[] = {
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_colorchooser */
+
+static const struct button_mapping button_context_eq[] = {
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_eq */
+
+/** Bookmark Screen **/
+static const struct button_mapping button_context_bmark[] = {
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
+}; /* button_context_bmark */
+
+static const struct button_mapping button_context_quickscreen[] = {
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_quickscreen */
+
+static const struct button_mapping button_context_pitchscreen[] = {
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_pitchcreen */
+
+static const struct button_mapping button_context_keyboard[] = {
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_keyboard */
+
+/** FM Radio Screen **/
+static const struct button_mapping button_context_radio[] = {
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
+}; /* button_context_radio */
+
+const struct button_mapping* target_get_context_mapping(int context)
+{
+ switch (context)
+ {
+ case CONTEXT_STD:
+ return button_context_standard;
+ case CONTEXT_WPS:
+ return button_context_wps;
+
+ case CONTEXT_LIST:
+ return button_context_list;
+ case CONTEXT_MAINMENU:
+ case CONTEXT_CUSTOM|CONTEXT_TREE:
+ return button_context_tree;
+
+ case CONTEXT_SETTINGS:
+ case CONTEXT_SETTINGS_TIME:
+ return button_context_settings;
+ case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
+ case CONTEXT_SETTINGS_COLOURCHOOSER:
+ case CONTEXT_SETTINGS_EQ:
+ case CONTEXT_SETTINGS_RECTRIGGER:
+ return button_context_settings_right_is_inc;
+
+ case CONTEXT_YESNOSCREEN:
+ return button_context_yesno;
+ case CONTEXT_FM:
+ return button_context_radio;
+ case CONTEXT_BOOKMARKSCREEN:
+ return button_context_bmark;
+ case CONTEXT_QUICKSCREEN:
+ return button_context_quickscreen;
+ case CONTEXT_PITCHSCREEN:
+ return button_context_pitchscreen;
+ case CONTEXT_KEYBOARD:
+ return button_context_keyboard;
+ }
+ return button_context_standard;
+}
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 42bc2f36c3..0778ab74d3 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -12368,15 +12368,15 @@
user: core
<source>
*: none
- gigabeats: "Tone Controls"
+ gigabeats,samsungypr1: "Tone Controls"
</source>
<dest>
*: none
- gigabeats: "Tone Controls"
+ gigabeats,samsungypr1: "Tone Controls"
</dest>
<voice>
*: none
- gigabeats: "Tone Controls"
+ gigabeats,samsungypr1: "Tone Controls"
</voice>
</phrase>
<phrase>
@@ -12385,15 +12385,15 @@
user: core
<source>
*: none
- gigabeats: "Advanced Tone Control Settings"
+ gigabeats,samsungypr1: "Advanced Tone Control Settings"
</source>
<dest>
*: none
- gigabeats: "Advanced Tone Control Settings"
+ gigabeats,samsungypr1: "Advanced Tone Control Settings"
</dest>
<voice>
*: none
- gigabeats: "Advanced Tone Control Settings"
+ gigabeats,samsungypr1: "Advanced Tone Control Settings"
</voice>
</phrase>
<phrase>
@@ -12402,15 +12402,15 @@
user: core
<source>
*: none
- gigabeats: "Band %d Gain"
+ gigabeats,samsungypr1: "Band %d Gain"
</source>
<dest>
*: none
- gigabeats: "Band %d Gain"
+ gigabeats,samsungypr1: "Band %d Gain"
</dest>
<voice>
*: none
- gigabeats: "Band Gain"
+ gigabeats,samsungypr1: "Band Gain"
</voice>
</phrase>
<phrase>
@@ -12419,15 +12419,15 @@
user: core
<source>
*: none
- gigabeats: "Band %d Frequency"
+ gigabeats,samsungypr1: "Band %d Frequency"
</source>
<dest>
*: none
- gigabeats: "Band %d Frequency"
+ gigabeats,samsungypr1: "Band %d Frequency"
</dest>
<voice>
*: none
- gigabeats: "Band Frequency"
+ gigabeats,samsungypr1: "Band Frequency"
</voice>
</phrase>
<phrase>
@@ -12436,15 +12436,15 @@
user: core
<source>
*: none
- gigabeats: "Band %d Width"
+ gigabeats,samsungypr1: "Band %d Width"
</source>
<dest>
*: none
- gigabeats: "Band %d Width"
+ gigabeats,samsungypr1: "Band %d Width"
</dest>
<voice>
*: none
- gigabeats: "Band Width"
+ gigabeats,samsungypr1: "Band Width"
</voice>
</phrase>
<phrase>
@@ -12453,15 +12453,15 @@
user: core
<source>
*: none
- gigabeats: "Narrow"
+ gigabeats,samsungypr1: "Narrow"
</source>
<dest>
*: none
- gigabeats: "Narrow"
+ gigabeats,samsungypr1: "Narrow"
</dest>
<voice>
*: none
- gigabeats: "Narrow"
+ gigabeats,samsungypr1: "Narrow"
</voice>
</phrase>
<phrase>
@@ -12470,15 +12470,15 @@
user: core
<source>
*: none
- gigabeats: "Wide"
+ gigabeats,samsungypr1: "Wide"
</source>
<dest>
*: none
- gigabeats: "Wide"
+ gigabeats,samsungypr1: "Wide"
</dest>
<voice>
*: none
- gigabeats: "Wide"
+ gigabeats,samsungypr1: "Wide"
</voice>
</phrase>
<phrase>
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c
index 14b0b09cda..59cf162b0a 100644
--- a/apps/plugins/clix.c
+++ b/apps/plugins/clix.c
@@ -221,6 +221,9 @@
#define CLIX_BUTTON_RIGHT BUTTON_RIGHT
#define CLIX_BUTTON_CLICK BUTTON_SELECT
+#elif (CONFIG_KEYPAD == SAMSUNG_YPR1_PAD)
+#define CLIX_BUTTON_QUIT BUTTON_POWER
+
#else
#error "no keymap"
#endif
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h
index 47b7ff204d..124cf471bb 100644
--- a/apps/plugins/reversi/reversi-gui.h
+++ b/apps/plugins/reversi/reversi-gui.h
@@ -283,6 +283,9 @@
#define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT
#define REVERSI_BUTTON_MENU BUTTON_POWER
+#elif CONFIG_KEYPAD == SAMSUNG_YPR1_PAD
+#define REVERSI_BUTTON_QUIT BUTTON_POWER
+
#else
#error No keymap defined!
#endif