summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--volk/include/volk/Makefile.am2
-rw-r--r--volk/include/volk/volk_32fc_s32f_power_32fc_a16.h (renamed from volk/include/volk/volk_32fc_32f_power_32fc_a16.h)10
-rw-r--r--volk/lib/testqa.cc2
3 files changed, 7 insertions, 7 deletions
diff --git a/volk/include/volk/Makefile.am b/volk/include/volk/Makefile.am
index 1eb46b602..eb97775b0 100644
--- a/volk/include/volk/Makefile.am
+++ b/volk/include/volk/Makefile.am
@@ -62,7 +62,7 @@ volkinclude_HEADERS = \
volk_32f_accumulator_s32f_a16.h \
volk_32f_x2_add_32f_a16.h \
volk_32fc_32f_multiply_32fc_a16.h \
- volk_32fc_32f_power_32fc_a16.h \
+ volk_32fc_s32f_power_32fc_a16.h \
volk_32f_s32f_calc_spectral_noise_floor_32f_a16.h \
volk_32fc_s32f_atan2_32f_a16.h \
volk_32fc_x2_conjugate_dot_prod_32fc_a16.h \
diff --git a/volk/include/volk/volk_32fc_32f_power_32fc_a16.h b/volk/include/volk/volk_32fc_s32f_power_32fc_a16.h
index 6f9e9e3ee..3507fdb3c 100644
--- a/volk/include/volk/volk_32fc_32f_power_32fc_a16.h
+++ b/volk/include/volk/volk_32fc_s32f_power_32fc_a16.h
@@ -1,5 +1,5 @@
-#ifndef INCLUDED_volk_32fc_32f_power_32fc_a16_H
-#define INCLUDED_volk_32fc_32f_power_32fc_a16_H
+#ifndef INCLUDED_volk_32fc_s32f_power_32fc_a16_H
+#define INCLUDED_volk_32fc_s32f_power_32fc_a16_H
#include <inttypes.h>
#include <stdio.h>
@@ -18,7 +18,7 @@
\param power The power value to be applied to each data point
\param num_points The number of values in aVector to be taken to the specified power level and stored into cVector
*/
-static inline void volk_32fc_32f_power_32fc_a16_sse(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float power, unsigned int num_points){
+static inline void volk_32fc_s32f_power_32fc_a16_sse(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float power, unsigned int num_points){
unsigned int number = 0;
const unsigned int quarterPoints = num_points / 4;
@@ -89,7 +89,7 @@ static inline void volk_32fc_32f_power_32fc_a16_sse(lv_32fc_t* cVector, const lv
\param power The power value to be applied to each data point
\param num_points The number of values in aVector to be taken to the specified power level and stored into cVector
*/
-static inline void volk_32fc_32f_power_32fc_a16_generic(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float power, unsigned int num_points){
+static inline void volk_32fc_s32f_power_32fc_a16_generic(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float power, unsigned int num_points){
lv_32fc_t* cPtr = cVector;
const lv_32fc_t* aPtr = aVector;
unsigned int number = 0;
@@ -106,4 +106,4 @@ static inline void volk_32fc_32f_power_32fc_a16_generic(lv_32fc_t* cVector, cons
-#endif /* INCLUDED_volk_32fc_32f_power_32fc_a16_H */
+#endif /* INCLUDED_volk_32fc_s32f_power_32fc_a16_H */
diff --git a/volk/lib/testqa.cc b/volk/lib/testqa.cc
index e9734411b..f33670856 100644
--- a/volk/lib/testqa.cc
+++ b/volk/lib/testqa.cc
@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE(volk_test_all) {
VOLK_RUN_TESTS(volk_32f_accumulator_s32f_a16, 1e-4, 0, 2046, 10000);
VOLK_RUN_TESTS(volk_32f_x2_add_32f_a16, 1e-4, 0, 2046, 10000);
VOLK_RUN_TESTS(volk_32fc_32f_multiply_32fc_a16, 1e-4, 0, 2046, 10000);
- VOLK_RUN_TESTS(volk_32fc_32f_power_32fc_a16, 1e-4, 0, 2046, 1000);
+ VOLK_RUN_TESTS(volk_32fc_s32f_power_32fc_a16, 1e-4, 0, 2046, 1000);
VOLK_RUN_TESTS(volk_32f_s32f_calc_spectral_noise_floor_32f_a16, 1e-4, 20.0, 2046, 10000);
VOLK_RUN_TESTS(volk_32fc_s32f_atan2_32f_a16, 1e-4, 10.0, 2046, 10000);
VOLK_RUN_TESTS(volk_32fc_x2_conjugate_dot_prod_32fc_a16, 1e-4, 0, 2046, 10000);