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
This commit is contained in:
Michael Giacomelli 2010-03-16 04:47:24 +00:00
parent a384cdf7e8
commit 70ac57b95b
2 changed files with 4 additions and 4 deletions

View file

@ -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;
}

View file

@ -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;\