diff options
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c | 8 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/pcm-s5l8700.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/s5l8702/ipod6g/lcd-ipod6g.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c | 8 | ||||
-rw-r--r-- | firmware/target/arm/s5l8702/pcm-s5l8702.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/usb-s3c6400x.c | 6 |
6 files changed, 15 insertions, 15 deletions
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, | |||
230 | DMACOM3 = DMACOM_CLEARBOTHDONE; | 230 | DMACOM3 = DMACOM_CLEARBOTHDONE; |
231 | DMABASE3 = (uint32_t)buffer; | 231 | DMABASE3 = (uint32_t)buffer; |
232 | DMATCNT3 = (size >> 4) - 1; | 232 | DMATCNT3 = (size >> 4) - 1; |
233 | clean_dcache(); | 233 | commit_dcache(); |
234 | DMACOM3 = 4; | 234 | DMACOM3 = 4; |
235 | } | 235 | } |
236 | 236 | ||
@@ -239,7 +239,7 @@ static uint32_t nand_transfer_data_collect(uint32_t direction) | |||
239 | long timeout = current_tick + HZ / 50; | 239 | long timeout = current_tick + HZ / 50; |
240 | while ((DMAALLST & DMAALLST_DMABUSY3)) | 240 | while ((DMAALLST & DMAALLST_DMABUSY3)) |
241 | if (nand_timeout(timeout)) return 1; | 241 | if (nand_timeout(timeout)) return 1; |
242 | if (!direction) invalidate_dcache(); | 242 | if (!direction) commit_discard_dcache(); |
243 | if (nand_wait_addrdone()) return 1; | 243 | if (nand_wait_addrdone()) return 1; |
244 | if (!direction) FMCTRL1 = FMCTRL1_CLEARRFIFO | FMCTRL1_CLEARWFIFO; | 244 | if (!direction) FMCTRL1 = FMCTRL1_CLEARRFIFO | FMCTRL1_CLEARWFIFO; |
245 | else FMCTRL1 = FMCTRL1_CLEARRFIFO; | 245 | else FMCTRL1 = FMCTRL1_CLEARRFIFO; |
@@ -263,7 +263,7 @@ static void ecc_start(uint32_t size, void* databuffer, void* sparebuffer, | |||
263 | ECC_UNK1 = size; | 263 | ECC_UNK1 = size; |
264 | ECC_DATA_PTR = (uint32_t)databuffer; | 264 | ECC_DATA_PTR = (uint32_t)databuffer; |
265 | ECC_SPARE_PTR = (uint32_t)sparebuffer; | 265 | ECC_SPARE_PTR = (uint32_t)sparebuffer; |
266 | clean_dcache(); | 266 | commit_dcache(); |
267 | ECC_CTRL = type; | 267 | ECC_CTRL = type; |
268 | } | 268 | } |
269 | 269 | ||
@@ -272,7 +272,7 @@ static uint32_t ecc_collect(void) | |||
272 | long timeout = current_tick + HZ / 50; | 272 | long timeout = current_tick + HZ / 50; |
273 | while (!(SRCPND & INTMSK_ECC)) | 273 | while (!(SRCPND & INTMSK_ECC)) |
274 | if (nand_timeout(timeout)) return ecc_unlock(1); | 274 | if (nand_timeout(timeout)) return ecc_unlock(1); |
275 | invalidate_dcache(); | 275 | commit_discard_dcache(); |
276 | ECC_INT_CLR = 1; | 276 | ECC_INT_CLR = 1; |
277 | SRCPND = INTMSK_ECC; | 277 | SRCPND = INTMSK_ECC; |
278 | return ecc_unlock(ECC_RESULT); | 278 | 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) | |||
127 | DMATCNT0 = nextsize / 2 - 1; | 127 | DMATCNT0 = nextsize / 2 - 1; |
128 | nextsize = 0; | 128 | nextsize = 0; |
129 | } | 129 | } |
130 | clean_dcache(); | 130 | commit_dcache(); |
131 | DMACOM0 = 4; | 131 | DMACOM0 = 4; |
132 | DMACOM0 = 7; | 132 | DMACOM0 = 7; |
133 | 133 | ||
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) | |||
232 | | (last ? 0x80000000 : 0) | 0x4000000; | 232 | | (last ? 0x80000000 : 0) | 0x4000000; |
233 | data += 0x1ffe; | 233 | data += 0x1ffe; |
234 | } | 234 | } |
235 | clean_dcache(); | 235 | commit_dcache(); |
236 | DMAC0C4CONFIG = 0x88c1; | 236 | DMAC0C4CONFIG = 0x88c1; |
237 | mutex_unlock(&lcd_mutex); | 237 | mutex_unlock(&lcd_mutex); |
238 | } | 238 | } |
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 | |||
333 | SDCI_DMACOUNT = 1; | 333 | SDCI_DMACOUNT = 1; |
334 | SDCI_DMAADDR = dest; | 334 | SDCI_DMAADDR = dest; |
335 | SDCI_DCTRL = SDCI_DCTRL_TXFIFORST | SDCI_DCTRL_RXFIFORST; | 335 | SDCI_DCTRL = SDCI_DCTRL_TXFIFORST | SDCI_DCTRL_RXFIFORST; |
336 | invalidate_dcache(); | 336 | commit_discard_dcache(); |
337 | PASS_RC(mmc_send_command(SDCI_CMD_CMD_NUM(MMC_CMD_CEATA_RW_MULTIPLE_REG) | 337 | PASS_RC(mmc_send_command(SDCI_CMD_CMD_NUM(MMC_CMD_CEATA_RW_MULTIPLE_REG) |
338 | | SDCI_CMD_CMD_TYPE_ADTC | SDCI_CMD_RES_TYPE_R1 | 338 | | SDCI_CMD_CMD_TYPE_ADTC | SDCI_CMD_RES_TYPE_R1 |
339 | | SDCI_CMD_RES_SIZE_48 | SDCI_CMD_NCR_NID_NCR, | 339 | | 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 | |||
477 | SDCI_DMAADDR = buf; | 477 | SDCI_DMAADDR = buf; |
478 | SDCI_DMACOUNT = count; | 478 | SDCI_DMACOUNT = count; |
479 | SDCI_DCTRL = SDCI_DCTRL_TXFIFORST | SDCI_DCTRL_RXFIFORST; | 479 | SDCI_DCTRL = SDCI_DCTRL_TXFIFORST | SDCI_DCTRL_RXFIFORST; |
480 | invalidate_dcache(); | 480 | commit_discard_dcache(); |
481 | PASS_RC(mmc_send_command(SDCI_CMD_CMD_NUM(MMC_CMD_CEATA_RW_MULTIPLE_BLOCK) | 481 | PASS_RC(mmc_send_command(SDCI_CMD_CMD_NUM(MMC_CMD_CEATA_RW_MULTIPLE_BLOCK) |
482 | | SDCI_CMD_CMD_TYPE_ADTC | cmdtype | responsetype | 482 | | SDCI_CMD_CMD_TYPE_ADTC | cmdtype | responsetype |
483 | | SDCI_CMD_RES_SIZE_48 | SDCI_CMD_NCR_NID_NCR, | 483 | | 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 | |||
883 | if (sector + count > ata_total_sectors) RET_ERR(0); | 883 | if (sector + count > ata_total_sectors) RET_ERR(0); |
884 | if (!ata_powered) ata_power_up(); | 884 | if (!ata_powered) ata_power_up(); |
885 | ata_set_active(); | 885 | ata_set_active(); |
886 | if (ata_dma && write) clean_dcache(); | 886 | if (ata_dma && write) commit_dcache(); |
887 | else if (ata_dma) invalidate_dcache(); | 887 | else if (ata_dma) commit_discard_dcache(); |
888 | if (!ceata) ATA_COMMAND = BIT(1); | 888 | if (!ceata) ATA_COMMAND = BIT(1); |
889 | while (count) | 889 | while (count) |
890 | { | 890 | { |
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) | |||
72 | { | 72 | { |
73 | pcm_lli->nextlli = NULL; | 73 | pcm_lli->nextlli = NULL; |
74 | pcm_lli->control = 0x75249000; | 74 | pcm_lli->control = 0x75249000; |
75 | clean_dcache(); | 75 | commit_dcache(); |
76 | return; | 76 | return; |
77 | } | 77 | } |
78 | uint32_t lastsize = MIN(PCM_WATERMARK * 4, pcm_remaining / 2 + 1) & ~1; | 78 | uint32_t lastsize = MIN(PCM_WATERMARK * 4, pcm_remaining / 2 + 1) & ~1; |
@@ -107,7 +107,7 @@ void INT_DMAC0C0(void) | |||
107 | lastlli->nextlli = last ? NULL : pcm_lli; | 107 | lastlli->nextlli = last ? NULL : pcm_lli; |
108 | lastlli->control = (last ? 0xf5249000 : 0x75249000) | (lastsize / 2); | 108 | lastlli->control = (last ? 0xf5249000 : 0x75249000) | (lastsize / 2); |
109 | dataptr += lastsize; | 109 | dataptr += lastsize; |
110 | clean_dcache(); | 110 | commit_dcache(); |
111 | if (!(DMAC0C0CONFIG & 1) && (pcm_lli[0].control & 0xfff)) | 111 | if (!(DMAC0C0CONFIG & 1) && (pcm_lli[0].control & 0xfff)) |
112 | { | 112 | { |
113 | DMAC0C0LLI = pcm_lli[0]; | 113 | 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) | |||
176 | 176 | ||
177 | if (epints & DEPINT_xfercompl) | 177 | if (epints & DEPINT_xfercompl) |
178 | { | 178 | { |
179 | invalidate_dcache(); | 179 | commit_discard_dcache(); |
180 | int bytes = endpoints[ep].size - (DEPTSIZ(ep, out) & (DEPTSIZ_xfersize_bits < DEPTSIZ_xfersize_bitp)); | 180 | int bytes = endpoints[ep].size - (DEPTSIZ(ep, out) & (DEPTSIZ_xfersize_bits < DEPTSIZ_xfersize_bitp)); |
181 | if (endpoints[ep].busy) | 181 | if (endpoints[ep].busy) |
182 | { | 182 | { |
@@ -204,7 +204,7 @@ static void handle_ep_int(bool out) | |||
204 | 204 | ||
205 | if (out && (epints & DOEPINT_setup)) | 205 | if (out && (epints & DOEPINT_setup)) |
206 | { | 206 | { |
207 | invalidate_dcache(); | 207 | commit_discard_dcache(); |
208 | if (ep != 0) | 208 | if (ep != 0) |
209 | panicf("USB: SETUP done on OUT EP%d!?", ep); | 209 | panicf("USB: SETUP done on OUT EP%d!?", ep); |
210 | 210 | ||
@@ -281,7 +281,7 @@ static void ep_transfer(int ep, void *ptr, int length, int out) | |||
281 | 281 | ||
282 | DEPTSIZ(ep, out) = length | (packets << DEPTSIZ0_pkcnt_bitp); | 282 | DEPTSIZ(ep, out) = length | (packets << DEPTSIZ0_pkcnt_bitp); |
283 | DEPDMA(ep, out) = length ? ptr : NULL; | 283 | DEPDMA(ep, out) = length ? ptr : NULL; |
284 | clean_dcache(); | 284 | commit_dcache(); |
285 | DEPCTL(ep, out) |= DEPCTL_epena | DEPCTL_cnak; | 285 | DEPCTL(ep, out) |= DEPCTL_epena | DEPCTL_cnak; |
286 | } | 286 | } |
287 | 287 | ||