summaryrefslogtreecommitdiff
path: root/gr-filter
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-06-22 18:58:33 -0400
committerTom Rondeau <trondeau@vt.edu>2012-06-22 18:58:33 -0400
commit81589710a52c0e1b087f28ac54e83b9cbfa477d1 (patch)
tree0338e754701e71f211a024434b67a14ec72e9370 /gr-filter
parent5cf2674681b3fd68c528eaeac57edf1ec94bee71 (diff)
volk: fixing some volk kernels.
This should fix some problems with gr-filter QA tests. Also removes some warnings.
Diffstat (limited to 'gr-filter')
-rw-r--r--gr-filter/lib/qa_fir_filter_with_buffer.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/gr-filter/lib/qa_fir_filter_with_buffer.cc b/gr-filter/lib/qa_fir_filter_with_buffer.cc
index f8af9ea0b1..eaa0359d08 100644
--- a/gr-filter/lib/qa_fir_filter_with_buffer.cc
+++ b/gr-filter/lib/qa_fir_filter_with_buffer.cc
@@ -39,8 +39,6 @@ namespace gr {
#define MAX_DATA (16383)
#define ERR_DELTA (1e-5)
-#define NELEM(x) (sizeof(x) / sizeof(x[0]))
-
static float
uniform()
{
@@ -58,8 +56,8 @@ namespace gr {
random_complex(gr_complex *buf, unsigned n)
{
for(unsigned i = 0; i < n; i++) {
- float re = rint(uniform () * MAX_DATA);
- float im = rint(uniform () * MAX_DATA);
+ float re = rint(uniform() * MAX_DATA);
+ float im = rint(uniform() * MAX_DATA);
buf[i] = gr_complex(re, im);
}
}
@@ -263,7 +261,7 @@ namespace gr {
new kernel::fir_filter_with_buffer_ccc(f1_taps);
// zero the output, then do the filtering
- memset(actual_output, 0, sizeof(actual_output));
+ memset(actual_output, 0, OUTPUT_LEN*sizeof(o_type));
f1->filterNdec(actual_output, input, ol/decimate, decimate);
// check results