diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2009-02-11 12:55:51 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2009-02-11 12:55:51 +0000 |
commit | 21f0c9a2829415f52b64cbdf965b01525e78f17a (patch) | |
tree | b5cb8021097722969f75784011c9f64f991c0c3d /apps/codecs.h | |
parent | 4cd7597172d916db9fc99bde4c03b669366f852a (diff) | |
download | rockbox-21f0c9a2829415f52b64cbdf965b01525e78f17a.tar.gz rockbox-21f0c9a2829415f52b64cbdf965b01525e78f17a.zip |
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
Diffstat (limited to 'apps/codecs.h')
-rw-r--r-- | apps/codecs.h | 24 |
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 { | |||
170 | void (*semaphore_release)(struct semaphore *s); | 170 | void (*semaphore_release)(struct semaphore *s); |
171 | #endif /* NUM_CORES */ | 171 | #endif /* NUM_CORES */ |
172 | 172 | ||
173 | #ifdef CACHE_FUNCTIONS_AS_CALL | 173 | #if NUM_CORES > 1 |
174 | void (*flush_icache)(void); | 174 | void (*cpucache_flush)(void); |
175 | void (*invalidate_icache)(void); | 175 | void (*cpucache_invalidate)(void); |
176 | #endif | 176 | #endif |
177 | 177 | ||
178 | /* strings and memory */ | 178 | /* strings and memory */ |
@@ -297,22 +297,4 @@ int codec_load_file(const char* codec, struct codec_api *api); | |||
297 | enum codec_status codec_start(void); | 297 | enum codec_status codec_start(void); |
298 | enum codec_status codec_main(void); | 298 | enum codec_status codec_main(void); |
299 | 299 | ||
300 | #ifndef CACHE_FUNCTION_WRAPPERS | ||
301 | |||
302 | #ifdef CACHE_FUNCTIONS_AS_CALL | ||
303 | #define CACHE_FUNCTION_WRAPPERS(api) \ | ||
304 | void flush_icache(void) \ | ||
305 | { \ | ||
306 | (api)->flush_icache(); \ | ||
307 | } \ | ||
308 | void invalidate_icache(void) \ | ||
309 | { \ | ||
310 | (api)->invalidate_icache(); \ | ||
311 | } | ||
312 | #else | ||
313 | #define CACHE_FUNCTION_WRAPPERS(api) | ||
314 | #endif /* CACHE_FUNCTIONS_AS_CALL */ | ||
315 | |||
316 | #endif /* CACHE_FUNCTION_WRAPPERS */ | ||
317 | |||
318 | #endif | 300 | #endif |