diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/audio_path.c | 2 | ||||
-rw-r--r-- | apps/debug_menu.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-ypr0.c | 19 | ||||
-rw-r--r-- | apps/radio/radio.c | 10 |
4 files changed, 34 insertions, 2 deletions
diff --git a/apps/audio_path.c b/apps/audio_path.c index dab43ebf42..9ef748382f 100644 --- a/apps/audio_path.c +++ b/apps/audio_path.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #endif | 42 | #endif |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | 45 | #if ((CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SAMSUNG_YPR0)) |
46 | 46 | ||
47 | #ifdef AUDIO_CPU_BOOST | 47 | #ifdef AUDIO_CPU_BOOST |
48 | static void audio_cpu_boost(bool state) | 48 | static void audio_cpu_boost(bool state) |
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index e611694b5b..aec0a9a1a6 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -78,6 +78,11 @@ | |||
78 | #endif | 78 | #endif |
79 | #include "power.h" | 79 | #include "power.h" |
80 | 80 | ||
81 | #if defined(SAMSUNG_YPR0) && defined(CONFIG_TUNER) | ||
82 | #include "tuner.h" | ||
83 | #include "radio.h" | ||
84 | #endif | ||
85 | |||
81 | #ifdef HAVE_LCD_BITMAP | 86 | #ifdef HAVE_LCD_BITMAP |
82 | #include "scrollbar.h" | 87 | #include "scrollbar.h" |
83 | #include "peakmeter.h" | 88 | #include "peakmeter.h" |
diff --git a/apps/keymaps/keymap-ypr0.c b/apps/keymaps/keymap-ypr0.c index b5706760ba..306fd91e34 100644 --- a/apps/keymaps/keymap-ypr0.c +++ b/apps/keymaps/keymap-ypr0.c | |||
@@ -212,7 +212,24 @@ static const struct button_mapping button_context_keyboard[] = { | |||
212 | }; /* button_context_keyboard */ | 212 | }; /* button_context_keyboard */ |
213 | 213 | ||
214 | static const struct button_mapping button_context_radio[] = { | 214 | static const struct button_mapping button_context_radio[] = { |
215 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | 215 | { ACTION_FM_MENU, BUTTON_SELECT | BUTTON_REPEAT, BUTTON_NONE }, |
216 | { ACTION_FM_PRESET, BUTTON_MENU | BUTTON_REPEAT, BUTTON_NONE }, | ||
217 | { ACTION_FM_STOP, BUTTON_POWER | BUTTON_REL, BUTTON_POWER }, | ||
218 | { ACTION_FM_MODE, BUTTON_MENU | BUTTON_REL, BUTTON_MENU }, | ||
219 | { ACTION_FM_EXIT, BUTTON_BACK | BUTTON_REL, BUTTON_BACK }, | ||
220 | { ACTION_FM_PLAY, BUTTON_SELECT | BUTTON_REL, BUTTON_SELECT }, | ||
221 | { ACTION_FM_NEXT_PRESET, BUTTON_USER | BUTTON_RIGHT, BUTTON_NONE }, | ||
222 | { ACTION_FM_PREV_PRESET, BUTTON_USER | BUTTON_LEFT, BUTTON_NONE }, | ||
223 | /* Volume */ | ||
224 | { ACTION_SETTINGS_INC, BUTTON_UP | BUTTON_REPEAT, BUTTON_NONE }, | ||
225 | { ACTION_SETTINGS_INCREPEAT, BUTTON_UP, BUTTON_NONE }, | ||
226 | { ACTION_SETTINGS_DEC, BUTTON_DOWN | BUTTON_REPEAT, BUTTON_NONE }, | ||
227 | { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN, BUTTON_NONE }, | ||
228 | /* Tuning */ | ||
229 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | ||
230 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT | BUTTON_REPEAT, BUTTON_NONE }, | ||
231 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | ||
232 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT | BUTTON_REPEAT, BUTTON_NONE }, | ||
216 | }; /* button_context_radio */ | 233 | }; /* button_context_radio */ |
217 | 234 | ||
218 | const struct button_mapping* get_context_mapping(int context) | 235 | const struct button_mapping* get_context_mapping(int context) |
diff --git a/apps/radio/radio.c b/apps/radio/radio.c index 9f139f49a6..326e6a3bb0 100644 --- a/apps/radio/radio.c +++ b/apps/radio/radio.c | |||
@@ -127,6 +127,16 @@ | |||
127 | #define FM_MODE | 127 | #define FM_MODE |
128 | #define FM_STOP | 128 | #define FM_STOP |
129 | 129 | ||
130 | #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) | ||
131 | #define FM_MENU | ||
132 | #define FM_PRESET | ||
133 | #define FM_STOP | ||
134 | #define FM_MODE | ||
135 | #define FM_EXIT | ||
136 | #define FM_PLAY | ||
137 | #define FM_PREV_PRESET | ||
138 | #define FM_NEXT_PRESET | ||
139 | |||
130 | #endif | 140 | #endif |
131 | 141 | ||
132 | /* presets.c needs these so keep unstatic or redo the whole thing! */ | 142 | /* presets.c needs these so keep unstatic or redo the whole thing! */ |