diff options
| author | Johnathan Corgan | 2012-03-01 17:02:07 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-03-01 17:02:07 -0800 |
| commit | 875f5185a7feecbb1d4a3426a443bd873b0abd4b (patch) | |
| tree | 92ab827d8b1d0b822c03eb480e29d0f47c9dd100 /volk/lib/qa_utils.h | |
| parent | bc5494fc83721b22b5c6a94e1300e112d6269313 (diff) | |
| parent | 0a6f1494b8e462c13c8c48c69680832967ebec72 (diff) | |
| download | gnuradio-875f5185a7feecbb1d4a3426a443bd873b0abd4b.tar.gz gnuradio-875f5185a7feecbb1d4a3426a443bd873b0abd4b.tar.bz2 gnuradio-875f5185a7feecbb1d4a3426a443bd873b0abd4b.zip | |
Merge branch 'master' into next
Conflicts:
config/grc_volk.m4
gnuradio-core/src/guile/tests/gengen_ctors.test
gnuradio-core/src/lib/Makefile.am
gnuradio-core/src/lib/general/.gitignore
gnuradio-core/src/lib/general/Makefile.am
gnuradio-core/src/lib/gengen/.gitignore
gnuradio-core/src/python/gnuradio/gr/Makefile.am
volk/include/volk/Makefile.am
Diffstat (limited to 'volk/lib/qa_utils.h')
| -rw-r--r-- | volk/lib/qa_utils.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/volk/lib/qa_utils.h b/volk/lib/qa_utils.h index a1bc1f20c..b998df852 100644 --- a/volk/lib/qa_utils.h +++ b/volk/lib/qa_utils.h @@ -21,7 +21,7 @@ volk_type_t volk_type_from_string(std::string); float uniform(void); void random_floats(float *buf, unsigned n); -bool run_volk_tests(struct volk_func_desc, void(*)(), std::string, float, float, int, int, std::vector<std::string> *); +bool run_volk_tests(struct volk_func_desc, void(*)(), std::string, float, lv_32fc_t, int, int, std::vector<std::string> *); #define VOLK_RUN_TESTS(func, tol, scalar, len, iter) BOOST_AUTO_TEST_CASE(func##_test) { BOOST_CHECK_EQUAL(run_volk_tests(func##_get_func_desc(), (void (*)())func##_manual, std::string(#func), tol, scalar, len, iter, 0), 0); } #define VOLK_PROFILE(func, tol, scalar, len, iter, results) run_volk_tests(func##_get_func_desc(), (void (*)())func##_manual, std::string(#func), tol, scalar, len, iter, results) @@ -32,5 +32,8 @@ typedef void (*volk_fn_4arg)(void *, void *, void *, void *, unsigned int, const typedef void (*volk_fn_1arg_s32f)(void *, float, unsigned int, const char*); //one input vector, one scalar float input typedef void (*volk_fn_2arg_s32f)(void *, void *, float, unsigned int, const char*); typedef void (*volk_fn_3arg_s32f)(void *, void *, void *, float, unsigned int, const char*); +typedef void (*volk_fn_1arg_s32fc)(void *, lv_32fc_t, unsigned int, const char*); //one input vector, one scalar float input +typedef void (*volk_fn_2arg_s32fc)(void *, void *, lv_32fc_t, unsigned int, const char*); +typedef void (*volk_fn_3arg_s32fc)(void *, void *, void *, lv_32fc_t, unsigned int, const char*); #endif //VOLK_QA_UTILS_H |