diff options
| author | Michael Giacomelli <giac2000@hotmail.com> | 2010-03-16 04:47:24 +0000 |
|---|---|---|
| committer | Michael Giacomelli <giac2000@hotmail.com> | 2010-03-16 04:47:24 +0000 |
| commit | 70ac57b95b84aed377cd9105c39c7b1a6967139e (patch) | |
| tree | da5269b46b5529a94bdc6049f5d92b89c003b79e /apps | |
| parent | a384cdf7e8e3e649b9fee401a2ff651a7f323b0a (diff) | |
Change various CPU_ARM defines to _ARM_ASSEM_ to be more consistent with the rest of Tremor.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25214 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/codecs/libtremor/codebook.c | 6 | ||||
| -rw-r--r-- | apps/codecs/libtremor/mapping0.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/codecs/libtremor/codebook.c b/apps/codecs/libtremor/codebook.c index 8d34b6df03..ad817fc269 100644 --- a/apps/codecs/libtremor/codebook.c +++ b/apps/codecs/libtremor/codebook.c @@ -143,7 +143,7 @@ int vorbis_staticbook_unpack(oggpack_buffer *opb,static_codebook *s){ static inline ogg_uint32_t bitreverse(register ogg_uint32_t x) { unsigned tmp, ret; -#ifdef CPU_ARM +#ifdef _ARM_ASSEM_ #if ARM_ARCH >= 6 unsigned mask = 0x0f0f0f0f; #else @@ -191,7 +191,7 @@ static inline ogg_uint32_t bitreverse(register ogg_uint32_t x) : /* inputs */ [x]"r"(x) ); -#else /* !CPU_ARM */ +#else /* !_ARM_ASSEM_ */ #ifdef CPU_COLDFIRE ret = x; @@ -211,7 +211,7 @@ static inline ogg_uint32_t bitreverse(register ogg_uint32_t x) tmp = ret & 0x55555555; ret ^= tmp; ret = (ret >> 1) | (tmp << 1); /* done */ -#endif /* !CPU_ARM */ +#endif /* !_ARM_ASSEM_ */ return ret; } diff --git a/apps/codecs/libtremor/mapping0.c b/apps/codecs/libtremor/mapping0.c index 13a8d75aef..9a9ec9e74c 100644 --- a/apps/codecs/libtremor/mapping0.c +++ b/apps/codecs/libtremor/mapping0.c @@ -178,7 +178,7 @@ static vorbis_info_mapping *mapping0_unpack(vorbis_info *vi,oggpack_buffer *opb) return(NULL); } -#ifdef CPU_ARM +#ifdef _ARM_ASSEM_ #define MAGANG( _mag, _ang )\ {\ register int temp;\ |