Swap red and yellow for green on r31339's cranky builds.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31340 a1c6a512-1295-4272-9138-f99709370657

7 files changed, 16 insertions, 16 deletions

diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c
index c384007898..c21f51a7ad 100644
--- a/bootloader/sansa_as3525.c
+++ b/bootloader/sansa_as3525.c
@@ -158,7 +158,7 @@ void main(void)
     }
 
     kernel_entry = (void*) loadbuffer;
-    cpucache_invalidate();
+    commit_discard_idcache();
     printf("Executing");
     kernel_entry();
     printf("ERR: Failed to boot");
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
index 9261e5b3a0..1698dc2b9b 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
@@ -230,7 +230,7 @@ static void nand_transfer_data_start(uint32_t bank, uint32_t direction,
         DMACOM3 = DMACOM_CLEARBOTHDONE;
     DMABASE3 = (uint32_t)buffer;
     DMATCNT3 = (size >> 4) - 1;
-    clean_dcache();
+    commit_dcache();
     DMACOM3 = 4;
 }
 
@@ -239,7 +239,7 @@ static uint32_t nand_transfer_data_collect(uint32_t direction)
     long timeout = current_tick + HZ / 50;
     while ((DMAALLST & DMAALLST_DMABUSY3))
         if (nand_timeout(timeout)) return 1;
-    if (!direction) invalidate_dcache();
+    if (!direction) commit_discard_dcache();
     if (nand_wait_addrdone()) return 1;
     if (!direction) FMCTRL1 = FMCTRL1_CLEARRFIFO | FMCTRL1_CLEARWFIFO;
     else FMCTRL1 = FMCTRL1_CLEARRFIFO;
@@ -263,7 +263,7 @@ static void ecc_start(uint32_t size, void* databuffer, void* sparebuffer,
     ECC_UNK1 = size;
     ECC_DATA_PTR = (uint32_t)databuffer;
     ECC_SPARE_PTR = (uint32_t)sparebuffer;
-    clean_dcache();
+    commit_dcache();
     ECC_CTRL = type;
 }
 
@@ -272,7 +272,7 @@ static uint32_t ecc_collect(void)
     long timeout = current_tick + HZ / 50;
     while (!(SRCPND & INTMSK_ECC))
         if (nand_timeout(timeout)) return ecc_unlock(1);
-    invalidate_dcache();
+    commit_discard_dcache();
     ECC_INT_CLR = 1;
     SRCPND = INTMSK_ECC;
     return ecc_unlock(ECC_RESULT);
diff --git a/firmware/target/arm/s5l8700/pcm-s5l8700.c b/firmware/target/arm/s5l8700/pcm-s5l8700.c
index 6d733e0ff1..7b4258fa68 100644
--- a/firmware/target/arm/s5l8700/pcm-s5l8700.c
+++ b/firmware/target/arm/s5l8700/pcm-s5l8700.c
@@ -127,7 +127,7 @@ void INT_DMA(void)
             DMATCNT0 = nextsize / 2 - 1;
             nextsize = 0;
         }
-        clean_dcache();
+        commit_dcache();
         DMACOM0 = 4;
         DMACOM0 = 7;
 
diff --git a/firmware/target/arm/s5l8702/ipod6g/lcd-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/lcd-ipod6g.c
index 3cc2c9d5c8..e7a9cf4141 100644
--- a/firmware/target/arm/s5l8702/ipod6g/lcd-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/lcd-ipod6g.c
@@ -232,7 +232,7 @@ static void displaylcd_dma(int pixels)
                      | (last ? 0x80000000 : 0) | 0x4000000;
         data += 0x1ffe;
     }
-    clean_dcache();
+    commit_dcache();
     DMAC0C4CONFIG = 0x88c1;
     mutex_unlock(&lcd_mutex);
 }
