From 09769827fe6767a643909cfdbcdf867e1c33d2eb Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sat, 17 Dec 2011 07:54:00 +0000 Subject: 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 --- firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c | 8 ++++---- firmware/target/arm/s5l8700/pcm-s5l8700.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'firmware/target/arm/s5l8700') 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; -- cgit v1.2.3