From f49e75053198cc24aff92e9045795e011fa25083 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Wed, 10 Apr 2013 13:24:32 -0400 Subject: Move fixedpoint.h to be accessible in /firmware. Will need it soon enough. Combine the contents of all the various fixedpoint.h files. Not moving fixedpoint.c for now since I'm not sure where it should be and it causes some dependency issues. Change-Id: Ideacbca2ca78f9158c2b114b113c274f68e908d5 --- apps/plugins/lib/fixedpoint.h | 52 ++----------------------------------------- 1 file changed, 2 insertions(+), 50 deletions(-) (limited to 'apps/plugins/lib/fixedpoint.h') diff --git a/apps/plugins/lib/fixedpoint.h b/apps/plugins/lib/fixedpoint.h index 1631f8d6d8..811a1d9b81 100644 --- a/apps/plugins/lib/fixedpoint.h +++ b/apps/plugins/lib/fixedpoint.h @@ -20,55 +20,7 @@ * KIND, either express or implied. * ****************************************************************************/ - -/** PLUGINS - FIXED POINT MATH ROUTINES - USAGE - * - * - x and y arguments are fixed point integers - * - fracbits is the number of fractional bits in the argument(s) - * - functions return long fixed point integers with the specified number - * of fractional bits unless otherwise specified - * - * Calculate sin and cos of an angle: - * fp_sincos(phase, *cos) - * where phase is a 32 bit unsigned integer with 0 representing 0 - * and 0xFFFFFFFF representing 2*pi, and *cos is the address to - * a long signed integer. Value returned is a long signed integer - * from -0x80000000 to 0x7fffffff, representing -1 to 1 respectively. - * That is, value is a fixed point integer with 31 fractional bits. - * - * Take square root of a fixed point number: - * fp_sqrt(x, fracbits) - * - * Calculate sin or cos of an angle (very fast, from a table): - * fp14_sin(angle) - * fp14_cos(angle) - * where angle is a non-fixed point integer in degrees. Value - * returned is a fixed point integer with 14 fractional bits. - * - * Calculate the natural log of a positive fixed point integer - * fp16_log(x) - * where x and the value returned are fixed point integers - * with 16 fractional bits. - */ - #ifndef _FIXEDPOINT_H_PLUGINS #define _FIXEDPOINT_H_PLUGINS - -long fp_sincos(unsigned long phase, long *cos); -long fp_sqrt(long a, unsigned int fracbits); -long fp14_cos(int val); -long fp14_sin(int val); -long fp16_log(int x); -long fp16_exp(int x); - -unsigned long isqrt(unsigned long x); - -/* fast unsigned multiplication (16x16bit->32bit or 32x32bit->32bit, - * whichever is faster for the architecture) */ -#ifdef CPU_ARM -#define FMULU(a, b) ((uint32_t) (((uint32_t) (a)) * ((uint32_t) (b)))) -#else /* SH1, coldfire */ -#define FMULU(a, b) ((uint32_t) (((uint16_t) (a)) * ((uint16_t) (b)))) -#endif - -#endif +#include "../../../firmware/include/fixedpoint.h" +#endif /* _FIXEDPOINT_H_PLUGINS */ -- cgit v1.2.3