len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31340 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2011-12-17 07:54:00 +00:00
parent 6a67707b5e
commit 09769827fe
7 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bootloader/sansa_as3525.c
View file

@ -158,7 +158,7 @@ void main(void)
} }
kernel_entry = (void*) loadbuffer; kernel_entry = (void*) loadbuffer;
cpucache_invalidate(); commit_discard_idcache();
printf("Executing"); printf("Executing");
kernel_entry(); kernel_entry();
printf("ERR: Failed to boot"); printf("ERR: Failed to boot");

8
firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
View file

@ -230,7 +230,7 @@ static void nand_transfer_data_start(uint32_t bank, uint32_t direction,
DMACOM3 = DMACOM_CLEARBOTHDONE; DMACOM3 = DMACOM_CLEARBOTHDONE;
DMABASE3 = (uint32_t)buffer; DMABASE3 = (uint32_t)buffer;
DMATCNT3 = (size >> 4) - 1; DMATCNT3 = (size >> 4) - 1;
clean_dcache(); commit_dcache();
DMACOM3 = 4; DMACOM3 = 4;
} }
@ -239,7 +239,7 @@ static uint32_t nand_transfer_data_collect(uint32_t direction)
long timeout = current_tick + HZ / 50; long timeout = current_tick + HZ / 50;
while ((DMAALLST & DMAALLST_DMABUSY3)) while ((DMAALLST & DMAALLST_DMABUSY3))
if (nand_timeout(timeout)) return 1; if (nand_timeout(timeout)) return 1;
if (!direction) invalidate_dcache(); if (!direction) commit_discard_dcache();
if (nand_wait_addrdone()) return 1; if (nand_wait_addrdone()) return 1;
if (!direction) FMCTRL1 = FMCTRL1_CLEARRFIFO | FMCTRL1_CLEARWFIFO; if (!direction) FMCTRL1 = FMCTRL1_CLEARRFIFO | FMCTRL1_CLEARWFIFO;
else FMCTRL1 = FMCTRL1_CLEARRFIFO; else FMCTRL1 = FMCTRL1_CLEARRFIFO;
@ -263,7 +263,7 @@ static void ecc_start(uint32_t size, void* databuffer, void* sparebuffer,
ECC_UNK1 = size; ECC_UNK1 = size;
ECC_DATA_PTR = (uint32_t)databuffer; ECC_DATA_PTR = (uint32_t)databuffer;
ECC_SPARE_PTR = (uint32_t)sparebuffer; ECC_SPARE_PTR = (uint32_t)sparebuffer;
clean_dcache(); commit_dcache();
ECC_CTRL = type; ECC_CTRL = type;
} }
@ -272,7 +272,7 @@ static uint32_t ecc_collect(void)
long timeout = current_tick + HZ / 50; long timeout = current_tick + HZ / 50;
while (!(SRCPND & INTMSK_ECC)) while (!(SRCPND & INTMSK_ECC))
if (nand_timeout(timeout)) return ecc_unlock(1); if (nand_timeout(timeout)) return ecc_unlock(1);
invalidate_dcache(); commit_discard_dcache();
ECC_INT_CLR = 1; ECC_INT_CLR = 1;
SRCPND = INTMSK_ECC; SRCPND = INTMSK_ECC;
return ecc_unlock(ECC_RESULT); return ecc_unlock(ECC_RESULT);

2
firmware/target/arm/s5l8700/pcm-s5l8700.c
View file

@ -127,7 +127,7 @@ void INT_DMA(void)
DMATCNT0 = nextsize / 2 - 1; DMATCNT0 = nextsize / 2 - 1;
nextsize = 0; nextsize = 0;
} }
clean_dcache(); commit_dcache();
DMACOM0 = 4; DMACOM0 = 4;
DMACOM0 = 7; DMACOM0 = 7;

2
firmware/target/arm/s5l8702/ipod6g/lcd-ipod6g.c
View file

@ -232,7 +232,7 @@ static void displaylcd_dma(int pixels)
| (last ? 0x80000000 : 0) | 0x4000000; | (last ? 0x80000000 : 0) | 0x4000000;
data += 0x1ffe; data += 0x1ffe;
} }
clean_dcache(); commit_dcache();
DMAC0C4CONFIG = 0x88c1; DMAC0C4CONFIG = 0x88c1;
mutex_unlock(&lcd_mutex); mutex_unlock(&lcd_mutex);
} }

8
firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
View file

