summaryrefslogtreecommitdiff
path: root/firmware/target/arm/pcm-pp.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/pcm-pp.c')
-rw-r--r--firmware/target/arm/pcm-pp.c22
1 files changed, 3 insertions, 19 deletions
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c
index bd12b13032..bad3f593fe 100644
--- a/firmware/target/arm/pcm-pp.c
+++ b/firmware/target/arm/pcm-pp.c
@@ -431,9 +431,6 @@ static void play_stop_pcm(void)
431 431
432void pcm_play_dma_start(const void *addr, size_t size) 432void pcm_play_dma_start(const void *addr, size_t size)
433{ 433{
434 addr = (void *)(((long)addr + 2) & ~3);
435 size &= ~3;
436
437#if NUM_CORES > 1 434#if NUM_CORES > 1
438 /* This will become more important later - and different ! */ 435 /* This will become more important later - and different ! */
439 dma_play_data.core = processor_id(); /* save initiating core */ 436 dma_play_data.core = processor_id(); /* save initiating core */
@@ -441,9 +438,6 @@ void pcm_play_dma_start(const void *addr, size_t size)
441 438
442 pcm_play_dma_stop(); 439 pcm_play_dma_stop();
443 440
444 if (size == 0)
445 return;
446
447#ifdef CPU_PP502x 441#ifdef CPU_PP502x
448 if ((unsigned long)addr < UNCACHED_BASE_ADDR) { 442 if ((unsigned long)addr < UNCACHED_BASE_ADDR) {
449 /* Flush any pending cache writes */ 443 /* Flush any pending cache writes */
@@ -691,9 +685,8 @@ void fiq_record(void)
691#endif /* SANSA_E200 */ 685#endif /* SANSA_E200 */
692 686
693/* Continue transferring data in */ 687/* Continue transferring data in */
694void pcm_record_more(void *start, size_t size) 688void pcm_rec_dma_record_more(void *start, size_t size)
695{ 689{
696 pcm_rec_peak_addr = start; /* Start peaking at dest */
697 dma_rec_data.addr = (unsigned long)start; /* Start of RX buffer */ 690 dma_rec_data.addr = (unsigned long)start; /* Start of RX buffer */
698 dma_rec_data.size = size; /* Bytes to transfer */ 691 dma_rec_data.size = size; /* Bytes to transfer */
699} 692}
@@ -718,7 +711,6 @@ void pcm_rec_dma_start(void *addr, size_t size)
718{ 711{
719 pcm_rec_dma_stop(); 712 pcm_rec_dma_stop();
720 713
721 pcm_rec_peak_addr = addr;
722 dma_rec_data.addr = (unsigned long)addr; 714 dma_rec_data.addr = (unsigned long)addr;
723 dma_rec_data.size = size; 715 dma_rec_data.size = size;
724#if NUM_CORES > 1 716#if NUM_CORES > 1
@@ -749,17 +741,9 @@ void pcm_rec_dma_init(void)
749 pcm_rec_dma_stop(); 741 pcm_rec_dma_stop();
750} /* pcm_init */ 742} /* pcm_init */
751 743
752const void * pcm_rec_dma_get_peak_buffer(int *count) 744const void * pcm_rec_dma_get_peak_buffer(void)
753{ 745{
754 unsigned long addr, end; 746 return (void *)((unsigned long)dma_rec_data.addr & ~3);
755
756 int status = disable_fiq_save();
757 addr = (unsigned long)pcm_rec_peak_addr;
758 end = dma_rec_data.addr;
759 restore_fiq(status);
760
761 *count = (end >> 2) - (addr >> 2);
762 return (void *)(addr & ~3);
763} /* pcm_rec_dma_get_peak_buffer */ 747} /* pcm_rec_dma_get_peak_buffer */
764 748
765#endif /* HAVE_RECORDING */ 749#endif /* HAVE_RECORDING */