Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58d81d64 authored by Priit Laes's avatar Priit Laes Committed by Kalle Valo
Browse files

lib: cordic: Move cordic macros and defines to header file 



Now that these macros are in header file, we can eventually
clean up the duplicate macros present in the drivers that
utilize the same cordic algorithm implementation.

Also add CORDIC_ prefix to nonprefixed macros.

Reviewed-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarPriit Laes <plaes@plaes.org>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 559afaa2

include/linux/cordic.h

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,15 @@ 


#include <linux/types.h>



#define CORDIC_ANGLE_GEN	39797

#define CORDIC_PRECISION_SHIFT	16

#define CORDIC_NUM_ITER	(CORDIC_PRECISION_SHIFT + 2)



#define CORDIC_FIXED(X)	((s32)((X) << CORDIC_PRECISION_SHIFT))

#define CORDIC_FLOAT(X)	(((X) >= 0) \

		? ((((X) >> (CORDIC_PRECISION_SHIFT - 1)) + 1) >> 1) \

		: -((((-(X)) >> (CORDIC_PRECISION_SHIFT - 1)) + 1) >> 1))



/**

 * struct cordic_iq - i/q coordinate.

 *

lib/cordic.c

+7 −16
Original line number Diff line number Diff line
@@ -16,15 +16,6 @@ 
#include <linux/module.h>

#include <linux/cordic.h>



#define CORDIC_ANGLE_GEN	39797

#define CORDIC_PRECISION_SHIFT	16

#define	CORDIC_NUM_ITER		(CORDIC_PRECISION_SHIFT + 2)



#define	FIXED(X)	((s32)((X) << CORDIC_PRECISION_SHIFT))

#define	FLOAT(X)	(((X) >= 0) \

		? ((((X) >> (CORDIC_PRECISION_SHIFT - 1)) + 1) >> 1) \

		: -((((-(X)) >> (CORDIC_PRECISION_SHIFT - 1)) + 1) >> 1))



static const s32 arctan_table[] = {

	2949120,

	1740967,
@@ -64,16 +55,16 @@ struct cordic_iq cordic_calc_iq(s32 theta) 
	coord.q = 0;

	angle = 0;



	theta = FIXED(theta);

	theta = CORDIC_FIXED(theta);

	signtheta = (theta < 0) ? -1 : 1;

	theta = ((theta + FIXED(180) * signtheta) % FIXED(360)) -

		FIXED(180) * signtheta;

	theta = ((theta + CORDIC_FIXED(180) * signtheta) % CORDIC_FIXED(360)) -

		CORDIC_FIXED(180) * signtheta;



	if (FLOAT(theta) > 90) {

		theta -= FIXED(180);

	if (CORDIC_FLOAT(theta) > 90) {

		theta -= CORDIC_FIXED(180);

		signx = -1;

	} else if (FLOAT(theta) < -90) {

		theta += FIXED(180);

	} else if (CORDIC_FLOAT(theta) < -90) {

		theta += CORDIC_FIXED(180);

		signx = -1;

	}