diff options
author | Michael Sparmann <theseven@rockbox.org> | 2009-11-09 20:01:07 +0000 |
---|---|---|
committer | Michael Sparmann <theseven@rockbox.org> | 2009-11-09 20:01:07 +0000 |
commit | 099df2fb7144bbee4ec97c133acafe8ce8c19524 (patch) | |
tree | 8b746b888751d2a5272e5b39e1aa3203feff4683 | |
parent | cc4d92c27058fca4e8f9817e1d06d8c75574d6f4 (diff) | |
download | rockbox-099df2fb7144bbee4ec97c133acafe8ce8c19524.tar.gz rockbox-099df2fb7144bbee4ec97c133acafe8ce8c19524.zip |
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
-rw-r--r-- | apps/codecs/demac/libdemac/demac_config.h | 4 | ||||
-rw-r--r-- | apps/codecs/libtremor/config-tremor.h | 2 | ||||
-rw-r--r-- | apps/codecs/libwma/wmadec.h | 2 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/audio_thread.c | 2 |
4 files changed, 7 insertions, 3 deletions
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 | |||
54 | #define ICODE_SECTION_DEMAC_ARM .text | 54 | #define ICODE_SECTION_DEMAC_ARM .text |
55 | #define ICODE_ATTR_DEMAC | 55 | #define ICODE_ATTR_DEMAC |
56 | #define IBSS_ATTR_DEMAC_INSANEBUF | 56 | #define IBSS_ATTR_DEMAC_INSANEBUF |
57 | #elif defined(CPU_S5L870X) | ||
58 | #define ICODE_SECTION_DEMAC_ARM .icode | ||
59 | #define ICODE_ATTR_DEMAC ICODE_ATTR | ||
60 | #define IBSS_ATTR_DEMAC_INSANEBUF IBSS_ATTR | ||
57 | #else | 61 | #else |
58 | #define ICODE_SECTION_DEMAC_ARM .text | 62 | #define ICODE_SECTION_DEMAC_ARM .text |
59 | #define ICODE_ATTR_DEMAC | 63 | #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 @@ | |||
41 | #define IRAM_IBSS_SIZE 37376 | 41 | #define IRAM_IBSS_SIZE 37376 |
42 | 42 | ||
43 | /* Define CPU of large IRAM (PP5022/5024) */ | 43 | /* Define CPU of large IRAM (PP5022/5024) */ |
44 | #elif (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) | 44 | #elif (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) || defined(CPU_S5L870X) |
45 | /* PCM_BUFFER : 32768 byte (4096*2*4 or 2048*4*4) * | 45 | /* PCM_BUFFER : 32768 byte (4096*2*4 or 2048*4*4) * |
46 | * WINDOW_LOOKUP : 9216 Byte (256*4 + 2048*4) * | 46 | * WINDOW_LOOKUP : 9216 Byte (256*4 + 2048*4) * |
47 | * TOTAL : 41984 */ | 47 | * 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 @@ | |||
55 | 55 | ||
56 | /*define IRAM for targets with 48k/80k IRAM split*/ | 56 | /*define IRAM for targets with 48k/80k IRAM split*/ |
57 | #ifndef IBSS_ATTR_WMA_LARGE_IRAM | 57 | #ifndef IBSS_ATTR_WMA_LARGE_IRAM |
58 | #if (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) | 58 | #if (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) || defined(CPU_S5L870X) |
59 | /* PP5022/24 and MCF5250 have 128KB of IRAM, but only PP5022+ have 80KB allocated for codecs */ | 59 | /* PP5022/24 and MCF5250 have 128KB of IRAM, but only PP5022+ have 80KB allocated for codecs */ |
60 | #define IBSS_ATTR_WMA_LARGE_IRAM IBSS_ATTR | 60 | #define IBSS_ATTR_WMA_LARGE_IRAM IBSS_ATTR |
61 | #else | 61 | #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]; | |||
58 | is for Coldfire. */ | 58 | is for Coldfire. */ |
59 | 59 | ||
60 | /* 4608 bytes */ | 60 | /* 4608 bytes */ |
61 | #ifdef CPU_COLDFIRE | 61 | #if defined(CPU_COLDFIRE) || defined(CPU_S5L870X) |
62 | static mad_fixed_t mad_frame_overlap[2][32][18] IBSS_ATTR; | 62 | static mad_fixed_t mad_frame_overlap[2][32][18] IBSS_ATTR; |
63 | #else | 63 | #else |
64 | static mad_fixed_t mad_frame_overlap[2][32][18]; | 64 | static mad_fixed_t mad_frame_overlap[2][32][18]; |