From 099df2fb7144bbee4ec97c133acafe8ce8c19524 Mon Sep 17 00:00:00 2001
From: Michael Sparmann <theseven@rockbox.org>
Date: Mon, 9 Nov 2009 20:01:07 +0000
Subject: Make the codecs use more IRAM on S5L870x, as we have plenty of it.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23594 a1c6a512-1295-4272-9138-f99709370657
---
 apps/codecs/demac/libdemac/demac_config.h | 4 ++++
 apps/codecs/libtremor/config-tremor.h     | 2 +-
 apps/codecs/libwma/wmadec.h               | 2 +-
 apps/plugins/mpegplayer/audio_thread.c    | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'apps')

diff --git a/apps/codecs/demac/libdemac/demac_config.h b/apps/codecs/demac/libdemac/demac_config.h
index 986e5376c4..1bbdef3d56 100644
--- a/apps/codecs/demac/libdemac/demac_config.h
+++ b/apps/codecs/demac/libdemac/demac_config.h
@@ -54,6 +54,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
 #define ICODE_SECTION_DEMAC_ARM   .text
 #define ICODE_ATTR_DEMAC
 #define IBSS_ATTR_DEMAC_INSANEBUF
+#elif defined(CPU_S5L870X)
+#define ICODE_SECTION_DEMAC_ARM   .icode
+#define ICODE_ATTR_DEMAC          ICODE_ATTR
+#define IBSS_ATTR_DEMAC_INSANEBUF IBSS_ATTR
 #else
 #define ICODE_SECTION_DEMAC_ARM   .text
 #define ICODE_ATTR_DEMAC
diff --git a/apps/codecs/libtremor/config-tremor.h b/apps/codecs/libtremor/config-tremor.h
index 403fdfd88b..eb9429e319 100644
--- a/apps/codecs/libtremor/config-tremor.h
+++ b/apps/codecs/libtremor/config-tremor.h
@@ -41,7 +41,7 @@
 #define IRAM_IBSS_SIZE 37376
 
 /* Define CPU of large IRAM (PP5022/5024)              */
-#elif (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024)
+#elif (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) || defined(CPU_S5L870X)
 /* PCM_BUFFER    : 32768 byte (4096*2*4 or 2048*4*4)   *
  * WINDOW_LOOKUP : 9216 Byte (256*4 + 2048*4)          *
  * TOTAL         : 41984                               */
diff --git a/apps/codecs/libwma/wmadec.h b/apps/codecs/libwma/wmadec.h
index d22e435304..a547ece157 100644
--- a/apps/codecs/libwma/wmadec.h
+++ b/apps/codecs/libwma/wmadec.h
@@ -55,7 +55,7 @@
 
 /*define IRAM for targets with 48k/80k IRAM split*/
 #ifndef IBSS_ATTR_WMA_LARGE_IRAM
-#if (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024)
+#if (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) || defined(CPU_S5L870X)
 /* PP5022/24 and MCF5250 have 128KB of IRAM, but only PP5022+ have 80KB allocated for codecs */
 #define IBSS_ATTR_WMA_LARGE_IRAM IBSS_ATTR
 #else
diff --git a/apps/plugins/mpegplayer/audio_thread.c b/apps/plugins/mpegplayer/audio_thread.c
index a901b721d8..c9252f5890 100644
--- a/apps/plugins/mpegplayer/audio_thread.c
+++ b/apps/plugins/mpegplayer/audio_thread.c
@@ -58,7 +58,7 @@ static unsigned char mad_main_data[MAD_BUFFER_MDLEN];
    is for Coldfire. */
 
 /* 4608 bytes */
-#ifdef CPU_COLDFIRE
+#if defined(CPU_COLDFIRE) || defined(CPU_S5L870X)
 static mad_fixed_t mad_frame_overlap[2][32][18] IBSS_ATTR;
 #else
 static mad_fixed_t mad_frame_overlap[2][32][18];
-- 
cgit v1.2.3