diff options
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/pcm-pp.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/audio-e200.c | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c index 9027ff13b3..0608c208eb 100644 --- a/firmware/target/arm/pcm-pp.c +++ b/firmware/target/arm/pcm-pp.c | |||
@@ -377,7 +377,7 @@ void fiq_record(void) | |||
377 | if (audio_channels == 2) { | 377 | if (audio_channels == 2) { |
378 | /* RX is stereo */ | 378 | /* RX is stereo */ |
379 | while (p_size > 0) { | 379 | while (p_size > 0) { |
380 | if (FIFO_FREE_COUNT < 2) { | 380 | if (FIFO_FREE_COUNT < 8) { |
381 | /* enable interrupt */ | 381 | /* enable interrupt */ |
382 | IISCONFIG |= (1 << 0); | 382 | IISCONFIG |= (1 << 0); |
383 | goto fiq_record_exit; | 383 | goto fiq_record_exit; |
@@ -401,7 +401,7 @@ void fiq_record(void) | |||
401 | else { | 401 | else { |
402 | /* RX is left channel mono */ | 402 | /* RX is left channel mono */ |
403 | while (p_size > 0) { | 403 | while (p_size > 0) { |
404 | if (FIFO_FREE_COUNT < 2) { | 404 | if (FIFO_FREE_COUNT < 8) { |
405 | /* enable interrupt */ | 405 | /* enable interrupt */ |
406 | IISCONFIG |= (1 << 0); | 406 | IISCONFIG |= (1 << 0); |
407 | goto fiq_record_exit; | 407 | goto fiq_record_exit; |
diff --git a/firmware/target/arm/sandisk/sansa-e200/audio-e200.c b/firmware/target/arm/sandisk/sansa-e200/audio-e200.c index a3f3284b98..f046f0db99 100644 --- a/firmware/target/arm/sandisk/sansa-e200/audio-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/audio-e200.c | |||
@@ -42,11 +42,8 @@ void audio_set_output_source(int source) | |||
42 | void audio_set_source(int source, unsigned flags) | 42 | void audio_set_source(int source, unsigned flags) |
43 | { | 43 | { |
44 | static int last_source = AUDIO_SRC_PLAYBACK; | 44 | static int last_source = AUDIO_SRC_PLAYBACK; |
45 | #if 0 | ||
46 | static bool last_recording = false; | 45 | static bool last_recording = false; |
47 | bool recording = flags & SRCF_RECORDING; | 46 | bool recording = flags & SRCF_RECORDING; |
48 | #endif | ||
49 | (void)flags; | ||
50 | 47 | ||
51 | switch (source) | 48 | switch (source) |
52 | { | 49 | { |
@@ -70,13 +67,9 @@ void audio_set_source(int source, unsigned flags) | |||
70 | } | 67 | } |
71 | break; | 68 | break; |
72 | 69 | ||
73 | #if 0 | ||
74 | case AUDIO_SRC_FMRADIO: /* recording and playback */ | 70 | case AUDIO_SRC_FMRADIO: /* recording and playback */ |
75 | audio_channels = 2; | 71 | audio_channels = 2; |
76 | 72 | ||
77 | if (!recording) | ||
78 | audiohw_set_recvol(23, 23, AUDIO_GAIN_LINEIN); | ||
79 | |||
80 | if (source == last_source && recording == last_recording) | 73 | if (source == last_source && recording == last_recording) |
81 | break; | 74 | break; |
82 | 75 | ||
@@ -92,9 +85,7 @@ void audio_set_source(int source, unsigned flags) | |||
92 | audiohw_disable_recording(); | 85 | audiohw_disable_recording(); |
93 | audiohw_set_monitor(true); /* line 1 analog audio path */ | 86 | audiohw_set_monitor(true); /* line 1 analog audio path */ |
94 | } | 87 | } |
95 | |||
96 | break; | 88 | break; |
97 | #endif | ||
98 | } /* end switch */ | 89 | } /* end switch */ |
99 | 90 | ||
100 | last_source = source; | 91 | last_source = source; |