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, 3 insertions, 21 deletions

diff --git a/apps/codecs.h b/apps/codecs.h
index 3eab1d35c2..c2358e1750 100644
--- a/apps/codecs.h
+++ b/apps/codecs.h
@@ -170,9 +170,9 @@ struct codec_api {
     void (*semaphore_release)(struct semaphore *s);
 #endif /* NUM_CORES */
 
-#ifdef CACHE_FUNCTIONS_AS_CALL
-    void (*flush_icache)(void);
-    void (*invalidate_icache)(void);
+#if NUM_CORES > 1
+    void (*cpucache_flush)(void);
+    void (*cpucache_invalidate)(void);
 #endif
 
     /* strings and memory */
@@ -297,22 +297,4 @@ int codec_load_file(const char* codec, struct codec_api *api);
 enum codec_status codec_start(void);
 enum codec_status codec_main(void);
 
-#ifndef CACHE_FUNCTION_WRAPPERS
-
-#ifdef CACHE_FUNCTIONS_AS_CALL
-#define CACHE_FUNCTION_WRAPPERS(api) \
-        void flush_icache(void) \
-        { \
-            (api)->flush_icache(); \
-        } \
-        void invalidate_icache(void) \
-        { \
-            (api)->invalidate_icache(); \
-        }
-#else
-#define CACHE_FUNCTION_WRAPPERS(api)
-#endif /* CACHE_FUNCTIONS_AS_CALL */
-
-#endif /* CACHE_FUNCTION_WRAPPERS */
-
 #endif