diff options
author | Marianne Arnold <pixelma@rockbox.org> | 2007-10-02 21:04:10 +0000 |
---|---|---|
committer | Marianne Arnold <pixelma@rockbox.org> | 2007-10-02 21:04:10 +0000 |
commit | af97e9369a5ecbe4438a1a5df14269fa56320fa3 (patch) | |
tree | aa9f6c3df7f0eaee880caf10366ec9e8ef036e31 /apps | |
parent | 51a8a1e3f3e390c55f2661ef5b4b681121156eee (diff) | |
download | rockbox-af97e9369a5ecbe4438a1a5df14269fa56320fa3.tar.gz rockbox-af97e9369a5ecbe4438a1a5df14269fa56320fa3.zip |
Commit FS #7881 by Mark Arigo - enable radio on the Sansa c200. It seems that many (if not all) c200s have the radio hardware even if you can't use it with the original firmware...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14963 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-c200.c | 15 | ||||
-rw-r--r-- | apps/recorder/radio.c | 4 |
2 files changed, 13 insertions, 6 deletions
diff --git a/apps/keymaps/keymap-c200.c b/apps/keymaps/keymap-c200.c index f8801a2abe..3f4bb49743 100644 --- a/apps/keymaps/keymap-c200.c +++ b/apps/keymaps/keymap-c200.c | |||
@@ -87,12 +87,12 @@ static const struct button_mapping button_context_wps[] = { | |||
87 | static const struct button_mapping button_context_settings[] = { | 87 | static const struct button_mapping button_context_settings[] = { |
88 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | 88 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
89 | { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE }, | 89 | { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE }, |
90 | |||
91 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | ||
92 | { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
93 | 90 | ||
94 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | 91 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, |
95 | { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 92 | { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
93 | |||
94 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | ||
95 | { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
96 | 96 | ||
97 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | 97 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, |
98 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 98 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -241,6 +241,11 @@ static const struct button_mapping button_context_radio[] = { | |||
241 | { ACTION_FM_MODE, BUTTON_REC, BUTTON_NONE }, | 241 | { ACTION_FM_MODE, BUTTON_REC, BUTTON_NONE }, |
242 | { ACTION_FM_EXIT, BUTTON_POWER, BUTTON_NONE }, | 242 | { ACTION_FM_EXIT, BUTTON_POWER, BUTTON_NONE }, |
243 | { ACTION_FM_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, | 243 | { ACTION_FM_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
244 | { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE }, | ||
245 | { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
246 | { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, | ||
247 | { ACTION_SETTINGS_DECREPEAT,BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
248 | |||
244 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | 249 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) |
245 | }; /* button_context_radio */ | 250 | }; /* button_context_radio */ |
246 | #endif | 251 | #endif |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 5042305967..6f155e5417 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -45,7 +45,9 @@ | |||
45 | #include "lang.h" | 45 | #include "lang.h" |
46 | #include "font.h" | 46 | #include "font.h" |
47 | #include "sound_menu.h" | 47 | #include "sound_menu.h" |
48 | #ifdef HAVE_RECORDING | ||
48 | #include "recording.h" | 49 | #include "recording.h" |
50 | #endif | ||
49 | #include "talk.h" | 51 | #include "talk.h" |
50 | #include "tuner.h" | 52 | #include "tuner.h" |
51 | #include "power.h" | 53 | #include "power.h" |
@@ -90,7 +92,7 @@ | |||
90 | #elif CONFIG_KEYPAD == ONDIO_PAD | 92 | #elif CONFIG_KEYPAD == ONDIO_PAD |
91 | #define FM_RECORD_DBLPRE | 93 | #define FM_RECORD_DBLPRE |
92 | #define FM_RECORD | 94 | #define FM_RECORD |
93 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 95 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SANSA_C200_PAD) |
94 | #define FM_MENU | 96 | #define FM_MENU |
95 | #define FM_PRESET | 97 | #define FM_PRESET |
96 | #define FM_STOP | 98 | #define FM_STOP |