From 6a67707b5ec3b2c649c401550bb7fdef2b7c8d07 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sat, 17 Dec 2011 07:27:24 +0000 Subject: Commit to certain names for cache coherency APIs and discard the aliases. Wouldn't surprise me a bit to get some non-green. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31339 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/coldfire/system-coldfire.c | 4 +--- firmware/target/coldfire/system-target.h | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'firmware/target/coldfire') diff --git a/firmware/target/coldfire/system-coldfire.c b/firmware/target/coldfire/system-coldfire.c index 4f7ac43017..ed130fca1f 100644 --- a/firmware/target/coldfire/system-coldfire.c +++ b/firmware/target/coldfire/system-coldfire.c @@ -384,12 +384,10 @@ void coldfire_set_dataincontrol(unsigned long value) restore_irq(level); } -void cpucache_commit_discard(void) +void commit_discard_idcache(void) { asm volatile ("move.l #0x01000000,%d0\n" "movec.l %d0,%cacr\n" "move.l #0x80000000,%d0\n" "movec.l %d0,%cacr"); } - -void cpucache_invalidate(void) __attribute__((alias("cpucache_commit_discard"))); diff --git a/firmware/target/coldfire/system-target.h b/firmware/target/coldfire/system-target.h index 3d7502a6dd..74767c4583 100644 --- a/firmware/target/coldfire/system-target.h +++ b/firmware/target/coldfire/system-target.h @@ -194,10 +194,6 @@ static inline uint32_t swap_odd_even32_hw(uint32_t value) return value; } -#define HAVE_CPUCACHE_COMMIT_DISCARD -/* deprecated alias */ -#define HAVE_CPUCACHE_INVALIDATE - #define DEFAULT_PLLCR_AUDIO_BITS 0x10400000 void coldfire_set_pllcr_audio_bits(long bits); @@ -223,4 +219,8 @@ extern void cf_set_cpu_frequency(long frequency); #define CPUFREQ_MAX_MULT 11 #define CPUFREQ_MAX (CPUFREQ_MAX_MULT * CPU_FREQ) +void commit_discard_idcache(void); +static inline void commit_discard_dcache(void) {} +static inline void commit_dcache(void) {} + #endif /* SYSTEM_TARGET_H */ -- cgit v1.2.3