From 13bf4c00d0ad0e36601035a011ba27ff5bc1e01d Mon Sep 17 00:00:00 2001 From: yang Date: Fri, 26 Oct 2012 17:40:35 +0800 Subject: [PATCH] format accordding to code review --- inc/NE10_dsp.h | 45 +++++++++++++++------------------------------ modules/dsp/NE10_fir.c | 21 +++++++-------------- modules/dsp/NE10_fir.neon.s | 1 + modules/dsp/NE10_iir.neon.s | 2 -- modules/dsp/NE10_init_dsp.c | 4 ++-- 5 files changed, 25 insertions(+), 48 deletions(-) diff --git a/inc/NE10_dsp.h b/inc/NE10_dsp.h index 85e0d75..d2570f4 100644 --- a/inc/NE10_dsp.h +++ b/inc/NE10_dsp.h @@ -56,8 +56,7 @@ extern void (*ne10_radix4_butterfly_inverse_float)(ne10_float32_t *pDst, ne10_uint16_t N, ne10_float32_t *pCoef); -extern void (*ne10_rfft_float)( - const ne10_rfft_instance_f32_t * S, +extern void (*ne10_rfft_float)(const ne10_rfft_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_float32_t * pTemp); @@ -81,8 +80,7 @@ extern void ne10_radix4_butterfly_inverse_float_c(ne10_float32_t *pDst, ne10_uint16_t N, ne10_float32_t *pCoef); -extern void ne10_rfft_float_c( - const ne10_rfft_instance_f32_t * S, +extern void ne10_rfft_float_c(const ne10_rfft_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_float32_t * pTemp); @@ -99,8 +97,7 @@ extern void ne10_radix4_butterfly_inverse_float_neon(ne10_float32_t *pDst, ne10_uint16_t N, ne10_float32_t *pCoef); -extern void ne10_rfft_float_neon( - const ne10_rfft_instance_f32_t * S, +extern void ne10_rfft_float_neon(const ne10_rfft_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_float32_t * pTemp); @@ -112,26 +109,22 @@ extern void (*ne10_fir_float)(const ne10_fir_instance_f32_t * S, ne10_float32_t * pDst, ne10_uint32_t blockSize); -extern void (*ne10_fir_decimate_float)( - const ne10_fir_decimate_instance_f32_t * S, +extern void (*ne10_fir_decimate_float)(const ne10_fir_decimate_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_uint32_t blockSize); -extern void (*ne10_fir_interpolate_float)( - const ne10_fir_interpolate_instance_f32_t * S, +extern void (*ne10_fir_interpolate_float)(const ne10_fir_interpolate_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_uint32_t blockSize); -extern void (*ne10_fir_lattice_float)( - const ne10_fir_lattice_instance_f32_t * S, +extern void (*ne10_fir_lattice_float)(const ne10_fir_lattice_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_uint32_t blockSize); -extern void (*ne10_fir_sparse_float)( - ne10_fir_sparse_instance_f32_t * S, +extern void (*ne10_fir_sparse_float)(ne10_fir_sparse_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_float32_t * pScratchIn, @@ -145,30 +138,26 @@ extern ne10_result_t ne10_fir_init_float(ne10_fir_instance_f32_t * S, ne10_float32_t * pState, ne10_uint32_t blockSize); -extern ne10_result_t ne10_fir_decimate_init_float( - ne10_fir_decimate_instance_f32_t * S, +extern ne10_result_t ne10_fir_decimate_init_float(ne10_fir_decimate_instance_f32_t * S, ne10_uint16_t numTaps, ne10_uint8_t M, ne10_float32_t * pCoeffs, ne10_float32_t * pState, ne10_uint32_t blockSize); -extern ne10_result_t ne10_fir_interpolate_init_float( - ne10_fir_interpolate_instance_f32_t * S, +extern ne10_result_t ne10_fir_interpolate_init_float(ne10_fir_interpolate_instance_f32_t * S, ne10_uint8_t L, ne10_uint16_t numTaps, ne10_float32_t * pCoeffs, ne10_float32_t * pState, ne10_uint32_t blockSize); -extern ne10_result_t ne10_fir_lattice_init_float( - ne10_fir_lattice_instance_f32_t * S, +extern ne10_result_t ne10_fir_lattice_init_float(ne10_fir_lattice_instance_f32_t * S, ne10_uint16_t numStages, ne10_float32_t * pCoeffs, ne10_float32_t * pState); -extern ne10_result_t ne10_fir_sparse_init_float( - ne10_fir_sparse_instance_f32_t * S, +extern ne10_result_t ne10_fir_sparse_init_float(ne10_fir_sparse_instance_f32_t * S, ne10_uint16_t numTaps, ne10_float32_t * pCoeffs, ne10_float32_t * pState, @@ -182,26 +171,22 @@ extern void ne10_fir_float_c(const ne10_fir_instance_f32_t * S, ne10_float32_t * pDst, ne10_uint32_t blockSize); -extern void ne10_fir_decimate_float_c( - const ne10_fir_decimate_instance_f32_t * S, +extern void ne10_fir_decimate_float_c(const ne10_fir_decimate_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_uint32_t blockSize); -extern void ne10_fir_interpolate_float_c( - const ne10_fir_interpolate_instance_f32_t * S, +extern void ne10_fir_interpolate_float_c(const ne10_fir_interpolate_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_uint32_t blockSize); -extern void ne10_fir_lattice_float_c( - const ne10_fir_lattice_instance_f32_t * S, +extern void ne10_fir_lattice_float_c(const ne10_fir_lattice_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_uint32_t blockSize); -extern void ne10_fir_sparse_float_c( - ne10_fir_sparse_instance_f32_t * S, +extern void ne10_fir_sparse_float_c(ne10_fir_sparse_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_float32_t * pScratchIn, diff --git a/modules/dsp/NE10_fir.c b/modules/dsp/NE10_fir.c index 4c95d28..93c126c 100644 --- a/modules/dsp/NE10_fir.c +++ b/modules/dsp/NE10_fir.c @@ -106,8 +106,7 @@ * */ -void ne10_fir_float_c ( - const ne10_fir_instance_f32_t * S, +void ne10_fir_float_c (const ne10_fir_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_uint32_t blockSize) @@ -351,8 +350,7 @@ void ne10_fir_float_c ( * @return none. */ -void ne10_fir_decimate_float_c ( - const ne10_fir_decimate_instance_f32_t * S, +void ne10_fir_decimate_float_c (const ne10_fir_decimate_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_uint32_t blockSize) @@ -516,8 +514,7 @@ void ne10_fir_decimate_float_c ( * @return none. */ -void ne10_fir_interpolate_float_c ( - const ne10_fir_interpolate_instance_f32_t * S, +void ne10_fir_interpolate_float_c (const ne10_fir_interpolate_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_uint32_t blockSize) @@ -700,8 +697,7 @@ void ne10_fir_interpolate_float_c ( * @return none. */ -void ne10_fir_lattice_float_c ( - const ne10_fir_lattice_instance_f32_t * S, +void ne10_fir_lattice_float_c (const ne10_fir_lattice_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_uint32_t blockSize) @@ -1001,8 +997,7 @@ void ne10_fir_lattice_float_c ( * @brief floating-point Circular write function. */ -static void ne10_circular_write_float ( - ne10_int32_t * circBuffer, +static void ne10_circular_write_float (ne10_int32_t * circBuffer, ne10_int32_t L, ne10_uint16_t * writeOffset, ne10_int32_t bufferInc, @@ -1046,8 +1041,7 @@ static void ne10_circular_write_float ( /** * @brief floating-point Circular Read function. */ -static void ne10_circular_read_float ( - ne10_int32_t * circBuffer, +static void ne10_circular_read_float (ne10_int32_t * circBuffer, ne10_int32_t L, ne10_int32_t * readOffset, ne10_int32_t bufferInc, @@ -1108,8 +1102,7 @@ static void ne10_circular_read_float ( * @return none. */ -void ne10_fir_sparse_float_c ( - ne10_fir_sparse_instance_f32_t * S, +void ne10_fir_sparse_float_c (ne10_fir_sparse_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_float32_t * pScratchIn, diff --git a/modules/dsp/NE10_fir.neon.s b/modules/dsp/NE10_fir.neon.s index f63cb2e..17ff5c1 100644 --- a/modules/dsp/NE10_fir.neon.s +++ b/modules/dsp/NE10_fir.neon.s @@ -1608,6 +1608,7 @@ firLatticeEnd: ne10_fir_sparse_float_neon: PUSH {r4-r12,lr} + @ save the point of struct to stack for stateIndex update PUSH {r0} @/*ARM Registers*/ diff --git a/modules/dsp/NE10_iir.neon.s b/modules/dsp/NE10_iir.neon.s index 81af588..78dc471 100644 --- a/modules/dsp/NE10_iir.neon.s +++ b/modules/dsp/NE10_iir.neon.s @@ -39,7 +39,6 @@ ne10_iir_lattice_float_neon: PUSH {r4-r12,lr} - @VPUSH {d8,d9} @/*ARM Registers*/ pStateStruct .req R0 @@ -372,7 +371,6 @@ firLatticeEnd: .unreq dGnext_0 .unreq dGnext_1 - @VPOP {d8,d9} POP {r4-r12,pc} .end diff --git a/modules/dsp/NE10_init_dsp.c b/modules/dsp/NE10_init_dsp.c index e02e6f2..1f03242 100644 --- a/modules/dsp/NE10_init_dsp.c +++ b/modules/dsp/NE10_init_dsp.c @@ -44,6 +44,7 @@ ne10_result_t ne10_init_dsp (ne10_int32_t is_NEON_available) ne10_fir_sparse_float = ne10_fir_sparse_float_neon; ne10_iir_lattice_float = ne10_iir_lattice_float_neon; + } else { @@ -73,8 +74,7 @@ void (*ne10_radix4_butterfly_inverse_float)(ne10_float32_t *pDst, ne10_uint16_t N, ne10_float32_t *pCoef); -void (*ne10_rfft_float)( - const ne10_rfft_instance_f32_t * S, +void (*ne10_rfft_float)(const ne10_rfft_instance_f32_t * S, ne10_float32_t * pSrc, ne10_float32_t * pDst, ne10_float32_t * pTemp); -- 2.7.4