Staging: echo: Replace __BLACKFIN__ASM__ with __bfin__ (f55ccbf6) · Commits · 戴 / test

drivers/staging/echo/echo.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@
		/* adapting coeffs using the traditional stochastic descent (N)LMS algorithm */


		#ifdef __BLACKFIN_ASM__
		#ifdef __bfin__
		static void __inline__ lms_adapt_bg(struct oslec_state *ec, int clean, int shift)
		{
		int i, j;

+4 −4

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ static __inline__ const int16_t fir16_create(fir16_state_t fir,
		fir->taps = taps;
		fir->curr_pos = taps - 1;
		fir->coeffs = coeffs;
		#if defined(USE_MMX) \|\| defined(USE_SSE2) \|\| defined(__BLACKFIN_ASM__)
		#if defined(USE_MMX) \|\| defined(USE_SSE2) \|\| defined(__bfin__)
		if ((fir->history = malloc(2tapssizeof(int16_t))))
		memset(fir->history, 0, 2tapssizeof(int16_t));
		#else
		@@ -129,7 +129,7 @@ static __inline__ const int16_t fir16_create(fir16_state_t fir,

		static __inline__ void fir16_flush(fir16_state_t *fir)
		{
		#if defined(USE_MMX) \|\| defined(USE_SSE2) \|\| defined(__BLACKFIN_ASM__)
		#if defined(USE_MMX) \|\| defined(USE_SSE2) \|\| defined(__bfin__)
		memset(fir->history, 0, 2fir->tapssizeof(int16_t));
		#else
		memset(fir->history, 0, fir->taps*sizeof(int16_t));
		@@ -143,7 +143,7 @@ static __inline__ void fir16_free(fir16_state_t *fir)
		}
		/- End of function --------------------------------------------------------/

		#ifdef __BLACKFIN_ASM__
		#ifdef __bfin__
		static inline int32_t dot_asm(short x, short y, int len)
		{
		int dot;
		@@ -242,7 +242,7 @@ static __inline__ int16_t fir16(fir16_state_t *fir, int16_t sample)
		psrldq_i2r(4, xmm0);
		paddd_r2r(xmm0, xmm4);
		movd_r2m(xmm4, y);
		#elif defined(__BLACKFIN_ASM__)
		#elif defined(__bfin__)
		fir->history[fir->curr_pos] = sample;
		fir->history[fir->curr_pos + fir->taps] = sample;
		y = dot_asm((int16_t*)fir->coeffs, &fir->history[fir->curr_pos], fir->taps);