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/plugin.c | |
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/plugin.c')
-rw-r--r-- | apps/plugin.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index 3b14b0032f..f9f1c53617 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -327,9 +327,9 @@ static const struct plugin_api rockbox_api = { | |||
327 | trigger_cpu_boost, | 327 | trigger_cpu_boost, |
328 | cancel_cpu_boost, | 328 | cancel_cpu_boost, |
329 | #endif | 329 | #endif |
330 | #ifdef CACHE_FUNCTIONS_AS_CALL | 330 | #if NUM_CORES > 1 |
331 | flush_icache, | 331 | cpucache_flush, |
332 | invalidate_icache, | 332 | cpucache_invalidate, |
333 | #endif | 333 | #endif |
334 | timer_register, | 334 | timer_register, |
335 | timer_unregister, | 335 | timer_unregister, |
@@ -694,7 +694,7 @@ int plugin_load(const char* plugin, const void* parameter) | |||
694 | #if NUM_CORES > 1 | 694 | #if NUM_CORES > 1 |
695 | /* Make sure COP cache is flushed and invalidated before loading */ | 695 | /* Make sure COP cache is flushed and invalidated before loading */ |
696 | my_core = switch_core(CURRENT_CORE ^ 1); | 696 | my_core = switch_core(CURRENT_CORE ^ 1); |
697 | invalidate_icache(); | 697 | cpucache_invalidate(); |
698 | switch_core(my_core); | 698 | switch_core(my_core); |
699 | #endif | 699 | #endif |
700 | 700 | ||
@@ -742,7 +742,7 @@ int plugin_load(const char* plugin, const void* parameter) | |||
742 | lcd_remote_update(); | 742 | lcd_remote_update(); |
743 | #endif | 743 | #endif |
744 | 744 | ||
745 | invalidate_icache(); | 745 | cpucache_invalidate(); |
746 | oldbars = viewportmanager_set_statusbar(VP_SB_HIDE_ALL); | 746 | oldbars = viewportmanager_set_statusbar(VP_SB_HIDE_ALL); |
747 | 747 | ||
748 | rc = hdr->entry_point(parameter); | 748 | rc = hdr->entry_point(parameter); |
@@ -854,7 +854,7 @@ void plugin_iram_init(char *iramstart, char *iramcopy, size_t iram_size, | |||
854 | memset(iramcopy, 0, iram_size); | 854 | memset(iramcopy, 0, iram_size); |
855 | #if NUM_CORES > 1 | 855 | #if NUM_CORES > 1 |
856 | /* writeback cleared iedata and iramcopy areas */ | 856 | /* writeback cleared iedata and iramcopy areas */ |
857 | flush_icache(); | 857 | cpucache_flush(); |
858 | #endif | 858 | #endif |
859 | } | 859 | } |
860 | #endif /* PLUGIN_USE_IRAM */ | 860 | #endif /* PLUGIN_USE_IRAM */ |