From 1f5b9434daeda72ffa6d37357d3ed55c44c5c66e Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Mon, 24 May 2010 16:57:48 +0000 Subject: Cleanup r26253 red and yellow. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26254 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c | 4 ++-- firmware/target/hosted/sdl/pcm-sdl.c | 2 +- firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c index d7d8f92a0c..c4693d632a 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c @@ -32,8 +32,8 @@ /* These are global to save some latency when pcm_play_dma_get_peak_buffer is * called. */ -static unsigned char *start; -static size_t size; +static void *start; +static size_t size; void pcm_postinit(void) { diff --git a/firmware/target/hosted/sdl/pcm-sdl.c b/firmware/target/hosted/sdl/pcm-sdl.c index 03e6e1336c..811d5c7814 100644 --- a/firmware/target/hosted/sdl/pcm-sdl.c +++ b/firmware/target/hosted/sdl/pcm-sdl.c @@ -228,7 +228,7 @@ static void sdl_audio_callback(struct pcm_udata *udata, Uint8 *stream, int len) /* Audio card wants more? Get some more then. */ while (len > 0) { - pcm_play_get_more_callback(&pcm_data, &pcm_data_size); + pcm_play_get_more_callback((void **)&pcm_data, &pcm_data_size); start: if (pcm_data_size != 0) { udata->num_in = pcm_data_size / pcm_sample_bytes; diff --git a/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c b/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c index 4cf43471eb..5cd9c33e18 100644 --- a/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c @@ -100,7 +100,7 @@ static inline void set_dma(const void *addr, size_t size) static inline void play_dma_callback(void) { - unsigned char *start; + void *start; size_t size; pcm_play_get_more_callback(&start, &size); -- cgit v1.2.3