len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05: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
firmware/target/arm/s5l8702/ipod6g/lcd-ipod6g.c
View file

@ -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);
}

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_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)
{

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

@ -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];