Use bitmasks to define which inputs are available. Makes it easier to remove old assumptions of which are available. Inspired by e200 being unique in having FM Radio and Mic but no Line. Doesn't remove the assumption that Mic is available or that one of Mic and/or Line is available just to avoid excessive #ifdef'ing until needed.

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

3 files changed, 18 insertions, 7 deletions

diff --git a/firmware/target/arm/audio-pp.c b/firmware/target/arm/audio-pp.c
index 603bbad5fe..82c5545a3f 100644
--- a/firmware/target/arm/audio-pp.c
+++ b/firmware/target/arm/audio-pp.c
@@ -40,7 +40,6 @@ void audio_set_source(int source, unsigned flags)
     {
         default:                        /* playback - no recording */
             source = AUDIO_SRC_PLAYBACK;
-#ifdef HAVE_RECORDING
         case AUDIO_SRC_PLAYBACK:
             if (source != last_source)
             {
@@ -48,6 +47,7 @@ void audio_set_source(int source, unsigned flags)
                 audiohw_set_monitor(false);
             }
         break;
+#ifdef HAVE_MIC_REC
         case AUDIO_SRC_MIC:             /* recording only */
             if (source != last_source)
             {
@@ -55,7 +55,8 @@ void audio_set_source(int source, unsigned flags)
                 audiohw_set_monitor(false);
             }
         break;
-
+#endif
+#ifdef HAVE_LINEIN_REC
         case AUDIO_SRC_LINEIN:          /* recording only */
             if (source != last_source)
             {
@@ -64,7 +65,7 @@ void audio_set_source(int source, unsigned flags)
             }
         break;
 #endif
-#if CONFIG_TUNER
+#ifdef HAVE_FMRADIO_REC
         case AUDIO_SRC_FMRADIO:         /* recording and playback */
             if (!recording)
                 audiohw_set_recvol(0, 0, AUDIO_GAIN_LINEIN);
diff --git a/firmware/target/arm/system-pp502x.c b/firmware/target/arm/system-pp502x.c
index 1f2d27a7b7..0148f3d9de 100644
--- a/firmware/target/arm/system-pp502x.c
+++ b/firmware/target/arm/system-pp502x.c
@@ -62,6 +62,11 @@ extern void clickwheel_int(void);
 void irq(void)
 {
     if(CURRENT_CORE == CPU) {
+        if (CPU_HI_INT_STAT)
+        {
+            gui_syncsplash(0, "%08X %08X", inl(0x6000414c), CPU_HI_INT_STAT);
+        }
+
         if (CPU_INT_STAT & TIMER1_MASK) {
 #ifdef SANSA_E200
             if (GPIOF_INT_STAT & 0xff)
@@ -239,6 +244,11 @@ void system_init(void)
         CPU_INT_CLR         = -1;
         INT_FORCED_CLR      = -1;
 
+        outl(0, 0x6000414c);
+        outl(0, 0x60004144);
+
+//        outl(0x80000, 0x6000414c);
+
         GPIOA_INT_EN        = 0;
         GPIOB_INT_EN        = 0;
         GPIOC_INT_EN        = 0;
diff --git a/firmware/target/coldfire/pcm-coldfire.c b/firmware/target/coldfire/pcm-coldfire.c
index b52e5e09b5..dc40dacf0e 100644
--- a/firmware/target/coldfire/pcm-coldfire.c
+++ b/firmware/target/coldfire/pcm-coldfire.c
@@ -22,7 +22,7 @@
 #include "logf.h"
 #include "audio.h"
 #include "sound.h"
-#if defined(HAVE_SPDIF_IN) || defined(HAVE_SPDIF_OUT)
+#if defined(HAVE_SPDIF_REC) || defined(HAVE_SPDIF_OUT)
 #include "spdif.h"
 #endif
 
@@ -276,7 +276,7 @@ void pcm_init(void)
     audiohw_set_frequency(freq_ent[FPARM_FSEL]);
     coldfire_set_pllcr_audio_bits(PLLCR_SET_AUDIO_BITS_DEFPARM);
 
-#if defined(HAVE_SPDIF_IN) || defined(HAVE_SPDIF_OUT)
+#if defined(HAVE_SPDIF_REC) || defined(HAVE_SPDIF_OUT)
     spdif_init();
 #endif
     /* Enable interrupt at level 6, priority 0 */
@@ -365,7 +365,7 @@ void pcm_rec_dma_start(void *addr, size_t size)
     _pcm_apply_settings(!is_playback_monitoring());
 
     /* Start the DMA transfer.. */
-#ifdef HAVE_SPDIF_IN
+#ifdef HAVE_SPDIF_REC
     /* clear: ebu1cnew, valnogood, symbolerr, parityerr */
     INTERRUPTCLEAR = (1 << 25) | (1 << 24) | (1 << 23) | (1 << 22);
 #endif
@@ -462,7 +462,7 @@ void DMA1(void)
         logf("  DCR1: %08x", DCR1);
 #endif
     }
-#ifdef HAVE_SPDIF_IN
+#ifdef HAVE_SPDIF_REC
     else if (DATAINCONTROL == 0xc038 &&
         (INTERRUPTSTAT & ((1 << 24) | (1 << 23) | (1 << 22))))
     {