Do some adjustments to alleviate IRAM congestion on some targets from r30097. Include removing pointless IRAM declarations in pcmbuf.c because that callback code runs at a fairly relaxed pace. M5 is still the biggest problem.

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

2 files changed, 8 insertions, 2 deletions

diff --git a/firmware/export/pcm_mixer.h b/firmware/export/pcm_mixer.h
index 3b420e1320..f430ce0efe 100644
--- a/firmware/export/pcm_mixer.h
+++ b/firmware/export/pcm_mixer.h
@@ -37,12 +37,18 @@
 #if defined(CPU_COLDFIRE) || defined(CPU_PP)
 /* For Coldfire, it's just faster
    For PortalPlayer, this also avoids more expensive cache coherency */
-#define DOWNMIX_BUF_IBSS    IBSS_ATTR
+#define DOWNMIX_BUF_IBSS        IBSS_ATTR
 #else
 /* Otherwise can't DMA from IRAM, IRAM is pointless or worse */
 #define DOWNMIX_BUF_IBSS
 #endif
 
+#if defined(CPU_COLDFIRE) || defined(CPU_PP)
+#define MIXER_CALLBACK_ICODE    ICODE_ATTR
+#else
+#define MIXER_CALLBACK_ICODE
+#endif
+
 
 /** Definitions **/
 
diff --git a/firmware/pcm_mixer.c b/firmware/pcm_mixer.c
index e5625fbd32..69a43cfbda 100644
--- a/firmware/pcm_mixer.c
+++ b/firmware/pcm_mixer.c
@@ -218,7 +218,7 @@ static void mixer_pcm_callback(unsigned char **start, size_t *size)
 
 /* Buffering callback - calls sub-callbacks and mixes the data for next
    buffer to be sent from mixer_pcm_callback() */
-static void ICODE_ATTR mixer_buffer_callback(void)
+static void MIXER_CALLBACK_ICODE mixer_buffer_callback(void)
 {
     downmix_index ^= 1; /* Next buffer */