From 644f5d383ba294f1f1b80c77a57ae0f3190813e3 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 6 Apr 2009 23:07:04 +0000 Subject: cx88-dsp: fixing 64bit math From: Miroslav Sustek cx88-dsp: fixing 64bit math on 32bit kernels Some gcc versions report the missing of __divdi3 Signed-off-by: Miroslav Sustek Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/cx88/cx88-dsp.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/cx88/cx88-dsp.c b/linux/drivers/media/video/cx88/cx88-dsp.c index da2b306c0..262bda9ec 100644 --- a/linux/drivers/media/video/cx88/cx88-dsp.c +++ b/linux/drivers/media/video/cx88/cx88-dsp.c @@ -100,13 +100,22 @@ static u32 int_goertzel(s16 x[], u32 N, u32 freq) s32 s_prev2 = 0; s32 coeff = 2*int_cos(freq); u32 i; + + s64 tmp; + u32 remainder; + for (i = 0; i < N; i++) { s32 s = x[i] + ((s64)coeff*s_prev/32768) - s_prev2; s_prev2 = s_prev; s_prev = s; } - return (u32)(((s64)s_prev2*s_prev2 + (s64)s_prev*s_prev - - (s64)coeff*s_prev2*s_prev/32768)/N/N); + + tmp = (s64)s_prev2*s_prev2 + (s64)s_prev*s_prev - + (s64)coeff*s_prev2*s_prev/32768; + + /* XXX: N must be low enough so that N*N fits in s32. + * Else we need two divisions. */ + return (u32) div_s64_rem(tmp, N*N, &remainder); } static u32 freq_magnitude(s16 x[], u32 N, u32 freq) -- cgit v1.2.3