diff options
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/as3525/pcm-as3525.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/target/arm/as3525/pcm-as3525.c b/firmware/target/arm/as3525/pcm-as3525.c index 9f31d623fe..6794875e49 100644 --- a/firmware/target/arm/as3525/pcm-as3525.c +++ b/firmware/target/arm/as3525/pcm-as3525.c | |||
@@ -35,7 +35,7 @@ | |||
35 | * and the number of 32bits words has to | 35 | * and the number of 32bits words has to |
36 | * fit in 11 bits of DMA register */ | 36 | * fit in 11 bits of DMA register */ |
37 | 37 | ||
38 | static unsigned char *dma_start_addr; | 38 | static void *dma_start_addr; |
39 | static size_t dma_size; /* in 4*32 bits */ | 39 | static size_t dma_size; /* in 4*32 bits */ |
40 | static void dma_callback(void); | 40 | static void dma_callback(void); |
41 | static int locked = 0; | 41 | static int locked = 0; |
@@ -89,7 +89,7 @@ static void dma_callback(void) | |||
89 | 89 | ||
90 | if(!dma_size) | 90 | if(!dma_size) |
91 | { | 91 | { |
92 | pcm_play_get_more_callback((void **)&dma_start_addr, &dma_size); | 92 | pcm_play_get_more_callback(&dma_start_addr, &dma_size); |
93 | 93 | ||
94 | if (!dma_size) | 94 | if (!dma_size) |
95 | return; | 95 | return; |
@@ -188,7 +188,7 @@ size_t pcm_get_bytes_waiting(void) | |||
188 | const void * pcm_play_dma_get_peak_buffer(int *count) | 188 | const void * pcm_play_dma_get_peak_buffer(int *count) |
189 | { | 189 | { |
190 | pcm_play_lock(); | 190 | pcm_play_lock(); |
191 | unsigned char *addr = (void*)DMAC_CH_SRC_ADDR(1); | 191 | void *addr = (void*)DMAC_CH_SRC_ADDR(1); |
192 | *count = (dma_size - (addr - dma_start_addr)) >> 2; | 192 | *count = (dma_size - (addr - dma_start_addr)) >> 2; |
193 | pcm_play_unlock(); | 193 | pcm_play_unlock(); |
194 | return AS3525_UNCACHED_ADDR(addr); | 194 | return AS3525_UNCACHED_ADDR(addr); |
@@ -212,7 +212,7 @@ void * pcm_dma_addr(void *addr) | |||
212 | static int rec_locked = 0; | 212 | static int rec_locked = 0; |
213 | static bool is_recording = false; | 213 | static bool is_recording = false; |
214 | static bool rec_callback_pending = false; | 214 | static bool rec_callback_pending = false; |
215 | static unsigned char *rec_dma_start_addr; | 215 | static void *rec_dma_start_addr; |
216 | static size_t rec_dma_size, rec_dma_transfer_size; | 216 | static size_t rec_dma_size, rec_dma_transfer_size; |
217 | static void rec_dma_callback(void); | 217 | static void rec_dma_callback(void); |
218 | #if CONFIG_CPU == AS3525 | 218 | #if CONFIG_CPU == AS3525 |
@@ -315,7 +315,7 @@ static void rec_dma_callback(void) | |||
315 | 315 | ||
316 | if(!rec_dma_size) | 316 | if(!rec_dma_size) |
317 | { | 317 | { |
318 | pcm_rec_more_ready_callback(0, (void **)&rec_dma_start_addr, | 318 | pcm_rec_more_ready_callback(0, &rec_dma_start_addr, |
319 | &rec_dma_size); | 319 | &rec_dma_size); |
320 | 320 | ||
321 | if(rec_dma_size == 0) | 321 | if(rec_dma_size == 0) |