summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2010-05-24 16:57:48 +0000
committerMichael Sevakis <jethead71@rockbox.org>2010-05-24 16:57:48 +0000
commit1f5b9434daeda72ffa6d37357d3ed55c44c5c66e (patch)
treecabea3bf9b4d2fe1b9d3a69e582b26ac8a63b398
parentd56999890f2aacf197d9ae4383313271499509a9 (diff)
downloadrockbox-1f5b9434daeda72ffa6d37357d3ed55c44c5c66e.tar.gz
rockbox-1f5b9434daeda72ffa6d37357d3ed55c44c5c66e.zip
Cleanup r26253 red and yellow.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26254 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c4
-rw-r--r--firmware/target/hosted/sdl/pcm-sdl.c2
-rw-r--r--firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c2
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 @@
32/* These are global to save some latency when pcm_play_dma_get_peak_buffer is 32/* These are global to save some latency when pcm_play_dma_get_peak_buffer is
33 * called. 33 * called.
34 */ 34 */
35static unsigned char *start; 35static void *start;
36static size_t size; 36static size_t size;
37 37
38void pcm_postinit(void) 38void pcm_postinit(void)
39{ 39{
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)
228 228
229 /* Audio card wants more? Get some more then. */ 229 /* Audio card wants more? Get some more then. */
230 while (len > 0) { 230 while (len > 0) {
231 pcm_play_get_more_callback(&pcm_data, &pcm_data_size); 231 pcm_play_get_more_callback((void **)&pcm_data, &pcm_data_size);
232 start: 232 start:
233 if (pcm_data_size != 0) { 233 if (pcm_data_size != 0) {
234 udata->num_in = pcm_data_size / pcm_sample_bytes; 234 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)
100 100
101static inline void play_dma_callback(void) 101static inline void play_dma_callback(void)
102{ 102{
103 unsigned char *start; 103 void *start;
104 size_t size; 104 size_t size;
105 105
106 pcm_play_get_more_callback(&start, &size); 106 pcm_play_get_more_callback(&start, &size);