@ -333,7 +333,7 @@ static int ceata_read_multiple_register(uint32_t addr, void* dest, uint32_t size
SDCI_DMACOUNT = 1; SDCI_DMACOUNT = 1;
SDCI_DMAADDR = dest; SDCI_DMAADDR = dest;
SDCI_DCTRL = SDCI_DCTRL_TXFIFORST | SDCI_DCTRL_RXFIFORST; 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) 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_CMD_TYPE_ADTC | SDCI_CMD_RES_TYPE_R1
| SDCI_CMD_RES_SIZE_48 | SDCI_CMD_NCR_NID_NCR, | 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_DMAADDR = buf;
SDCI_DMACOUNT = count; SDCI_DMACOUNT = count;
SDCI_DCTRL = SDCI_DCTRL_TXFIFORST | SDCI_DCTRL_RXFIFORST; 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) PASS_RC(mmc_send_command(SDCI_CMD_CMD_NUM(MMC_CMD_CEATA_RW_MULTIPLE_BLOCK)
| SDCI_CMD_CMD_TYPE_ADTC | cmdtype | responsetype | SDCI_CMD_CMD_TYPE_ADTC | cmdtype | responsetype
| SDCI_CMD_RES_SIZE_48 | SDCI_CMD_NCR_NID_NCR, | 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 (sector + count > ata_total_sectors) RET_ERR(0);
if (!ata_powered) ata_power_up(); if (!ata_powered) ata_power_up();
ata_set_active(); ata_set_active();
if (ata_dma && write) clean_dcache(); if (ata_dma && write) commit_dcache();
else if (ata_dma) invalidate_dcache(); else if (ata_dma) commit_discard_dcache();
if (!ceata) ATA_COMMAND = BIT(1); if (!ceata) ATA_COMMAND = BIT(1);
while (count) while (count)
{ {

4
firmware/target/arm/s5l8702/pcm-s5l8702.c
View file

@ -72,7 +72,7 @@ void INT_DMAC0C0(void)
{ {
pcm_lli->nextlli = NULL; pcm_lli->nextlli = NULL;
pcm_lli->control = 0x75249000; pcm_lli->control = 0x75249000;
clean_dcache(); commit_dcache();
return; return;
} }
uint32_t lastsize = MIN(PCM_WATERMARK * 4, pcm_remaining / 2 + 1) & ~1; 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->nextlli = last ? NULL : pcm_lli;
lastlli->control = (last ? 0xf5249000 : 0x75249000) | (lastsize / 2); lastlli->control = (last ? 0xf5249000 : 0x75249000) | (lastsize / 2);
dataptr += lastsize; dataptr += lastsize;
clean_dcache(); commit_dcache();
if (!(DMAC0C0CONFIG & 1) && (pcm_lli[0].control & 0xfff)) if (!(DMAC0C0CONFIG & 1) && (pcm_lli[0].control & 0xfff))
{ {
DMAC0C0LLI = pcm_lli[0]; DMAC0C0LLI = pcm_lli[0];

6
firmware/target/arm/usb-s3c6400x.c
View file

@ -176,7 +176,7 @@ static void handle_ep_int(bool out)
if (epints & DEPINT_xfercompl) if (epints & DEPINT_xfercompl)
{ {
invalidate_dcache(); commit_discard_dcache();
int bytes = endpoints[ep].size - (DEPTSIZ(ep, out) & (DEPTSIZ_xfersize_bits < DEPTSIZ_xfersize_bitp)); int bytes = endpoints[ep].size - (DEPTSIZ(ep, out) & (DEPTSIZ_xfersize_bits < DEPTSIZ_xfersize_bitp));
if (endpoints[ep].busy) if (endpoints[ep].busy)
{ {
@ -204,7 +204,7 @@ static void handle_ep_int(bool out)
if (out && (epints & DOEPINT_setup)) if (out && (epints & DOEPINT_setup))
{ {
invalidate_dcache(); commit_discard_dcache();
if (ep != 0) if (ep != 0)
panicf("USB: SETUP done on OUT EP%d!?", ep); 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); DEPTSIZ(ep, out) = length | (packets << DEPTSIZ0_pkcnt_bitp);
DEPDMA(ep, out) = length ? ptr : NULL; DEPDMA(ep, out) = length ? ptr : NULL;
clean_dcache(); commit_dcache();
DEPCTL(ep, out) |= DEPCTL_epena | DEPCTL_cnak; DEPCTL(ep, out) |= DEPCTL_epena | DEPCTL_cnak;
} }