diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2012-02-23 08:14:46 -0500 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2012-03-03 07:23:38 +0100 |
commit | 286a4c5caa1945c8d1cb365a3d90fb09d5700cb2 (patch) | |
tree | 4835f46d16ec78d035ec9f49333079fe618384c1 /firmware/target/arm/s3c2440 | |
parent | 3f82f3aca14eb954e55f761721ffdd2684f0e812 (diff) | |
download | rockbox-286a4c5caa1945c8d1cb365a3d90fb09d5700cb2.tar.gz rockbox-286a4c5caa1945c8d1cb365a3d90fb09d5700cb2.zip |
Revise the PCM callback system after adding multichannel audio.
Additional status callback is added to pcm_play/rec_data instead of
using a special function to set it. Status includes DMA error
reporting to the status callback. Playback and recording callback
become more alike except playback uses "const void **addr" (because
the data should not be altered) and recording uses "void **addr".
"const" is put in place throughout where appropriate.
Most changes are fairly trivial. One that should be checked in
particular because it isn't so much is telechips, if anyone cares to
bother. PP5002 is not so trivial either but that tested as working.
Change-Id: I4928d69b3b3be7fb93e259f81635232df9bd1df2
Reviewed-on: http://gerrit.rockbox.org/166
Reviewed-by: Michael Sevakis <jethead71@rockbox.org>
Tested-by: Michael Sevakis <jethead71@rockbox.org>
Diffstat (limited to 'firmware/target/arm/s3c2440')
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c | 8 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c index 35905645dd..a1c854a0df 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c | |||
@@ -215,16 +215,14 @@ void pcm_play_dma_pause(bool pause) | |||
215 | 215 | ||
216 | void fiq_handler(void) | 216 | void fiq_handler(void) |
217 | { | 217 | { |
218 | static void *start; | 218 | static const void *start; |
219 | static size_t size; | 219 | static size_t size; |
220 | 220 | ||
221 | /* clear any pending interrupt */ | 221 | /* clear any pending interrupt */ |
222 | SRCPND = DMA2_MASK; | 222 | SRCPND = DMA2_MASK; |
223 | 223 | ||
224 | /* Buffer empty. Try to get more. */ | 224 | /* Buffer empty. Try to get more. */ |
225 | pcm_play_get_more_callback(&start, &size); | 225 | if (!pcm_play_dma_complete_callback(PCM_DMAST_OK, &start, &size)) |
226 | |||
227 | if (size == 0) | ||
228 | return; | 226 | return; |
229 | 227 | ||
230 | /* Flush any pending cache writes */ | 228 | /* Flush any pending cache writes */ |
@@ -237,7 +235,7 @@ void fiq_handler(void) | |||
237 | /* Re-Activate the channel */ | 235 | /* Re-Activate the channel */ |
238 | DMASKTRIG2 = 0x2; | 236 | DMASKTRIG2 = 0x2; |
239 | 237 | ||
240 | pcm_play_dma_started_callback(); | 238 | pcm_play_dma_status_callback(PCM_DMAST_STARTED); |
241 | } | 239 | } |
242 | 240 | ||
243 | size_t pcm_get_bytes_waiting(void) | 241 | size_t pcm_get_bytes_waiting(void) |
diff --git a/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c b/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c index a4f58a8e06..943cbb2ade 100644 --- a/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c +++ b/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c | |||
@@ -255,16 +255,14 @@ void pcm_play_dma_pause(bool pause) | |||
255 | 255 | ||
256 | void fiq_handler(void) | 256 | void fiq_handler(void) |
257 | { | 257 | { |
258 | static void *start; | 258 | static const void *start; |
259 | static size_t size; | 259 | static size_t size; |
260 | 260 | ||
261 | /* clear any pending interrupt */ | 261 | /* clear any pending interrupt */ |
262 | SRCPND = DMA2_MASK; | 262 | SRCPND = DMA2_MASK; |
263 | 263 | ||
264 | /* Buffer empty. Try to get more. */ | 264 | /* Buffer empty. Try to get more. */ |
265 | pcm_play_get_more_callback(&start, &size); | 265 | if (!pcm_play_dma_complete_callback(PCM_DMAST_OK, &start, &size)) |
266 | |||
267 | if (size == 0) | ||
268 | return; | 266 | return; |
269 | 267 | ||
270 | /* Flush any pending cache writes */ | 268 | /* Flush any pending cache writes */ |
@@ -277,7 +275,7 @@ void fiq_handler(void) | |||
277 | /* Re-Activate the channel */ | 275 | /* Re-Activate the channel */ |
278 | DMASKTRIG2 = 0x2; | 276 | DMASKTRIG2 = 0x2; |
279 | 277 | ||
280 | pcm_play_dma_started_callback(); | 278 | pcm_play_dma_status_callback(PCM_DMAST_STARTED); |
281 | } | 279 | } |
282 | 280 | ||
283 | size_t pcm_get_bytes_waiting(void) | 281 | size_t pcm_get_bytes_waiting(void) |