summaryrefslogtreecommitdiffstats
path: root/firmware/asm
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2012-02-05 22:48:47 -0500
committerMichael Sevakis <jethead71@rockbox.org>2012-02-05 22:48:47 -0500
commit43e6d7aef833b894780981eaceda35424c2186e8 (patch)
treeaac7b18a73d0e4822aa0175d4c8f8f51695aa1b3 /firmware/asm
parent691c7a76148d3e8f46c98add6d0b78666b503e96 (diff)
downloadrockbox-43e6d7aef833b894780981eaceda35424c2186e8.tar.gz
rockbox-43e6d7aef833b894780981eaceda35424c2186e8.tar.bz2
rockbox-43e6d7aef833b894780981eaceda35424c2186e8.zip
Urgh...actually change all the stuff I'm supposed to.
Goofed a couple fn params. Change-Id: I2474d10fe08d2629ada54c83e201ee91c596d854
Diffstat (limited to 'firmware/asm')
-rw-r--r--firmware/asm/pcm-mixer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/asm/pcm-mixer.c b/firmware/asm/pcm-mixer.c
index bedaa4c7cb..62dfa3e9db 100644
--- a/firmware/asm/pcm-mixer.c
+++ b/firmware/asm/pcm-mixer.c
@@ -27,7 +27,7 @@
#include "dsp-util.h" /* for clip_sample_16 */
/* Mix channels' samples and apply gain factors */
-static FORCE_INLINE void mix_samples(uint16_t *out,
+static FORCE_INLINE void mix_samples(int16_t *out,
int16_t *src0,
int32_t src0_amp,
int16_t *src1,
@@ -83,7 +83,7 @@ static FORCE_INLINE void mix_samples(uint16_t *out,
}
/* Write channel's samples and apply gain factor */
-static FORCE_INLINE void write_samples(uint32_t *out,
+static FORCE_INLINE void write_samples(int16_t *out,
int16_t *src,
int32_t amp,
size_t size)