Make basic cache functions into calls, and get rid of CACHE_FUNCTION_WRAPPERS and CACHE_FUNCTIONS_AS_CALL macros. Rename flush/invalidate_icache to cpucache_flush/invalidate. They're inlined only if an implementation isn't provided by defining HAVE_CPUCACHE_FLUSH/INVALIDATE.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19971 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 12 insertions, 4 deletions

diff --git a/firmware/export/system.h b/firmware/export/system.h
index fb9dfa3003..b44600d2c2 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -272,12 +272,20 @@ static inline uint32_t swap_odd_even32(uint32_t value)
 #endif
 
 /* Just define these as empty if not declared */
-#ifndef HAVE_INVALIDATE_ICACHE
-#define invalidate_icache()
+#ifdef HAVE_CPUCACHE_INVALIDATE
+void cpucache_invalidate(void);
+#else
+static inline void cpucache_invalidate(void)
+{
+}
 #endif
 
-#ifndef HAVE_FLUSH_ICACHE
-#define flush_icache()
+#ifdef HAVE_CPUCACHE_FLUSH
+void cpucache_flush(void);
+#else
+static inline void cpucache_flush(void)
+{
+}
 #endif
 
 #ifdef PROC_NEEDS_CACHEALIGN