summaryrefslogtreecommitdiff
path: root/gr-digital/lib
diff options
context:
space:
mode:
authorJeff Long <willcode4@gmail.com>2020-11-24 09:43:15 -0500
committermormj <34754695+mormj@users.noreply.github.com>2020-11-30 06:20:55 -0500
commit0c62af72fe30c0a9009fe7cbb6de2efc853b7d37 (patch)
tree88a275d5922f877af756443eea5c4397c249d6e3 /gr-digital/lib
parent08d4dbd5b8a5f297065f2806a5d4b4929e910c9c (diff)
fir_filter: in constructor, 'decimation' is unused
Diffstat (limited to 'gr-digital/lib')
-rw-r--r--gr-digital/lib/cma_equalizer_cc_impl.cc2
-rw-r--r--gr-digital/lib/decision_feedback_equalizer_impl.cc1
-rw-r--r--gr-digital/lib/interpolating_resampler.cc16
-rw-r--r--gr-digital/lib/kurtotic_equalizer_cc_impl.cc3
-rw-r--r--gr-digital/lib/linear_equalizer_impl.cc2
-rw-r--r--gr-digital/lib/lms_dd_equalizer_cc_impl.cc2
-rw-r--r--gr-digital/lib/pfb_clock_sync_ccf_impl.cc4
-rw-r--r--gr-digital/lib/pfb_clock_sync_fff_impl.cc4
8 files changed, 16 insertions, 18 deletions
diff --git a/gr-digital/lib/cma_equalizer_cc_impl.cc b/gr-digital/lib/cma_equalizer_cc_impl.cc
index a44d80d581..d0dc1e0961 100644
--- a/gr-digital/lib/cma_equalizer_cc_impl.cc
+++ b/gr-digital/lib/cma_equalizer_cc_impl.cc
@@ -34,7 +34,7 @@ cma_equalizer_cc_impl::cma_equalizer_cc_impl(int num_taps,
io_signature::make(1, 1, sizeof(gr_complex)),
io_signature::make(1, 1, sizeof(gr_complex)),
sps),
- fir_filter_ccc(sps, std::vector<gr_complex>(num_taps, gr_complex(0, 0))),
+ fir_filter_ccc(std::vector<gr_complex>(num_taps, gr_complex(0, 0))),
d_new_taps(num_taps, gr_complex(0, 0)),
d_updated(false),
d_error(gr_complex(0, 0))
diff --git a/gr-digital/lib/decision_feedback_equalizer_impl.cc b/gr-digital/lib/decision_feedback_equalizer_impl.cc
index 323692628f..7f39360999 100644
--- a/gr-digital/lib/decision_feedback_equalizer_impl.cc
+++ b/gr-digital/lib/decision_feedback_equalizer_impl.cc
@@ -64,7 +64,6 @@ decision_feedback_equalizer_impl::decision_feedback_equalizer_impl(
sizeof(unsigned short) }),
sps),
filter::kernel::fir_filter_ccc(
- sps,
vector<gr_complex>(num_taps_forward + num_taps_feedback, gr_complex(0, 0))),
d_num_taps_fwd(num_taps_forward),
d_num_taps_rev(num_taps_feedback),
diff --git a/gr-digital/lib/interpolating_resampler.cc b/gr-digital/lib/interpolating_resampler.cc
index 1fa78dae63..c65df7b098 100644
--- a/gr-digital/lib/interpolating_resampler.cc
+++ b/gr-digital/lib/interpolating_resampler.cc
@@ -215,10 +215,10 @@ interp_resampler_pfb_no_mf_cc::interp_resampler_pfb_no_mf_cc(bool derivative, in
for (int src = 0; src <= NSTEPS; src += incr) {
t.assign(&taps[src][0], &taps[src][NTAPS]);
- d_filters.emplace_back(1, t);
+ d_filters.emplace_back(t);
if (d_derivative) {
t.assign(&Dtaps[src][0], &Dtaps[src][DNTAPS]);
- d_diff_filters.emplace_back(1, t);
+ d_diff_filters.emplace_back(t);
}
}
}
@@ -284,10 +284,10 @@ interp_resampler_pfb_no_mf_ff::interp_resampler_pfb_no_mf_ff(bool derivative, in
for (int src = 0; src <= NSTEPS; src += incr) {
t.assign(&taps[src][0], &taps[src][NTAPS]);
- d_filters.emplace_back(1, t);
+ d_filters.emplace_back(t);
if (d_derivative) {
t.assign(&Dtaps[src][0], &Dtaps[src][DNTAPS]);
- d_diff_filters.emplace_back(1, t);
+ d_diff_filters.emplace_back(t);
}
}
}
@@ -414,7 +414,7 @@ interp_resampler_pfb_mf_ccf::interp_resampler_pfb_mf_ccf(const std::vector<float
if (k < m)
d_taps[i][j] = taps[k];
}
- d_filters.emplace_back(1, d_taps[i]);
+ d_filters.emplace_back(d_taps[i]);
if (!d_derivative)
continue;
@@ -424,7 +424,7 @@ interp_resampler_pfb_mf_ccf::interp_resampler_pfb_mf_ccf(const std::vector<float
if (k < n)
d_diff_taps[i][j] = diff_taps[k];
}
- d_diff_filters.emplace_back(1, d_diff_taps[i]);
+ d_diff_filters.emplace_back(d_diff_taps[i]);
}
}
@@ -552,7 +552,7 @@ interp_resampler_pfb_mf_fff::interp_resampler_pfb_mf_fff(const std::vector<float
if (k < m)
d_taps[i][j] = taps[k];
}
- d_filters.emplace_back(1, d_taps[i]);
+ d_filters.emplace_back(d_taps[i]);
if (!d_derivative)
continue;
@@ -562,7 +562,7 @@ interp_resampler_pfb_mf_fff::interp_resampler_pfb_mf_fff(const std::vector<float
if (k < n)
d_diff_taps[i][j] = diff_taps[k];
}
- d_diff_filters.emplace_back(1, d_diff_taps[i]);
+ d_diff_filters.emplace_back(d_diff_taps[i]);
}
}
diff --git a/gr-digital/lib/kurtotic_equalizer_cc_impl.cc b/gr-digital/lib/kurtotic_equalizer_cc_impl.cc
index a80c4dc451..002ee69f9f 100644
--- a/gr-digital/lib/kurtotic_equalizer_cc_impl.cc
+++ b/gr-digital/lib/kurtotic_equalizer_cc_impl.cc
@@ -29,8 +29,7 @@ kurtotic_equalizer_cc_impl::kurtotic_equalizer_cc_impl(int num_taps, float mu)
io_signature::make(1, 1, sizeof(gr_complex)),
io_signature::make(1, 1, sizeof(gr_complex)),
1),
- filter::kernel::fir_filter_ccc(1,
- std::vector<gr_complex>(num_taps, gr_complex(0, 0)))
+ filter::kernel::fir_filter_ccc(std::vector<gr_complex>(num_taps, gr_complex(0, 0)))
{
set_gain(mu);
if (num_taps > 0)
diff --git a/gr-digital/lib/linear_equalizer_impl.cc b/gr-digital/lib/linear_equalizer_impl.cc
index 747e935fc3..6fbafd203b 100644
--- a/gr-digital/lib/linear_equalizer_impl.cc
+++ b/gr-digital/lib/linear_equalizer_impl.cc
@@ -55,7 +55,7 @@ linear_equalizer_impl::linear_equalizer_impl(unsigned num_taps,
num_taps * sizeof(gr_complex),
sizeof(unsigned short)),
sps),
- filter::kernel::fir_filter_ccc(sps, vector<gr_complex>(num_taps, gr_complex(0, 0))),
+ filter::kernel::fir_filter_ccc(vector<gr_complex>(num_taps, gr_complex(0, 0))),
d_num_taps(num_taps),
d_sps(sps),
d_alg(alg),
diff --git a/gr-digital/lib/lms_dd_equalizer_cc_impl.cc b/gr-digital/lib/lms_dd_equalizer_cc_impl.cc
index 33fccb5757..ad40171964 100644
--- a/gr-digital/lib/lms_dd_equalizer_cc_impl.cc
+++ b/gr-digital/lib/lms_dd_equalizer_cc_impl.cc
@@ -36,7 +36,7 @@ lms_dd_equalizer_cc_impl::lms_dd_equalizer_cc_impl(int num_taps,
io_signature::make(1, 1, sizeof(gr_complex)),
io_signature::make(1, 1, sizeof(gr_complex)),
sps),
- fir_filter_ccc(sps, std::vector<gr_complex>(num_taps, gr_complex(0, 0))),
+ fir_filter_ccc(std::vector<gr_complex>(num_taps, gr_complex(0, 0))),
d_new_taps(num_taps, gr_complex(0, 0)),
d_updated(false),
d_cnst(cnst)
diff --git a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc
index 7ab1e857d9..a5f2e7cb14 100644
--- a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc
+++ b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc
@@ -86,8 +86,8 @@ pfb_clock_sync_ccf_impl::pfb_clock_sync_ccf_impl(double sps,
// Create an FIR filter for each channel and zero out the taps
std::vector<float> vtaps(1, 0);
for (int i = 0; i < d_nfilters; i++) {
- d_filters.emplace_back(1, vtaps);
- d_diff_filters.emplace_back(1, vtaps);
+ d_filters.emplace_back(vtaps);
+ d_diff_filters.emplace_back(vtaps);
}
// Now, actually set the filters' taps
diff --git a/gr-digital/lib/pfb_clock_sync_fff_impl.cc b/gr-digital/lib/pfb_clock_sync_fff_impl.cc
index e15b184e22..f7ff14b586 100644
--- a/gr-digital/lib/pfb_clock_sync_fff_impl.cc
+++ b/gr-digital/lib/pfb_clock_sync_fff_impl.cc
@@ -82,8 +82,8 @@ pfb_clock_sync_fff_impl::pfb_clock_sync_fff_impl(double sps,
// Create an FIR filter for each channel and zero out the taps
std::vector<float> vtaps(1, 0);
for (int i = 0; i < d_nfilters; i++) {
- d_filters.emplace_back(1, vtaps);
- d_diff_filters.emplace_back(1, vtaps);
+ d_filters.emplace_back(vtaps);
+ d_diff_filters.emplace_back(vtaps);
}
// Now, actually set the filters' taps
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-22 07:06:53 +0000