4 files changed, 9 insertions, 13 deletions

diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index 11bdfc8e74..89205503e7 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -1249,7 +1249,7 @@ static void fft_thread_entry(void)
         }
 
         /* write back output for other processor and invalidate for next frame read */
-        rb->cpucache_invalidate();
+        rb->commit_discard_dcache();
 
         int new_tail = output_tail ^ 1;
 
@@ -1311,7 +1311,7 @@ static void fft_close_fft(void)
     /* Handle our FFT thread. */
     fft_thread_run = false;
     rb->thread_wait(fft_thread);
-    rb->cpucache_invalidate();
+    rb->commit_discard_dcache();
 }
 #else /* NUM_CORES == 1 */
 /* everything serialize on single-core and FFT gets to use IRAM main stack if
diff --git a/apps/plugins/mpegplayer/alloc.c b/apps/plugins/mpegplayer/alloc.c
index c2165b2ea9..eb58c67f44 100644
--- a/apps/plugins/mpegplayer/alloc.c
+++ b/apps/plugins/mpegplayer/alloc.c
@@ -149,7 +149,7 @@ bool mpeg_alloc_init(unsigned char *buf, size_t mallocsize)
         return false;
     }
 
-    IF_COP(rb->cpucache_invalidate());
+    IF_COP(rb->commit_discard_dcache());
     return true;
 }
 
diff --git a/apps/plugins/mpegplayer/video_thread.c b/apps/plugins/mpegplayer/video_thread.c
index 5119712396..392cc6179f 100644
--- a/apps/plugins/mpegplayer/video_thread.c
+++ b/apps/plugins/mpegplayer/video_thread.c
@@ -550,7 +550,7 @@ static void video_thread_msg(struct video_thread_data *td)
             }
             else
             {
-                IF_COP(rb->cpucache_invalidate());
+                IF_COP(rb->commit_discard_dcache());
                 vo_lock();
                 rb->lcd_update();
                 vo_unlock();
@@ -1007,7 +1007,7 @@ bool video_thread_init(void)
 {
     intptr_t rep;
 
-    IF_COP(rb->cpucache_flush());
+    IF_COP(rb->commit_dcache());
 
     video_str.hdr.q = &video_str_queue;
     rb->queue_init(video_str.hdr.q, false);
@@ -1025,7 +1025,7 @@ bool video_thread_init(void)
 
     /* Wait for thread to initialize */
     rep = str_send_msg(&video_str, STREAM_NULL, 0);
-    IF_COP(rb->cpucache_invalidate());
+    IF_COP(rb->commit_discard_dcache());
 
     return rep == 0; /* Normally STREAM_NULL should be ignored */
 }
@@ -1037,7 +1037,7 @@ void video_thread_exit(void)
     {
         str_post_msg(&video_str, STREAM_QUIT, 0);
         rb->thread_wait(video_str.thread);
-        IF_COP(rb->cpucache_invalidate());
+        IF_COP(rb->commit_discard_dcache());
         video_str.thread = 0;
     }
 }
diff --git a/apps/plugins/plugin_crt0.c b/apps/plugins/plugin_crt0.c
index 917ccb11a9..680bb0723d 100644
--- a/apps/plugins/plugin_crt0.c
+++ b/apps/plugins/plugin_crt0.c
@@ -76,10 +76,8 @@ enum plugin_status plugin__start(const void *param)
         rb->audio_stop();
         rb->memcpy(iramstart, iramcopy, iram_size);
         rb->memset(iedata, 0, ibss_size);
-#ifdef HAVE_CPUCACHE_INVALIDATE
         /* make the icache (if it exists) up to date with the new code */
-        rb->cpucache_invalidate();
-#endif /* HAVE_CPUCACHE_INVALIDATE */
+        rb->commit_discard_idcache();
 
         /* barrier to prevent reordering iram copy and BSS clearing,
          * because the BSS segment alias the IRAM copy.
@@ -91,12 +89,10 @@ enum plugin_status plugin__start(const void *param)
     /* zero out the bss section */
     rb->memset(plugin_bss_start, 0, plugin_end_addr - plugin_bss_start);
 
-#ifdef HAVE_CPUCACHE_INVALIDATE
     /* Some parts of bss may be used via a no-cache alias (at least
      * portalplayer has this). If we don't clear the cache, those aliases
      * may read garbage */
-    rb->cpucache_invalidate();
-#endif /* HAVE_CPUCACHE_INVALIDATE */
+    rb->commit_dcache();
 #endif
 
     /* we come back here if exit() was called or the plugin returned normally */