diff --git a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
index 42fa0c2e75..2952c36324 100644
--- a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
@@ -333,7 +333,7 @@ static int ceata_read_multiple_register(uint32_t addr, void* dest, uint32_t size
     SDCI_DMACOUNT = 1;
     SDCI_DMAADDR = dest;
     SDCI_DCTRL = SDCI_DCTRL_TXFIFORST | SDCI_DCTRL_RXFIFORST;
-    invalidate_dcache();
+    commit_discard_dcache();
     PASS_RC(mmc_send_command(SDCI_CMD_CMD_NUM(MMC_CMD_CEATA_RW_MULTIPLE_REG)
                            | SDCI_CMD_CMD_TYPE_ADTC | SDCI_CMD_RES_TYPE_R1
                            | SDCI_CMD_RES_SIZE_48 | SDCI_CMD_NCR_NID_NCR,
@@ -477,7 +477,7 @@ static int ceata_rw_multiple_block(bool write, void* buf, uint32_t count, long t
     SDCI_DMAADDR = buf;
     SDCI_DMACOUNT = count;
     SDCI_DCTRL = SDCI_DCTRL_TXFIFORST | SDCI_DCTRL_RXFIFORST;
-    invalidate_dcache();
+    commit_discard_dcache();
     PASS_RC(mmc_send_command(SDCI_CMD_CMD_NUM(MMC_CMD_CEATA_RW_MULTIPLE_BLOCK)
                            | SDCI_CMD_CMD_TYPE_ADTC | cmdtype | responsetype
                            | SDCI_CMD_RES_SIZE_48 | SDCI_CMD_NCR_NID_NCR,
@@ -883,8 +883,8 @@ int ata_rw_sectors_internal(uint64_t sector, uint32_t count, void* buffer, bool
     if (sector + count > ata_total_sectors) RET_ERR(0);
     if (!ata_powered) ata_power_up();
     ata_set_active();
-    if (ata_dma && write) clean_dcache();
-    else if (ata_dma) invalidate_dcache();
+    if (ata_dma && write) commit_dcache();
+    else if (ata_dma) commit_discard_dcache();
     if (!ceata) ATA_COMMAND = BIT(1);
     while (count)
     {
diff --git a/firmware/target/arm/s5l8702/pcm-s5l8702.c b/firmware/target/arm/s5l8702/pcm-s5l8702.c
index 6461418744..52a040c35a 100644
--- a/firmware/target/arm/s5l8702/pcm-s5l8702.c
+++ b/firmware/target/arm/s5l8702/pcm-s5l8702.c
@@ -72,7 +72,7 @@ void INT_DMAC0C0(void)
     {
         pcm_lli->nextlli = NULL;
         pcm_lli->control = 0x75249000;
-        clean_dcache();
+        commit_dcache();
         return;
     }
     uint32_t lastsize = MIN(PCM_WATERMARK * 4, pcm_remaining / 2 + 1) & ~1;
@@ -107,7 +107,7 @@ void INT_DMAC0C0(void)
     lastlli->nextlli = last ? NULL : pcm_lli;
     lastlli->control = (last ? 0xf5249000 : 0x75249000) | (lastsize / 2);
     dataptr += lastsize;
-    clean_dcache();
+    commit_dcache();
     if (!(DMAC0C0CONFIG & 1) && (pcm_lli[0].control & 0xfff))
     {
         DMAC0C0LLI = pcm_lli[0];
diff --git a/firmware/target/arm/usb-s3c6400x.c b/firmware/target/arm/usb-s3c6400x.c
index af4f0eb955..beac2376fa 100644
--- a/firmware/target/arm/usb-s3c6400x.c
+++ b/firmware/target/arm/usb-s3c6400x.c
@@ -176,7 +176,7 @@ static void handle_ep_int(bool out)
 
         if (epints & DEPINT_xfercompl)
         {
-            invalidate_dcache();
+            commit_discard_dcache();
             int bytes = endpoints[ep].size - (DEPTSIZ(ep, out) & (DEPTSIZ_xfersize_bits < DEPTSIZ_xfersize_bitp));
             if (endpoints[ep].busy)
             {
@@ -204,7 +204,7 @@ static void handle_ep_int(bool out)
 
         if (out && (epints & DOEPINT_setup))
         {
-            invalidate_dcache();
+            commit_discard_dcache();
             if (ep != 0)
                 panicf("USB: SETUP done on OUT EP%d!?", ep);
 
@@ -281,7 +281,7 @@ static void ep_transfer(int ep, void *ptr, int length, int out)
 
     DEPTSIZ(ep, out) = length | (packets << DEPTSIZ0_pkcnt_bitp);
     DEPDMA(ep, out) = length ? ptr : NULL;
-    clean_dcache();
+    commit_dcache();
     DEPCTL(ep, out) |= DEPCTL_epena | DEPCTL_cnak;
 }