summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-06-29 13:43:47 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-06-29 13:43:47 +0000
commit8c47ed15e97c85903850cf73ac83be8667ee2fae (patch)
treed4fb29d9a6aedb2d2fbaafc8c9fc8493436f3bb1 /firmware
parent5ff641fb8153e0a935317cca4330ca5ea4826c5a (diff)
downloadrockbox-8c47ed15e97c85903850cf73ac83be8667ee2fae.tar.gz
rockbox-8c47ed15e97c85903850cf73ac83be8667ee2fae.zip
Get M5 building again by moving the downmix buffer out of IRAM for now. Everything should still work. It doesn't have any apparently measurable effect on pure playback CPU usage as seen from the buffering thread screen compared to earlier tests on the same file.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30101 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/pcm_mixer.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/firmware/export/pcm_mixer.h b/firmware/export/pcm_mixer.h
index f430ce0efe..9c4e06e0be 100644
--- a/firmware/export/pcm_mixer.h
+++ b/firmware/export/pcm_mixer.h
@@ -34,7 +34,8 @@
#define MIX_FRAME_SAMPLES 256
#endif
-#if defined(CPU_COLDFIRE) || defined(CPU_PP)
+/* IAUDIO_M5 is very tight on IRAM */
+#if (defined(CPU_COLDFIRE) && !defined(IAUDIO_M5)) || defined(CPU_PP)
/* For Coldfire, it's just faster
For PortalPlayer, this also avoids more expensive cache coherency */
#define DOWNMIX_BUF_IBSS IBSS_ATTR