diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/pcm_playback.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c index c79902845a..a6fa4fb2d8 100644 --- a/firmware/pcm_playback.c +++ b/firmware/pcm_playback.c | |||
@@ -191,12 +191,6 @@ void pcm_play_data(void (*get_more)(unsigned char** start, long* size)) | |||
191 | get_more((unsigned char **)&start, (long *)&size); | 191 | get_more((unsigned char **)&start, (long *)&size); |
192 | get_more(&next_start, &next_size); | 192 | get_more(&next_start, &next_size); |
193 | dma_start(start, size); | 193 | dma_start(start, size); |
194 | |||
195 | #if defined(HAVE_UDA1380) | ||
196 | uda1380_mute(false); | ||
197 | #elif defined(HAVE_TLV320) | ||
198 | tlv320_mute(false); | ||
199 | #endif | ||
200 | } | 194 | } |
201 | 195 | ||
202 | long pcm_get_bytes_waiting(void) | 196 | long pcm_get_bytes_waiting(void) |
@@ -207,12 +201,6 @@ long pcm_get_bytes_waiting(void) | |||
207 | void pcm_play_stop(void) | 201 | void pcm_play_stop(void) |
208 | { | 202 | { |
209 | if (pcm_playing) { | 203 | if (pcm_playing) { |
210 | |||
211 | #if defined(HAVE_UDA1380) | ||
212 | uda1380_mute(true); | ||
213 | #elif defined(HAVE_TLV320) | ||
214 | tlv320_mute(true); | ||
215 | #endif | ||
216 | dma_stop(); | 204 | dma_stop(); |
217 | } | 205 | } |
218 | } | 206 | } |
@@ -230,23 +218,11 @@ void pcm_play_pause(bool play) | |||
230 | IIS2CONFIG = (pcm_freq << 12) | 0x300 | 4 << 2; | 218 | IIS2CONFIG = (pcm_freq << 12) | 0x300 | 4 << 2; |
231 | EBU1CONFIG = (7 << 12) | (3 << 8) | (1 << 5) | (5 << 2); | 219 | EBU1CONFIG = (7 << 12) | (3 << 8) | (1 << 5) | (5 << 2); |
232 | DCR0 |= DMA_EEXT | DMA_START; | 220 | DCR0 |= DMA_EEXT | DMA_START; |
233 | |||
234 | #if defined(HAVE_UDA1380) | ||
235 | uda1380_mute(false); | ||
236 | #elif defined(HAVE_TLV320) | ||
237 | tlv320_mute(false); | ||
238 | #endif | ||
239 | } | 221 | } |
240 | else if(!pcm_paused && !play) | 222 | else if(!pcm_paused && !play) |
241 | { | 223 | { |
242 | logf("pause"); | 224 | logf("pause"); |
243 | 225 | ||
244 | #if defined(HAVE_UDA1380) | ||
245 | uda1380_mute(true); | ||
246 | #elif defined(HAVE_TLV320) | ||
247 | tlv320_mute(true); | ||
248 | #endif | ||
249 | |||
250 | /* Disable DMA peripheral request. */ | 226 | /* Disable DMA peripheral request. */ |
251 | DCR0 &= ~DMA_EEXT; | 227 | DCR0 &= ~DMA_EEXT; |
252 | IIS2CONFIG = 0x800; | 228 | IIS2CONFIG = 0x800; |
@@ -326,11 +302,11 @@ void pcm_init(void) | |||
326 | 302 | ||
327 | pcm_set_frequency(44100); | 303 | pcm_set_frequency(44100); |
328 | 304 | ||
329 | /* Turn on headphone power with audio output muted. */ | 305 | /* Turn on headphone power */ |
330 | #if defined(HAVE_UDA1380) | 306 | #if defined(HAVE_UDA1380) |
331 | uda1380_mute(true); | 307 | uda1380_mute(false); |
332 | #elif defined(HAVE_TLV320) | 308 | #elif defined(HAVE_TLV320) |
333 | tlv320_mute(true); | 309 | tlv320_mute(false); |
334 | #endif | 310 | #endif |
335 | sleep(HZ/4); | 311 | sleep(HZ/4); |
336 | #if defined(HAVE_UDA1380) | 312 | #if defined(HAVE_UDA1380) |