diff options
Diffstat (limited to 'firmware')
111 files changed, 208 insertions, 392 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 9cd1a5671c..cc1dca3557 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -425,8 +425,6 @@ drivers/rds.c | |||
425 | /* Sound */ | 425 | /* Sound */ |
426 | sound.c | 426 | sound.c |
427 | 427 | ||
428 | #if CONFIG_CODEC == SWCODEC | ||
429 | |||
430 | #ifndef BOOTLOADER | 428 | #ifndef BOOTLOADER |
431 | pcm_sampr.c | 429 | pcm_sampr.c |
432 | pcm.c | 430 | pcm.c |
@@ -440,7 +438,6 @@ enc_base.c | |||
440 | 438 | ||
441 | drivers/audio/audiohw-swcodec.c | 439 | drivers/audio/audiohw-swcodec.c |
442 | #endif /* BOOTLOADER */ | 440 | #endif /* BOOTLOADER */ |
443 | #endif /* SWCODEC */ | ||
444 | 441 | ||
445 | /* Audio codec */ | 442 | /* Audio codec */ |
446 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER) | 443 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER) |
@@ -505,13 +502,13 @@ drivers/audio/rocker_codec.c | |||
505 | drivers/audio/xduoolinux_codec.c | 502 | drivers/audio/xduoolinux_codec.c |
506 | #elif defined(HAVE_SDL_AUDIO) | 503 | #elif defined(HAVE_SDL_AUDIO) |
507 | drivers/audio/sdl.c | 504 | drivers/audio/sdl.c |
508 | #if CONFIG_CODEC == SWCODEC | 505 | |
509 | #if (CONFIG_PLATFORM & PLATFORM_MAEMO5) | 506 | #if (CONFIG_PLATFORM & PLATFORM_MAEMO5) |
510 | target/hosted/maemo/pcm-gstreamer.c | 507 | target/hosted/maemo/pcm-gstreamer.c |
511 | #else | 508 | #else |
512 | target/hosted/sdl/pcm-sdl.c | 509 | target/hosted/sdl/pcm-sdl.c |
513 | #endif /* (CONFIG_PLATFORM & PLATFORM_MAEMO) */ | 510 | #endif /* (CONFIG_PLATFORM & PLATFORM_MAEMO) */ |
514 | #endif /* CONFIG_CODEC == SWCODEC */ | 511 | |
515 | #endif | 512 | #endif |
516 | #endif /* (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER) */ | 513 | #endif /* (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER) */ |
517 | 514 | ||
diff --git a/firmware/drivers/audio/sdl.c b/firmware/drivers/audio/sdl.c index d701665889..fb49a291d1 100644 --- a/firmware/drivers/audio/sdl.c +++ b/firmware/drivers/audio/sdl.c | |||
@@ -48,7 +48,7 @@ void audiohw_set_volume(int volume) | |||
48 | #ifdef HAVE_SW_VOLUME_CONTROL | 48 | #ifdef HAVE_SW_VOLUME_CONTROL |
49 | volume = sdl_volume_level(volume); | 49 | volume = sdl_volume_level(volume); |
50 | pcm_set_master_volume(volume, volume); | 50 | pcm_set_master_volume(volume, volume); |
51 | #elif CONFIG_CODEC == SWCODEC | 51 | #else |
52 | extern void pcm_set_mixer_volume(int volume); | 52 | extern void pcm_set_mixer_volume(int volume); |
53 | pcm_set_mixer_volume(volume); | 53 | pcm_set_mixer_volume(volume); |
54 | #endif | 54 | #endif |
@@ -87,14 +87,6 @@ void audiohw_set_bass(int value) { (void)value; } | |||
87 | void audiohw_set_treble(int value) { (void)value; } | 87 | void audiohw_set_treble(int value) { (void)value; } |
88 | #endif | 88 | #endif |
89 | #endif /* HAVE_SW_TONE_CONTROLS */ | 89 | #endif /* HAVE_SW_TONE_CONTROLS */ |
90 | #if CONFIG_CODEC != SWCODEC | ||
91 | void audiohw_set_channel(int value) { (void)value; } | ||
92 | void audiohw_set_stereo_width(int value){ (void)value; } | ||
93 | #ifdef HAVE_PITCHCONTROL | ||
94 | void audiohw_set_pitch(int32_t value) { (void)value; } | ||
95 | int32_t audiohw_get_pitch(void) { return PITCH_SPEED_100; } | ||
96 | #endif | ||
97 | #endif /* CONFIG_CODEC != SWCODEC */ | ||
98 | #if defined(AUDIOHW_HAVE_BASS_CUTOFF) | 90 | #if defined(AUDIOHW_HAVE_BASS_CUTOFF) |
99 | void audiohw_set_bass_cutoff(int value) { (void)value; } | 91 | void audiohw_set_bass_cutoff(int value) { (void)value; } |
100 | #endif | 92 | #endif |
diff --git a/firmware/export/audio.h b/firmware/export/audio.h index 5ed9c706a4..c2c23dfd5c 100644 --- a/firmware/export/audio.h +++ b/firmware/export/audio.h | |||
@@ -18,8 +18,8 @@ | |||
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #ifndef AUDIO_H | 21 | #ifndef __AUDIO_H |
22 | #define AUDIO_H | 22 | #define __AUDIO_H |
23 | 23 | ||
24 | #include <stdbool.h> | 24 | #include <stdbool.h> |
25 | #include <string.h> /* size_t */ | 25 | #include <string.h> /* size_t */ |
@@ -27,13 +27,11 @@ | |||
27 | /* These must always be included with audio.h for this to compile under | 27 | /* These must always be included with audio.h for this to compile under |
28 | cetain conditions. Do it here or else spread the complication around to | 28 | cetain conditions. Do it here or else spread the complication around to |
29 | many files. */ | 29 | many files. */ |
30 | #if CONFIG_CODEC == SWCODEC | ||
31 | #include "pcm_sampr.h" | 30 | #include "pcm_sampr.h" |
32 | #include "pcm.h" | 31 | #include "pcm.h" |
33 | #ifdef HAVE_RECORDING | 32 | #ifdef HAVE_RECORDING |
34 | #include "enc_base.h" | 33 | #include "enc_base.h" |
35 | #endif /* HAVE_RECORDING */ | 34 | #endif /* HAVE_RECORDING */ |
36 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
37 | 35 | ||
38 | #define AUDIO_STATUS_PLAY 0x0001 | 36 | #define AUDIO_STATUS_PLAY 0x0001 |
39 | #define AUDIO_STATUS_PAUSE 0x0002 | 37 | #define AUDIO_STATUS_PAUSE 0x0002 |
@@ -75,44 +73,9 @@ void audio_error_clear(void); | |||
75 | int audio_get_file_pos(void); | 73 | int audio_get_file_pos(void); |
76 | void audio_beep(int duration); | 74 | void audio_beep(int duration); |
77 | 75 | ||
78 | #if CONFIG_CODEC == SWCODEC | ||
79 | void audio_next_dir(void); | 76 | void audio_next_dir(void); |
80 | void audio_prev_dir(void); | 77 | void audio_prev_dir(void); |
81 | 78 | ||
82 | #else /* hwcodec only */ | ||
83 | struct audio_debug | ||
84 | { | ||
85 | int audiobuflen; | ||
86 | int audiobuf_write; | ||
87 | int audiobuf_swapwrite; | ||
88 | int audiobuf_read; | ||
89 | |||
90 | int last_dma_chunk_size; | ||
91 | |||
92 | bool dma_on; | ||
93 | bool playing; | ||
94 | bool play_pending; | ||
95 | bool is_playing; | ||
96 | bool filling; | ||
97 | bool dma_underrun; | ||
98 | |||
99 | int unplayed_space; | ||
100 | int playable_space; | ||
101 | int unswapped_space; | ||
102 | |||
103 | int low_watermark_level; | ||
104 | int lowest_watermark_level; | ||
105 | }; | ||
106 | |||
107 | void audio_get_debugdata(struct audio_debug *dbgdata); | ||
108 | /* unsigned int audio_error(void); - unused function */ | ||
109 | void audio_init_playback(void); | ||
110 | |||
111 | #define audio_next_dir() ({ }) | ||
112 | #define audio_prev_dir() ({ }) | ||
113 | |||
114 | #endif | ||
115 | |||
116 | /* channel modes */ | 79 | /* channel modes */ |
117 | enum rec_channel_modes | 80 | enum rec_channel_modes |
118 | { | 81 | { |
@@ -124,12 +87,10 @@ enum rec_channel_modes | |||
124 | CHN_NUM_MODES | 87 | CHN_NUM_MODES |
125 | }; | 88 | }; |
126 | 89 | ||
127 | #if CONFIG_CODEC == SWCODEC | ||
128 | /* channel mode capability bits */ | 90 | /* channel mode capability bits */ |
129 | #define CHN_CAP_STEREO (1 << CHN_MODE_STEREO) | 91 | #define CHN_CAP_STEREO (1 << CHN_MODE_STEREO) |
130 | #define CHN_CAP_MONO (1 << CHN_MODE_MONO) | 92 | #define CHN_CAP_MONO (1 << CHN_MODE_MONO) |
131 | #define CHN_CAP_ALL (CHN_CAP_STEREO | CHN_CAP_MONO) | 93 | #define CHN_CAP_ALL (CHN_CAP_STEREO | CHN_CAP_MONO) |
132 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
133 | 94 | ||
134 | /* the enums below must match prestr[] in recording.c */ | 95 | /* the enums below must match prestr[] in recording.c */ |
135 | enum audio_sources | 96 | enum audio_sources |
@@ -164,7 +125,6 @@ enum rec_sources | |||
164 | }; | 125 | }; |
165 | #endif /* HAVE_RECORDING */ | 126 | #endif /* HAVE_RECORDING */ |
166 | 127 | ||
167 | #if CONFIG_CODEC == SWCODEC | ||
168 | /* selects a source to monitor for recording or playback */ | 128 | /* selects a source to monitor for recording or playback */ |
169 | #define SRCF_PLAYBACK 0x0000 /* default */ | 129 | #define SRCF_PLAYBACK 0x0000 /* default */ |
170 | #define SRCF_RECORDING 0x1000 | 130 | #define SRCF_RECORDING 0x1000 |
@@ -173,7 +133,6 @@ enum rec_sources | |||
173 | #define SRCF_FMRADIO_PLAYING 0x0000 /* default */ | 133 | #define SRCF_FMRADIO_PLAYING 0x0000 /* default */ |
174 | #define SRCF_FMRADIO_PAUSED 0x2000 | 134 | #define SRCF_FMRADIO_PAUSED 0x2000 |
175 | #endif | 135 | #endif |
176 | #endif | ||
177 | 136 | ||
178 | #ifdef HAVE_RECORDING | 137 | #ifdef HAVE_RECORDING |
179 | /* parameters for audio_set_recording_options */ | 138 | /* parameters for audio_set_recording_options */ |
@@ -183,14 +142,9 @@ struct audio_recording_options | |||
183 | int rec_frequency; | 142 | int rec_frequency; |
184 | int rec_channels; | 143 | int rec_channels; |
185 | int rec_prerecord_time; | 144 | int rec_prerecord_time; |
186 | #if CONFIG_CODEC == SWCODEC | ||
187 | int rec_mono_mode; | 145 | int rec_mono_mode; |
188 | int rec_source_flags; /* for rec_set_source */ | 146 | int rec_source_flags; /* for rec_set_source */ |
189 | struct encoder_config enc_config; | 147 | struct encoder_config enc_config; |
190 | #else | ||
191 | int rec_quality; | ||
192 | bool rec_editable; | ||
193 | #endif | ||
194 | }; | 148 | }; |
195 | 149 | ||
196 | /* audio recording functions */ | 150 | /* audio recording functions */ |
@@ -206,15 +160,10 @@ void audio_set_recording_gain(int left, int right, int type); | |||
206 | unsigned long audio_recorded_time(void); | 160 | unsigned long audio_recorded_time(void); |
207 | unsigned long audio_num_recorded_bytes(void); | 161 | unsigned long audio_num_recorded_bytes(void); |
208 | 162 | ||
209 | #if CONFIG_CODEC == SWCODEC | ||
210 | /* SWCODEC recording functions */ | ||
211 | unsigned long audio_prerecorded_time(void); | 163 | unsigned long audio_prerecorded_time(void); |
212 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
213 | 164 | ||
214 | #endif /* HAVE_RECORDING */ | 165 | #endif /* HAVE_RECORDING */ |
215 | 166 | ||
216 | #if CONFIG_CODEC == SWCODEC | ||
217 | /* SWCODEC misc. audio functions */ | ||
218 | #if INPUT_SRC_CAPS != 0 | 167 | #if INPUT_SRC_CAPS != 0 |
219 | /* audio.c */ | 168 | /* audio.c */ |
220 | void audio_set_input_source(int source, unsigned flags); | 169 | void audio_set_input_source(int source, unsigned flags); |
@@ -223,7 +172,6 @@ void audio_set_input_source(int source, unsigned flags); | |||
223 | void audio_input_mux(int source, unsigned flags); | 172 | void audio_input_mux(int source, unsigned flags); |
224 | void audio_set_output_source(int source); | 173 | void audio_set_output_source(int source); |
225 | #endif /* INPUT_SRC_CAPS */ | 174 | #endif /* INPUT_SRC_CAPS */ |
226 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
227 | 175 | ||
228 | #ifdef HAVE_SPDIF_IN | 176 | #ifdef HAVE_SPDIF_IN |
229 | /* returns index into rec_master_sampr_list */ | 177 | /* returns index into rec_master_sampr_list */ |
@@ -247,11 +195,9 @@ enum track_event_flags | |||
247 | { | 195 | { |
248 | TEF_NONE = 0x0, /* no flags are set */ | 196 | TEF_NONE = 0x0, /* no flags are set */ |
249 | TEF_CURRENT = 0x1, /* event is for the current track */ | 197 | TEF_CURRENT = 0x1, /* event is for the current track */ |
250 | #if CONFIG_CODEC == SWCODEC | ||
251 | TEF_AUTO_SKIP = 0x2, /* event is sent in context of auto skip */ | 198 | TEF_AUTO_SKIP = 0x2, /* event is sent in context of auto skip */ |
252 | TEF_REWIND = 0x4, /* interpret as rewind, id3->elapsed is the | 199 | TEF_REWIND = 0x4, /* interpret as rewind, id3->elapsed is the |
253 | position before the seek back to 0 */ | 200 | position before the seek back to 0 */ |
254 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
255 | }; | 201 | }; |
256 | 202 | ||
257 | struct track_event | 203 | struct track_event |
@@ -260,43 +206,4 @@ struct track_event | |||
260 | struct mp3entry *id3; /* pointer to mp3entry describing track */ | 206 | struct mp3entry *id3; /* pointer to mp3entry describing track */ |
261 | }; | 207 | }; |
262 | 208 | ||
263 | #if CONFIG_CODEC != SWCODEC | 209 | #endif /* __AUDIO_H */ |
264 | /* subscribe to one or more audio event(s) by OR'ing together the desired */ | ||
265 | /* event IDs (defined below); a handler is called with a solitary event ID */ | ||
266 | /* (so switch() is okay) and possibly some useful data (depending on the */ | ||
267 | /* event); a handler must return one of the return codes defined below */ | ||
268 | |||
269 | typedef int (*AUDIO_EVENT_HANDLER)(unsigned short event, unsigned long data); | ||
270 | |||
271 | void audio_register_event_handler(AUDIO_EVENT_HANDLER handler, unsigned short mask); | ||
272 | |||
273 | /***********************************************************************/ | ||
274 | /* handler return codes */ | ||
275 | |||
276 | #define AUDIO_EVENT_RC_IGNORED 200 | ||
277 | /* indicates that no action was taken or the event was not recognized */ | ||
278 | |||
279 | #define AUDIO_EVENT_RC_HANDLED 201 | ||
280 | /* indicates that the event was handled and some action was taken which renders | ||
281 | the original event invalid; USE WITH CARE!; this return code aborts all further | ||
282 | processing of the given event */ | ||
283 | |||
284 | /***********************************************************************/ | ||
285 | /* audio event IDs */ | ||
286 | |||
287 | #define AUDIO_EVENT_POS_REPORT (1<<0) | ||
288 | /* sends a periodic song position report to handlers; a report is sent on | ||
289 | each kernal tick; the number of ticks per second is defined by HZ; on each | ||
290 | report the current song position is passed in 'data'; if a handler takes an | ||
291 | action that changes the song or the song position it must return | ||
292 | AUDIO_EVENT_RC_HANDLED which suppresses the event for any remaining handlers */ | ||
293 | |||
294 | #define AUDIO_EVENT_END_OF_TRACK (1<<1) | ||
295 | /* generated when the end of the currently playing track is reached; no | ||
296 | data is passed; if the handler implements some alternate end-of-track | ||
297 | processing it should return AUDIO_EVENT_RC_HANDLED which suppresses the | ||
298 | event for any remaining handlers as well as the normal end-of-track | ||
299 | processing */ | ||
300 | |||
301 | #endif | ||
302 | #endif | ||
diff --git a/firmware/export/config.h b/firmware/export/config.h index 6ce9bede41..e4397517db 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -53,9 +53,6 @@ | |||
53 | #define RDA5802 0x80 /* RDA Microelectronics */ | 53 | #define RDA5802 0x80 /* RDA Microelectronics */ |
54 | #define STFM1000 0x100 /* Sigmatel */ | 54 | #define STFM1000 0x100 /* Sigmatel */ |
55 | 55 | ||
56 | /* CONFIG_CODEC */ | ||
57 | #define SWCODEC 1 /* if codec is done by SW */ | ||
58 | |||
59 | /* CONFIG_CPU */ | 56 | /* CONFIG_CPU */ |
60 | #define MCF5249 5249 | 57 | #define MCF5249 5249 |
61 | #define MCF5250 5250 | 58 | #define MCF5250 5250 |
@@ -903,7 +900,6 @@ Lyre prototype 1 */ | |||
903 | #define HAVE_PICTUREFLOW_INTEGRATION | 900 | #define HAVE_PICTUREFLOW_INTEGRATION |
904 | #endif | 901 | #endif |
905 | 902 | ||
906 | #if (CONFIG_CODEC == SWCODEC) | ||
907 | #ifdef BOOTLOADER | 903 | #ifdef BOOTLOADER |
908 | 904 | ||
909 | #ifdef HAVE_BOOTLOADER_USB_MODE | 905 | #ifdef HAVE_BOOTLOADER_USB_MODE |
@@ -975,8 +971,6 @@ Lyre prototype 1 */ | |||
975 | #define HAVE_CROSSFADE | 971 | #define HAVE_CROSSFADE |
976 | #endif | 972 | #endif |
977 | 973 | ||
978 | #endif /* (CONFIG_CODEC == SWCODEC) */ | ||
979 | |||
980 | /* Determine if accesses should be strictly long aligned. */ | 974 | /* Determine if accesses should be strictly long aligned. */ |
981 | #if defined(CPU_ARM) || defined(CPU_MIPS) | 975 | #if defined(CPU_ARM) || defined(CPU_MIPS) |
982 | #define ROCKBOX_STRICT_ALIGN 1 | 976 | #define ROCKBOX_STRICT_ALIGN 1 |
@@ -1248,19 +1242,16 @@ Lyre prototype 1 */ | |||
1248 | #define HAVE_PCM_FULL_DUPLEX | 1242 | #define HAVE_PCM_FULL_DUPLEX |
1249 | #endif | 1243 | #endif |
1250 | 1244 | ||
1251 | #if (CONFIG_CODEC == SWCODEC) | ||
1252 | #define HAVE_PITCHCONTROL | 1245 | #define HAVE_PITCHCONTROL |
1253 | #endif | ||
1254 | 1246 | ||
1255 | /* enable logging messages to disk*/ | 1247 | /* enable logging messages to disk*/ |
1256 | #if !defined(BOOTLOADER) && !defined(__PCTOOL__) && (CONFIG_CODEC == SWCODEC) | 1248 | #if !defined(BOOTLOADER) && !defined(__PCTOOL__) |
1257 | #define ROCKBOX_HAS_LOGDISKF | 1249 | #define ROCKBOX_HAS_LOGDISKF |
1258 | #endif | 1250 | #endif |
1259 | 1251 | ||
1260 | #if defined(HAVE_SDL_AUDIO) \ | 1252 | #if defined(HAVE_SDL_AUDIO) \ |
1261 | && !(CONFIG_PLATFORM & PLATFORM_MAEMO5) \ | 1253 | && !(CONFIG_PLATFORM & PLATFORM_MAEMO5) \ |
1262 | && !defined(HAVE_SW_VOLUME_CONTROL) \ | 1254 | && !defined(HAVE_SW_VOLUME_CONTROL) |
1263 | && CONFIG_CODEC == SWCODEC | ||
1264 | /* SW volume is needed for accurate control and no double buffering should be | 1255 | /* SW volume is needed for accurate control and no double buffering should be |
1265 | * required. If target uses SW volume, then its definitions are used instead | 1256 | * required. If target uses SW volume, then its definitions are used instead |
1266 | * so things are as on target. */ | 1257 | * so things are as on target. */ |
diff --git a/firmware/export/config/agptekrocker.h b/firmware/export/config/agptekrocker.h index a943ff4273..3d5565f1d9 100644 --- a/firmware/export/config/agptekrocker.h +++ b/firmware/export/config/agptekrocker.h | |||
@@ -75,8 +75,8 @@ | |||
75 | /* The number of bytes reserved for loadable plugins */ | 75 | /* The number of bytes reserved for loadable plugins */ |
76 | #define PLUGIN_BUFFER_SIZE 0x100000 | 76 | #define PLUGIN_BUFFER_SIZE 0x100000 |
77 | 77 | ||
78 | /* Define this if you do software codec */ | 78 | |
79 | #define CONFIG_CODEC SWCODEC | 79 | |
80 | #define HAVE_ROCKER_CODEC | 80 | #define HAVE_ROCKER_CODEC |
81 | 81 | ||
82 | #define HAVE_HEADPHONE_DETECTION | 82 | #define HAVE_HEADPHONE_DETECTION |
diff --git a/firmware/export/config/android.h b/firmware/export/config/android.h index 2aee700f08..fa95ade999 100644 --- a/firmware/export/config/android.h +++ b/firmware/export/config/android.h | |||
@@ -67,8 +67,8 @@ | |||
67 | 67 | ||
68 | #define AB_REPEAT_ENABLE | 68 | #define AB_REPEAT_ENABLE |
69 | 69 | ||
70 | /* Define this if you do software codec */ | 70 | |
71 | #define CONFIG_CODEC SWCODEC | 71 | |
72 | 72 | ||
73 | #define HAVE_MULTIMEDIA_KEYS | 73 | #define HAVE_MULTIMEDIA_KEYS |
74 | #define CONFIG_KEYPAD ANDROID_PAD | 74 | #define CONFIG_KEYPAD ANDROID_PAD |
diff --git a/firmware/export/config/cowond2.h b/firmware/export/config/cowond2.h index 167f1125a1..f0e117dd7a 100644 --- a/firmware/export/config/cowond2.h +++ b/firmware/export/config/cowond2.h | |||
@@ -107,8 +107,8 @@ | |||
107 | 107 | ||
108 | #define AB_REPEAT_ENABLE | 108 | #define AB_REPEAT_ENABLE |
109 | 109 | ||
110 | /* Define this if you do software codec */ | 110 | |
111 | #define CONFIG_CODEC SWCODEC | 111 | |
112 | 112 | ||
113 | /* The D2 uses a WM8985 codec */ | 113 | /* The D2 uses a WM8985 codec */ |
114 | #define HAVE_WM8985 | 114 | #define HAVE_WM8985 |
diff --git a/firmware/export/config/creativezen.h b/firmware/export/config/creativezen.h index 0033b7d4eb..234556dd23 100644 --- a/firmware/export/config/creativezen.h +++ b/firmware/export/config/creativezen.h | |||
@@ -89,8 +89,8 @@ | |||
89 | /* Define this to enable morse code input */ | 89 | /* Define this to enable morse code input */ |
90 | #define HAVE_MORSE_INPUT | 90 | #define HAVE_MORSE_INPUT |
91 | 91 | ||
92 | /* Define this if you do software codec */ | 92 | |
93 | #define CONFIG_CODEC SWCODEC | 93 | |
94 | 94 | ||
95 | /* LCD dimensions */ | 95 | /* LCD dimensions */ |
96 | #define LCD_WIDTH 320 | 96 | #define LCD_WIDTH 320 |
diff --git a/firmware/export/config/creativezenmozaic.h b/firmware/export/config/creativezenmozaic.h index 3a95d0388a..c8397f26bb 100644 --- a/firmware/export/config/creativezenmozaic.h +++ b/firmware/export/config/creativezenmozaic.h | |||
@@ -90,8 +90,8 @@ | |||
90 | /* Define this to enable morse code input */ | 90 | /* Define this to enable morse code input */ |
91 | #define HAVE_MORSE_INPUT | 91 | #define HAVE_MORSE_INPUT |
92 | 92 | ||
93 | /* Define this if you do software codec */ | 93 | |
94 | #define CONFIG_CODEC SWCODEC | 94 | |
95 | 95 | ||
96 | /* LCD dimensions */ | 96 | /* LCD dimensions */ |
97 | #define LCD_WIDTH 128 | 97 | #define LCD_WIDTH 128 |
diff --git a/firmware/export/config/creativezenv.h b/firmware/export/config/creativezenv.h index 3e9be8ba29..fcdc39242f 100644 --- a/firmware/export/config/creativezenv.h +++ b/firmware/export/config/creativezenv.h | |||
@@ -87,8 +87,8 @@ | |||
87 | /* Define this to enable morse code input */ | 87 | /* Define this to enable morse code input */ |
88 | #define HAVE_MORSE_INPUT | 88 | #define HAVE_MORSE_INPUT |
89 | 89 | ||
90 | /* Define this if you do software codec */ | 90 | |
91 | #define CONFIG_CODEC SWCODEC | 91 | |
92 | 92 | ||
93 | /* LCD dimensions */ | 93 | /* LCD dimensions */ |
94 | #define LCD_WIDTH 132 | 94 | #define LCD_WIDTH 132 |
diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h index 35bd1efdfb..2eb747687a 100644 --- a/firmware/export/config/creativezenxfi.h +++ b/firmware/export/config/creativezenxfi.h | |||
@@ -94,8 +94,8 @@ | |||
94 | /* Define this to enable morse code input */ | 94 | /* Define this to enable morse code input */ |
95 | #define HAVE_MORSE_INPUT | 95 | #define HAVE_MORSE_INPUT |
96 | 96 | ||
97 | /* Define this if you do software codec */ | 97 | |
98 | #define CONFIG_CODEC SWCODEC | 98 | |
99 | 99 | ||
100 | /* LCD dimensions */ | 100 | /* LCD dimensions */ |
101 | #define LCD_WIDTH 320 | 101 | #define LCD_WIDTH 320 |
diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h index 3945311e29..9e5c748cd9 100644 --- a/firmware/export/config/creativezenxfi2.h +++ b/firmware/export/config/creativezenxfi2.h | |||
@@ -97,8 +97,8 @@ | |||
97 | /* Define this to enable morse code input */ | 97 | /* Define this to enable morse code input */ |
98 | #define HAVE_MORSE_INPUT | 98 | #define HAVE_MORSE_INPUT |
99 | 99 | ||
100 | /* Define this if you do software codec */ | 100 | |
101 | #define CONFIG_CODEC SWCODEC | 101 | |
102 | 102 | ||
103 | /* LCD dimensions */ | 103 | /* LCD dimensions */ |
104 | #define LCD_WIDTH 240 | 104 | #define LCD_WIDTH 240 |
diff --git a/firmware/export/config/creativezenxfi3.h b/firmware/export/config/creativezenxfi3.h index d72b41d608..a3626800bd 100644 --- a/firmware/export/config/creativezenxfi3.h +++ b/firmware/export/config/creativezenxfi3.h | |||
@@ -97,8 +97,8 @@ | |||
97 | /* Define this to enable morse code input */ | 97 | /* Define this to enable morse code input */ |
98 | #define HAVE_MORSE_INPUT | 98 | #define HAVE_MORSE_INPUT |
99 | 99 | ||
100 | /* Define this if you do software codec */ | 100 | |
101 | #define CONFIG_CODEC SWCODEC | 101 | |
102 | 102 | ||
103 | /* Define this if you have a speaker */ | 103 | /* Define this if you have a speaker */ |
104 | #define HAVE_SPEAKER | 104 | #define HAVE_SPEAKER |
diff --git a/firmware/export/config/creativezenxfistyle.h b/firmware/export/config/creativezenxfistyle.h index 0c6cd470e3..afb2b18db4 100644 --- a/firmware/export/config/creativezenxfistyle.h +++ b/firmware/export/config/creativezenxfistyle.h | |||
@@ -94,8 +94,8 @@ | |||
94 | /* Define this to enable morse code input */ | 94 | /* Define this to enable morse code input */ |
95 | #define HAVE_MORSE_INPUT | 95 | #define HAVE_MORSE_INPUT |
96 | 96 | ||
97 | /* Define this if you do software codec */ | 97 | |
98 | #define CONFIG_CODEC SWCODEC | 98 | |
99 | 99 | ||
100 | /* LCD dimensions */ | 100 | /* LCD dimensions */ |
101 | #define LCD_WIDTH 320 | 101 | #define LCD_WIDTH 320 |
diff --git a/firmware/export/config/creativezv.h b/firmware/export/config/creativezv.h index ce812d38c9..a38c72afaa 100644 --- a/firmware/export/config/creativezv.h +++ b/firmware/export/config/creativezv.h | |||
@@ -80,8 +80,8 @@ | |||
80 | /* Define this to enable morse code input */ | 80 | /* Define this to enable morse code input */ |
81 | #define HAVE_MORSE_INPUT | 81 | #define HAVE_MORSE_INPUT |
82 | 82 | ||
83 | /* Define this if you do software codec */ | 83 | |
84 | #define CONFIG_CODEC SWCODEC | 84 | |
85 | 85 | ||
86 | /* define this if you have a real-time clock */ | 86 | /* define this if you have a real-time clock */ |
87 | //#define CONFIG_RTC RTC_RX5X348AB | 87 | //#define CONFIG_RTC RTC_RX5X348AB |
diff --git a/firmware/export/config/gigabeatfx.h b/firmware/export/config/gigabeatfx.h index c9e20ad8a7..2382cb9d43 100644 --- a/firmware/export/config/gigabeatfx.h +++ b/firmware/export/config/gigabeatfx.h | |||
@@ -69,8 +69,8 @@ | |||
69 | /* Define this to enable morse code input */ | 69 | /* Define this to enable morse code input */ |
70 | #define HAVE_MORSE_INPUT | 70 | #define HAVE_MORSE_INPUT |
71 | 71 | ||
72 | /* Define this if you do software codec */ | 72 | |
73 | #define CONFIG_CODEC SWCODEC | 73 | |
74 | 74 | ||
75 | /* define this if you have a real-time clock */ | 75 | /* define this if you have a real-time clock */ |
76 | #define CONFIG_RTC RTC_S3C2440 | 76 | #define CONFIG_RTC RTC_S3C2440 |
diff --git a/firmware/export/config/gigabeats.h b/firmware/export/config/gigabeats.h index 928e8c0e60..1a60fff38f 100644 --- a/firmware/export/config/gigabeats.h +++ b/firmware/export/config/gigabeats.h | |||
@@ -59,8 +59,8 @@ | |||
59 | /* Define this to enable morse code input */ | 59 | /* Define this to enable morse code input */ |
60 | #define HAVE_MORSE_INPUT | 60 | #define HAVE_MORSE_INPUT |
61 | 61 | ||
62 | /* Define this if you do software codec */ | 62 | |
63 | #define CONFIG_CODEC SWCODEC | 63 | |
64 | 64 | ||
65 | /* define this if you have a real-time clock */ | 65 | /* define this if you have a real-time clock */ |
66 | #define CONFIG_RTC RTC_MC13783 | 66 | #define CONFIG_RTC RTC_MC13783 |
diff --git a/firmware/export/config/gogearhdd1630.h b/firmware/export/config/gogearhdd1630.h index 773d3fe158..4a4f7b10d4 100644 --- a/firmware/export/config/gogearhdd1630.h +++ b/firmware/export/config/gogearhdd1630.h | |||
@@ -85,8 +85,8 @@ | |||
85 | /* define this if the target has volume keys which can be used in the lists */ | 85 | /* define this if the target has volume keys which can be used in the lists */ |
86 | #define HAVE_VOLUME_IN_LIST | 86 | #define HAVE_VOLUME_IN_LIST |
87 | 87 | ||
88 | /* Define this if you do software codec */ | 88 | |
89 | #define CONFIG_CODEC SWCODEC | 89 | |
90 | 90 | ||
91 | /* define this if you have a real-time clock. The HDD16x0 has a PCF8563 RTC, | 91 | /* define this if you have a real-time clock. The HDD16x0 has a PCF8563 RTC, |
92 | but it's register compatible with the E8564. */ | 92 | but it's register compatible with the E8564. */ |
diff --git a/firmware/export/config/gogearhdd6330.h b/firmware/export/config/gogearhdd6330.h index 3f89240a48..921ca637f2 100644 --- a/firmware/export/config/gogearhdd6330.h +++ b/firmware/export/config/gogearhdd6330.h | |||
@@ -85,8 +85,8 @@ | |||
85 | /* define this if the target has volume keys which can be used in the lists */ | 85 | /* define this if the target has volume keys which can be used in the lists */ |
86 | #define HAVE_VOLUME_IN_LIST | 86 | #define HAVE_VOLUME_IN_LIST |
87 | 87 | ||
88 | /* Define this if you do software codec */ | 88 | |
89 | #define CONFIG_CODEC SWCODEC | 89 | |
90 | 90 | ||
91 | /* define this if you have a real-time clock. The HDD16x0 has a PCF8563 RTC, | 91 | /* define this if you have a real-time clock. The HDD16x0 has a PCF8563 RTC, |
92 | but it's register compatible with the E8564. */ | 92 | but it's register compatible with the E8564. */ |
diff --git a/firmware/export/config/gogearsa9200.h b/firmware/export/config/gogearsa9200.h index f0487fcbb3..c1aeb527cd 100644 --- a/firmware/export/config/gogearsa9200.h +++ b/firmware/export/config/gogearsa9200.h | |||
@@ -68,8 +68,8 @@ | |||
68 | /* define this if the target has volume keys which can be used in the lists */ | 68 | /* define this if the target has volume keys which can be used in the lists */ |
69 | #define HAVE_VOLUME_IN_LIST | 69 | #define HAVE_VOLUME_IN_LIST |
70 | 70 | ||
71 | /* Define this if you do software codec */ | 71 | |
72 | #define CONFIG_CODEC SWCODEC | 72 | |
73 | 73 | ||
74 | /* There is no hardware tone control */ | 74 | /* There is no hardware tone control */ |
75 | #define HAVE_SW_TONE_CONTROLS | 75 | #define HAVE_SW_TONE_CONTROLS |
diff --git a/firmware/export/config/hifietma8.h b/firmware/export/config/hifietma8.h index 0cd63f9d14..48c4145c80 100644 --- a/firmware/export/config/hifietma8.h +++ b/firmware/export/config/hifietma8.h | |||
@@ -75,8 +75,8 @@ | |||
75 | /* Define this to enable morse code input */ | 75 | /* Define this to enable morse code input */ |
76 | #define HAVE_MORSE_INPUT | 76 | #define HAVE_MORSE_INPUT |
77 | 77 | ||
78 | /* Define this if you do software codec */ | 78 | |
79 | #define CONFIG_CODEC SWCODEC | 79 | |
80 | 80 | ||
81 | #define CONFIG_LCD LCD_ILI9342 | 81 | #define CONFIG_LCD LCD_ILI9342 |
82 | 82 | ||
diff --git a/firmware/export/config/hifietma8c.h b/firmware/export/config/hifietma8c.h index 0fc93ab61f..72b5ea7ee4 100644 --- a/firmware/export/config/hifietma8c.h +++ b/firmware/export/config/hifietma8c.h | |||
@@ -75,8 +75,8 @@ | |||
75 | /* Define this to enable morse code input */ | 75 | /* Define this to enable morse code input */ |
76 | #define HAVE_MORSE_INPUT | 76 | #define HAVE_MORSE_INPUT |
77 | 77 | ||
78 | /* Define this if you do software codec */ | 78 | |
79 | #define CONFIG_CODEC SWCODEC | 79 | |
80 | 80 | ||
81 | #define CONFIG_LCD LCD_ILI9342C | 81 | #define CONFIG_LCD LCD_ILI9342C |
82 | 82 | ||
diff --git a/firmware/export/config/hifietma9.h b/firmware/export/config/hifietma9.h index c7a206f0f4..6b96afde08 100644 --- a/firmware/export/config/hifietma9.h +++ b/firmware/export/config/hifietma9.h | |||
@@ -75,8 +75,8 @@ | |||
75 | /* Define this to enable morse code input */ | 75 | /* Define this to enable morse code input */ |
76 | #define HAVE_MORSE_INPUT | 76 | #define HAVE_MORSE_INPUT |
77 | 77 | ||
78 | /* Define this if you do software codec */ | 78 | |
79 | #define CONFIG_CODEC SWCODEC | 79 | |
80 | 80 | ||
81 | #define CONFIG_LCD LCD_ILI9342 | 81 | #define CONFIG_LCD LCD_ILI9342 |
82 | 82 | ||
diff --git a/firmware/export/config/hifietma9c.h b/firmware/export/config/hifietma9c.h index ff312aa94f..5bdb28cd6e 100644 --- a/firmware/export/config/hifietma9c.h +++ b/firmware/export/config/hifietma9c.h | |||
@@ -75,8 +75,8 @@ | |||
75 | /* Define this to enable morse code input */ | 75 | /* Define this to enable morse code input */ |
76 | #define HAVE_MORSE_INPUT | 76 | #define HAVE_MORSE_INPUT |
77 | 77 | ||
78 | /* Define this if you do software codec */ | 78 | |
79 | #define CONFIG_CODEC SWCODEC | 79 | |
80 | 80 | ||
81 | #define CONFIG_LCD LCD_ILI9342C | 81 | #define CONFIG_LCD LCD_ILI9342C |
82 | 82 | ||
diff --git a/firmware/export/config/hifimanhm60x.h b/firmware/export/config/hifimanhm60x.h index 9cb9713bc8..fc718ba935 100644 --- a/firmware/export/config/hifimanhm60x.h +++ b/firmware/export/config/hifimanhm60x.h | |||
@@ -90,8 +90,8 @@ | |||
90 | /* Define this to enable morse code input */ | 90 | /* Define this to enable morse code input */ |
91 | #define HAVE_MORSE_INPUT | 91 | #define HAVE_MORSE_INPUT |
92 | 92 | ||
93 | /* Define this if you do software codec */ | 93 | |
94 | #define CONFIG_CODEC SWCODEC | 94 | |
95 | 95 | ||
96 | /* define this if you have a real-time clock */ | 96 | /* define this if you have a real-time clock */ |
97 | /* #define CONFIG_RTC RTC_NANO2G */ | 97 | /* #define CONFIG_RTC RTC_NANO2G */ |
diff --git a/firmware/export/config/hifimanhm801.h b/firmware/export/config/hifimanhm801.h index 023b532e3c..049c4a40b5 100644 --- a/firmware/export/config/hifimanhm801.h +++ b/firmware/export/config/hifimanhm801.h | |||
@@ -87,8 +87,8 @@ | |||
87 | /* Define this to enable morse code input */ | 87 | /* Define this to enable morse code input */ |
88 | #define HAVE_MORSE_INPUT | 88 | #define HAVE_MORSE_INPUT |
89 | 89 | ||
90 | /* Define this if you do software codec */ | 90 | |
91 | #define CONFIG_CODEC SWCODEC | 91 | |
92 | 92 | ||
93 | #define CONFIG_LCD LCD_HX8340B | 93 | #define CONFIG_LCD LCD_HX8340B |
94 | 94 | ||
diff --git a/firmware/export/config/iaudio7.h b/firmware/export/config/iaudio7.h index 8d03e04be2..0cc8b19787 100644 --- a/firmware/export/config/iaudio7.h +++ b/firmware/export/config/iaudio7.h | |||
@@ -107,8 +107,8 @@ | |||
107 | 107 | ||
108 | #define AB_REPEAT_ENABLE | 108 | #define AB_REPEAT_ENABLE |
109 | 109 | ||
110 | /* Define this if you do software codec */ | 110 | |
111 | #define CONFIG_CODEC SWCODEC | 111 | |
112 | 112 | ||
113 | /* The iaudio7 uses built-in WM8731 codec */ | 113 | /* The iaudio7 uses built-in WM8731 codec */ |
114 | #define HAVE_WM8731 | 114 | #define HAVE_WM8731 |
diff --git a/firmware/export/config/iaudiom3.h b/firmware/export/config/iaudiom3.h index 8dd7396ca3..06ada6b8d5 100644 --- a/firmware/export/config/iaudiom3.h +++ b/firmware/export/config/iaudiom3.h | |||
@@ -73,8 +73,8 @@ | |||
73 | #define AB_REPEAT_ENABLE | 73 | #define AB_REPEAT_ENABLE |
74 | #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE | 74 | #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE |
75 | 75 | ||
76 | /* Define this if you do software codec */ | 76 | |
77 | #define CONFIG_CODEC SWCODEC | 77 | |
78 | 78 | ||
79 | /* define this if you have a real-time clock */ | 79 | /* define this if you have a real-time clock */ |
80 | /* #define CONFIG_RTC FIXME: most probably none */ | 80 | /* #define CONFIG_RTC FIXME: most probably none */ |
diff --git a/firmware/export/config/iaudiom5.h b/firmware/export/config/iaudiom5.h index 19c77ceb2d..9619fd36bb 100644 --- a/firmware/export/config/iaudiom5.h +++ b/firmware/export/config/iaudiom5.h | |||
@@ -92,8 +92,8 @@ | |||
92 | #define AB_REPEAT_ENABLE | 92 | #define AB_REPEAT_ENABLE |
93 | #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE | 93 | #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE |
94 | 94 | ||
95 | /* Define this if you do software codec */ | 95 | |
96 | #define CONFIG_CODEC SWCODEC | 96 | |
97 | 97 | ||
98 | /* define this if you have a real-time clock */ | 98 | /* define this if you have a real-time clock */ |
99 | #define CONFIG_RTC RTC_PCF50606 | 99 | #define CONFIG_RTC RTC_PCF50606 |
diff --git a/firmware/export/config/iaudiox5.h b/firmware/export/config/iaudiox5.h index d74c4472e9..0b520bf12c 100644 --- a/firmware/export/config/iaudiox5.h +++ b/firmware/export/config/iaudiox5.h | |||
@@ -94,8 +94,8 @@ | |||
94 | #define AB_REPEAT_ENABLE | 94 | #define AB_REPEAT_ENABLE |
95 | #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE | 95 | #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE |
96 | 96 | ||
97 | /* Define this if you do software codec */ | 97 | |
98 | #define CONFIG_CODEC SWCODEC | 98 | |
99 | 99 | ||
100 | /* define this if you have a real-time clock */ | 100 | /* define this if you have a real-time clock */ |
101 | #define CONFIG_RTC RTC_PCF50606 | 101 | #define CONFIG_RTC RTC_PCF50606 |
diff --git a/firmware/export/config/ibassodx50.h b/firmware/export/config/ibassodx50.h index e26d43c4a7..9ebad8b120 100644 --- a/firmware/export/config/ibassodx50.h +++ b/firmware/export/config/ibassodx50.h | |||
@@ -95,8 +95,8 @@ | |||
95 | /* Which backlight fading type? */ | 95 | /* Which backlight fading type? */ |
96 | #define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING | 96 | #define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING |
97 | 97 | ||
98 | /* Define this if you do software codec */ | 98 | |
99 | #define CONFIG_CODEC SWCODEC | 99 | |
100 | #define HAVE_SW_TONE_CONTROLS | 100 | #define HAVE_SW_TONE_CONTROLS |
101 | #define HAVE_SW_VOLUME_CONTROL | 101 | #define HAVE_SW_VOLUME_CONTROL |
102 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL | 102 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL |
diff --git a/firmware/export/config/ibassodx90.h b/firmware/export/config/ibassodx90.h index 6de06d9e27..7f8b3725c8 100644 --- a/firmware/export/config/ibassodx90.h +++ b/firmware/export/config/ibassodx90.h | |||
@@ -94,8 +94,8 @@ | |||
94 | /* Which backlight fading type? */ | 94 | /* Which backlight fading type? */ |
95 | #define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING | 95 | #define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING |
96 | 96 | ||
97 | /* Define this if you do software codec */ | 97 | |
98 | #define CONFIG_CODEC SWCODEC | 98 | |
99 | #define HAVE_SW_TONE_CONTROLS | 99 | #define HAVE_SW_TONE_CONTROLS |
100 | #define HAVE_SW_VOLUME_CONTROL | 100 | #define HAVE_SW_VOLUME_CONTROL |
101 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL | 101 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL |
diff --git a/firmware/export/config/ihifi760.h b/firmware/export/config/ihifi760.h index 3e6d3e8449..06ed3640a3 100644 --- a/firmware/export/config/ihifi760.h +++ b/firmware/export/config/ihifi760.h | |||
@@ -90,8 +90,8 @@ | |||
90 | /* Define this to enable morse code input */ | 90 | /* Define this to enable morse code input */ |
91 | #define HAVE_MORSE_INPUT | 91 | #define HAVE_MORSE_INPUT |
92 | 92 | ||
93 | /* Define this if you do software codec */ | 93 | |
94 | #define CONFIG_CODEC SWCODEC | 94 | |
95 | 95 | ||
96 | /* define this if you have a real-time clock */ | 96 | /* define this if you have a real-time clock */ |
97 | /* #define CONFIG_RTC RTC_NANO2G */ | 97 | /* #define CONFIG_RTC RTC_NANO2G */ |
diff --git a/firmware/export/config/ihifi770.h b/firmware/export/config/ihifi770.h index 5215b2f637..f2c28bee2d 100644 --- a/firmware/export/config/ihifi770.h +++ b/firmware/export/config/ihifi770.h | |||
@@ -91,8 +91,8 @@ | |||
91 | /* Define this if a programmable hotkey is mapped */ | 91 | /* Define this if a programmable hotkey is mapped */ |
92 | /* #define HAVE_HOTKEY */ | 92 | /* #define HAVE_HOTKEY */ |
93 | 93 | ||
94 | /* Define this if you do software codec */ | 94 | |
95 | #define CONFIG_CODEC SWCODEC | 95 | |
96 | 96 | ||
97 | /* define this if you have a real-time clock */ | 97 | /* define this if you have a real-time clock */ |
98 | /* #define CONFIG_RTC RTC_NANO2G */ | 98 | /* #define CONFIG_RTC RTC_NANO2G */ |
diff --git a/firmware/export/config/ihifi770c.h b/firmware/export/config/ihifi770c.h index 41081dc0e8..589ef44046 100644 --- a/firmware/export/config/ihifi770c.h +++ b/firmware/export/config/ihifi770c.h | |||
@@ -91,8 +91,8 @@ | |||
91 | /* Define this if a programmable hotkey is mapped */ | 91 | /* Define this if a programmable hotkey is mapped */ |
92 | /* #define HAVE_HOTKEY */ | 92 | /* #define HAVE_HOTKEY */ |
93 | 93 | ||
94 | /* Define this if you do software codec */ | 94 | |
95 | #define CONFIG_CODEC SWCODEC | 95 | |
96 | 96 | ||
97 | /* define this if you have a real-time clock */ | 97 | /* define this if you have a real-time clock */ |
98 | /* #define CONFIG_RTC RTC_NANO2G */ | 98 | /* #define CONFIG_RTC RTC_NANO2G */ |
diff --git a/firmware/export/config/ihifi800.h b/firmware/export/config/ihifi800.h index 63ae764e14..9ee488111c 100644 --- a/firmware/export/config/ihifi800.h +++ b/firmware/export/config/ihifi800.h | |||
@@ -91,8 +91,8 @@ | |||
91 | /* Define this if a programmable hotkey is mapped */ | 91 | /* Define this if a programmable hotkey is mapped */ |
92 | /* #define HAVE_HOTKEY */ | 92 | /* #define HAVE_HOTKEY */ |
93 | 93 | ||
94 | /* Define this if you do software codec */ | 94 | |
95 | #define CONFIG_CODEC SWCODEC | 95 | |
96 | 96 | ||
97 | /* define this if you have a real-time clock */ | 97 | /* define this if you have a real-time clock */ |
98 | /* #define CONFIG_RTC RTC_NANO2G */ | 98 | /* #define CONFIG_RTC RTC_NANO2G */ |
diff --git a/firmware/export/config/ihifi960.h b/firmware/export/config/ihifi960.h index 99c1fcd5b1..9b0c1fe7e2 100644 --- a/firmware/export/config/ihifi960.h +++ b/firmware/export/config/ihifi960.h | |||
@@ -90,8 +90,8 @@ | |||
90 | /* Define this to enable morse code input */ | 90 | /* Define this to enable morse code input */ |
91 | #define HAVE_MORSE_INPUT | 91 | #define HAVE_MORSE_INPUT |
92 | 92 | ||
93 | /* Define this if you do software codec */ | 93 | |
94 | #define CONFIG_CODEC SWCODEC | 94 | |
95 | 95 | ||
96 | /* define this if you have a real-time clock */ | 96 | /* define this if you have a real-time clock */ |
97 | /* #define CONFIG_RTC RTC_NANO2G */ | 97 | /* #define CONFIG_RTC RTC_NANO2G */ |
diff --git a/firmware/export/config/ipod1g2g.h b/firmware/export/config/ipod1g2g.h index 1d0fd5c9fb..5dfac2e0c3 100644 --- a/firmware/export/config/ipod1g2g.h +++ b/firmware/export/config/ipod1g2g.h | |||
@@ -92,8 +92,8 @@ | |||
92 | /* Define this to enable morse code input */ | 92 | /* Define this to enable morse code input */ |
93 | #define HAVE_MORSE_INPUT | 93 | #define HAVE_MORSE_INPUT |
94 | 94 | ||
95 | /* Define this if you do software codec */ | 95 | |
96 | #define CONFIG_CODEC SWCODEC | 96 | |
97 | 97 | ||
98 | /* Define this if you have a software controlled poweroff */ | 98 | /* Define this if you have a software controlled poweroff */ |
99 | #define HAVE_SW_POWEROFF | 99 | #define HAVE_SW_POWEROFF |
diff --git a/firmware/export/config/ipod3g.h b/firmware/export/config/ipod3g.h index b34bd6547b..3914d9f654 100644 --- a/firmware/export/config/ipod3g.h +++ b/firmware/export/config/ipod3g.h | |||
@@ -92,8 +92,8 @@ | |||
92 | /* Define this to enable morse code input */ | 92 | /* Define this to enable morse code input */ |
93 | #define HAVE_MORSE_INPUT | 93 | #define HAVE_MORSE_INPUT |
94 | 94 | ||
95 | /* Define this if you do software codec */ | 95 | |
96 | #define CONFIG_CODEC SWCODEC | 96 | |
97 | 97 | ||
98 | /* define this if you have a real-time clock */ | 98 | /* define this if you have a real-time clock */ |
99 | #define CONFIG_RTC RTC_PCF50605 | 99 | #define CONFIG_RTC RTC_PCF50605 |
diff --git a/firmware/export/config/ipod4g.h b/firmware/export/config/ipod4g.h index 785491a9ab..e838174701 100644 --- a/firmware/export/config/ipod4g.h +++ b/firmware/export/config/ipod4g.h | |||
@@ -84,8 +84,8 @@ | |||
84 | /* Define this to enable morse code input */ | 84 | /* Define this to enable morse code input */ |
85 | #define HAVE_MORSE_INPUT | 85 | #define HAVE_MORSE_INPUT |
86 | 86 | ||
87 | /* Define this if you do software codec */ | 87 | |
88 | #define CONFIG_CODEC SWCODEC | 88 | |
89 | 89 | ||
90 | /* define this if you have a real-time clock */ | 90 | /* define this if you have a real-time clock */ |
91 | #define CONFIG_RTC RTC_PCF50605 | 91 | #define CONFIG_RTC RTC_PCF50605 |
diff --git a/firmware/export/config/ipod6g.h b/firmware/export/config/ipod6g.h index b4be39d935..d3c4805389 100644 --- a/firmware/export/config/ipod6g.h +++ b/firmware/export/config/ipod6g.h | |||
@@ -110,8 +110,8 @@ | |||
110 | /* Define this to enable morse code input */ | 110 | /* Define this to enable morse code input */ |
111 | #define HAVE_MORSE_INPUT | 111 | #define HAVE_MORSE_INPUT |
112 | 112 | ||
113 | /* Define this if you do software codec */ | 113 | |
114 | #define CONFIG_CODEC SWCODEC | 114 | |
115 | 115 | ||
116 | /* define this if you have a real-time clock */ | 116 | /* define this if you have a real-time clock */ |
117 | #define CONFIG_RTC RTC_NANO2G | 117 | #define CONFIG_RTC RTC_NANO2G |
diff --git a/firmware/export/config/ipodcolor.h b/firmware/export/config/ipodcolor.h index 33533f925f..6292b97d58 100644 --- a/firmware/export/config/ipodcolor.h +++ b/firmware/export/config/ipodcolor.h | |||
@@ -71,8 +71,8 @@ | |||
71 | /* Define this to enable morse code input */ | 71 | /* Define this to enable morse code input */ |
72 | #define HAVE_MORSE_INPUT | 72 | #define HAVE_MORSE_INPUT |
73 | 73 | ||
74 | /* Define this if you do software codec */ | 74 | |
75 | #define CONFIG_CODEC SWCODEC | 75 | |
76 | 76 | ||
77 | /* define this if you have a real-time clock */ | 77 | /* define this if you have a real-time clock */ |
78 | #define CONFIG_RTC RTC_PCF50605 | 78 | #define CONFIG_RTC RTC_PCF50605 |
diff --git a/firmware/export/config/ipodmini1g.h b/firmware/export/config/ipodmini1g.h index 4f9f1b3dd9..84481550f1 100644 --- a/firmware/export/config/ipodmini1g.h +++ b/firmware/export/config/ipodmini1g.h | |||
@@ -93,8 +93,8 @@ | |||
93 | /* Define this to enable morse code input */ | 93 | /* Define this to enable morse code input */ |
94 | #define HAVE_MORSE_INPUT | 94 | #define HAVE_MORSE_INPUT |
95 | 95 | ||
96 | /* Define this if you do software codec */ | 96 | |
97 | #define CONFIG_CODEC SWCODEC | 97 | |
98 | 98 | ||
99 | /* define this if you have a real-time clock */ | 99 | /* define this if you have a real-time clock */ |
100 | #define CONFIG_RTC RTC_PCF50605 | 100 | #define CONFIG_RTC RTC_PCF50605 |
diff --git a/firmware/export/config/ipodmini2g.h b/firmware/export/config/ipodmini2g.h index 977eb3da3f..ffc566920d 100644 --- a/firmware/export/config/ipodmini2g.h +++ b/firmware/export/config/ipodmini2g.h | |||
@@ -85,8 +85,8 @@ | |||
85 | /* Define this to enable morse code input */ | 85 | /* Define this to enable morse code input */ |
86 | #define HAVE_MORSE_INPUT | 86 | #define HAVE_MORSE_INPUT |
87 | 87 | ||
88 | /* Define this if you do software codec */ | 88 | |
89 | #define CONFIG_CODEC SWCODEC | 89 | |
90 | 90 | ||
91 | /* define this if you have a real-time clock */ | 91 | /* define this if you have a real-time clock */ |
92 | #define CONFIG_RTC RTC_PCF50605 | 92 | #define CONFIG_RTC RTC_PCF50605 |
diff --git a/firmware/export/config/ipodnano1g.h b/firmware/export/config/ipodnano1g.h index 81d4a0ae4c..8ca7544dbe 100644 --- a/firmware/export/config/ipodnano1g.h +++ b/firmware/export/config/ipodnano1g.h | |||
@@ -74,8 +74,8 @@ | |||
74 | /* Define this to enable morse code input */ | 74 | /* Define this to enable morse code input */ |
75 | #define HAVE_MORSE_INPUT | 75 | #define HAVE_MORSE_INPUT |
76 | 76 | ||
77 | /* Define this if you do software codec */ | 77 | |
78 | #define CONFIG_CODEC SWCODEC | 78 | |
79 | 79 | ||
80 | /* define this if you have a real-time clock */ | 80 | /* define this if you have a real-time clock */ |
81 | #define CONFIG_RTC RTC_PCF50605 | 81 | #define CONFIG_RTC RTC_PCF50605 |
diff --git a/firmware/export/config/ipodnano2g.h b/firmware/export/config/ipodnano2g.h index 0693cedc14..362258a822 100644 --- a/firmware/export/config/ipodnano2g.h +++ b/firmware/export/config/ipodnano2g.h | |||
@@ -111,8 +111,8 @@ | |||
111 | /* Define this to enable morse code input */ | 111 | /* Define this to enable morse code input */ |
112 | #define HAVE_MORSE_INPUT | 112 | #define HAVE_MORSE_INPUT |
113 | 113 | ||
114 | /* Define this if you do software codec */ | 114 | |
115 | #define CONFIG_CODEC SWCODEC | 115 | |
116 | 116 | ||
117 | /* define this if you have a real-time clock */ | 117 | /* define this if you have a real-time clock */ |
118 | #define CONFIG_RTC RTC_NANO2G | 118 | #define CONFIG_RTC RTC_NANO2G |
diff --git a/firmware/export/config/ipodvideo.h b/firmware/export/config/ipodvideo.h index 7f1d83f4a5..d48f7e3387 100644 --- a/firmware/export/config/ipodvideo.h +++ b/firmware/export/config/ipodvideo.h | |||
@@ -70,8 +70,8 @@ | |||
70 | /* Define this to enable morse code input */ | 70 | /* Define this to enable morse code input */ |
71 | #define HAVE_MORSE_INPUT | 71 | #define HAVE_MORSE_INPUT |
72 | 72 | ||
73 | /* Define this if you do software codec */ | 73 | |
74 | #define CONFIG_CODEC SWCODEC | 74 | |
75 | 75 | ||
76 | /* define this if you have a real-time clock */ | 76 | /* define this if you have a real-time clock */ |
77 | #define CONFIG_RTC RTC_PCF50605 | 77 | #define CONFIG_RTC RTC_PCF50605 |
diff --git a/firmware/export/config/iriverh10.h b/firmware/export/config/iriverh10.h index efa0c993a1..ed3157020a 100644 --- a/firmware/export/config/iriverh10.h +++ b/firmware/export/config/iriverh10.h | |||
@@ -79,8 +79,8 @@ | |||
79 | /* Define this to enable morse code input */ | 79 | /* Define this to enable morse code input */ |
80 | #define HAVE_MORSE_INPUT | 80 | #define HAVE_MORSE_INPUT |
81 | 81 | ||
82 | /* Define this if you do software codec */ | 82 | |
83 | #define CONFIG_CODEC SWCODEC | 83 | |
84 | 84 | ||
85 | /* define this if you have a real-time clock */ | 85 | /* define this if you have a real-time clock */ |
86 | #ifndef BOOTLOADER | 86 | #ifndef BOOTLOADER |
diff --git a/firmware/export/config/iriverh100.h b/firmware/export/config/iriverh100.h index 33d79cb194..798ee27f44 100644 --- a/firmware/export/config/iriverh100.h +++ b/firmware/export/config/iriverh100.h | |||
@@ -73,8 +73,8 @@ | |||
73 | /* Define this to enable morse code input */ | 73 | /* Define this to enable morse code input */ |
74 | #define HAVE_MORSE_INPUT | 74 | #define HAVE_MORSE_INPUT |
75 | 75 | ||
76 | /* Define this if you do software codec */ | 76 | |
77 | #define CONFIG_CODEC SWCODEC | 77 | |
78 | 78 | ||
79 | /* Define this if you have an remote lcd */ | 79 | /* Define this if you have an remote lcd */ |
80 | #define HAVE_REMOTE_LCD | 80 | #define HAVE_REMOTE_LCD |
diff --git a/firmware/export/config/iriverh10_5gb.h b/firmware/export/config/iriverh10_5gb.h index 4d3c3f28b0..b75e834a1f 100644 --- a/firmware/export/config/iriverh10_5gb.h +++ b/firmware/export/config/iriverh10_5gb.h | |||
@@ -62,8 +62,8 @@ | |||
62 | /* Define this to enable morse code input */ | 62 | /* Define this to enable morse code input */ |
63 | #define HAVE_MORSE_INPUT | 63 | #define HAVE_MORSE_INPUT |
64 | 64 | ||
65 | /* Define this if you do software codec */ | 65 | |
66 | #define CONFIG_CODEC SWCODEC | 66 | |
67 | 67 | ||
68 | /* define this if you have a real-time clock */ | 68 | /* define this if you have a real-time clock */ |
69 | #ifndef BOOTLOADER | 69 | #ifndef BOOTLOADER |
diff --git a/firmware/export/config/iriverh120.h b/firmware/export/config/iriverh120.h index 2c3a67330a..e1cfda768b 100644 --- a/firmware/export/config/iriverh120.h +++ b/firmware/export/config/iriverh120.h | |||
@@ -73,8 +73,8 @@ | |||
73 | /* Define this to enable morse code input */ | 73 | /* Define this to enable morse code input */ |
74 | #define HAVE_MORSE_INPUT | 74 | #define HAVE_MORSE_INPUT |
75 | 75 | ||
76 | /* Define this if you do software codec */ | 76 | |
77 | #define CONFIG_CODEC SWCODEC | 77 | |
78 | 78 | ||
79 | /* define this if you have a disk storage, i.e. something | 79 | /* define this if you have a disk storage, i.e. something |
80 | that needs spinups and can cause skips when shaked */ | 80 | that needs spinups and can cause skips when shaked */ |
diff --git a/firmware/export/config/iriverh300.h b/firmware/export/config/iriverh300.h index 0be9d0da7a..15c5448aed 100644 --- a/firmware/export/config/iriverh300.h +++ b/firmware/export/config/iriverh300.h | |||
@@ -66,8 +66,8 @@ | |||
66 | /* Define this to enable morse code input */ | 66 | /* Define this to enable morse code input */ |
67 | #define HAVE_MORSE_INPUT | 67 | #define HAVE_MORSE_INPUT |
68 | 68 | ||
69 | /* Define this if you do software codec */ | 69 | |
70 | #define CONFIG_CODEC SWCODEC | 70 | |
71 | 71 | ||
72 | /* define this if you have a real-time clock */ | 72 | /* define this if you have a real-time clock */ |
73 | #define CONFIG_RTC RTC_PCF50606 | 73 | #define CONFIG_RTC RTC_PCF50606 |
diff --git a/firmware/export/config/iriverifp7xx.h b/firmware/export/config/iriverifp7xx.h index db905c4674..cb48d9713d 100644 --- a/firmware/export/config/iriverifp7xx.h +++ b/firmware/export/config/iriverifp7xx.h | |||
@@ -41,8 +41,8 @@ | |||
41 | 41 | ||
42 | #define HAVE_FAT16SUPPORT | 42 | #define HAVE_FAT16SUPPORT |
43 | 43 | ||
44 | /* Define this if you do software codec */ | 44 | |
45 | #define CONFIG_CODEC SWCODEC | 45 | |
46 | 46 | ||
47 | /* Define this if you have a software controlled poweroff */ | 47 | /* Define this if you have a software controlled poweroff */ |
48 | #define HAVE_SW_POWEROFF | 48 | #define HAVE_SW_POWEROFF |
diff --git a/firmware/export/config/logikdax.h b/firmware/export/config/logikdax.h index 0168cd810b..5f35c6e725 100644 --- a/firmware/export/config/logikdax.h +++ b/firmware/export/config/logikdax.h | |||
@@ -80,8 +80,8 @@ | |||
80 | 80 | ||
81 | #define AB_REPEAT_ENABLE | 81 | #define AB_REPEAT_ENABLE |
82 | 82 | ||
83 | /* Define this if you do software codec */ | 83 | |
84 | #define CONFIG_CODEC SWCODEC | 84 | |
85 | 85 | ||
86 | /* The DAX uses built-in WM8731 codec */ | 86 | /* The DAX uses built-in WM8731 codec */ |
87 | #define HAVE_WM8731 | 87 | #define HAVE_WM8731 |
diff --git a/firmware/export/config/lyreproto1.h b/firmware/export/config/lyreproto1.h index 2ec1199acb..5281a4a864 100644 --- a/firmware/export/config/lyreproto1.h +++ b/firmware/export/config/lyreproto1.h | |||
@@ -61,8 +61,8 @@ | |||
61 | 61 | ||
62 | #define CONFIG_KEYPAD LYRE_PROTO1_PAD | 62 | #define CONFIG_KEYPAD LYRE_PROTO1_PAD |
63 | 63 | ||
64 | /* Define this if you do software codec */ | 64 | |
65 | #define CONFIG_CODEC SWCODEC | 65 | |
66 | 66 | ||
67 | /* The number of bytes reserved for loadable codecs */ | 67 | /* The number of bytes reserved for loadable codecs */ |
68 | #define CODEC_SIZE 0x100000 | 68 | #define CODEC_SIZE 0x100000 |
diff --git a/firmware/export/config/meizum3.h b/firmware/export/config/meizum3.h index 9c88db0621..161330d38f 100644 --- a/firmware/export/config/meizum3.h +++ b/firmware/export/config/meizum3.h | |||
@@ -77,8 +77,8 @@ | |||
77 | //#define AB_REPEAT_ENABLE | 77 | //#define AB_REPEAT_ENABLE |
78 | //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE | 78 | //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE |
79 | 79 | ||
80 | /* Define this if you do software codec */ | 80 | |
81 | #define CONFIG_CODEC SWCODEC | 81 | |
82 | 82 | ||
83 | /* define this if you have a real-time clock */ | 83 | /* define this if you have a real-time clock */ |
84 | //#define CONFIG_RTC RTC_S5L8700 | 84 | //#define CONFIG_RTC RTC_S5L8700 |
diff --git a/firmware/export/config/meizum6sl.h b/firmware/export/config/meizum6sl.h index 7d568f3319..267950b9e2 100644 --- a/firmware/export/config/meizum6sl.h +++ b/firmware/export/config/meizum6sl.h | |||
@@ -77,8 +77,8 @@ | |||
77 | //#define AB_REPEAT_ENABLE | 77 | //#define AB_REPEAT_ENABLE |
78 | //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE | 78 | //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE |
79 | 79 | ||
80 | /* Define this if you do software codec */ | 80 | |
81 | #define CONFIG_CODEC SWCODEC | 81 | |
82 | 82 | ||
83 | /* define this if you have a real-time clock */ | 83 | /* define this if you have a real-time clock */ |
84 | #define CONFIG_RTC RTC_S5L8700 | 84 | #define CONFIG_RTC RTC_S5L8700 |
diff --git a/firmware/export/config/meizum6sp.h b/firmware/export/config/meizum6sp.h index 35dd84c589..dc9e2f657e 100644 --- a/firmware/export/config/meizum6sp.h +++ b/firmware/export/config/meizum6sp.h | |||
@@ -83,8 +83,8 @@ | |||
83 | //#define AB_REPEAT_ENABLE | 83 | //#define AB_REPEAT_ENABLE |
84 | //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE | 84 | //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE |
85 | 85 | ||
86 | /* Define this if you do software codec */ | 86 | |
87 | #define CONFIG_CODEC SWCODEC | 87 | |
88 | 88 | ||
89 | /* define this if you have a real-time clock */ | 89 | /* define this if you have a real-time clock */ |
90 | #define CONFIG_RTC RTC_S5L8700 | 90 | #define CONFIG_RTC RTC_S5L8700 |
diff --git a/firmware/export/config/mini2440.h b/firmware/export/config/mini2440.h index b872b78f83..f78c101c80 100644 --- a/firmware/export/config/mini2440.h +++ b/firmware/export/config/mini2440.h | |||
@@ -114,8 +114,8 @@ | |||
114 | /* define this if you have a real-time clock */ | 114 | /* define this if you have a real-time clock */ |
115 | #define CONFIG_RTC RTC_S3C2440 | 115 | #define CONFIG_RTC RTC_S3C2440 |
116 | 116 | ||
117 | /* Define this if you do software codec */ | 117 | |
118 | #define CONFIG_CODEC SWCODEC | 118 | |
119 | 119 | ||
120 | /* The number of bytes reserved for loadable codecs */ | 120 | /* The number of bytes reserved for loadable codecs */ |
121 | #define CODEC_SIZE 0x100000 | 121 | #define CODEC_SIZE 0x100000 |
diff --git a/firmware/export/config/mpiohd200.h b/firmware/export/config/mpiohd200.h index b6539e3a44..da2420b814 100644 --- a/firmware/export/config/mpiohd200.h +++ b/firmware/export/config/mpiohd200.h | |||
@@ -67,8 +67,8 @@ | |||
67 | 67 | ||
68 | #define CONFIG_KEYPAD MPIO_HD200_PAD | 68 | #define CONFIG_KEYPAD MPIO_HD200_PAD |
69 | 69 | ||
70 | /* Define this if you do software codec */ | 70 | |
71 | #define CONFIG_CODEC SWCODEC | 71 | |
72 | 72 | ||
73 | #define CONFIG_LCD LCD_TL0350A | 73 | #define CONFIG_LCD LCD_TL0350A |
74 | #define HAVE_LCD_SHUTDOWN | 74 | #define HAVE_LCD_SHUTDOWN |
diff --git a/firmware/export/config/mpiohd300.h b/firmware/export/config/mpiohd300.h index 7858672301..bf0821e1a9 100644 --- a/firmware/export/config/mpiohd300.h +++ b/firmware/export/config/mpiohd300.h | |||
@@ -67,8 +67,8 @@ | |||
67 | 67 | ||
68 | #define CONFIG_KEYPAD MPIO_HD300_PAD | 68 | #define CONFIG_KEYPAD MPIO_HD300_PAD |
69 | 69 | ||
70 | /* Define this if you do software codec */ | 70 | |
71 | #define CONFIG_CODEC SWCODEC | 71 | |
72 | 72 | ||
73 | /* Define this if you have RTC */ | 73 | /* Define this if you have RTC */ |
74 | #define CONFIG_RTC RTC_S35380A | 74 | #define CONFIG_RTC RTC_S35380A |
diff --git a/firmware/export/config/mrobe100.h b/firmware/export/config/mrobe100.h index 5b6a489550..f2ecb5a6f0 100644 --- a/firmware/export/config/mrobe100.h +++ b/firmware/export/config/mrobe100.h | |||
@@ -67,8 +67,8 @@ | |||
67 | /* Define this to enable morse code input */ | 67 | /* Define this to enable morse code input */ |
68 | #define HAVE_MORSE_INPUT | 68 | #define HAVE_MORSE_INPUT |
69 | 69 | ||
70 | /* Define this if you do software codec */ | 70 | |
71 | #define CONFIG_CODEC SWCODEC | 71 | |
72 | 72 | ||
73 | /* define this if you have a real-time clock */ | 73 | /* define this if you have a real-time clock */ |
74 | #ifndef BOOTLOADER | 74 | #ifndef BOOTLOADER |
diff --git a/firmware/export/config/mrobe500.h b/firmware/export/config/mrobe500.h index 32b4f7c99d..82a4ef28d1 100644 --- a/firmware/export/config/mrobe500.h +++ b/firmware/export/config/mrobe500.h | |||
@@ -143,8 +143,8 @@ | |||
143 | /* define this if the target has volume keys which can be used in the lists */ | 143 | /* define this if the target has volume keys which can be used in the lists */ |
144 | #define HAVE_VOLUME_IN_LIST | 144 | #define HAVE_VOLUME_IN_LIST |
145 | 145 | ||
146 | /* Define this if you do software codec */ | 146 | |
147 | #define CONFIG_CODEC SWCODEC | 147 | |
148 | 148 | ||
149 | //#define HAVE_HARDWARE_BEEP | 149 | //#define HAVE_HARDWARE_BEEP |
150 | 150 | ||
diff --git a/firmware/export/config/nokian8xx.h b/firmware/export/config/nokian8xx.h index 566683c760..4204fddf1d 100644 --- a/firmware/export/config/nokian8xx.h +++ b/firmware/export/config/nokian8xx.h | |||
@@ -57,8 +57,8 @@ | |||
57 | 57 | ||
58 | #define AB_REPEAT_ENABLE | 58 | #define AB_REPEAT_ENABLE |
59 | 59 | ||
60 | /* Define this if you do software codec */ | 60 | |
61 | #define CONFIG_CODEC SWCODEC | 61 | |
62 | 62 | ||
63 | /* Work around debug macro expansion of strncmp in scratchbox */ | 63 | /* Work around debug macro expansion of strncmp in scratchbox */ |
64 | #define _HAVE_STRING_ARCH_strncmp | 64 | #define _HAVE_STRING_ARCH_strncmp |
diff --git a/firmware/export/config/nokian900.h b/firmware/export/config/nokian900.h index c6d6eb8205..bf692af312 100644 --- a/firmware/export/config/nokian900.h +++ b/firmware/export/config/nokian900.h | |||
@@ -57,8 +57,8 @@ | |||
57 | 57 | ||
58 | #define AB_REPEAT_ENABLE | 58 | #define AB_REPEAT_ENABLE |
59 | 59 | ||
60 | /* Define this if you do software codec */ | 60 | |
61 | #define CONFIG_CODEC SWCODEC | 61 | |
62 | 62 | ||
63 | /* Work around debug macro expansion of strncmp in scratchbox */ | 63 | /* Work around debug macro expansion of strncmp in scratchbox */ |
64 | #define _HAVE_STRING_ARCH_strncmp | 64 | #define _HAVE_STRING_ARCH_strncmp |
diff --git a/firmware/export/config/ondavx747.h b/firmware/export/config/ondavx747.h index bf2c47e05c..e14edb3e37 100644 --- a/firmware/export/config/ondavx747.h +++ b/firmware/export/config/ondavx747.h | |||
@@ -87,8 +87,8 @@ | |||
87 | #define HAVE_TOUCHSCREEN | 87 | #define HAVE_TOUCHSCREEN |
88 | #define HAVE_BUTTON_DATA | 88 | #define HAVE_BUTTON_DATA |
89 | 89 | ||
90 | /* Define this if you do software codec */ | 90 | |
91 | #define CONFIG_CODEC SWCODEC | 91 | |
92 | 92 | ||
93 | /* define this if you have a real-time clock */ | 93 | /* define this if you have a real-time clock */ |
94 | #define CONFIG_RTC RTC_JZ4740 | 94 | #define CONFIG_RTC RTC_JZ4740 |
diff --git a/firmware/export/config/ondavx767.h b/firmware/export/config/ondavx767.h index 3718d202a2..dbad0b6a95 100644 --- a/firmware/export/config/ondavx767.h +++ b/firmware/export/config/ondavx767.h | |||
@@ -76,8 +76,8 @@ | |||
76 | 76 | ||
77 | #define CONFIG_KEYPAD ONDAVX767_PAD | 77 | #define CONFIG_KEYPAD ONDAVX767_PAD |
78 | 78 | ||
79 | /* Define this if you do software codec */ | 79 | |
80 | #define CONFIG_CODEC SWCODEC | 80 | |
81 | 81 | ||
82 | /* define this if you have a real-time clock */ | 82 | /* define this if you have a real-time clock */ |
83 | #define CONFIG_RTC RTC_JZ4740 | 83 | #define CONFIG_RTC RTC_JZ4740 |
diff --git a/firmware/export/config/ondavx777.h b/firmware/export/config/ondavx777.h index 17e3eda165..7225096237 100644 --- a/firmware/export/config/ondavx777.h +++ b/firmware/export/config/ondavx777.h | |||
@@ -81,8 +81,8 @@ | |||
81 | #define HAVE_TOUCHSCREEN | 81 | #define HAVE_TOUCHSCREEN |
82 | #define HAVE_BUTTON_DATA | 82 | #define HAVE_BUTTON_DATA |
83 | 83 | ||
84 | /* Define this if you do software codec */ | 84 | |
85 | #define CONFIG_CODEC SWCODEC | 85 | |
86 | 86 | ||
87 | /* define this if you have a real-time clock */ | 87 | /* define this if you have a real-time clock */ |
88 | #define CONFIG_RTC RTC_JZ4740 | 88 | #define CONFIG_RTC RTC_JZ4740 |
diff --git a/firmware/export/config/pandora.h b/firmware/export/config/pandora.h index bd11441dd7..27745073ec 100644 --- a/firmware/export/config/pandora.h +++ b/firmware/export/config/pandora.h | |||
@@ -57,8 +57,8 @@ | |||
57 | 57 | ||
58 | #define AB_REPEAT_ENABLE | 58 | #define AB_REPEAT_ENABLE |
59 | 59 | ||
60 | /* Define this if you do software codec */ | 60 | |
61 | #define CONFIG_CODEC SWCODEC | 61 | |
62 | 62 | ||
63 | /* Work around debug macro expansion of strncmp in scratchbox */ | 63 | /* Work around debug macro expansion of strncmp in scratchbox */ |
64 | #define _HAVE_STRING_ARCH_strncmp | 64 | #define _HAVE_STRING_ARCH_strncmp |
diff --git a/firmware/export/config/rk27generic.h b/firmware/export/config/rk27generic.h index 69cf9f3758..c116f17603 100644 --- a/firmware/export/config/rk27generic.h +++ b/firmware/export/config/rk27generic.h | |||
@@ -95,8 +95,8 @@ | |||
95 | /* Define this to enable morse code input */ | 95 | /* Define this to enable morse code input */ |
96 | #define HAVE_MORSE_INPUT | 96 | #define HAVE_MORSE_INPUT |
97 | 97 | ||
98 | /* Define this if you do software codec */ | 98 | |
99 | #define CONFIG_CODEC SWCODEC | 99 | |
100 | 100 | ||
101 | /* define this if you have a real-time clock */ | 101 | /* define this if you have a real-time clock */ |
102 | /* #define CONFIG_RTC RTC_NANO2G */ | 102 | /* #define CONFIG_RTC RTC_NANO2G */ |
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config/samsungyh820.h index 51c829c70b..4980084a07 100644 --- a/firmware/export/config/samsungyh820.h +++ b/firmware/export/config/samsungyh820.h | |||
@@ -102,8 +102,8 @@ | |||
102 | /* Define this to enable morse code input */ | 102 | /* Define this to enable morse code input */ |
103 | #define HAVE_MORSE_INPUT | 103 | #define HAVE_MORSE_INPUT |
104 | 104 | ||
105 | /* Define this if you do software codec */ | 105 | |
106 | #define CONFIG_CODEC SWCODEC | 106 | |
107 | 107 | ||
108 | /* define this if you have a disk storage, i.e. something | 108 | /* define this if you have a disk storage, i.e. something |
109 | that needs spinups and can cause skips when shaked */ | 109 | that needs spinups and can cause skips when shaked */ |
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h index 0f7060c02f..aaf93609b0 100644 --- a/firmware/export/config/samsungyh920.h +++ b/firmware/export/config/samsungyh920.h | |||
@@ -95,8 +95,8 @@ | |||
95 | /* Define this to enable morse code input */ | 95 | /* Define this to enable morse code input */ |
96 | #define HAVE_MORSE_INPUT | 96 | #define HAVE_MORSE_INPUT |
97 | 97 | ||
98 | /* Define this if you do software codec */ | 98 | |
99 | #define CONFIG_CODEC SWCODEC | 99 | |
100 | 100 | ||
101 | /* define this if you have a real-time clock */ | 101 | /* define this if you have a real-time clock */ |
102 | #ifndef BOOTLOADER | 102 | #ifndef BOOTLOADER |
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h index 8c102d7fd1..10e9743f3a 100644 --- a/firmware/export/config/samsungyh925.h +++ b/firmware/export/config/samsungyh925.h | |||
@@ -92,8 +92,8 @@ | |||
92 | /* Define this to enable morse code input */ | 92 | /* Define this to enable morse code input */ |
93 | #define HAVE_MORSE_INPUT | 93 | #define HAVE_MORSE_INPUT |
94 | 94 | ||
95 | /* Define this if you do software codec */ | 95 | |
96 | #define CONFIG_CODEC SWCODEC | 96 | |
97 | 97 | ||
98 | /* define this if you have a real-time clock */ | 98 | /* define this if you have a real-time clock */ |
99 | #ifndef BOOTLOADER | 99 | #ifndef BOOTLOADER |
diff --git a/firmware/export/config/samsungypr0.h b/firmware/export/config/samsungypr0.h index 212eaa8ec2..e9596fb9cc 100644 --- a/firmware/export/config/samsungypr0.h +++ b/firmware/export/config/samsungypr0.h | |||
@@ -84,8 +84,8 @@ | |||
84 | #define AB_REPEAT_ENABLE | 84 | #define AB_REPEAT_ENABLE |
85 | #define ACTION_WPSAB_SINGLE ACTION_WPS_HOTKEY | 85 | #define ACTION_WPSAB_SINGLE ACTION_WPS_HOTKEY |
86 | 86 | ||
87 | /* Define this if you do software codec */ | 87 | |
88 | #define CONFIG_CODEC SWCODEC | 88 | |
89 | 89 | ||
90 | /* R0 KeyPad configuration for plugins */ | 90 | /* R0 KeyPad configuration for plugins */ |
91 | #define CONFIG_KEYPAD SAMSUNG_YPR0_PAD | 91 | #define CONFIG_KEYPAD SAMSUNG_YPR0_PAD |
diff --git a/firmware/export/config/samsungypr1.h b/firmware/export/config/samsungypr1.h index 710cc3a3db..0021f81a52 100644 --- a/firmware/export/config/samsungypr1.h +++ b/firmware/export/config/samsungypr1.h | |||
@@ -89,8 +89,8 @@ | |||
89 | 89 | ||
90 | #define AB_REPEAT_ENABLE | 90 | #define AB_REPEAT_ENABLE |
91 | 91 | ||
92 | /* Define this if you do software codec */ | 92 | |
93 | #define CONFIG_CODEC SWCODEC | 93 | |
94 | 94 | ||
95 | /* R1 KeyPad configuration for plugins */ | 95 | /* R1 KeyPad configuration for plugins */ |
96 | #define CONFIG_KEYPAD SAMSUNG_YPR1_PAD | 96 | #define CONFIG_KEYPAD SAMSUNG_YPR1_PAD |
diff --git a/firmware/export/config/samsungyps3.h b/firmware/export/config/samsungyps3.h index 3843a3c08d..3707507f72 100644 --- a/firmware/export/config/samsungyps3.h +++ b/firmware/export/config/samsungyps3.h | |||
@@ -80,8 +80,8 @@ | |||
80 | //#define AB_REPEAT_ENABLE | 80 | //#define AB_REPEAT_ENABLE |
81 | //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE | 81 | //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE |
82 | 82 | ||
83 | /* Define this if you do software codec */ | 83 | |
84 | #define CONFIG_CODEC SWCODEC | 84 | |
85 | 85 | ||
86 | /* define this if you have a real-time clock */ | 86 | /* define this if you have a real-time clock */ |
87 | #define CONFIG_RTC RTC_S35390A | 87 | #define CONFIG_RTC RTC_S35390A |
diff --git a/firmware/export/config/samsungypz5.h b/firmware/export/config/samsungypz5.h index 882acc2a6c..8c013e7c29 100644 --- a/firmware/export/config/samsungypz5.h +++ b/firmware/export/config/samsungypz5.h | |||
@@ -94,8 +94,8 @@ | |||
94 | /* Define this to enable morse code input */ | 94 | /* Define this to enable morse code input */ |
95 | #define HAVE_MORSE_INPUT | 95 | #define HAVE_MORSE_INPUT |
96 | 96 | ||
97 | /* Define this if you do software codec */ | 97 | |
98 | #define CONFIG_CODEC SWCODEC | 98 | |
99 | 99 | ||
100 | /* LCD dimensions */ | 100 | /* LCD dimensions */ |
101 | #define LCD_WIDTH 128 | 101 | #define LCD_WIDTH 128 |
diff --git a/firmware/export/config/sansac100.h b/firmware/export/config/sansac100.h index 109977ed06..7e984762d6 100644 --- a/firmware/export/config/sansac100.h +++ b/firmware/export/config/sansac100.h | |||
@@ -68,8 +68,8 @@ | |||
68 | 68 | ||
69 | #define AB_REPEAT_ENABLE | 69 | #define AB_REPEAT_ENABLE |
70 | 70 | ||
71 | /* Define this if you do software codec */ | 71 | |
72 | #define CONFIG_CODEC SWCODEC | 72 | |
73 | 73 | ||
74 | /* Define this if you have the TLV320 audio codec */ | 74 | /* Define this if you have the TLV320 audio codec */ |
75 | #define HAVE_TLV320 | 75 | #define HAVE_TLV320 |
diff --git a/firmware/export/config/sansac200.h b/firmware/export/config/sansac200.h index 4e8ea55002..1eed043b8c 100644 --- a/firmware/export/config/sansac200.h +++ b/firmware/export/config/sansac200.h | |||
@@ -84,8 +84,8 @@ | |||
84 | /* define this if the target has volume keys which can be used in the lists */ | 84 | /* define this if the target has volume keys which can be used in the lists */ |
85 | #define HAVE_VOLUME_IN_LIST | 85 | #define HAVE_VOLUME_IN_LIST |
86 | 86 | ||
87 | /* Define this if you do software codec */ | 87 | |
88 | #define CONFIG_CODEC SWCODEC | 88 | |
89 | 89 | ||
90 | /* There is no hardware tone control */ | 90 | /* There is no hardware tone control */ |
91 | #define HAVE_SW_TONE_CONTROLS | 91 | #define HAVE_SW_TONE_CONTROLS |
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h index a51f9e3b00..e98b44d0e8 100644 --- a/firmware/export/config/sansac200v2.h +++ b/firmware/export/config/sansac200v2.h | |||
@@ -88,8 +88,8 @@ | |||
88 | /* define this if the target has volume keys which can be used in the lists */ | 88 | /* define this if the target has volume keys which can be used in the lists */ |
89 | #define HAVE_VOLUME_IN_LIST | 89 | #define HAVE_VOLUME_IN_LIST |
90 | 90 | ||
91 | /* Define this if you do software codec */ | 91 | |
92 | #define CONFIG_CODEC SWCODEC | 92 | |
93 | 93 | ||
94 | /* There is no hardware tone control */ | 94 | /* There is no hardware tone control */ |
95 | #define HAVE_SW_TONE_CONTROLS | 95 | #define HAVE_SW_TONE_CONTROLS |
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h index 35496e5fda..70f66779a4 100644 --- a/firmware/export/config/sansaclip.h +++ b/firmware/export/config/sansaclip.h | |||
@@ -93,8 +93,8 @@ | |||
93 | /* define this if the target has volume keys which can be used in the lists */ | 93 | /* define this if the target has volume keys which can be used in the lists */ |
94 | #define HAVE_VOLUME_IN_LIST | 94 | #define HAVE_VOLUME_IN_LIST |
95 | 95 | ||
96 | /* Define this if you do software codec */ | 96 | |
97 | #define CONFIG_CODEC SWCODEC | 97 | |
98 | /* There is no hardware tone control */ | 98 | /* There is no hardware tone control */ |
99 | #define HAVE_SW_TONE_CONTROLS | 99 | #define HAVE_SW_TONE_CONTROLS |
100 | 100 | ||
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index 851884da36..54ffdb1071 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h | |||
@@ -103,8 +103,8 @@ | |||
103 | 103 | ||
104 | #define HAVE_GUI_BOOST | 104 | #define HAVE_GUI_BOOST |
105 | 105 | ||
106 | /* Define this if you do software codec */ | 106 | |
107 | #define CONFIG_CODEC SWCODEC | 107 | |
108 | /* There is no hardware tone control */ | 108 | /* There is no hardware tone control */ |
109 | #define HAVE_SW_TONE_CONTROLS | 109 | #define HAVE_SW_TONE_CONTROLS |
110 | 110 | ||
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h index 581f6e900f..04c2efacfa 100644 --- a/firmware/export/config/sansaclipv2.h +++ b/firmware/export/config/sansaclipv2.h | |||
@@ -97,8 +97,8 @@ | |||
97 | 97 | ||
98 | #define HAVE_GUI_BOOST | 98 | #define HAVE_GUI_BOOST |
99 | 99 | ||
100 | /* Define this if you do software codec */ | 100 | |
101 | #define CONFIG_CODEC SWCODEC | 101 | |
102 | /* There is no hardware tone control */ | 102 | /* There is no hardware tone control */ |
103 | #define HAVE_SW_TONE_CONTROLS | 103 | #define HAVE_SW_TONE_CONTROLS |
104 | 104 | ||
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h index 8c2e3404d4..9513b0074c 100644 --- a/firmware/export/config/sansaclipzip.h +++ b/firmware/export/config/sansaclipzip.h | |||
@@ -98,8 +98,8 @@ | |||
98 | 98 | ||
99 | #define HAVE_GUI_BOOST | 99 | #define HAVE_GUI_BOOST |
100 | 100 | ||
101 | /* Define this if you do software codec */ | 101 | |
102 | #define CONFIG_CODEC SWCODEC | 102 | |
103 | /* There is no hardware tone control */ | 103 | /* There is no hardware tone control */ |
104 | #define HAVE_SW_TONE_CONTROLS | 104 | #define HAVE_SW_TONE_CONTROLS |
105 | 105 | ||
diff --git a/firmware/export/config/sansaconnect.h b/firmware/export/config/sansaconnect.h index 9e6be6cbee..8ad4cab396 100644 --- a/firmware/export/config/sansaconnect.h +++ b/firmware/export/config/sansaconnect.h | |||
@@ -101,8 +101,8 @@ | |||
101 | 101 | ||
102 | #define HAVE_MORSE_INPUT | 102 | #define HAVE_MORSE_INPUT |
103 | 103 | ||
104 | /* Define this if you do software codec */ | 104 | |
105 | #define CONFIG_CODEC SWCODEC | 105 | |
106 | 106 | ||
107 | //#define HAVE_HARDWARE_BEEP | 107 | //#define HAVE_HARDWARE_BEEP |
108 | 108 | ||
diff --git a/firmware/export/config/sansae200.h b/firmware/export/config/sansae200.h index db3ccb1c1c..af9baa3202 100644 --- a/firmware/export/config/sansae200.h +++ b/firmware/export/config/sansae200.h | |||
@@ -82,8 +82,8 @@ | |||
82 | /* Define this to enable morse code input */ | 82 | /* Define this to enable morse code input */ |
83 | #define HAVE_MORSE_INPUT | 83 | #define HAVE_MORSE_INPUT |
84 | 84 | ||
85 | /* Define this if you do software codec */ | 85 | |
86 | #define CONFIG_CODEC SWCODEC | 86 | |
87 | /* There is no hardware tone control */ | 87 | /* There is no hardware tone control */ |
88 | #define HAVE_SW_TONE_CONTROLS | 88 | #define HAVE_SW_TONE_CONTROLS |
89 | /* The PP5024 has a built-in AustriaMicrosystems AS3514 */ | 89 | /* The PP5024 has a built-in AustriaMicrosystems AS3514 */ |
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h index 96b51f4e12..604f51db23 100644 --- a/firmware/export/config/sansae200v2.h +++ b/firmware/export/config/sansae200v2.h | |||
@@ -84,8 +84,8 @@ | |||
84 | /* Define this to have CPU boosted while scrolling in the UI */ | 84 | /* Define this to have CPU boosted while scrolling in the UI */ |
85 | #define HAVE_GUI_BOOST | 85 | #define HAVE_GUI_BOOST |
86 | 86 | ||
87 | /* Define this if you do software codec */ | 87 | |
88 | #define CONFIG_CODEC SWCODEC | 88 | |
89 | 89 | ||
90 | /* There is no hardware tone control */ | 90 | /* There is no hardware tone control */ |
91 | #define HAVE_SW_TONE_CONTROLS | 91 | #define HAVE_SW_TONE_CONTROLS |
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h index fae3463d75..e918cd888f 100644 --- a/firmware/export/config/sansafuze.h +++ b/firmware/export/config/sansafuze.h | |||
@@ -91,8 +91,8 @@ | |||
91 | /* Define this to enable morse code input */ | 91 | /* Define this to enable morse code input */ |
92 | #define HAVE_MORSE_INPUT | 92 | #define HAVE_MORSE_INPUT |
93 | 93 | ||
94 | /* Define this if you do software codec */ | 94 | |
95 | #define CONFIG_CODEC SWCODEC | 95 | |
96 | 96 | ||
97 | 97 | ||
98 | /* LCD dimensions */ | 98 | /* LCD dimensions */ |
diff --git a/firmware/export/config/sansafuzeplus.h b/firmware/export/config/sansafuzeplus.h index 2a57619b06..bd587be11a 100644 --- a/firmware/export/config/sansafuzeplus.h +++ b/firmware/export/config/sansafuzeplus.h | |||
@@ -95,8 +95,8 @@ | |||
95 | /* Define this to enable morse code input */ | 95 | /* Define this to enable morse code input */ |
96 | #define HAVE_MORSE_INPUT | 96 | #define HAVE_MORSE_INPUT |
97 | 97 | ||
98 | /* Define this if you do software codec */ | 98 | |
99 | #define CONFIG_CODEC SWCODEC | 99 | |
100 | 100 | ||
101 | /* LCD dimensions */ | 101 | /* LCD dimensions */ |
102 | #define LCD_WIDTH 240 | 102 | #define LCD_WIDTH 240 |
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h index b85e0747a3..1fa03cf6be 100644 --- a/firmware/export/config/sansafuzev2.h +++ b/firmware/export/config/sansafuzev2.h | |||
@@ -102,8 +102,8 @@ | |||
102 | /* Define this to enable morse code input */ | 102 | /* Define this to enable morse code input */ |
103 | #define HAVE_MORSE_INPUT | 103 | #define HAVE_MORSE_INPUT |
104 | 104 | ||
105 | /* Define this if you do software codec */ | 105 | |
106 | #define CONFIG_CODEC SWCODEC | 106 | |
107 | 107 | ||
108 | 108 | ||
109 | /* LCD dimensions */ | 109 | /* LCD dimensions */ |
diff --git a/firmware/export/config/sansam200.h b/firmware/export/config/sansam200.h index fa4a129e26..044802550e 100644 --- a/firmware/export/config/sansam200.h +++ b/firmware/export/config/sansam200.h | |||
@@ -77,8 +77,8 @@ | |||
77 | 77 | ||
78 | #define AB_REPEAT_ENABLE | 78 | #define AB_REPEAT_ENABLE |
79 | 79 | ||
80 | /* Define this if you do software codec */ | 80 | |
81 | #define CONFIG_CODEC SWCODEC | 81 | |
82 | 82 | ||
83 | /* Define this if you have the TLV320 audio codec */ | 83 | /* Define this if you have the TLV320 audio codec */ |
84 | #define HAVE_TLV320 | 84 | #define HAVE_TLV320 |
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config/sansam200v4.h index d905d10c95..7415ba7dae 100644 --- a/firmware/export/config/sansam200v4.h +++ b/firmware/export/config/sansam200v4.h | |||
@@ -92,8 +92,8 @@ | |||
92 | #define CONFIG_TUNER TEA5767 | 92 | #define CONFIG_TUNER TEA5767 |
93 | #define CONFIG_TUNER_XTAL 32768 | 93 | #define CONFIG_TUNER_XTAL 32768 |
94 | 94 | ||
95 | /* Define this if you do software codec */ | 95 | |
96 | #define CONFIG_CODEC SWCODEC | 96 | |
97 | 97 | ||
98 | /* Define this if you have the TLV320 audio codec */ | 98 | /* Define this if you have the TLV320 audio codec */ |
99 | /*#define HAVE_TLV320*/ | 99 | /*#define HAVE_TLV320*/ |
diff --git a/firmware/export/config/sansaview.h b/firmware/export/config/sansaview.h index 21083da7cb..1057c5e817 100644 --- a/firmware/export/config/sansaview.h +++ b/firmware/export/config/sansaview.h | |||
@@ -71,8 +71,8 @@ | |||
71 | /* Define this to enable morse code input */ | 71 | /* Define this to enable morse code input */ |
72 | #define HAVE_MORSE_INPUT | 72 | #define HAVE_MORSE_INPUT |
73 | 73 | ||
74 | /* Define this if you do software codec */ | 74 | |
75 | #define CONFIG_CODEC SWCODEC | 75 | |
76 | /* There is no hardware tone control */ | 76 | /* There is no hardware tone control */ |
77 | /* #define HAVE_SW_TONE_CONTROLS*/ | 77 | /* #define HAVE_SW_TONE_CONTROLS*/ |
78 | #define HAVE_WM8731 | 78 | #define HAVE_WM8731 |
diff --git a/firmware/export/config/sdlapp.h b/firmware/export/config/sdlapp.h index 626bd5c99f..dde0b2783c 100644 --- a/firmware/export/config/sdlapp.h +++ b/firmware/export/config/sdlapp.h | |||
@@ -65,8 +65,8 @@ | |||
65 | 65 | ||
66 | #define AB_REPEAT_ENABLE | 66 | #define AB_REPEAT_ENABLE |
67 | 67 | ||
68 | /* Define this if you do software codec */ | 68 | |
69 | #define CONFIG_CODEC SWCODEC | 69 | |
70 | 70 | ||
71 | #define HAVE_SCROLLWHEEL | 71 | #define HAVE_SCROLLWHEEL |
72 | #define CONFIG_KEYPAD SDL_PAD | 72 | #define CONFIG_KEYPAD SDL_PAD |
diff --git a/firmware/export/config/sonynwze360.h b/firmware/export/config/sonynwze360.h index a25e95d274..0049f13123 100644 --- a/firmware/export/config/sonynwze360.h +++ b/firmware/export/config/sonynwze360.h | |||
@@ -83,8 +83,8 @@ | |||
83 | /* Define this to enable morse code input */ | 83 | /* Define this to enable morse code input */ |
84 | #define HAVE_MORSE_INPUT | 84 | #define HAVE_MORSE_INPUT |
85 | 85 | ||
86 | /* Define this if you do software codec */ | 86 | |
87 | #define CONFIG_CODEC SWCODEC | 87 | |
88 | 88 | ||
89 | /* LCD dimensions */ | 89 | /* LCD dimensions */ |
90 | #define LCD_WIDTH 240 | 90 | #define LCD_WIDTH 240 |
diff --git a/firmware/export/config/sonynwze370.h b/firmware/export/config/sonynwze370.h index 2ed87f2f1b..f0e6d08e0d 100644 --- a/firmware/export/config/sonynwze370.h +++ b/firmware/export/config/sonynwze370.h | |||
@@ -80,8 +80,8 @@ | |||
80 | /* Define this to enable morse code input */ | 80 | /* Define this to enable morse code input */ |
81 | #define HAVE_MORSE_INPUT | 81 | #define HAVE_MORSE_INPUT |
82 | 82 | ||
83 | /* Define this if you do software codec */ | 83 | |
84 | #define CONFIG_CODEC SWCODEC | 84 | |
85 | 85 | ||
86 | /* LCD dimensions */ | 86 | /* LCD dimensions */ |
87 | #define LCD_WIDTH 128 | 87 | #define LCD_WIDTH 128 |
diff --git a/firmware/export/config/sonynwzlinux.h b/firmware/export/config/sonynwzlinux.h index 00b606b1e3..771cef57bb 100644 --- a/firmware/export/config/sonynwzlinux.h +++ b/firmware/export/config/sonynwzlinux.h | |||
@@ -59,8 +59,8 @@ | |||
59 | /* The number of bytes reserved for loadable plugins */ | 59 | /* The number of bytes reserved for loadable plugins */ |
60 | #define PLUGIN_BUFFER_SIZE 0x100000 | 60 | #define PLUGIN_BUFFER_SIZE 0x100000 |
61 | 61 | ||
62 | /* Define this if you do software codec */ | 62 | |
63 | #define CONFIG_CODEC SWCODEC | 63 | |
64 | 64 | ||
65 | #define CONFIG_TUNER SI4700 | 65 | #define CONFIG_TUNER SI4700 |
66 | 66 | ||
diff --git a/firmware/export/config/tatungtpj1022.h b/firmware/export/config/tatungtpj1022.h index 7c25039f9f..7f3b579c49 100644 --- a/firmware/export/config/tatungtpj1022.h +++ b/firmware/export/config/tatungtpj1022.h | |||
@@ -45,8 +45,8 @@ | |||
45 | 45 | ||
46 | #define CONFIG_KEYPAD TATUNG_TPJ1022_PAD | 46 | #define CONFIG_KEYPAD TATUNG_TPJ1022_PAD |
47 | 47 | ||
48 | /* Define this if you do software codec */ | 48 | |
49 | #define CONFIG_CODEC SWCODEC | 49 | |
50 | 50 | ||
51 | /* define this if you have a real-time clock */ | 51 | /* define this if you have a real-time clock */ |
52 | #ifndef BOOTLOADER | 52 | #ifndef BOOTLOADER |
diff --git a/firmware/export/config/vibe500.h b/firmware/export/config/vibe500.h index 8e61726434..0626fe1078 100644 --- a/firmware/export/config/vibe500.h +++ b/firmware/export/config/vibe500.h | |||
@@ -75,8 +75,8 @@ | |||
75 | /* Define this to enable morse code input */ | 75 | /* Define this to enable morse code input */ |
76 | #define HAVE_MORSE_INPUT | 76 | #define HAVE_MORSE_INPUT |
77 | 77 | ||
78 | /* Define this if you do software codec */ | 78 | |
79 | #define CONFIG_CODEC SWCODEC | 79 | |
80 | 80 | ||
81 | /* define this if you have a real-time clock */ | 81 | /* define this if you have a real-time clock */ |
82 | /* Philips 8563T - E8564 is a clone of it */ | 82 | /* Philips 8563T - E8564 is a clone of it */ |
diff --git a/firmware/export/config/xduoox20.h b/firmware/export/config/xduoox20.h index 018e32888f..b453e42a9c 100644 --- a/firmware/export/config/xduoox20.h +++ b/firmware/export/config/xduoox20.h | |||
@@ -72,8 +72,8 @@ | |||
72 | /* The number of bytes reserved for loadable plugins */ | 72 | /* The number of bytes reserved for loadable plugins */ |
73 | #define PLUGIN_BUFFER_SIZE 0x100000 | 73 | #define PLUGIN_BUFFER_SIZE 0x100000 |
74 | 74 | ||
75 | /* Define this if you do software codec */ | 75 | |
76 | #define CONFIG_CODEC SWCODEC | 76 | |
77 | 77 | ||
78 | #define HAVE_HEADPHONE_DETECTION | 78 | #define HAVE_HEADPHONE_DETECTION |
79 | 79 | ||
diff --git a/firmware/export/config/xduoox3.h b/firmware/export/config/xduoox3.h index 14f9369567..3d35555ebf 100644 --- a/firmware/export/config/xduoox3.h +++ b/firmware/export/config/xduoox3.h | |||
@@ -81,8 +81,8 @@ | |||
81 | /* Define this if a programmable hotkey is mapped */ | 81 | /* Define this if a programmable hotkey is mapped */ |
82 | #define HAVE_HOTKEY | 82 | #define HAVE_HOTKEY |
83 | 83 | ||
84 | /* Define this if you do software codec */ | 84 | |
85 | #define CONFIG_CODEC SWCODEC | 85 | |
86 | 86 | ||
87 | #ifndef BOOTLOADER | 87 | #ifndef BOOTLOADER |
88 | /* define this if you have a real-time clock */ | 88 | /* define this if you have a real-time clock */ |
diff --git a/firmware/export/config/xduoox3ii.h b/firmware/export/config/xduoox3ii.h index 886d91dc0f..fb72532993 100644 --- a/firmware/export/config/xduoox3ii.h +++ b/firmware/export/config/xduoox3ii.h | |||
@@ -72,8 +72,8 @@ | |||
72 | /* The number of bytes reserved for loadable plugins */ | 72 | /* The number of bytes reserved for loadable plugins */ |
73 | #define PLUGIN_BUFFER_SIZE 0x100000 | 73 | #define PLUGIN_BUFFER_SIZE 0x100000 |
74 | 74 | ||
75 | /* Define this if you do software codec */ | 75 | |
76 | #define CONFIG_CODEC SWCODEC | 76 | |
77 | 77 | ||
78 | #define HAVE_HEADPHONE_DETECTION | 78 | #define HAVE_HEADPHONE_DETECTION |
79 | 79 | ||
diff --git a/firmware/export/config/zenvisionm30gb.h b/firmware/export/config/zenvisionm30gb.h index 6ce2876551..5fa5496b20 100644 --- a/firmware/export/config/zenvisionm30gb.h +++ b/firmware/export/config/zenvisionm30gb.h | |||
@@ -81,8 +81,8 @@ | |||
81 | /* Define this to enable morse code input */ | 81 | /* Define this to enable morse code input */ |
82 | #define HAVE_MORSE_INPUT | 82 | #define HAVE_MORSE_INPUT |
83 | 83 | ||
84 | /* Define this if you do software codec */ | 84 | |
85 | #define CONFIG_CODEC SWCODEC | 85 | |
86 | 86 | ||
87 | /* define this if you have a real-time clock */ | 87 | /* define this if you have a real-time clock */ |
88 | //#define CONFIG_RTC RTC_RX5X348AB | 88 | //#define CONFIG_RTC RTC_RX5X348AB |
diff --git a/firmware/export/config/zenvisionm60gb.h b/firmware/export/config/zenvisionm60gb.h index 5510e9a338..23e92ddb0a 100644 --- a/firmware/export/config/zenvisionm60gb.h +++ b/firmware/export/config/zenvisionm60gb.h | |||
@@ -80,8 +80,8 @@ | |||
80 | /* Define this to enable morse code input */ | 80 | /* Define this to enable morse code input */ |
81 | #define HAVE_MORSE_INPUT | 81 | #define HAVE_MORSE_INPUT |
82 | 82 | ||
83 | /* Define this if you do software codec */ | 83 | |
84 | #define CONFIG_CODEC SWCODEC | 84 | |
85 | 85 | ||
86 | /* define this if you have a real-time clock */ | 86 | /* define this if you have a real-time clock */ |
87 | //#define CONFIG_RTC RTC_RX5X348AB | 87 | //#define CONFIG_RTC RTC_RX5X348AB |
diff --git a/firmware/export/general.h b/firmware/export/general.h index 16c824086b..9762823998 100644 --- a/firmware/export/general.h +++ b/firmware/export/general.h | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <stddef.h> | 26 | #include <stddef.h> |
27 | #include "config.h" | 27 | #include "config.h" |
28 | 28 | ||
29 | #if CONFIG_CODEC == SWCODEC | ||
30 | /* round a signed/unsigned 32bit value to the closest of a list of values */ | 29 | /* round a signed/unsigned 32bit value to the closest of a list of values */ |
31 | /* returns the index of the closest value */ | 30 | /* returns the index of the closest value */ |
32 | int round_value_to_list32(unsigned long value, | 31 | int round_value_to_list32(unsigned long value, |
@@ -38,7 +37,6 @@ int make_list_from_caps32(unsigned long src_mask, | |||
38 | const unsigned long *src_list, | 37 | const unsigned long *src_list, |
39 | unsigned long caps_mask, | 38 | unsigned long caps_mask, |
40 | unsigned long *caps_list); | 39 | unsigned long *caps_list); |
41 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
42 | 40 | ||
43 | /* Create a filename with a number part in a way that the number is 1 | 41 | /* Create a filename with a number part in a way that the number is 1 |
44 | * higher than the highest numbered file matching the same pattern. | 42 | * higher than the highest numbered file matching the same pattern. |
diff --git a/firmware/export/mp3_playback.h b/firmware/export/mp3_playback.h deleted file mode 100644 index 51efb45651..0000000000 --- a/firmware/export/mp3_playback.h +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Code that has been in mpeg.c/h before, now creating an encapsulated play | ||
11 | * data module, to be used by other sources than file playback as well. | ||
12 | * | ||
13 | * Copyright (C) 2004 by Linus Nielsen Feltzing | ||
14 | * | ||
15 | * This program is free software; you can redistribute it and/or | ||
16 | * modify it under the terms of the GNU General Public License | ||
17 | * as published by the Free Software Foundation; either version 2 | ||
18 | * of the License, or (at your option) any later version. | ||
19 | * | ||
20 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
21 | * KIND, either express or implied. | ||
22 | * | ||
23 | ****************************************************************************/ | ||
24 | #ifndef _MP3_PLAYBACK_H_ | ||
25 | #define _MP3_PLAYBACK_H_ | ||
26 | |||
27 | #include <stdbool.h> | ||
28 | |||
29 | /* callback fn */ | ||
30 | #ifndef MP3_PLAY_CALLBACK_DEFINED | ||
31 | #define MP3_PLAY_CALLBACK_DEFINED | ||
32 | typedef void (*mp3_play_callback_t)(const void **start, size_t* size); | ||
33 | #endif | ||
34 | |||
35 | /* functions formerly in mpeg.c */ | ||
36 | void mp3_init(int volume, int bass, int treble, int balance, int loudness, | ||
37 | int avc, int channel_config, int stereo_width, | ||
38 | int mdb_strength, int mdb_harmonics, | ||
39 | int mdb_center, int mdb_shape, bool mdb_enable, | ||
40 | bool superbass); | ||
41 | |||
42 | void mp3_play_data(const void* start, size_t size, | ||
43 | mp3_play_callback_t get_more); | ||
44 | void mp3_play_pause(bool play); | ||
45 | bool mp3_pause_done(void); | ||
46 | void mp3_play_stop(void); | ||
47 | bool mp3_is_playing(void); | ||
48 | unsigned char* mp3_get_pos(void); | ||
49 | void mp3_shutdown(void); | ||
50 | |||
51 | #endif /* #ifndef _MP3_PLAYBACK_H_ */ | ||
diff --git a/firmware/general.c b/firmware/general.c index a4e7fba0f6..8508b34b88 100644 --- a/firmware/general.c +++ b/firmware/general.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include "time.h" | 31 | #include "time.h" |
32 | #include "timefuncs.h" | 32 | #include "timefuncs.h" |
33 | 33 | ||
34 | #if CONFIG_CODEC == SWCODEC | ||
35 | int round_value_to_list32(unsigned long value, | 34 | int round_value_to_list32(unsigned long value, |
36 | const unsigned long list[], | 35 | const unsigned long list[], |
37 | int count, | 36 | int count, |
@@ -87,7 +86,6 @@ int make_list_from_caps32(unsigned long src_mask, | |||
87 | 86 | ||
88 | return count; | 87 | return count; |
89 | } /* make_list_from_caps32 */ | 88 | } /* make_list_from_caps32 */ |
90 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
91 | 89 | ||
92 | /* Create a filename with a number part in a way that the number is 1 | 90 | /* Create a filename with a number part in a way that the number is 1 |
93 | * higher than the highest numbered file matching the same pattern. | 91 | * higher than the highest numbered file matching the same pattern. |
diff --git a/firmware/kernel/include/thread.h b/firmware/kernel/include/thread.h index a4f338ed0c..75d13773c6 100644 --- a/firmware/kernel/include/thread.h +++ b/firmware/kernel/include/thread.h | |||
@@ -66,15 +66,11 @@ | |||
66 | #define IO_PRIORITY_IMMEDIATE 0 | 66 | #define IO_PRIORITY_IMMEDIATE 0 |
67 | #define IO_PRIORITY_BACKGROUND 32 | 67 | #define IO_PRIORITY_BACKGROUND 32 |
68 | 68 | ||
69 | #if CONFIG_CODEC == SWCODEC | ||
70 | # ifdef HAVE_HARDWARE_CLICK | 69 | # ifdef HAVE_HARDWARE_CLICK |
71 | # define BASETHREADS 17 | 70 | # define BASETHREADS 17 |
72 | # else | 71 | # else |
73 | # define BASETHREADS 16 | 72 | # define BASETHREADS 16 |
74 | # endif | 73 | # endif |
75 | #else | ||
76 | # define BASETHREADS 11 | ||
77 | #endif /* CONFIG_CODE == * */ | ||
78 | 74 | ||
79 | #ifndef TARGET_EXTRA_THREADS | 75 | #ifndef TARGET_EXTRA_THREADS |
80 | #define TARGET_EXTRA_THREADS 0 | 76 | #define TARGET_EXTRA_THREADS 0 |
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index 750f8d5ef4..ed979f83ce 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include "storage.h" | 31 | #include "storage.h" |
32 | #include "power.h" | 32 | #include "power.h" |
33 | #include "audio.h" | 33 | #include "audio.h" |
34 | #include "mp3_playback.h" | ||
35 | #include "usb.h" | 34 | #include "usb.h" |
36 | #include "powermgmt.h" | 35 | #include "powermgmt.h" |
37 | #include "backlight.h" | 36 | #include "backlight.h" |
@@ -770,11 +769,7 @@ void shutdown_hw(void) | |||
770 | storage_spindown(1); | 769 | storage_spindown(1); |
771 | } | 770 | } |
772 | 771 | ||
773 | #if CONFIG_CODEC == SWCODEC | ||
774 | audiohw_close(); | 772 | audiohw_close(); |
775 | #else | ||
776 | mp3_shutdown(); | ||
777 | #endif | ||
778 | 773 | ||
779 | /* If HD is still active we try to wait for spindown, otherwise the | 774 | /* If HD is still active we try to wait for spindown, otherwise the |
780 | shutdown_timeout in power_thread_step will force a power off */ | 775 | shutdown_timeout in power_thread_step will force a power off */ |
diff --git a/firmware/target/hosted/maemo/pcm-gstreamer.c b/firmware/target/hosted/maemo/pcm-gstreamer.c index 5bca6f2d92..bd264fe5d3 100644 --- a/firmware/target/hosted/maemo/pcm-gstreamer.c +++ b/firmware/target/hosted/maemo/pcm-gstreamer.c | |||
@@ -65,8 +65,6 @@ | |||
65 | extern bool debug_audio; | 65 | extern bool debug_audio; |
66 | #endif | 66 | #endif |
67 | 67 | ||
68 | #if CONFIG_CODEC == SWCODEC | ||
69 | |||
70 | /* Declarations for libplayblack */ | 68 | /* Declarations for libplayblack */ |
71 | pb_playback_t *playback = NULL; | 69 | pb_playback_t *playback = NULL; |
72 | void playback_state_req_handler(pb_playback_t *pb, | 70 | void playback_state_req_handler(pb_playback_t *pb, |
@@ -481,5 +479,3 @@ unsigned long spdif_measure_frequency(void) | |||
481 | #endif | 479 | #endif |
482 | 480 | ||
483 | #endif /* HAVE_RECORDING */ | 481 | #endif /* HAVE_RECORDING */ |
484 | |||
485 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
diff --git a/firmware/target/hosted/sdl/pcm-sdl.c b/firmware/target/hosted/sdl/pcm-sdl.c index 290dffbb95..9cb35beb48 100644 --- a/firmware/target/hosted/sdl/pcm-sdl.c +++ b/firmware/target/hosted/sdl/pcm-sdl.c | |||
@@ -51,7 +51,6 @@ | |||
51 | extern bool debug_audio; | 51 | extern bool debug_audio; |
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | #if CONFIG_CODEC == SWCODEC | ||
55 | static int cvt_status = -1; | 54 | static int cvt_status = -1; |
56 | 55 | ||
57 | static const void *pcm_data; | 56 | static const void *pcm_data; |
@@ -411,5 +410,3 @@ void pcm_play_dma_init(void) | |||
411 | void pcm_play_dma_postinit(void) | 410 | void pcm_play_dma_postinit(void) |
412 | { | 411 | { |
413 | } | 412 | } |
414 | |||
415 | #endif /* CONFIG_CODEC == SWCODEC */ | ||