Accept FS#7178 - Sansa e200 FM tuner support by Ivan Zupan. Do the needed integration work into recording and the AS3514 audio driver. Do a little AS3514 fiq_record tweak to have it all work nicely from the start.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13573 a1c6a512-1295-4272-9138-f99709370657

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)
     if (audio_channels == 2) {
         /* RX is stereo */
         while (p_size > 0) {
-            if (FIFO_FREE_COUNT < 2) {
+            if (FIFO_FREE_COUNT < 8) {
                 /* enable interrupt */
                 IISCONFIG |= (1 << 0);
                 goto fiq_record_exit;
@@ -401,7 +401,7 @@ void fiq_record(void)
     else {
         /* RX is left channel mono */
         while (p_size > 0) {
-            if (FIFO_FREE_COUNT < 2) {
+            if (FIFO_FREE_COUNT < 8) {
                 /* enable interrupt */
                 IISCONFIG |= (1 << 0);
                 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)
 void audio_set_source(int source, unsigned flags)
 {
     static int last_source = AUDIO_SRC_PLAYBACK;
-#if 0
     static bool last_recording = false;
     bool recording = flags & SRCF_RECORDING;
-#endif
-    (void)flags;
 
     switch (source)
     {
@@ -70,13 +67,9 @@ void audio_set_source(int source, unsigned flags)
             }
             break;
 
-#if 0
         case AUDIO_SRC_FMRADIO:         /* recording and playback */
             audio_channels = 2;
 
-            if (!recording)
-                audiohw_set_recvol(23, 23, AUDIO_GAIN_LINEIN);
-
             if (source == last_source && recording == last_recording)
                 break;
 
@@ -92,9 +85,7 @@ void audio_set_source(int source, unsigned flags)
                 audiohw_disable_recording();
                 audiohw_set_monitor(true); /* line 1 analog audio path */
             }
-
             break;
-#endif
     } /* end switch */
 
     last_source = source;