From 4092029b3b616b09e483db1d1eb5e3566b518d9d Mon Sep 17 00:00:00 2001 From: Thom Johansen Date: Fri, 17 Mar 2006 02:45:06 +0000 Subject: Don't paste when sleepy, kids. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9075 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/system.h | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'firmware/export/system.h') diff --git a/firmware/export/system.h b/firmware/export/system.h index 150f87210d..1f74b27f29 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h @@ -306,7 +306,7 @@ static inline void invalidate_icache(void) /* TODO: Implement set_irq_level and check CPU frequencies */ #define CPUFREQ_DEFAULT_MULT 8 -#define CPUFREQ_DEFAULT 240000000 +#define CPUFREQ_DEFAULT 24000000 #define CPUFREQ_NORMAL_MULT 10 #define CPUFREQ_NORMAL 30000000 #define CPUFREQ_MAX_MULT 25 @@ -328,10 +328,17 @@ static inline unsigned long swap32(unsigned long value) result[15.. 8] = value[23..16]; result[ 7.. 0] = value[31..24]; */ -{ - unsigned long hi = swap16(value >> 16); - unsigned long lo = swap16(value & 0xffff); - return (lo << 16) | hi; +{ + unsigned int tmp; + + asm volatile ( + "eor %1, %0, %0, ror #16 \n\t" + "bic %1, %1, #0xff0000 \n\t" + "mov %0, %0, ror #8 \n\t" + "eor %0, %0, %1, lsr #8 \n\t" + : "+r" (value), "=r" (tmp) + ); + return value; } #define HIGHEST_IRQ_LEVEL (1) @@ -463,19 +470,11 @@ static inline unsigned long swap32(unsigned long value) result[ 7.. 0] = value[31..24]; */ { - unsigned int tmp; - - asm volatile ( - "eor %1, %0, %0, ror #16 \n\t" - "bic %1, %1, #0xff0000 \n\t" - "mov %0, %0, ror #8 \n\t" - "eor %0, %0, %1, lsr #8 \n\t" - : "+r" (value), "=r" (tmp) - ); - return value; + unsigned long hi = swap16(value >> 16); + unsigned long lo = swap16(value & 0xffff); + return (lo << 16) | hi; } - #define invalidate_icache() #endif -- cgit v1.2.3