summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2010-05-12 14:31:12 +0000
committerMichael Sevakis <jethead71@rockbox.org>2010-05-12 14:31:12 +0000
commitcc7457e788141b9570b65eda428181c139879f63 (patch)
tree98fdbfbfe9e55d1d4e97203b1215fd745e630750 /firmware
parent4d04132c76700b30708bf99fc0ef664e8bb0b58d (diff)
downloadrockbox-cc7457e788141b9570b65eda428181c139879f63.tar.gz
rockbox-cc7457e788141b9570b65eda428181c139879f63.zip
Fix r25970 red and yellow *and* a bug uncovered for pp5002 where pcm_play_dma_start wasn't actually initializing the dma_play_data with the first buffer info (must've happened during pp502x DMA conversion).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25971 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/config/sim.h1
-rw-r--r--firmware/target/arm/pcm-pp.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/firmware/export/config/sim.h b/firmware/export/config/sim.h
index 5b42394b1f..6d2e6d24ea 100644
--- a/firmware/export/config/sim.h
+++ b/firmware/export/config/sim.h
@@ -10,6 +10,7 @@
10#undef CONFIG_I2C 10#undef CONFIG_I2C
11 11
12#undef HAVE_PCM_DMA_ADDRESS 12#undef HAVE_PCM_DMA_ADDRESS
13#undef HAVE_PCM_REC_DMA_ADDRESS
13 14
14#undef FLASH_SIZE 15#undef FLASH_SIZE
15 16
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c
index bad3f593fe..e0b603c81f 100644
--- a/firmware/target/arm/pcm-pp.c
+++ b/firmware/target/arm/pcm-pp.c
@@ -450,6 +450,9 @@ void pcm_play_dma_start(const void *addr, size_t size)
450 DMA0_PER_ADDR = (unsigned long)&IISFIFO_WR; 450 DMA0_PER_ADDR = (unsigned long)&IISFIFO_WR;
451 DMA0_FLAGS = DMA_FLAGS_UNK26; 451 DMA0_FLAGS = DMA_FLAGS_UNK26;
452 DMA0_INCR = DMA_INCR_RANGE_FIXED | DMA_INCR_WIDTH_32BIT; 452 DMA0_INCR = DMA_INCR_RANGE_FIXED | DMA_INCR_WIDTH_32BIT;
453#else
454 dma_play_data.addr = (unsigned long)addr;
455 dma_play_data.size = size;
453#endif 456#endif
454 457
455 play_start_pcm(); 458 play_start_pcm();