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

3 files changed, 7 insertions, 7 deletions

diff --git a/firmware/target/arm/as3525/pcm-as3525.c b/firmware/target/arm/as3525/pcm-as3525.c
index b33ea2af84..0ecc63d018 100644
--- a/firmware/target/arm/as3525/pcm-as3525.c
+++ b/firmware/target/arm/as3525/pcm-as3525.c
@@ -109,7 +109,7 @@ static void dma_callback(void)
         dma_rem_size = dma_start_size;
 
         /* force writeback */
-        clean_dcache_range(dma_start_addr, dma_start_size);
+        commit_dcache_range(dma_start_addr, dma_start_size);
         play_start_pcm();
         pcm_play_dma_started_callback();
     }
@@ -131,7 +131,7 @@ void pcm_play_dma_start(const void *addr, size_t size)
     dma_retain();
 
     /* force writeback */
-    clean_dcache_range(dma_start_addr, dma_start_size);
+    commit_dcache_range(dma_start_addr, dma_start_size);
 
     bitset32(&CGU_AUDIO, (1<<11));
 
diff --git a/firmware/target/arm/as3525/usb-drv-as3525.c b/firmware/target/arm/as3525/usb-drv-as3525.c
index 1f52d40ce6..d619a014f1 100644
--- a/firmware/target/arm/as3525/usb-drv-as3525.c
+++ b/firmware/target/arm/as3525/usb-drv-as3525.c
@@ -432,7 +432,7 @@ int usb_drv_recv(int ep, void *ptr, int len)
     endpoints[ep][1].rc  = -1;
 
     /* remove data buffer from cache */
-    invalidate_dcache_range(ptr, len);
+    discard_dcache_range(ptr, len);
 
     /* DMA setup */
     uc_desc->status    = USB_DMA_DESC_BS_HST_RDY |
@@ -509,7 +509,7 @@ static void ep_send(int ep, void *ptr, int len)
         USB_IEP_CTRL(ep) |= USB_EP_CTRL_FLUSH;
 
     /* Make sure data is committed to memory */
-    clean_dcache_range(ptr, len);
+    commit_dcache_range(ptr, len);
 
     logf("xx%s\n", make_hex(ptr, len));
 
@@ -625,7 +625,7 @@ static void handle_out_ep(int ep)
              /*
               * If parts of the just dmaed range are in cache, dump them now.
               */
-             dump_dcache_range(uc_desc->data_ptr, dma_len);
+             discard_dcache_range(uc_desc->data_ptr, dma_len);
         } else{
              logf("EP%d OUT token, st:%08x frm:%x (no data)\n", ep,
                  dma_sts & 0xf8000000, (dma_sts >> 16) & 0x7ff);
diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.c b/firmware/target/arm/as3525/usb-drv-as3525v2.c
index 7b5ce886c5..c0542d5c45 100644
--- a/firmware/target/arm/as3525/usb-drv-as3525v2.c
+++ b/firmware/target/arm/as3525/usb-drv-as3525v2.c
@@ -449,9 +449,9 @@ static void usb_drv_transfer(int ep, void *ptr, int len, bool out)
         : (void*)0x10000000;
     DEPTSIZ(ep, out) = (nb_packets << DEPTSIZ_pkcnt_bitp) | len;
     if(out)
-        dump_dcache_range(ptr, len);
+        discard_dcache_range(ptr, len);
     else
-        clean_dcache_range(ptr, len);
+        commit_dcache_range(ptr, len);
 
     logf("pkt=%d dma=%lx", nb_packets, DEPDMA(ep, out));