From 43e6d7aef833b894780981eaceda35424c2186e8 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sun, 5 Feb 2012 22:48:47 -0500 Subject: [PATCH] Urgh...actually change all the stuff I'm supposed to. Goofed a couple fn params. Change-Id: I2474d10fe08d2629ada54c83e201ee91c596d854 --- firmware/asm/pcm-mixer.c | 4 ++-- 1 file 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)