diff options
| author | Josh Blum | 2011-07-28 09:39:53 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-07-28 09:39:53 -0700 |
| commit | 250f4ac60afdc5e502c8ab69ced8267f0e14e590 (patch) | |
| tree | 74207dfa4707fd293c16452b6dad914d5882c231 /gnuradio-core/src | |
| parent | c87a532824beb6d04ce4bc4cdfb66f9dbe5a8faf (diff) | |
| parent | aed2d2eacca0f045bb9594b20c1253776c342a08 (diff) | |
| download | gnuradio-250f4ac60afdc5e502c8ab69ced8267f0e14e590.tar.gz gnuradio-250f4ac60afdc5e502c8ab69ced8267f0e14e590.tar.bz2 gnuradio-250f4ac60afdc5e502c8ab69ced8267f0e14e590.zip | |
Merge branch 'next' of gnuradio.org:gnuradio into next
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.cc | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.cc b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.cc index 884caf29c..3fed74641 100644 --- a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.cc +++ b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.cc @@ -33,7 +33,7 @@ gr_adaptive_fir_ccc::gr_adaptive_fir_ccc(const char *name, int decimation, gr_make_io_signature (1, 1, sizeof(gr_complex)), gr_make_io_signature (1, 1, sizeof(gr_complex)), decimation), - d_taps(taps), d_updated(false) + d_updated(false), d_taps(taps) { set_history(d_taps.size()); } diff --git a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h index 3d028da56..6ce4c1a1e 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h +++ b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h @@ -124,6 +124,7 @@ class GR_CORE_API gr_pfb_clock_sync_ccf : public gr_block * \param init_phase (float) The initial phase to look at, or which filter to start * with (default = 0). * \param max_rate_deviation (float) Distance from 0 d_rate can get (default = 1.5). + * \parma osps (int) The number of output samples per symbol (default=1). * */ friend GR_CORE_API gr_pfb_clock_sync_ccf_sptr gr_make_pfb_clock_sync_ccf (double sps, float gain, |