From 2f3a3730fd09e44a4fd1b343666dbdf93bce1ce7 Mon Sep 17 00:00:00 2001 From: Christophe Favergeon Date: Mon, 8 Mar 2021 07:42:38 +0100 Subject: [PATCH] CMSIS-DSP: Correct problems related to issue 1140. --- Examples/ARM/arm_convolution_example/math_helper.c | 10 +++++++++- Examples/ARM/arm_convolution_example/math_helper.h | 1 - Examples/ARM/arm_fir_example/math_helper.c | 10 +++++++++- Examples/ARM/arm_fir_example/math_helper.h | 1 - .../ARM/arm_graphic_equalizer_example/math_helper.c | 10 ++++++++-- .../ARM/arm_graphic_equalizer_example/math_helper.h | 1 - Examples/ARM/arm_linear_interp_example/math_helper.c | 12 +++++++++--- Examples/ARM/arm_linear_interp_example/math_helper.h | 1 - Examples/ARM/arm_matrix_example/math_helper.c | 9 ++++++++- Examples/ARM/arm_matrix_example/math_helper.h | 1 - .../ARM/arm_signal_converge_example/math_helper.c | 10 ++++++++-- .../ARM/arm_signal_converge_example/math_helper.h | 1 - 12 files changed, 51 insertions(+), 16 deletions(-) diff --git a/Examples/ARM/arm_convolution_example/math_helper.c b/Examples/ARM/arm_convolution_example/math_helper.c index 4b0ee1f6..950bf42b 100644 --- a/Examples/ARM/arm_convolution_example/math_helper.c +++ b/Examples/ARM/arm_convolution_example/math_helper.c @@ -435,6 +435,14 @@ void arm_float_to_q28 (float *pIn, q31_t *pOut, uint32_t numSamples) } } + +/* + +Conflicting with the new clip functions in CMSIS-DSP and not used +in the examples. + +*/ +#if 0 /** * @brief Clip the float values to +/- 1 * @param[in,out] pIn input buffer @@ -461,6 +469,6 @@ void arm_clip_f32 (float *pIn, uint32_t numSamples) } } - +#endif diff --git a/Examples/ARM/arm_convolution_example/math_helper.h b/Examples/ARM/arm_convolution_example/math_helper.h index 46b0af3a..a0dbdf73 100644 --- a/Examples/ARM/arm_convolution_example/math_helper.h +++ b/Examples/ARM/arm_convolution_example/math_helper.h @@ -53,7 +53,6 @@ void arm_float_to_q14(float *pIn, q15_t *pOut, uint32_t numSamples); void arm_float_to_q29(float *pIn, q31_t *pOut, uint32_t numSamples); void arm_float_to_q28(float *pIn, q31_t *pOut, uint32_t numSamples); void arm_float_to_q30(float *pIn, q31_t *pOut, uint32_t numSamples); -void arm_clip_f32(float *pIn, uint32_t numSamples); uint32_t arm_calc_guard_bits(uint32_t num_adds); void arm_apply_guard_bits (float32_t * pIn, uint32_t numSamples, uint32_t guard_bits); uint32_t arm_compare_fixed_q15(q15_t *pIn, q15_t * pOut, uint32_t numSamples); diff --git a/Examples/ARM/arm_fir_example/math_helper.c b/Examples/ARM/arm_fir_example/math_helper.c index 4b0ee1f6..950bf42b 100644 --- a/Examples/ARM/arm_fir_example/math_helper.c +++ b/Examples/ARM/arm_fir_example/math_helper.c @@ -435,6 +435,14 @@ void arm_float_to_q28 (float *pIn, q31_t *pOut, uint32_t numSamples) } } + +/* + +Conflicting with the new clip functions in CMSIS-DSP and not used +in the examples. + +*/ +#if 0 /** * @brief Clip the float values to +/- 1 * @param[in,out] pIn input buffer @@ -461,6 +469,6 @@ void arm_clip_f32 (float *pIn, uint32_t numSamples) } } - +#endif diff --git a/Examples/ARM/arm_fir_example/math_helper.h b/Examples/ARM/arm_fir_example/math_helper.h index 46b0af3a..a0dbdf73 100644 --- a/Examples/ARM/arm_fir_example/math_helper.h +++ b/Examples/ARM/arm_fir_example/math_helper.h @@ -53,7 +53,6 @@ void arm_float_to_q14(float *pIn, q15_t *pOut, uint32_t numSamples); void arm_float_to_q29(float *pIn, q31_t *pOut, uint32_t numSamples); void arm_float_to_q28(float *pIn, q31_t *pOut, uint32_t numSamples); void arm_float_to_q30(float *pIn, q31_t *pOut, uint32_t numSamples); -void arm_clip_f32(float *pIn, uint32_t numSamples); uint32_t arm_calc_guard_bits(uint32_t num_adds); void arm_apply_guard_bits (float32_t * pIn, uint32_t numSamples, uint32_t guard_bits); uint32_t arm_compare_fixed_q15(q15_t *pIn, q15_t * pOut, uint32_t numSamples); diff --git a/Examples/ARM/arm_graphic_equalizer_example/math_helper.c b/Examples/ARM/arm_graphic_equalizer_example/math_helper.c index 4b0ee1f6..3d3cbe57 100644 --- a/Examples/ARM/arm_graphic_equalizer_example/math_helper.c +++ b/Examples/ARM/arm_graphic_equalizer_example/math_helper.c @@ -435,6 +435,13 @@ void arm_float_to_q28 (float *pIn, q31_t *pOut, uint32_t numSamples) } } +/* + +Conflicting with the new clip functions in CMSIS-DSP and not used +in the examples. + +*/ +#if 0 /** * @brief Clip the float values to +/- 1 * @param[in,out] pIn input buffer @@ -462,5 +469,4 @@ void arm_clip_f32 (float *pIn, uint32_t numSamples) } - - +#endif diff --git a/Examples/ARM/arm_graphic_equalizer_example/math_helper.h b/Examples/ARM/arm_graphic_equalizer_example/math_helper.h index 46b0af3a..a0dbdf73 100644 --- a/Examples/ARM/arm_graphic_equalizer_example/math_helper.h +++ b/Examples/ARM/arm_graphic_equalizer_example/math_helper.h @@ -53,7 +53,6 @@ void arm_float_to_q14(float *pIn, q15_t *pOut, uint32_t numSamples); void arm_float_to_q29(float *pIn, q31_t *pOut, uint32_t numSamples); void arm_float_to_q28(float *pIn, q31_t *pOut, uint32_t numSamples); void arm_float_to_q30(float *pIn, q31_t *pOut, uint32_t numSamples); -void arm_clip_f32(float *pIn, uint32_t numSamples); uint32_t arm_calc_guard_bits(uint32_t num_adds); void arm_apply_guard_bits (float32_t * pIn, uint32_t numSamples, uint32_t guard_bits); uint32_t arm_compare_fixed_q15(q15_t *pIn, q15_t * pOut, uint32_t numSamples); diff --git a/Examples/ARM/arm_linear_interp_example/math_helper.c b/Examples/ARM/arm_linear_interp_example/math_helper.c index 4b0ee1f6..fce27d25 100644 --- a/Examples/ARM/arm_linear_interp_example/math_helper.c +++ b/Examples/ARM/arm_linear_interp_example/math_helper.c @@ -435,6 +435,14 @@ void arm_float_to_q28 (float *pIn, q31_t *pOut, uint32_t numSamples) } } + +/* + +Conflicting with the new clip functions in CMSIS-DSP and not used +in the examples. + +*/ +#if 0 /** * @brief Clip the float values to +/- 1 * @param[in,out] pIn input buffer @@ -461,6 +469,4 @@ void arm_clip_f32 (float *pIn, uint32_t numSamples) } } - - - +#endif diff --git a/Examples/ARM/arm_linear_interp_example/math_helper.h b/Examples/ARM/arm_linear_interp_example/math_helper.h index 46b0af3a..a0dbdf73 100644 --- a/Examples/ARM/arm_linear_interp_example/math_helper.h +++ b/Examples/ARM/arm_linear_interp_example/math_helper.h @@ -53,7 +53,6 @@ void arm_float_to_q14(float *pIn, q15_t *pOut, uint32_t numSamples); void arm_float_to_q29(float *pIn, q31_t *pOut, uint32_t numSamples); void arm_float_to_q28(float *pIn, q31_t *pOut, uint32_t numSamples); void arm_float_to_q30(float *pIn, q31_t *pOut, uint32_t numSamples); -void arm_clip_f32(float *pIn, uint32_t numSamples); uint32_t arm_calc_guard_bits(uint32_t num_adds); void arm_apply_guard_bits (float32_t * pIn, uint32_t numSamples, uint32_t guard_bits); uint32_t arm_compare_fixed_q15(q15_t *pIn, q15_t * pOut, uint32_t numSamples); diff --git a/Examples/ARM/arm_matrix_example/math_helper.c b/Examples/ARM/arm_matrix_example/math_helper.c index 4b0ee1f6..f62043d6 100644 --- a/Examples/ARM/arm_matrix_example/math_helper.c +++ b/Examples/ARM/arm_matrix_example/math_helper.c @@ -435,6 +435,13 @@ void arm_float_to_q28 (float *pIn, q31_t *pOut, uint32_t numSamples) } } +/* + +Conflicting with the new clip functions in CMSIS-DSP and not used +in the examples. + +*/ +#if 0 /** * @brief Clip the float values to +/- 1 * @param[in,out] pIn input buffer @@ -460,7 +467,7 @@ void arm_clip_f32 (float *pIn, uint32_t numSamples) } } - +#endif diff --git a/Examples/ARM/arm_matrix_example/math_helper.h b/Examples/ARM/arm_matrix_example/math_helper.h index 46b0af3a..a0dbdf73 100644 --- a/Examples/ARM/arm_matrix_example/math_helper.h +++ b/Examples/ARM/arm_matrix_example/math_helper.h @@ -53,7 +53,6 @@ void arm_float_to_q14(float *pIn, q15_t *pOut, uint32_t numSamples); void arm_float_to_q29(float *pIn, q31_t *pOut, uint32_t numSamples); void arm_float_to_q28(float *pIn, q31_t *pOut, uint32_t numSamples); void arm_float_to_q30(float *pIn, q31_t *pOut, uint32_t numSamples); -void arm_clip_f32(float *pIn, uint32_t numSamples); uint32_t arm_calc_guard_bits(uint32_t num_adds); void arm_apply_guard_bits (float32_t * pIn, uint32_t numSamples, uint32_t guard_bits); uint32_t arm_compare_fixed_q15(q15_t *pIn, q15_t * pOut, uint32_t numSamples); diff --git a/Examples/ARM/arm_signal_converge_example/math_helper.c b/Examples/ARM/arm_signal_converge_example/math_helper.c index 4b0ee1f6..c87c97d9 100644 --- a/Examples/ARM/arm_signal_converge_example/math_helper.c +++ b/Examples/ARM/arm_signal_converge_example/math_helper.c @@ -435,6 +435,13 @@ void arm_float_to_q28 (float *pIn, q31_t *pOut, uint32_t numSamples) } } +/* + +Conflicting with the new clip functions in CMSIS-DSP and not used +in the examples. + +*/ +#if 0 /** * @brief Clip the float values to +/- 1 * @param[in,out] pIn input buffer @@ -461,6 +468,5 @@ void arm_clip_f32 (float *pIn, uint32_t numSamples) } } - - +#endif diff --git a/Examples/ARM/arm_signal_converge_example/math_helper.h b/Examples/ARM/arm_signal_converge_example/math_helper.h index 46b0af3a..a0dbdf73 100644 --- a/Examples/ARM/arm_signal_converge_example/math_helper.h +++ b/Examples/ARM/arm_signal_converge_example/math_helper.h @@ -53,7 +53,6 @@ void arm_float_to_q14(float *pIn, q15_t *pOut, uint32_t numSamples); void arm_float_to_q29(float *pIn, q31_t *pOut, uint32_t numSamples); void arm_float_to_q28(float *pIn, q31_t *pOut, uint32_t numSamples); void arm_float_to_q30(float *pIn, q31_t *pOut, uint32_t numSamples); -void arm_clip_f32(float *pIn, uint32_t numSamples); uint32_t arm_calc_guard_bits(uint32_t num_adds); void arm_apply_guard_bits (float32_t * pIn, uint32_t numSamples, uint32_t guard_bits); uint32_t arm_compare_fixed_q15(q15_t *pIn, q15_t * pOut, uint32_t numSamples);