diff options
| -rw-r--r-- | cmake/Modules/GrTest.cmake | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/flat_flowgraph.cc | 4 | ||||
| -rw-r--r-- | gr-digital/include/gnuradio/digital/constellation_receiver_cb.h | 4 | ||||
| -rw-r--r-- | gr-digital/lib/constellation_receiver_cb_impl.cc | 3 | ||||
| -rw-r--r-- | gr-digital/lib/constellation_receiver_cb_impl.h | 3 | ||||
| -rw-r--r-- | gr-digital/lib/costas_loop_cc_impl.cc | 2 | ||||
| -rw-r--r-- | gr-filter/lib/pfb_decimator_ccf_impl.cc | 1 | ||||
| m--------- | volk | 0 |
8 files changed, 10 insertions, 9 deletions
diff --git a/cmake/Modules/GrTest.cmake b/cmake/Modules/GrTest.cmake index ff78ed2726..69df96d4c8 100644 --- a/cmake/Modules/GrTest.cmake +++ b/cmake/Modules/GrTest.cmake @@ -45,7 +45,7 @@ function(GR_ADD_TEST test_name) get_target_property(location ${target} LOCATION) if(location) get_filename_component(path ${location} PATH) - string(REGEX REPLACE "\\$\\(.*\\)" ${CMAKE_BUILD_TYPE} path ${path}) + string(REGEX REPLACE "\\$\\(.*\\)" "${CMAKE_BUILD_TYPE}" path "${path}") list(APPEND GR_TEST_LIBRARY_DIRS ${path}) endif(location) endforeach(target) diff --git a/gnuradio-runtime/lib/flat_flowgraph.cc b/gnuradio-runtime/lib/flat_flowgraph.cc index 479943353b..81c1184cfa 100644 --- a/gnuradio-runtime/lib/flat_flowgraph.cc +++ b/gnuradio-runtime/lib/flat_flowgraph.cc @@ -324,7 +324,7 @@ namespace gr { //std::cerr << "reader: " << r << " alignment: " << ri << std::endl; if(ri != 0) { size_t itemsize = block->detail()->input(i)->get_sizeof_item(); - block->detail()->input(i)->update_read_pointer(alignment-ri/itemsize); + block->detail()->input(i)->update_read_pointer((alignment-ri)/itemsize); } block->set_unaligned(0); block->set_is_unaligned(false); @@ -336,7 +336,7 @@ namespace gr { //std::cerr << "writer: " << w << " alignment: " << wi << std::endl; if(wi != 0) { size_t itemsize = block->detail()->output(i)->get_sizeof_item(); - block->detail()->output(i)->update_write_pointer(alignment-wi/itemsize); + block->detail()->output(i)->update_write_pointer((alignment-wi)/itemsize); } block->set_unaligned(0); block->set_is_unaligned(false); diff --git a/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h b/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h index 36cfd5774f..af00c36619 100644 --- a/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h +++ b/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h @@ -25,6 +25,7 @@ #include <gnuradio/digital/api.h> #include <gnuradio/digital/constellation.h> +#include <gnuradio/blocks/control_loop.h> #include <gnuradio/block.h> namespace gr { @@ -55,7 +56,8 @@ namespace gr { * current phase of the receiver. */ class DIGITAL_API constellation_receiver_cb - : virtual public block + : virtual public block, + virtual public blocks::control_loop { public: // gr::digital::constellation_receiver_cb::sptr diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc index 01a920174c..97c4d8389a 100644 --- a/gr-digital/lib/constellation_receiver_cb_impl.cc +++ b/gr-digital/lib/constellation_receiver_cb_impl.cc @@ -217,7 +217,7 @@ namespace gr { // Setters add_rpc_variable( rpcbasic_sptr(new rpcbasic_register_set<control_loop, float>( - alias(), "loop bw", + alias(), "loop_bw", &control_loop::set_loop_bandwidth, pmt::mp(0.0f), pmt::mp(1.0f), pmt::mp(0.0f), "", "Loop bandwidth", @@ -225,6 +225,5 @@ namespace gr { #endif /* GR_CTRLPORT */ } - } /* namespace digital */ } /* namespace gr */ diff --git a/gr-digital/lib/constellation_receiver_cb_impl.h b/gr-digital/lib/constellation_receiver_cb_impl.h index 90482e2cc5..398d74004c 100644 --- a/gr-digital/lib/constellation_receiver_cb_impl.h +++ b/gr-digital/lib/constellation_receiver_cb_impl.h @@ -26,13 +26,12 @@ #include <gnuradio/digital/constellation_receiver_cb.h> #include <gnuradio/attributes.h> #include <gnuradio/gr_complex.h> -#include <gnuradio/blocks/control_loop.h> namespace gr { namespace digital { class constellation_receiver_cb_impl - : public constellation_receiver_cb, blocks::control_loop + : public constellation_receiver_cb { public: constellation_receiver_cb_impl(constellation_sptr constell, diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc index a53045ac55..d29d95684a 100644 --- a/gr-digital/lib/costas_loop_cc_impl.cc +++ b/gr-digital/lib/costas_loop_cc_impl.cc @@ -277,7 +277,7 @@ namespace gr { // Setters add_rpc_variable( rpcbasic_sptr(new rpcbasic_register_set<control_loop, float>( - alias(), "loop bw", + alias(), "loop_bw", &control_loop::set_loop_bandwidth, pmt::mp(0.0f), pmt::mp(1.0f), pmt::mp(0.0f), "", "Loop bandwidth", diff --git a/gr-filter/lib/pfb_decimator_ccf_impl.cc b/gr-filter/lib/pfb_decimator_ccf_impl.cc index 7b4bf73b39..e282b484fd 100644 --- a/gr-filter/lib/pfb_decimator_ccf_impl.cc +++ b/gr-filter/lib/pfb_decimator_ccf_impl.cc @@ -218,6 +218,7 @@ namespace gr { } } + fft::free(tmp); return noutput_items; } diff --git a/volk b/volk -Subproject c2c7f82aea2ed99df66fad2b91ed29791d7818a +Subproject f1d00d1ac4a7f2be8eab008ec3fcdc74810f271 |