Corrected issue #99 : name conflicts with Zephyr (00bab39e) · Commits · Wenxi XU / Cmsis Dsp

Include/dsp/utils.h

+6 −3

Original line number	Diff line number	Diff line
		@@ -48,10 +48,12 @@ extern "C"
		#define MAX(x,y) ((x) > (y) ? (x) : (y))
		#endif

		#define SQ(x) ((x) * (x))
		#ifndef ARM_SQ
		#define ARM_SQ(x) ((x) * (x))
		#endif

		#ifndef ROUND_UP
		#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
		#ifndef ARM_ROUND_UP
		#define ARM_ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
		#endif


		@@ -251,6 +253,7 @@ __STATIC_INLINE int32_t arm_div_int64_to_int32(int64_t num, int32_t den)
		return result;
		}

		#undef INDEX_MASK

		#ifdef __cplusplus
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ float16_t arm_euclidean_distance_f16(const float16_t pA,const float16_t pB, ui
		while(blockSize > 0)
		{
		tmp = (_Float16)pA++ - (_Float16)pB++;
		accum += SQ(tmp);
		accum += ARM_SQ(tmp);
		blockSize --;
		}
		arm_sqrt_f16(accum,&result);

+2 −2

Original line number	Diff line number	Diff line
		@@ -122,7 +122,7 @@ float32_t arm_euclidean_distance_f32(const float32_t pA,const float32_t pB, ui
		while(blkCnt > 0)
		{
		tmp = pA++ - pB++;
		accum += SQ(tmp);
		accum += ARM_SQ(tmp);
		blkCnt --;
		}
		arm_sqrt_f32(accum,&tmp);
		@@ -137,7 +137,7 @@ float32_t arm_euclidean_distance_f32(const float32_t pA,const float32_t pB, ui
		while(blockSize > 0)
		{
		tmp = pA++ - pB++;
		accum += SQ(tmp);
		accum += ARM_SQ(tmp);
		blockSize --;
		}
		arm_sqrt_f32(accum,&tmp);

+1 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ float64_t arm_euclidean_distance_f64(const float64_t pA,const float64_t pB, ui
		while(blkCnt > 0)
		{
		tmp = pA++ - pB++;
		accum += SQ(tmp);
		accum += ARM_SQ(tmp);
		blkCnt --;
		}
		tmp = sqrt(accum);

+1 −1

Original line number	Diff line number	Diff line
		@@ -244,7 +244,7 @@ void arm_fir_f16(const arm_fir_instance_f16 * S,
		float16_t * pDst,
		uint32_t blockSize)
		{
		float16_t *pRefStatePtr = S->pState + ROUND_UP(blockSize, 8);
		float16_t *pRefStatePtr = S->pState + ARM_ROUND_UP(blockSize, 8);
		float16_t pState = pRefStatePtr ; / State pointer */
		const float16_t pCoeffs = S->pCoeffs; / Coefficient pointer */
		const float16_t pSamples; / Temporary pointer to the sample buffer */