diff options
| author | Dave Chapman <dave@dchapman.com> | 2007-07-29 16:40:11 +0000 |
|---|---|---|
| committer | Dave Chapman <dave@dchapman.com> | 2007-07-29 16:40:11 +0000 |
| commit | f52c17851738b201ebafa45a055b748e9db12f4a (patch) | |
| tree | 68dc83b03e460d0143cd17aac78f0f04d00b746d /apps/codecs/libmad/global.h | |
| parent | 3d45dfb4bdb9c6cb75d1d25f012e9b2179a1f11b (diff) | |
| download | rockbox-f52c17851738b201ebafa45a055b748e9db12f4a.tar.gz rockbox-f52c17851738b201ebafa45a055b748e9db12f4a.zip | |
Revert r14050 (apart from the non-related whitespace changes) and fix the S3C2440 (Gigabeat F/X) problems introduced by my r14041 commit in a slightly different way: Introduce a mad_iram.h file and centralise all IRAM-related decisions in there (similar to how Tremor does it). Now checks for CPU type (S3C2440) instead of target (TOSHIBA_GIGABEAT_F) and there is also a .ibss variable in syth_full_arm.S which shouldn't go in IRAM on S3C2440 targets. Closes FS#7500
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14057 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libmad/global.h')
| -rw-r--r-- | apps/codecs/libmad/global.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/codecs/libmad/global.h b/apps/codecs/libmad/global.h index 38e4aade35..1dad4d5583 100644 --- a/apps/codecs/libmad/global.h +++ b/apps/codecs/libmad/global.h | |||
| @@ -24,6 +24,8 @@ | |||
| 24 | # ifndef LIBMAD_GLOBAL_H | 24 | # ifndef LIBMAD_GLOBAL_H |
| 25 | # define LIBMAD_GLOBAL_H | 25 | # define LIBMAD_GLOBAL_H |
| 26 | 26 | ||
| 27 | #include "mad_iram.h" | ||
| 28 | |||
| 27 | #if defined(CPU_COLDFIRE) | 29 | #if defined(CPU_COLDFIRE) |
| 28 | #define FPM_COLDFIRE_EMAC | 30 | #define FPM_COLDFIRE_EMAC |
| 29 | #elif defined(CPU_ARM) | 31 | #elif defined(CPU_ARM) |
| @@ -66,8 +68,4 @@ | |||
| 66 | # endif | 68 | # endif |
| 67 | # endif | 69 | # endif |
| 68 | 70 | ||
| 69 | #ifndef ICONST_ATTR_MPA_HUFFMAN | ||
| 70 | #define ICONST_ATTR_MPA_HUFFMAN ICONST_ATTR | ||
| 71 | #endif | ||
| 72 | |||
| 73 | # endif | 71 | # endif |