diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2011-12-17 07:27:24 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2011-12-17 07:27:24 +0000 |
commit | 6a67707b5ec3b2c649c401550bb7fdef2b7c8d07 (patch) | |
tree | bfe31942a4abbaac09ad0f4226effdcef8bf097e /apps/codecs | |
parent | 43d7a75369286dc3b39b858df34f66b0b45de34e (diff) | |
download | rockbox-6a67707b5ec3b2c649c401550bb7fdef2b7c8d07.tar.gz rockbox-6a67707b5ec3b2c649c401550bb7fdef2b7c8d07.zip |
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
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/codec_crt0.c | 4 | ||||
-rw-r--r-- | apps/codecs/mpa.c | 2 | ||||
-rw-r--r-- | apps/codecs/spc.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/apps/codecs/codec_crt0.c b/apps/codecs/codec_crt0.c index 50a2d8b66a..e3c3321e54 100644 --- a/apps/codecs/codec_crt0.c +++ b/apps/codecs/codec_crt0.c | |||
@@ -45,7 +45,7 @@ enum codec_status codec_start(enum codec_entry_call_reason reason) | |||
45 | ci->memcpy(iramstart, iramcopy, iram_size); | 45 | ci->memcpy(iramstart, iramcopy, iram_size); |
46 | ci->memset(iedata, 0, ibss_size); | 46 | ci->memset(iedata, 0, ibss_size); |
47 | /* make the icache (if it exists) up to date with the new code */ | 47 | /* make the icache (if it exists) up to date with the new code */ |
48 | ci->cpucache_invalidate(); | 48 | ci->commit_discard_idcache(); |
49 | /* barrier to prevent reordering iram copy and BSS clearing, | 49 | /* barrier to prevent reordering iram copy and BSS clearing, |
50 | * because the BSS segment alias the IRAM copy. | 50 | * because the BSS segment alias the IRAM copy. |
51 | */ | 51 | */ |
@@ -56,7 +56,7 @@ enum codec_status codec_start(enum codec_entry_call_reason reason) | |||
56 | /* Some parts of bss may be used via a no-cache alias (at least | 56 | /* Some parts of bss may be used via a no-cache alias (at least |
57 | * portalplayer has this). If we don't clear the cache, those aliases | 57 | * portalplayer has this). If we don't clear the cache, those aliases |
58 | * may read garbage */ | 58 | * may read garbage */ |
59 | ci->cpucache_invalidate(); | 59 | ci->commit_dcache(); |
60 | } | 60 | } |
61 | #endif /* CONFIG_PLATFORM */ | 61 | #endif /* CONFIG_PLATFORM */ |
62 | 62 | ||
diff --git a/apps/codecs/mpa.c b/apps/codecs/mpa.c index ac81f06cab..f9bf7e600f 100644 --- a/apps/codecs/mpa.c +++ b/apps/codecs/mpa.c | |||
@@ -274,7 +274,7 @@ static void mad_synth_thread_quit(void) | |||
274 | die = 1; | 274 | die = 1; |
275 | ci->semaphore_release(&synth_pending_sem); | 275 | ci->semaphore_release(&synth_pending_sem); |
276 | ci->thread_wait(mad_synth_thread_id); | 276 | ci->thread_wait(mad_synth_thread_id); |
277 | ci->cpucache_invalidate(); | 277 | ci->commit_discard_dcache(); |
278 | } | 278 | } |
279 | #else | 279 | #else |
280 | static inline void mad_synth_thread_ready(void) | 280 | static inline void mad_synth_thread_ready(void) |
diff --git a/apps/codecs/spc.c b/apps/codecs/spc.c index 94ac9ffadc..809562e2a0 100644 --- a/apps/codecs/spc.c +++ b/apps/codecs/spc.c | |||
@@ -295,7 +295,7 @@ static bool emu_thread_process_msg(struct sample_queue_chunk *chunk) | |||
295 | if (id == SPC_EMU_LOAD) | 295 | if (id == SPC_EMU_LOAD) |
296 | { | 296 | { |
297 | struct spc_load *ld = (struct spc_load *)chunk->data; | 297 | struct spc_load *ld = (struct spc_load *)chunk->data; |
298 | ci->cpucache_invalidate(); | 298 | ci->commit_discard_dcache(); |
299 | SPC_Init(&spc_emu); | 299 | SPC_Init(&spc_emu); |
300 | sample_queue.retval = SPC_load_spc(&spc_emu, ld->buf, ld->size); | 300 | sample_queue.retval = SPC_load_spc(&spc_emu, ld->buf, ld->size); |
301 | 301 | ||
@@ -368,7 +368,7 @@ static bool spc_emu_start(void) | |||
368 | static inline int load_spc_buffer(uint8_t *buf, size_t size) | 368 | static inline int load_spc_buffer(uint8_t *buf, size_t size) |
369 | { | 369 | { |
370 | struct spc_load ld = { buf, size }; | 370 | struct spc_load ld = { buf, size }; |
371 | ci->cpucache_flush(); | 371 | ci->commit_dcache(); |
372 | return emu_thread_send_msg(SPC_EMU_LOAD, (intptr_t)&ld); | 372 | return emu_thread_send_msg(SPC_EMU_LOAD, (intptr_t)&ld); |
373 | } | 373 | } |
374 | 374 | ||
@@ -378,7 +378,7 @@ static inline void spc_emu_quit(void) | |||
378 | emu_thread_send_msg(SPC_EMU_QUIT, 0); | 378 | emu_thread_send_msg(SPC_EMU_QUIT, 0); |
379 | /* Wait for emu thread to be killed */ | 379 | /* Wait for emu thread to be killed */ |
380 | ci->thread_wait(emu_thread_id); | 380 | ci->thread_wait(emu_thread_id); |
381 | ci->cpucache_invalidate(); | 381 | ci->commit_discard_dcache(); |
382 | } | 382 | } |
383 | } | 383 | } |
384 | 384 | ||