diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
| commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
| tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gr-blocks | |
| parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
| parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-blocks')
198 files changed, 439 insertions, 439 deletions
diff --git a/gr-blocks/doc/CMakeLists.txt b/gr-blocks/doc/CMakeLists.txt index c1397804be..4e185fde06 100644 --- a/gr-blocks/doc/CMakeLists.txt +++ b/gr-blocks/doc/CMakeLists.txt @@ -1,17 +1,17 @@ # Copyright 2012 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/doc/README.blocks b/gr-blocks/doc/README.blocks index 418a068255..7b36898f2e 100644 --- a/gr-blocks/doc/README.blocks +++ b/gr-blocks/doc/README.blocks @@ -7,6 +7,6 @@ imported as: See the Doxygen documentation for details about the blocks available in this package. A quick listing of the details can be found in Python -after importing by using: +after importing by using: help(blocks) diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 7001d906ac..b0d7ff0687 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -2,19 +2,19 @@ <!-- Copyright 2012,2013 Free Software Foundation, Inc. - + This file is part of GNU Radio - + GNU Radio is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. - + GNU Radio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GNU Radio; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/grc/blocks_ctrlport_performance.xml b/gr-blocks/grc/blocks_ctrlport_performance.xml index 00be541547..ae0fb91c50 100644 --- a/gr-blocks/grc/blocks_ctrlport_performance.xml +++ b/gr-blocks/grc/blocks_ctrlport_performance.xml @@ -2,19 +2,19 @@ <!-- Copyright 2012 Free Software Foundation, Inc. - + This file is part of GNU Radio - + GNU Radio is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. - + GNU Radio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GNU Radio; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/grc/blocks_ctrlport_probe2_c.xml b/gr-blocks/grc/blocks_ctrlport_probe2_c.xml index b5f0b089a7..708a8fdf9b 100644 --- a/gr-blocks/grc/blocks_ctrlport_probe2_c.xml +++ b/gr-blocks/grc/blocks_ctrlport_probe2_c.xml @@ -2,19 +2,19 @@ <!-- Copyright 2012-2013 Free Software Foundation, Inc. - + This file is part of GNU Radio - + GNU Radio is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. - + GNU Radio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GNU Radio; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, @@ -41,7 +41,7 @@ <value>Sample Points</value> <type>string</type> </param> - + <param> <name>Length</name> <key>len</key> diff --git a/gr-blocks/grc/blocks_ctrlport_probe2_x.xml b/gr-blocks/grc/blocks_ctrlport_probe2_x.xml index b9b1660bc9..47d1b81d3d 100644 --- a/gr-blocks/grc/blocks_ctrlport_probe2_x.xml +++ b/gr-blocks/grc/blocks_ctrlport_probe2_x.xml @@ -2,19 +2,19 @@ <!-- Copyright 2013 Free Software Foundation, Inc. - + This file is part of GNU Radio - + GNU Radio is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. - + GNU Radio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GNU Radio; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, @@ -72,7 +72,7 @@ <value>Sample Points</value> <type>string</type> </param> - + <param> <name>Length</name> <key>len</key> diff --git a/gr-blocks/grc/blocks_ctrlport_probe_c.xml b/gr-blocks/grc/blocks_ctrlport_probe_c.xml index 00a3f9cad7..64174204f1 100644 --- a/gr-blocks/grc/blocks_ctrlport_probe_c.xml +++ b/gr-blocks/grc/blocks_ctrlport_probe_c.xml @@ -2,19 +2,19 @@ <!-- Copyright 2012 Free Software Foundation, Inc. - + This file is part of GNU Radio - + GNU Radio is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. - + GNU Radio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GNU Radio; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/grc/blocks_ctrlport_viewer.xml b/gr-blocks/grc/blocks_ctrlport_viewer.xml index c8770d5dd9..2b69ae05ad 100644 --- a/gr-blocks/grc/blocks_ctrlport_viewer.xml +++ b/gr-blocks/grc/blocks_ctrlport_viewer.xml @@ -2,19 +2,19 @@ <!-- Copyright 2012 Free Software Foundation, Inc. - + This file is part of GNU Radio - + GNU Radio is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. - + GNU Radio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GNU Radio; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/grc/blocks_message_strobe.xml b/gr-blocks/grc/blocks_message_strobe.xml index 526a846477..4a6091d8e0 100644 --- a/gr-blocks/grc/blocks_message_strobe.xml +++ b/gr-blocks/grc/blocks_message_strobe.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- ################################################### -##Message Strobe +##Message Strobe ################################################### --> <block> diff --git a/gr-blocks/grc/blocks_message_strobe_random.xml b/gr-blocks/grc/blocks_message_strobe_random.xml index 71c51322c5..0b3e7296a0 100644 --- a/gr-blocks/grc/blocks_message_strobe_random.xml +++ b/gr-blocks/grc/blocks_message_strobe_random.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- ################################################### -##Message Strobe +##Message Strobe ################################################### --> <block> @@ -59,7 +59,7 @@ <type>message</type> <optional>1</optional> </source> - + <doc> Please note some peculiarities below: - poisson does not care about your std diff --git a/gr-blocks/grc/blocks_tags_strobe.xml b/gr-blocks/grc/blocks_tags_strobe.xml index f17edd2b99..ed14929329 100644 --- a/gr-blocks/grc/blocks_tags_strobe.xml +++ b/gr-blocks/grc/blocks_tags_strobe.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- ################################################### -## Tags Strobe +## Tags Strobe ################################################### --> <block> diff --git a/gr-blocks/include/gnuradio/blocks/abs_XX.h.t b/gr-blocks/include/gnuradio/blocks/abs_XX.h.t index a30e752b4b..f8688edcd3 100644 --- a/gr-blocks/include/gnuradio/blocks/abs_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/abs_XX.h.t @@ -42,10 +42,10 @@ namespace gr { { public: - + // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; - + /*! * \brief Create an instance of @NAME@ */ diff --git a/gr-blocks/include/gnuradio/blocks/add_XX.h.t b/gr-blocks/include/gnuradio/blocks/add_XX.h.t index 74c38889c0..0a7195d7c3 100644 --- a/gr-blocks/include/gnuradio/blocks/add_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/add_XX.h.t @@ -35,7 +35,7 @@ namespace gr { * \brief output = sum(input[0], input[1], ..., input[M-1]) * \ingroup math_operators_blk * - * \details + * \details * Add samples across all input streams. For all \f$n\f$ samples * on all \f$M\f$ input streams \f$x_m\f$: * @@ -46,7 +46,7 @@ namespace gr { class BLOCKS_API @NAME@ : virtual public sync_block { public: - + // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/add_const_XX.h.t b/gr-blocks/include/gnuradio/blocks/add_const_XX.h.t index 3e783213a8..723fc78218 100644 --- a/gr-blocks/include/gnuradio/blocks/add_const_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/add_const_XX.h.t @@ -38,16 +38,16 @@ namespace gr { class BLOCKS_API @NAME@ : virtual public sync_block { public: - + // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; - + /*! * \brief Create an instance of @NAME@ * \param k additive constant */ static sptr make(@O_TYPE@ k); - + /*! * \brief Return additive constant */ diff --git a/gr-blocks/include/gnuradio/blocks/add_const_vXX.h.t b/gr-blocks/include/gnuradio/blocks/add_const_vXX.h.t index d1ce947175..55b8ce3f73 100644 --- a/gr-blocks/include/gnuradio/blocks/add_const_vXX.h.t +++ b/gr-blocks/include/gnuradio/blocks/add_const_vXX.h.t @@ -39,16 +39,16 @@ namespace gr { { public: - + // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; - + /*! * \brief Create an instance of @NAME@ * \param k additive constant vector */ static sptr make(std::vector<@O_TYPE@> k); - + /*! * \brief Return additive constant vector */ diff --git a/gr-blocks/include/gnuradio/blocks/and_XX.h.t b/gr-blocks/include/gnuradio/blocks/and_XX.h.t index 8dc48fc04a..cf2b1ab488 100644 --- a/gr-blocks/include/gnuradio/blocks/and_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/and_XX.h.t @@ -41,7 +41,7 @@ namespace gr { class BLOCKS_API @NAME@ : virtual public sync_block { public: - + // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/and_const_XX.h.t b/gr-blocks/include/gnuradio/blocks/and_const_XX.h.t index 62bfca2041..ee2ff3da20 100644 --- a/gr-blocks/include/gnuradio/blocks/and_const_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/and_const_XX.h.t @@ -42,16 +42,16 @@ namespace gr { { public: - + // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; - + /*! * \brief Create an instance of @NAME@ * \param k AND constant */ static sptr make(@O_TYPE@ k); - + /*! * \brief Return AND constant */ diff --git a/gr-blocks/include/gnuradio/blocks/char_to_float.h b/gr-blocks/include/gnuradio/blocks/char_to_float.h index be7adf46a1..1fce660427 100644 --- a/gr-blocks/include/gnuradio/blocks/char_to_float.h +++ b/gr-blocks/include/gnuradio/blocks/char_to_float.h @@ -42,7 +42,7 @@ namespace gr { class BLOCKS_API char_to_float : virtual public sync_block { public: - + // gr::blocks::char_to_float_ff::sptr typedef boost::shared_ptr<char_to_float> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/char_to_short.h b/gr-blocks/include/gnuradio/blocks/char_to_short.h index 6f326c8da2..aa45810eee 100644 --- a/gr-blocks/include/gnuradio/blocks/char_to_short.h +++ b/gr-blocks/include/gnuradio/blocks/char_to_short.h @@ -42,7 +42,7 @@ namespace gr { class BLOCKS_API char_to_short : virtual public sync_block { public: - + // gr::blocks::char_to_short_ff::sptr typedef boost::shared_ptr<char_to_short> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/conjugate_cc.h b/gr-blocks/include/gnuradio/blocks/conjugate_cc.h index 9477130e98..6be3219e70 100644 --- a/gr-blocks/include/gnuradio/blocks/conjugate_cc.h +++ b/gr-blocks/include/gnuradio/blocks/conjugate_cc.h @@ -36,7 +36,7 @@ namespace gr { class BLOCKS_API conjugate_cc : virtual public sync_block { public: - + // gr::blocks::conjugate_cc_ff::sptr typedef boost::shared_ptr<conjugate_cc> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/control_loop.h b/gr-blocks/include/gnuradio/blocks/control_loop.h index f956c88285..f7ff9770f9 100644 --- a/gr-blocks/include/gnuradio/blocks/control_loop.h +++ b/gr-blocks/include/gnuradio/blocks/control_loop.h @@ -207,7 +207,7 @@ namespace gr { * \brief Set the control loop's maximum frequency. * * \details - * Set the maximum frequency the control loop can track. + * Set the maximum frequency the control loop can track. * * \param freq (float) new max frequency */ @@ -217,7 +217,7 @@ namespace gr { * \brief Set the control loop's minimum frequency. * * \details - * Set the minimum frequency the control loop can track. + * Set the minimum frequency the control loop can track. * * \param freq (float) new min frequency */ diff --git a/gr-blocks/include/gnuradio/blocks/count_bits.h b/gr-blocks/include/gnuradio/blocks/count_bits.h index 88f56f7221..80b58041bd 100644 --- a/gr-blocks/include/gnuradio/blocks/count_bits.h +++ b/gr-blocks/include/gnuradio/blocks/count_bits.h @@ -29,7 +29,7 @@ namespace gr { namespace blocks { //! return number of set bits in the low 8 bits of x - BLOCKS_API unsigned int count_bits8(unsigned int x); + BLOCKS_API unsigned int count_bits8(unsigned int x); //! return number of set bits in the low 16 bits of x BLOCKS_API unsigned int count_bits16(unsigned int x); diff --git a/gr-blocks/include/gnuradio/blocks/divide_XX.h.t b/gr-blocks/include/gnuradio/blocks/divide_XX.h.t index aa918facad..1ceeb5f1df 100644 --- a/gr-blocks/include/gnuradio/blocks/divide_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/divide_XX.h.t @@ -41,7 +41,7 @@ namespace gr { class BLOCKS_API @NAME@ : virtual public sync_block { public: - + // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/endian_swap.h b/gr-blocks/include/gnuradio/blocks/endian_swap.h index e55190fc17..f73eae3306 100644 --- a/gr-blocks/include/gnuradio/blocks/endian_swap.h +++ b/gr-blocks/include/gnuradio/blocks/endian_swap.h @@ -42,7 +42,7 @@ namespace gr { /*! * Make an endian swap block. * - * \param item_size_bytes number of bytes per item, 1=no-op, + * \param item_size_bytes number of bytes per item, 1=no-op, * 2=uint16_t, 4=uint32_t, 8=uint64_t */ static sptr make(size_t item_size_bytes=1); diff --git a/gr-blocks/include/gnuradio/blocks/float_to_uchar.h b/gr-blocks/include/gnuradio/blocks/float_to_uchar.h index bdcc4e7205..26189ac981 100644 --- a/gr-blocks/include/gnuradio/blocks/float_to_uchar.h +++ b/gr-blocks/include/gnuradio/blocks/float_to_uchar.h @@ -36,7 +36,7 @@ namespace gr { class BLOCKS_API float_to_uchar : virtual public sync_block { public: - + // gr::blocks::float_to_uchar_ff::sptr typedef boost::shared_ptr<float_to_uchar> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/integrate_XX.h.t b/gr-blocks/include/gnuradio/blocks/integrate_XX.h.t index 343ab1ef6c..33707970bc 100644 --- a/gr-blocks/include/gnuradio/blocks/integrate_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/integrate_XX.h.t @@ -38,10 +38,10 @@ namespace gr { class BLOCKS_API @NAME@ : virtual public sync_decimator { public: - + // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; - + static sptr make(int decim); }; diff --git a/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h b/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h index e6e7914847..b3b7a934db 100644 --- a/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h +++ b/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h @@ -36,7 +36,7 @@ namespace gr { class BLOCKS_API keep_m_in_n : virtual public block { public: - + // gr::blocks::keep_m_in_n::sptr typedef boost::shared_ptr<keep_m_in_n> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h b/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h index d1e751aee5..85eeb974f6 100644 --- a/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h +++ b/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h @@ -36,7 +36,7 @@ namespace gr { class BLOCKS_API keep_one_in_n : virtual public block { public: - + // gr::blocks::keep_one_in_n::sptr typedef boost::shared_ptr<keep_one_in_n> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/message_burst_source.h b/gr-blocks/include/gnuradio/blocks/message_burst_source.h index 91d8b55145..b5c068dcd4 100644 --- a/gr-blocks/include/gnuradio/blocks/message_burst_source.h +++ b/gr-blocks/include/gnuradio/blocks/message_burst_source.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2012-2013 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/include/gnuradio/blocks/message_debug.h b/gr-blocks/include/gnuradio/blocks/message_debug.h index ec32c050dd..c6c43f5644 100644 --- a/gr-blocks/include/gnuradio/blocks/message_debug.h +++ b/gr-blocks/include/gnuradio/blocks/message_debug.h @@ -54,14 +54,14 @@ namespace gr { // gr::blocks::message_debug::sptr typedef boost::shared_ptr<message_debug> sptr; - /*! + /*! * \brief Build the message debug block. It takes no parameters * and has three message ports: print, store, and * print_pdu. */ static sptr make(); - /*! + /*! * \brief Reports the number of messages received by this block. */ virtual int num_messages() = 0; diff --git a/gr-blocks/include/gnuradio/blocks/moving_average_XX.h.t b/gr-blocks/include/gnuradio/blocks/moving_average_XX.h.t index 37472f70d7..da5968240c 100644 --- a/gr-blocks/include/gnuradio/blocks/moving_average_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/moving_average_XX.h.t @@ -37,7 +37,7 @@ namespace gr { */ class BLOCKS_API @NAME@ : virtual public sync_block { - public: + public: // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/multiply_const_XX.h.t b/gr-blocks/include/gnuradio/blocks/multiply_const_XX.h.t index d1bc76c3b3..9cb2823f46 100644 --- a/gr-blocks/include/gnuradio/blocks/multiply_const_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/multiply_const_XX.h.t @@ -39,16 +39,16 @@ namespace gr { { public: - + // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; - + /*! * \brief Create an instance of @NAME@ * \param k multiplicative constant */ static sptr make(@O_TYPE@ k); - + /*! * \brief Return multiplicative constant */ diff --git a/gr-blocks/include/gnuradio/blocks/multiply_const_cc.h b/gr-blocks/include/gnuradio/blocks/multiply_const_cc.h index 6641880142..ff72572da9 100644 --- a/gr-blocks/include/gnuradio/blocks/multiply_const_cc.h +++ b/gr-blocks/include/gnuradio/blocks/multiply_const_cc.h @@ -39,17 +39,17 @@ namespace gr { { public: - + // gr::blocks::multiply_const_cc::sptr typedef boost::shared_ptr<multiply_const_cc> sptr; - + /*! * \brief Create an instance of multiply_const_cc * \param k complex multiplicative constant * \param vlen Vector length of incoming stream */ static sptr make(gr_complex k, size_t vlen=1); - + /*! * \brief Return complex multiplicative constant */ diff --git a/gr-blocks/include/gnuradio/blocks/multiply_const_ff.h b/gr-blocks/include/gnuradio/blocks/multiply_const_ff.h index 916d7a7463..5d93f04184 100644 --- a/gr-blocks/include/gnuradio/blocks/multiply_const_ff.h +++ b/gr-blocks/include/gnuradio/blocks/multiply_const_ff.h @@ -39,17 +39,17 @@ namespace gr { { public: - + // gr::blocks::multiply_const_ff::sptr typedef boost::shared_ptr<multiply_const_ff> sptr; - + /*! * \brief Create an instance of multiply_const_ff * \param k real multiplicative constant * \param vlen Vector length of incoming stream */ static sptr make(float k, size_t vlen=1); - + /*! * \brief Return real multiplicative constant */ diff --git a/gr-blocks/include/gnuradio/blocks/multiply_const_vXX.h.t b/gr-blocks/include/gnuradio/blocks/multiply_const_vXX.h.t index ed180dba33..608c52f78a 100644 --- a/gr-blocks/include/gnuradio/blocks/multiply_const_vXX.h.t +++ b/gr-blocks/include/gnuradio/blocks/multiply_const_vXX.h.t @@ -39,16 +39,16 @@ namespace gr { { public: - + // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; - + /*! * \brief Create an instance of @NAME@ * \param k multiplicative constant vector */ static sptr make(std::vector<@O_TYPE@> k); - + /*! * \brief Return multiplicative constant vector */ diff --git a/gr-blocks/include/gnuradio/blocks/nlog10_ff.h b/gr-blocks/include/gnuradio/blocks/nlog10_ff.h index 0203c5e0a2..e5f7d7bc2a 100644 --- a/gr-blocks/include/gnuradio/blocks/nlog10_ff.h +++ b/gr-blocks/include/gnuradio/blocks/nlog10_ff.h @@ -36,7 +36,7 @@ namespace gr { class BLOCKS_API nlog10_ff : virtual public sync_block { public: - + // gr::blocks::nlog10_ff::sptr typedef boost::shared_ptr<nlog10_ff> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/not_XX.h.t b/gr-blocks/include/gnuradio/blocks/not_XX.h.t index 2c32237ce5..1164c1f855 100644 --- a/gr-blocks/include/gnuradio/blocks/not_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/not_XX.h.t @@ -40,7 +40,7 @@ namespace gr { class BLOCKS_API @NAME@ : virtual public sync_block { public: - + // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/or_XX.h.t b/gr-blocks/include/gnuradio/blocks/or_XX.h.t index d485f04962..fbc691c5ed 100644 --- a/gr-blocks/include/gnuradio/blocks/or_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/or_XX.h.t @@ -40,7 +40,7 @@ namespace gr { class BLOCKS_API @NAME@ : virtual public sync_block { public: - + // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h b/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h index cd057725c1..af77aec18f 100644 --- a/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h +++ b/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2012-2013 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -48,7 +48,7 @@ namespace gr { public: // gr::blocks::pack_k_bits_bb::sptr typedef boost::shared_ptr<pack_k_bits_bb> sptr; - + /*! * \brief Make a pack_k_bits block. * \param k number of bits to be packed. diff --git a/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t b/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t index 6bf14320a0..bc743571fc 100644 --- a/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t @@ -85,7 +85,7 @@ namespace gr { * \param look new look-ahead factor */ virtual void set_look_ahead(int look) = 0; - + /*! \brief Set the running average alpha * \param alpha new alpha for running average */ diff --git a/gr-blocks/include/gnuradio/blocks/probe_rate.h b/gr-blocks/include/gnuradio/blocks/probe_rate.h index 90dfa67cdf..a941d10279 100644 --- a/gr-blocks/include/gnuradio/blocks/probe_rate.h +++ b/gr-blocks/include/gnuradio/blocks/probe_rate.h @@ -48,7 +48,7 @@ namespace gr { static sptr make(size_t itemsize, double update_rate_ms = 500.0, double alpha = 0.0001); virtual void set_alpha(double alpha) = 0; - + virtual double rate() = 0; virtual bool start() = 0; diff --git a/gr-blocks/include/gnuradio/blocks/probe_signal_X.h.t b/gr-blocks/include/gnuradio/blocks/probe_signal_X.h.t index 5398411a73..5b45fd2864 100644 --- a/gr-blocks/include/gnuradio/blocks/probe_signal_X.h.t +++ b/gr-blocks/include/gnuradio/blocks/probe_signal_X.h.t @@ -40,7 +40,7 @@ namespace gr { public: // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; - + static sptr make(); virtual @TYPE@ level() const = 0; diff --git a/gr-blocks/include/gnuradio/blocks/probe_signal_vX.h.t b/gr-blocks/include/gnuradio/blocks/probe_signal_vX.h.t index 05e0137953..9f24731663 100644 --- a/gr-blocks/include/gnuradio/blocks/probe_signal_vX.h.t +++ b/gr-blocks/include/gnuradio/blocks/probe_signal_vX.h.t @@ -42,7 +42,7 @@ namespace gr { public: // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; - + static sptr make(size_t size); virtual std::vector<@TYPE@> level() const = 0; diff --git a/gr-blocks/include/gnuradio/blocks/repeat.h b/gr-blocks/include/gnuradio/blocks/repeat.h index 68f92fcd8d..622b066017 100644 --- a/gr-blocks/include/gnuradio/blocks/repeat.h +++ b/gr-blocks/include/gnuradio/blocks/repeat.h @@ -30,7 +30,7 @@ namespace gr { namespace blocks { /*! - * \brief repeat each input \p repeat times + * \brief repeat each input \p repeat times * \ingroup stream_operators_blk */ class BLOCKS_API repeat : virtual public sync_interpolator diff --git a/gr-blocks/include/gnuradio/blocks/rotator.h b/gr-blocks/include/gnuradio/blocks/rotator.h index 9c3d9b6262..66843fde07 100644 --- a/gr-blocks/include/gnuradio/blocks/rotator.h +++ b/gr-blocks/include/gnuradio/blocks/rotator.h @@ -30,7 +30,7 @@ namespace gr { namespace blocks { - class rotator + class rotator { private: gr_complex d_phase; diff --git a/gr-blocks/include/gnuradio/blocks/sample_and_hold_XX.h.t b/gr-blocks/include/gnuradio/blocks/sample_and_hold_XX.h.t index 2f15b2490f..a87ae0f423 100644 --- a/gr-blocks/include/gnuradio/blocks/sample_and_hold_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/sample_and_hold_XX.h.t @@ -44,7 +44,7 @@ namespace gr { public: // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; - + static sptr make(); }; diff --git a/gr-blocks/include/gnuradio/blocks/short_to_char.h b/gr-blocks/include/gnuradio/blocks/short_to_char.h index a80e6dc63d..7e72ee34a3 100644 --- a/gr-blocks/include/gnuradio/blocks/short_to_char.h +++ b/gr-blocks/include/gnuradio/blocks/short_to_char.h @@ -33,8 +33,8 @@ namespace gr { * \brief Convert stream of shorts to a stream of chars. * * This block strips off the least significant byte from the - * short value. - * + * short value. + * * [0x00ff, 0x0ff0, 0xff00] => [0x00, 0x0f, 0xff] * * \ingroup type_converters_blk diff --git a/gr-blocks/include/gnuradio/blocks/stream_mux.h b/gr-blocks/include/gnuradio/blocks/stream_mux.h index 7830b5f70f..941c186b3f 100644 --- a/gr-blocks/include/gnuradio/blocks/stream_mux.h +++ b/gr-blocks/include/gnuradio/blocks/stream_mux.h @@ -45,7 +45,7 @@ namespace gr { class BLOCKS_API stream_mux : virtual public block { public: - + // gr::blocks::stream_mux::sptr typedef boost::shared_ptr<stream_mux> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/stretch_ff.h b/gr-blocks/include/gnuradio/blocks/stretch_ff.h index 8552d0dd18..d464ab34a1 100644 --- a/gr-blocks/include/gnuradio/blocks/stretch_ff.h +++ b/gr-blocks/include/gnuradio/blocks/stretch_ff.h @@ -28,7 +28,7 @@ namespace gr { namespace blocks { - + /*! * \brief adjust y-range of an input vector by mapping to range * (max-of-input, stipulated-min). Primarily for spectral @@ -40,7 +40,7 @@ namespace gr { public: // gr::blocks::stretch_ff::sptr typedef boost::shared_ptr<stretch_ff> sptr; - + /*! * \brief Make a stretch block. * diff --git a/gr-blocks/include/gnuradio/blocks/sub_XX.h.t b/gr-blocks/include/gnuradio/blocks/sub_XX.h.t index ecc55fc865..44da6e16c4 100644 --- a/gr-blocks/include/gnuradio/blocks/sub_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/sub_XX.h.t @@ -41,7 +41,7 @@ namespace gr { class BLOCKS_API @NAME@ : virtual public sync_block { public: - + // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; diff --git a/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h b/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h index 31046d4170..61c2ad8e60 100644 --- a/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h +++ b/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h @@ -50,7 +50,7 @@ namespace gr { public: // gr::blocks::tagged_file_sink::sptr typedef boost::shared_ptr<tagged_file_sink> sptr; - + /*! * \brief Build a tagged_file_sink block. * diff --git a/gr-blocks/include/gnuradio/blocks/tagged_stream_multiply_length.h b/gr-blocks/include/gnuradio/blocks/tagged_stream_multiply_length.h index de46516f24..234b42c041 100644 --- a/gr-blocks/include/gnuradio/blocks/tagged_stream_multiply_length.h +++ b/gr-blocks/include/gnuradio/blocks/tagged_stream_multiply_length.h @@ -1,18 +1,18 @@ /* -*- c++ -*- */ /* Copyright 2013 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h b/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h index 19879b67a9..b7f5685ae1 100644 --- a/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h +++ b/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h @@ -1,18 +1,18 @@ /* -*- c++ -*- */ /* Copyright 2012 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h b/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h index 09d7ae912c..73e3ca2ac4 100644 --- a/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h +++ b/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h @@ -28,7 +28,7 @@ namespace gr { namespace blocks { - + /*! * \brief Converts a byte with k relevent bits to k output bytes with 1 bit in the LSB. * @@ -46,7 +46,7 @@ namespace gr { public: // gr::blocks::unpack_k_bits_bb::sptr typedef boost::shared_ptr<unpack_k_bits_bb> sptr; - + /*! * \brief Make an unpack_k_bits block. * \param k number of bits to unpack. diff --git a/gr-blocks/include/gnuradio/blocks/vector_insert_X.h.t b/gr-blocks/include/gnuradio/blocks/vector_insert_X.h.t index 8b26b0b9b0..73330b175b 100644 --- a/gr-blocks/include/gnuradio/blocks/vector_insert_X.h.t +++ b/gr-blocks/include/gnuradio/blocks/vector_insert_X.h.t @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2012-2013 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -35,7 +35,7 @@ namespace gr { * \brief source of @TYPE@'s that gets its data from a vector * \ingroup stream_operators_blk */ - class BLOCKS_API @NAME@ : virtual public block + class BLOCKS_API @NAME@ : virtual public block { public: // gr::blocks::@NAME@::sptr diff --git a/gr-blocks/include/gnuradio/blocks/wavfile.h b/gr-blocks/include/gnuradio/blocks/wavfile.h index f0c8a4c1e7..9440105e76 100644 --- a/gr-blocks/include/gnuradio/blocks/wavfile.h +++ b/gr-blocks/include/gnuradio/blocks/wavfile.h @@ -61,7 +61,7 @@ namespace gr { short int wav_read_sample(FILE *fp, int bytes_per_sample); - + /*! * \brief Write a valid RIFF file header * diff --git a/gr-blocks/include/gnuradio/blocks/xor_XX.h.t b/gr-blocks/include/gnuradio/blocks/xor_XX.h.t index fa32192e76..e58866f03e 100644 --- a/gr-blocks/include/gnuradio/blocks/xor_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/xor_XX.h.t @@ -40,7 +40,7 @@ namespace gr { class BLOCKS_API @NAME@ : virtual public sync_block { public: - + // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; diff --git a/gr-blocks/lib/add_XX_impl.cc.t b/gr-blocks/lib/add_XX_impl.cc.t index 281dcea050..a88398d89b 100644 --- a/gr-blocks/lib/add_XX_impl.cc.t +++ b/gr-blocks/lib/add_XX_impl.cc.t @@ -51,14 +51,14 @@ namespace gr { gr_vector_void_star &output_items) { @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0]; - + int ninputs = input_items.size (); - + for (size_t i = 0; i < noutput_items*d_vlen; i++){ @I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i]; for (int j = 1; j < ninputs; j++) acc += ((@I_TYPE@ *) input_items[j])[i]; - + *optr++ = (@O_TYPE@) acc; } diff --git a/gr-blocks/lib/add_const_XX_impl.cc.t b/gr-blocks/lib/add_const_XX_impl.cc.t index 87b22452dc..fe68216923 100644 --- a/gr-blocks/lib/add_const_XX_impl.cc.t +++ b/gr-blocks/lib/add_const_XX_impl.cc.t @@ -52,9 +52,9 @@ namespace gr { { @I_TYPE@ *iptr = (@I_TYPE@ *) input_items[0]; @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0]; - + int size = noutput_items; - + while (size >= 8){ *optr++ = *iptr++ + d_k; *optr++ = *iptr++ + d_k; @@ -69,7 +69,7 @@ namespace gr { while (size-- > 0) *optr++ = *iptr++ + d_k; - + return noutput_items; } diff --git a/gr-blocks/lib/add_const_vXX_impl.cc.t b/gr-blocks/lib/add_const_vXX_impl.cc.t index 3a7174a4ef..28471ddeb1 100644 --- a/gr-blocks/lib/add_const_vXX_impl.cc.t +++ b/gr-blocks/lib/add_const_vXX_impl.cc.t @@ -52,13 +52,13 @@ namespace gr { { @I_TYPE@ *iptr = (@I_TYPE@ *)input_items[0]; @O_TYPE@ *optr = (@O_TYPE@ *)output_items[0]; - + int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(@I_TYPE@); - + for (int i = 0; i < noutput_items; i++) for (int j = 0; j < nitems_per_block; j++) *optr++ = *iptr++ + d_k[j]; - + return noutput_items; } diff --git a/gr-blocks/lib/add_ff_impl.cc b/gr-blocks/lib/add_ff_impl.cc index ca2fbe659c..e99b121816 100644 --- a/gr-blocks/lib/add_ff_impl.cc +++ b/gr-blocks/lib/add_ff_impl.cc @@ -54,7 +54,7 @@ namespace gr { { float *out = (float *) output_items[0]; int noi = d_vlen*noutput_items; - + memcpy(out, input_items[0], noi*sizeof(float)); for(size_t i = 1; i < input_items.size(); i++) volk_32f_x2_add_32f(out, out, (const float*)input_items[i], noi); diff --git a/gr-blocks/lib/add_ff_impl.h b/gr-blocks/lib/add_ff_impl.h index 237ca37217..4683688399 100644 --- a/gr-blocks/lib/add_ff_impl.h +++ b/gr-blocks/lib/add_ff_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_BLOCKS_ADD_FF_IMPL_H */ diff --git a/gr-blocks/lib/and_XX_impl.cc.t b/gr-blocks/lib/and_XX_impl.cc.t index 04d6dfe862..c2aa31c50c 100644 --- a/gr-blocks/lib/and_XX_impl.cc.t +++ b/gr-blocks/lib/and_XX_impl.cc.t @@ -51,14 +51,14 @@ namespace gr { gr_vector_void_star &output_items) { @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0]; - + int ninputs = input_items.size (); - + for (size_t i = 0; i < noutput_items*d_vlen; i++){ @I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i]; for (int j = 1; j < ninputs; j++) acc &= ((@I_TYPE@ *) input_items[j])[i]; - + *optr++ = (@O_TYPE@) acc; } diff --git a/gr-blocks/lib/and_const_XX_impl.cc.t b/gr-blocks/lib/and_const_XX_impl.cc.t index 8eba4ed588..975dd9334a 100644 --- a/gr-blocks/lib/and_const_XX_impl.cc.t +++ b/gr-blocks/lib/and_const_XX_impl.cc.t @@ -52,9 +52,9 @@ namespace gr { { @I_TYPE@ *iptr = (@I_TYPE@ *) input_items[0]; @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0]; - + int size = noutput_items; - + while (size >= 8){ *optr++ = *iptr++ & d_k; *optr++ = *iptr++ & d_k; @@ -69,7 +69,7 @@ namespace gr { while (size-- > 0) *optr++ = *iptr++ & d_k; - + return noutput_items; } diff --git a/gr-blocks/lib/annotator_raw_impl.cc b/gr-blocks/lib/annotator_raw_impl.cc index 499168c275..ea763c7658 100644 --- a/gr-blocks/lib/annotator_raw_impl.cc +++ b/gr-blocks/lib/annotator_raw_impl.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2010,2013 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -91,14 +91,14 @@ namespace gr { uint64_t start_N = nitems_read(0); uint64_t end_N = start_N + (uint64_t)(noutput_items); - + // locate queued tags that fall in this range and insert them when appropriate std::vector<tag_t>::iterator i = d_queued_tags.begin(); while( i != d_queued_tags.end() ) { if( (*i).offset >= start_N && (*i).offset < end_N) { add_item_tag(0, (*i).offset,(*i).key, (*i).value, (*i).srcid); i = d_queued_tags.erase(i); - } + } else { break; } diff --git a/gr-blocks/lib/char_to_float_impl.cc b/gr-blocks/lib/char_to_float_impl.cc index de6ee5ba5a..f6fb990981 100644 --- a/gr-blocks/lib/char_to_float_impl.cc +++ b/gr-blocks/lib/char_to_float_impl.cc @@ -57,7 +57,7 @@ namespace gr { // Note: the unaligned benchmarked much faster than the aligned volk_8i_s32f_convert_32f_u(out, in, d_scale, d_vlen*noutput_items); - + return noutput_items; } diff --git a/gr-blocks/lib/char_to_float_impl.h b/gr-blocks/lib/char_to_float_impl.h index f5677f86bd..4d056850b0 100644 --- a/gr-blocks/lib/char_to_float_impl.h +++ b/gr-blocks/lib/char_to_float_impl.h @@ -46,6 +46,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_CHAR_TO_FLOAT_IMPL_H */ diff --git a/gr-blocks/lib/char_to_short_impl.h b/gr-blocks/lib/char_to_short_impl.h index 1009defedc..ad13fd1918 100644 --- a/gr-blocks/lib/char_to_short_impl.h +++ b/gr-blocks/lib/char_to_short_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_CHAR_TO_SHORT_IMPL_H */ diff --git a/gr-blocks/lib/complex_to_arg_impl.cc b/gr-blocks/lib/complex_to_arg_impl.cc index 38539c8004..ab92c08b3b 100644 --- a/gr-blocks/lib/complex_to_arg_impl.cc +++ b/gr-blocks/lib/complex_to_arg_impl.cc @@ -56,13 +56,13 @@ namespace gr { const gr_complex *in = (const gr_complex *) input_items[0]; float *out = (float *) output_items[0]; int noi = noutput_items * d_vlen; - + // The fast_atan2f is faster than Volk for (int i = 0; i < noi; i++){ // out[i] = std::arg (in[i]); out[i] = gr::fast_atan2f(in[i]); } - + return noutput_items; } diff --git a/gr-blocks/lib/complex_to_arg_impl.h b/gr-blocks/lib/complex_to_arg_impl.h index cc1863b2d8..923ef4ba8e 100644 --- a/gr-blocks/lib/complex_to_arg_impl.h +++ b/gr-blocks/lib/complex_to_arg_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_COMPLEX_TO_ARG_IMPL_H */ diff --git a/gr-blocks/lib/complex_to_float_impl.cc b/gr-blocks/lib/complex_to_float_impl.cc index ee295dea12..bfa75bd35d 100644 --- a/gr-blocks/lib/complex_to_float_impl.cc +++ b/gr-blocks/lib/complex_to_float_impl.cc @@ -69,7 +69,7 @@ namespace gr { default: abort (); - + } return noutput_items; diff --git a/gr-blocks/lib/complex_to_float_impl.h b/gr-blocks/lib/complex_to_float_impl.h index d4fdcb7a9b..81ac801e71 100644 --- a/gr-blocks/lib/complex_to_float_impl.h +++ b/gr-blocks/lib/complex_to_float_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_COMPLEX_TO_FLOAT_IMPL_H */ diff --git a/gr-blocks/lib/complex_to_imag_impl.cc b/gr-blocks/lib/complex_to_imag_impl.cc index b58b59bb3b..8e47201694 100644 --- a/gr-blocks/lib/complex_to_imag_impl.cc +++ b/gr-blocks/lib/complex_to_imag_impl.cc @@ -57,7 +57,7 @@ namespace gr { int noi = noutput_items * d_vlen; volk_32fc_deinterleave_imag_32f(out, in, noi); - + return noutput_items; } diff --git a/gr-blocks/lib/complex_to_imag_impl.h b/gr-blocks/lib/complex_to_imag_impl.h index 6758b0f6c5..f624c97d82 100644 --- a/gr-blocks/lib/complex_to_imag_impl.h +++ b/gr-blocks/lib/complex_to_imag_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_COMPLEX_TO_IMAG_IMPL_H */ diff --git a/gr-blocks/lib/complex_to_interleaved_short_impl.cc b/gr-blocks/lib/complex_to_interleaved_short_impl.cc index 7b8ac90c8b..1bc79989a9 100644 --- a/gr-blocks/lib/complex_to_interleaved_short_impl.cc +++ b/gr-blocks/lib/complex_to_interleaved_short_impl.cc @@ -51,13 +51,13 @@ namespace gr { { const gr_complex *in = (const gr_complex *) input_items[0]; short *out = (short *) output_items[0]; - + int npairs = (d_vector?noutput_items:noutput_items/2); for (int i = 0; i < npairs; i++){ *out++ = (short) lrintf(in[i].real()); // FIXME saturate? *out++ = (short) lrintf(in[i].imag()); } - + return noutput_items; } diff --git a/gr-blocks/lib/complex_to_interleaved_short_impl.h b/gr-blocks/lib/complex_to_interleaved_short_impl.h index d166c56adc..64835f0eec 100644 --- a/gr-blocks/lib/complex_to_interleaved_short_impl.h +++ b/gr-blocks/lib/complex_to_interleaved_short_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_COMPLEX_TO_INTERLEAVED_SHORT_IMPL_H */ diff --git a/gr-blocks/lib/complex_to_mag_impl.cc b/gr-blocks/lib/complex_to_mag_impl.cc index 52a193f4d1..b9574a92ce 100644 --- a/gr-blocks/lib/complex_to_mag_impl.cc +++ b/gr-blocks/lib/complex_to_mag_impl.cc @@ -58,7 +58,7 @@ namespace gr { // turned out to be faster than aligned/unaligned switching volk_32fc_magnitude_32f_u(out, in, noi); - + return noutput_items; } diff --git a/gr-blocks/lib/complex_to_mag_impl.h b/gr-blocks/lib/complex_to_mag_impl.h index 54f12ac312..88f6f2843a 100644 --- a/gr-blocks/lib/complex_to_mag_impl.h +++ b/gr-blocks/lib/complex_to_mag_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_COMPLEX_TO_MAG_IMPL_H */ diff --git a/gr-blocks/lib/complex_to_mag_squared_impl.cc b/gr-blocks/lib/complex_to_mag_squared_impl.cc index 5e3fedc87c..0e41ae0d4c 100644 --- a/gr-blocks/lib/complex_to_mag_squared_impl.cc +++ b/gr-blocks/lib/complex_to_mag_squared_impl.cc @@ -57,7 +57,7 @@ namespace gr { int noi = noutput_items * d_vlen; volk_32fc_magnitude_squared_32f(out, in, noi); - + return noutput_items; } diff --git a/gr-blocks/lib/complex_to_mag_squared_impl.h b/gr-blocks/lib/complex_to_mag_squared_impl.h index 0cf22c8d9b..2413b3bbdf 100644 --- a/gr-blocks/lib/complex_to_mag_squared_impl.h +++ b/gr-blocks/lib/complex_to_mag_squared_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_COMPLEX_TO_MAG_SQUARED_IMPL_H */ diff --git a/gr-blocks/lib/complex_to_real_impl.cc b/gr-blocks/lib/complex_to_real_impl.cc index 36c4b203d8..bab139e79c 100644 --- a/gr-blocks/lib/complex_to_real_impl.cc +++ b/gr-blocks/lib/complex_to_real_impl.cc @@ -57,7 +57,7 @@ namespace gr { int noi = noutput_items * d_vlen; volk_32fc_deinterleave_real_32f(out, in, noi); - + return noutput_items; } diff --git a/gr-blocks/lib/complex_to_real_impl.h b/gr-blocks/lib/complex_to_real_impl.h index 233f90c93d..e3c4dbaa19 100644 --- a/gr-blocks/lib/complex_to_real_impl.h +++ b/gr-blocks/lib/complex_to_real_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_COMPLEX_TO_REAL_IMPL_H */ diff --git a/gr-blocks/lib/conjugate_cc_impl.cc b/gr-blocks/lib/conjugate_cc_impl.cc index 55ff30aa5d..d16f9eb421 100644 --- a/gr-blocks/lib/conjugate_cc_impl.cc +++ b/gr-blocks/lib/conjugate_cc_impl.cc @@ -53,9 +53,9 @@ namespace gr { { gr_complex *iptr = (gr_complex *) input_items[0]; gr_complex *optr = (gr_complex *) output_items[0]; - + volk_32fc_conjugate_32fc(optr, iptr, noutput_items); - + return noutput_items; } diff --git a/gr-blocks/lib/ctrlport_probe2_b_impl.cc b/gr-blocks/lib/ctrlport_probe2_b_impl.cc index 74c2980a7a..e6e2570ea6 100644 --- a/gr-blocks/lib/ctrlport_probe2_b_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_b_impl.cc @@ -62,7 +62,7 @@ namespace gr { for(unsigned i = 0; i < ninputs; i++) ninput_items_required[i] = d_len; } - + // boost::shared_mutex mutex_buffer; // mutable boost::mutex mutex_notify; // boost::condition_variable condition_buffer_ready; @@ -121,14 +121,14 @@ namespace gr { for(int i = 0; i < num_copy; i++) { d_buffer.push_back(in[i]); } - + // notify the waiting get() if we fill up the buffer if(d_buffer.size() == d_len) { condition_buffer_ready.notify_one(); } } mutex_buffer.unlock(); - + return noutput_items; } @@ -140,7 +140,7 @@ namespace gr { d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_b, std::vector<signed char> >( alias(), d_id.c_str(), &ctrlport_probe2_b::get, - pmt::mp(-128), pmt::mp(127), pmt::mp(0), + pmt::mp(-128), pmt::mp(127), pmt::mp(0), "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, d_disp_mask))); diff --git a/gr-blocks/lib/ctrlport_probe2_c_impl.cc b/gr-blocks/lib/ctrlport_probe2_c_impl.cc index 3e324b0d00..aa038c0765 100644 --- a/gr-blocks/lib/ctrlport_probe2_c_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_c_impl.cc @@ -63,7 +63,7 @@ namespace gr { for(unsigned i = 0; i < ninputs; i++) ninput_items_required[i] = d_len; } - + // boost::shared_mutex mutex_buffer; // mutable boost::mutex mutex_notify; // boost::condition_variable condition_buffer_ready; @@ -122,14 +122,14 @@ namespace gr { for(int i = 0; i < num_copy; i++) { d_buffer.push_back(in[i]); } - + // notify the waiting get() if we fill up the buffer if(d_buffer.size() == d_len) { condition_buffer_ready.notify_one(); } } mutex_buffer.unlock(); - + return noutput_items; } @@ -141,7 +141,7 @@ namespace gr { d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_c, std::vector<std::complex<float> > >( alias(), d_id.c_str(), &ctrlport_probe2_c::get, - pmt::mp(-2), pmt::mp(2), pmt::mp(0), + pmt::mp(-2), pmt::mp(2), pmt::mp(0), "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, d_disp_mask | DISPOPTCPLX))); diff --git a/gr-blocks/lib/ctrlport_probe2_f_impl.cc b/gr-blocks/lib/ctrlport_probe2_f_impl.cc index 3c723f8834..b53b2dc3cb 100644 --- a/gr-blocks/lib/ctrlport_probe2_f_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_f_impl.cc @@ -61,7 +61,7 @@ namespace gr { for(unsigned i = 0; i < ninputs; i++) ninput_items_required[i] = d_len; } - + // boost::shared_mutex mutex_buffer; // mutable boost::mutex mutex_notify; // boost::condition_variable condition_buffer_ready; @@ -120,14 +120,14 @@ namespace gr { for(int i = 0; i < num_copy; i++) { d_buffer.push_back(in[i]); } - + // notify the waiting get() if we fill up the buffer if(d_buffer.size() == d_len) { condition_buffer_ready.notify_one(); } } mutex_buffer.unlock(); - + return noutput_items; } @@ -142,7 +142,7 @@ namespace gr { pmt::mp(-2.0f), pmt::mp(2.0f), pmt::mp(0.0f), // pmt::make_f32vector(1,-2), // pmt::make_f32vector(1,2), -// pmt::make_f32vector(1,0), +// pmt::make_f32vector(1,0), "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, d_disp_mask))); diff --git a/gr-blocks/lib/ctrlport_probe2_i_impl.cc b/gr-blocks/lib/ctrlport_probe2_i_impl.cc index be7ae4d9d3..77dca2ad0d 100644 --- a/gr-blocks/lib/ctrlport_probe2_i_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_i_impl.cc @@ -63,7 +63,7 @@ namespace gr { for(unsigned i = 0; i < ninputs; i++) ninput_items_required[i] = d_len; } - + // boost::shared_mutex mutex_buffer; // mutable boost::mutex mutex_notify; // boost::condition_variable condition_buffer_ready; @@ -122,14 +122,14 @@ namespace gr { for(int i = 0; i < num_copy; i++) { d_buffer.push_back(in[i]); } - + // notify the waiting get() if we fill up the buffer if(d_buffer.size() == d_len) { condition_buffer_ready.notify_one(); } } mutex_buffer.unlock(); - + return noutput_items; } @@ -141,7 +141,7 @@ namespace gr { d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_i, std::vector<int> >( alias(), d_id.c_str(), &ctrlport_probe2_i::get, - pmt::mp(-32768), pmt::mp(32767), pmt::mp(0), + pmt::mp(-32768), pmt::mp(32767), pmt::mp(0), "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, d_disp_mask))); diff --git a/gr-blocks/lib/ctrlport_probe2_s_impl.cc b/gr-blocks/lib/ctrlport_probe2_s_impl.cc index b10c419eb5..6a4ade462c 100644 --- a/gr-blocks/lib/ctrlport_probe2_s_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_s_impl.cc @@ -63,7 +63,7 @@ namespace gr { for(unsigned i = 0; i < ninputs; i++) ninput_items_required[i] = d_len; } - + // boost::shared_mutex mutex_buffer; // mutable boost::mutex mutex_notify; // boost::condition_variable condition_buffer_ready; @@ -122,14 +122,14 @@ namespace gr { for(int i = 0; i < num_copy; i++) { d_buffer.push_back(in[i]); } - + // notify the waiting get() if we fill up the buffer if(d_buffer.size() == d_len) { condition_buffer_ready.notify_one(); } } mutex_buffer.unlock(); - + return noutput_items; } @@ -141,7 +141,7 @@ namespace gr { d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_s, std::vector<short> >( alias(), d_id.c_str(), &ctrlport_probe2_s::get, - pmt::mp(-32768), pmt::mp(32767), pmt::mp(0), + pmt::mp(-32768), pmt::mp(32767), pmt::mp(0), "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, d_disp_mask))); diff --git a/gr-blocks/lib/ctrlport_probe_c_impl.cc b/gr-blocks/lib/ctrlport_probe_c_impl.cc index 1c077af481..8141b2a2d1 100644 --- a/gr-blocks/lib/ctrlport_probe_c_impl.cc +++ b/gr-blocks/lib/ctrlport_probe_c_impl.cc @@ -78,7 +78,7 @@ namespace gr { d_ptr = in; d_ptrLen = noutput_items; ptrlock.unlock(); - + return noutput_items; } @@ -88,10 +88,10 @@ namespace gr { #ifdef GR_CTRLPORT d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe_c, std::vector<std::complex<float> > >( - alias(), d_id.c_str(), &ctrlport_probe_c::get, + alias(), d_id.c_str(), &ctrlport_probe_c::get, pmt::make_c32vector(0,-2), pmt::make_c32vector(0,2), - pmt::make_c32vector(0,0), + pmt::make_c32vector(0,0), "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, DISPXY | DISPOPTSCATTER))); #endif /* GR_CTRLPORT */ diff --git a/gr-blocks/lib/divide_XX_impl.cc.t b/gr-blocks/lib/divide_XX_impl.cc.t index 30cb3ab38c..052b09217a 100644 --- a/gr-blocks/lib/divide_XX_impl.cc.t +++ b/gr-blocks/lib/divide_XX_impl.cc.t @@ -51,14 +51,14 @@ namespace gr { gr_vector_void_star &output_items) { @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0]; - + int ninputs = input_items.size (); - + for (size_t i = 0; i < noutput_items*d_vlen; i++){ @I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i]; for (int j = 1; j < ninputs; j++) acc /= ((@I_TYPE@ *) input_items[j])[i]; - + *optr++ = (@O_TYPE@) acc; } diff --git a/gr-blocks/lib/file_meta_sink_impl.cc b/gr-blocks/lib/file_meta_sink_impl.cc index 82ecb93db3..06ac051d8c 100644 --- a/gr-blocks/lib/file_meta_sink_impl.cc +++ b/gr-blocks/lib/file_meta_sink_impl.cc @@ -145,7 +145,7 @@ namespace gr { fclose(d_fp); d_fp = 0; } - + if(d_state == STATE_DETACHED) { if(d_hdr_fp) { fclose(d_hdr_fp); diff --git a/gr-blocks/lib/file_meta_source_impl.cc b/gr-blocks/lib/file_meta_source_impl.cc index 6f1338dd58..58be9ece7e 100644 --- a/gr-blocks/lib/file_meta_source_impl.cc +++ b/gr-blocks/lib/file_meta_source_impl.cc @@ -115,7 +115,7 @@ namespace gr { fclose(d_fp); d_fp = 0; } - + if(d_state == STATE_DETACHED) { if(d_hdr_fp) { fclose(d_hdr_fp); diff --git a/gr-blocks/lib/file_source_impl.cc b/gr-blocks/lib/file_source_impl.cc index 0c3d752d9c..1602b02416 100644 --- a/gr-blocks/lib/file_source_impl.cc +++ b/gr-blocks/lib/file_source_impl.cc @@ -77,7 +77,7 @@ namespace gr { if(d_new_fp) fclose ((FILE*)d_new_fp); } - + bool file_source_impl::seek(long seek_point, int whence) { diff --git a/gr-blocks/lib/file_source_impl.h b/gr-blocks/lib/file_source_impl.h index 5f5e8c9340..80232a1dbe 100644 --- a/gr-blocks/lib/file_source_impl.h +++ b/gr-blocks/lib/file_source_impl.h @@ -38,7 +38,7 @@ namespace gr { bool d_repeat; bool d_updated; boost::mutex fp_mutex; - + void do_update(); public: diff --git a/gr-blocks/lib/float_to_char_impl.cc b/gr-blocks/lib/float_to_char_impl.cc index f51f08455c..342187d3ee 100644 --- a/gr-blocks/lib/float_to_char_impl.cc +++ b/gr-blocks/lib/float_to_char_impl.cc @@ -56,7 +56,7 @@ namespace gr { int8_t *out = (int8_t *) output_items[0]; volk_32f_s32f_convert_8i(out, in, d_scale, d_vlen*noutput_items); - + return noutput_items; } diff --git a/gr-blocks/lib/float_to_char_impl.h b/gr-blocks/lib/float_to_char_impl.h index a5435d9960..99376990c5 100644 --- a/gr-blocks/lib/float_to_char_impl.h +++ b/gr-blocks/lib/float_to_char_impl.h @@ -46,6 +46,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_FLOAT_TO_CHAR_IMPL_H */ diff --git a/gr-blocks/lib/float_to_complex_impl.cc b/gr-blocks/lib/float_to_complex_impl.cc index f37f2bb7a6..236438daac 100644 --- a/gr-blocks/lib/float_to_complex_impl.cc +++ b/gr-blocks/lib/float_to_complex_impl.cc @@ -66,11 +66,11 @@ namespace gr { for (size_t j = 0; j < noutput_items*d_vlen; j++) out[j] = gr_complex (r[j], i[j]); break; - + default: assert (0); } - + return noutput_items; } diff --git a/gr-blocks/lib/float_to_complex_impl.h b/gr-blocks/lib/float_to_complex_impl.h index d28beb2697..6e14aba4e5 100644 --- a/gr-blocks/lib/float_to_complex_impl.h +++ b/gr-blocks/lib/float_to_complex_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_FLOAT_TO_COMPLEX_IMPL_H */ diff --git a/gr-blocks/lib/float_to_int_impl.cc b/gr-blocks/lib/float_to_int_impl.cc index 7b4522068b..0dbef975bb 100644 --- a/gr-blocks/lib/float_to_int_impl.cc +++ b/gr-blocks/lib/float_to_int_impl.cc @@ -61,14 +61,14 @@ namespace gr { #if 0 const float *in = (const float *) input_items[0]; int32_t *out = (int32_t *) output_items[0]; - + volk_32f_s32f_convert_32i(out, in, d_scale, d_vlen*noutput_items); #else const float *in = (const float *) input_items[0]; int *out = (int *) output_items[0]; - + float_array_to_int (in, out, d_scale, d_vlen*noutput_items); - + #endif return noutput_items; diff --git a/gr-blocks/lib/float_to_int_impl.h b/gr-blocks/lib/float_to_int_impl.h index d437b50cfa..7062672738 100644 --- a/gr-blocks/lib/float_to_int_impl.h +++ b/gr-blocks/lib/float_to_int_impl.h @@ -46,6 +46,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_FLOAT_TO_INT_IMPL_H */ diff --git a/gr-blocks/lib/float_to_short_impl.h b/gr-blocks/lib/float_to_short_impl.h index 2ca5a3bf04..fb88092937 100644 --- a/gr-blocks/lib/float_to_short_impl.h +++ b/gr-blocks/lib/float_to_short_impl.h @@ -46,6 +46,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_FLOAT_TO_SHORT_IMPL_H */ diff --git a/gr-blocks/lib/float_to_uchar_impl.cc b/gr-blocks/lib/float_to_uchar_impl.cc index a55b3dbc82..eccd36da78 100644 --- a/gr-blocks/lib/float_to_uchar_impl.cc +++ b/gr-blocks/lib/float_to_uchar_impl.cc @@ -50,9 +50,9 @@ namespace gr { { const float *in = (const float *)input_items[0]; unsigned char *out = (unsigned char *)output_items[0]; - + float_array_to_uchar(in, out, noutput_items); - + return noutput_items; } diff --git a/gr-blocks/lib/float_to_uchar_impl.h b/gr-blocks/lib/float_to_uchar_impl.h index 56e815c511..1e60ae8ebd 100644 --- a/gr-blocks/lib/float_to_uchar_impl.h +++ b/gr-blocks/lib/float_to_uchar_impl.h @@ -40,6 +40,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_FLOAT_TO_UCHAR_IMPL_H */ diff --git a/gr-blocks/lib/int_to_float_impl.cc b/gr-blocks/lib/int_to_float_impl.cc index ec215c446b..33b59e9f4b 100644 --- a/gr-blocks/lib/int_to_float_impl.cc +++ b/gr-blocks/lib/int_to_float_impl.cc @@ -56,7 +56,7 @@ namespace gr { float *out = (float *) output_items[0]; volk_32i_s32f_convert_32f(out, in, d_scale, d_vlen*noutput_items); - + return noutput_items; } } /* namespace blocks */ diff --git a/gr-blocks/lib/int_to_float_impl.h b/gr-blocks/lib/int_to_float_impl.h index 96b416be1d..53942b1488 100644 --- a/gr-blocks/lib/int_to_float_impl.h +++ b/gr-blocks/lib/int_to_float_impl.h @@ -46,6 +46,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_INT_TO_FLOAT_IMPL_H */ diff --git a/gr-blocks/lib/integrate_XX_impl.cc.t b/gr-blocks/lib/integrate_XX_impl.cc.t index 2def0309df..800d6bc3cb 100644 --- a/gr-blocks/lib/integrate_XX_impl.cc.t +++ b/gr-blocks/lib/integrate_XX_impl.cc.t @@ -60,7 +60,7 @@ namespace gr { for (int j = 0; j < d_decim; j++) out[i] += in[i*d_decim+j]; } - + return noutput_items; } diff --git a/gr-blocks/lib/interleaved_char_to_complex_impl.cc b/gr-blocks/lib/interleaved_char_to_complex_impl.cc index 34114e3651..b16e3c4c73 100644 --- a/gr-blocks/lib/interleaved_char_to_complex_impl.cc +++ b/gr-blocks/lib/interleaved_char_to_complex_impl.cc @@ -55,8 +55,8 @@ namespace gr { { const int8_t *in = (const int8_t *) input_items[0]; float *out = (float *) output_items[0]; - - volk_8i_s32f_convert_32f_u(out, in, 1.0, 2*noutput_items); + + volk_8i_s32f_convert_32f_u(out, in, 1.0, 2*noutput_items); return noutput_items; } diff --git a/gr-blocks/lib/interleaved_char_to_complex_impl.h b/gr-blocks/lib/interleaved_char_to_complex_impl.h index e815f08a1e..484c33c9f4 100644 --- a/gr-blocks/lib/interleaved_char_to_complex_impl.h +++ b/gr-blocks/lib/interleaved_char_to_complex_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_INTERLEAVED_CHAR_TO_COMPLEX_IMPL_H */ diff --git a/gr-blocks/lib/keep_m_in_n_impl.cc b/gr-blocks/lib/keep_m_in_n_impl.cc index 8ce7a81d80..e987b52265 100644 --- a/gr-blocks/lib/keep_m_in_n_impl.cc +++ b/gr-blocks/lib/keep_m_in_n_impl.cc @@ -49,7 +49,7 @@ namespace gr { assert(d_n > 0); assert(d_m <= d_n); assert(d_offset <= (d_n-d_m)); - + set_output_multiple(m); } @@ -67,7 +67,7 @@ namespace gr { { uint8_t* out = (uint8_t*)output_items[0]; const uint8_t* in = (const uint8_t*)input_items[0]; - + // iterate over data blocks of size {n, input : m, output} int blks = std::min(noutput_items/d_m, ninput_items[0]/d_n); @@ -78,10 +78,10 @@ namespace gr { // perform copy memcpy( optr, iptr, d_m*d_itemsize ); } - + consume_each(d_n); return d_m; } - + } /* namespace blocks */ } /* namespace gr */ diff --git a/gr-blocks/lib/keep_m_in_n_impl.h b/gr-blocks/lib/keep_m_in_n_impl.h index 5531344da6..39c78d399e 100644 --- a/gr-blocks/lib/keep_m_in_n_impl.h +++ b/gr-blocks/lib/keep_m_in_n_impl.h @@ -36,7 +36,7 @@ namespace gr { int d_itemsize; void forecast(int noutput_items, gr_vector_int &ninput_items_required); - + public: keep_m_in_n_impl(size_t itemsize, int m, int n, int offset); @@ -44,7 +44,7 @@ namespace gr { gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); - + void set_m(int m) { d_m = m; } void set_n(int n) { d_n = n; } void set_offset(int offset) { d_offset = offset; } @@ -52,6 +52,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_KEEP_M_IN_N_IMPL_H */ diff --git a/gr-blocks/lib/keep_one_in_n_impl.cc b/gr-blocks/lib/keep_one_in_n_impl.cc index 34012dd59a..e588655f7a 100644 --- a/gr-blocks/lib/keep_one_in_n_impl.cc +++ b/gr-blocks/lib/keep_one_in_n_impl.cc @@ -55,7 +55,7 @@ namespace gr { { if (n < 1) n = 1; - + d_n = n; d_count = n; @@ -73,7 +73,7 @@ namespace gr { { const char *in = (const char *) input_items[0]; char *out = (char *) output_items[0]; - + size_t item_size = input_signature ()->sizeof_stream_item (0); int ni = 0; int no = 0; diff --git a/gr-blocks/lib/keep_one_in_n_impl.h b/gr-blocks/lib/keep_one_in_n_impl.h index 4138f164a1..f60bf1a02b 100644 --- a/gr-blocks/lib/keep_one_in_n_impl.h +++ b/gr-blocks/lib/keep_one_in_n_impl.h @@ -42,12 +42,12 @@ namespace gr { gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); - + void set_n(int n); }; } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_KEEP_ONE_IN_N_IMPL_H */ diff --git a/gr-blocks/lib/message_burst_source_impl.cc b/gr-blocks/lib/message_burst_source_impl.cc index 573959e027..0ce0a9284f 100644 --- a/gr-blocks/lib/message_burst_source_impl.cc +++ b/gr-blocks/lib/message_burst_source_impl.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2012-2013 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -95,7 +95,7 @@ namespace gr { // // Consume whatever we can from the current message // - + int mm = std::min(noutput_items - nn, (int)((d_msg->length() - d_msg_offset) / d_itemsize)); memcpy(out, &(d_msg->msg()[d_msg_offset]), mm * d_itemsize); @@ -112,7 +112,7 @@ namespace gr { //tag end of burst add_item_tag(0, //stream ID abs_sample_count+nn-1, //sample number - pmt::string_to_symbol("tx_eob"), + pmt::string_to_symbol("tx_eob"), pmt::from_bool(1), d_me); //block src id } @@ -133,7 +133,7 @@ namespace gr { //tag start of burst add_item_tag(0, //stream ID abs_sample_count+nn, //sample number - pmt::string_to_symbol("tx_sob"), + pmt::string_to_symbol("tx_sob"), pmt::from_bool(1), d_me); //block src id @@ -141,7 +141,7 @@ namespace gr { throw std::runtime_error("msg length is not a multiple of d_itemsize"); } } - + return nn; } diff --git a/gr-blocks/lib/message_burst_source_impl.h b/gr-blocks/lib/message_burst_source_impl.h index ceb0985e65..a389a23942 100644 --- a/gr-blocks/lib/message_burst_source_impl.h +++ b/gr-blocks/lib/message_burst_source_impl.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2012-2013 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc index 3f7c6ef097..620ca1eb42 100644 --- a/gr-blocks/lib/message_debug_impl.cc +++ b/gr-blocks/lib/message_debug_impl.cc @@ -31,7 +31,7 @@ namespace gr { namespace blocks { - + message_debug::sptr message_debug::make() { @@ -103,7 +103,7 @@ namespace gr { { message_port_register_in(pmt::mp("print")); set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, _1)); - + message_port_register_in(pmt::mp("store")); set_msg_handler(pmt::mp("store"), boost::bind(&message_debug_impl::store, this, _1)); diff --git a/gr-blocks/lib/message_sink_impl.cc b/gr-blocks/lib/message_sink_impl.cc index 4dfcc6396b..3dc4102c48 100644 --- a/gr-blocks/lib/message_sink_impl.cc +++ b/gr-blocks/lib/message_sink_impl.cc @@ -93,7 +93,7 @@ namespace gr { } } assert(packet_length != 0); - + // FIXME run this multiple times if input_items >= N * packet_length if (noutput_items >= packet_length ) { // If the message queue is full we drop the packet. @@ -110,7 +110,7 @@ namespace gr { } else { return 0; } - } else { + } else { // If the queue if full we drop all the data we got. if (!d_msgq->full_p()) { // build a message to hold whatever we've got @@ -119,7 +119,7 @@ namespace gr { noutput_items, // arg2 for other end (redundant) noutput_items * d_itemsize); // len of msg memcpy(msg->msg(), in, noutput_items * d_itemsize); - + d_msgq->handle(msg); // send it } @@ -129,4 +129,4 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + diff --git a/gr-blocks/lib/message_source_impl.cc b/gr-blocks/lib/message_source_impl.cc index 05ec2f248b..b4e9ba6ed7 100644 --- a/gr-blocks/lib/message_source_impl.cc +++ b/gr-blocks/lib/message_source_impl.cc @@ -117,7 +117,7 @@ namespace gr { out += mm * d_itemsize; d_msg_offset += mm * d_itemsize; assert(d_msg_offset <= d_msg->length()); - + if (d_msg_offset == d_msg->length()){ if (d_msg->type() == 1) // type == 1 sets EOF d_eof = true; @@ -131,17 +131,17 @@ namespace gr { if (d_msgq->empty_p() && nn > 0){ // no more messages in the queue, return what we've got break; } - + if (d_eof) return -1; - + d_msg = d_msgq->delete_head(); // block, waiting for a message d_msg_offset = 0; - + if ((d_msg->length() % d_itemsize) != 0) throw std::runtime_error("msg length is not a multiple of d_itemsize"); } - + } return nn; diff --git a/gr-blocks/lib/message_strobe_random_impl.cc b/gr-blocks/lib/message_strobe_random_impl.cc index 3d15574ba0..80819fc2fc 100644 --- a/gr-blocks/lib/message_strobe_random_impl.cc +++ b/gr-blocks/lib/message_strobe_random_impl.cc @@ -58,7 +58,7 @@ namespace gr { { // allocate RNGs update_dist(); - + // set up ports message_port_register_out(pmt::mp("strobe")); d_thread = boost::shared_ptr<boost::thread> @@ -87,7 +87,7 @@ namespace gr { boost::poisson_distribution<> pd(d_mean_ms); d_variate_poisson = boost::shared_ptr< boost::variate_generator<boost::mt19937, boost::poisson_distribution<> > > ( new boost::variate_generator <boost::mt19937, boost::poisson_distribution<> >(d_rng,pd) ); - + boost::normal_distribution<> nd(d_mean_ms, d_std_ms); d_variate_normal = boost::shared_ptr< boost::variate_generator<boost::mt19937, boost::normal_distribution<> > > ( new boost::variate_generator <boost::mt19937, boost::normal_distribution<> >(d_rng,nd) ); @@ -108,7 +108,7 @@ namespace gr { void message_strobe_random_impl::run() { while(!d_finished) { - boost::this_thread::sleep(boost::posix_time::milliseconds(std::max(0.0f,next_delay()))); + boost::this_thread::sleep(boost::posix_time::milliseconds(std::max(0.0f,next_delay()))); if(d_finished) { return; } diff --git a/gr-blocks/lib/multiply_XX_impl.cc.t b/gr-blocks/lib/multiply_XX_impl.cc.t index 3f82a1bbe8..d9b41b3d9f 100644 --- a/gr-blocks/lib/multiply_XX_impl.cc.t +++ b/gr-blocks/lib/multiply_XX_impl.cc.t @@ -51,14 +51,14 @@ namespace gr { gr_vector_void_star &output_items) { @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0]; - + int ninputs = input_items.size (); - + for (size_t i = 0; i < noutput_items*d_vlen; i++){ @I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i]; for (int j = 1; j < ninputs; j++) acc *= ((@I_TYPE@ *) input_items[j])[i]; - + *optr++ = (@O_TYPE@) acc; } diff --git a/gr-blocks/lib/multiply_cc_impl.cc b/gr-blocks/lib/multiply_cc_impl.cc index 2e1ce93b37..1f58ffd386 100644 --- a/gr-blocks/lib/multiply_cc_impl.cc +++ b/gr-blocks/lib/multiply_cc_impl.cc @@ -54,7 +54,7 @@ namespace gr { { gr_complex *out = (gr_complex *) output_items[0]; int noi = d_vlen*noutput_items; - + memcpy(out, input_items[0], noi*sizeof(gr_complex)); for(size_t i = 1; i < input_items.size(); i++) volk_32fc_x2_multiply_32fc(out, out, (gr_complex*)input_items[i], noi); diff --git a/gr-blocks/lib/multiply_cc_impl.h b/gr-blocks/lib/multiply_cc_impl.h index 0419a5439b..86b4334bf8 100644 --- a/gr-blocks/lib/multiply_cc_impl.h +++ b/gr-blocks/lib/multiply_cc_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_BLOCKS_MULTIPLY_CC_IMPL_H */ diff --git a/gr-blocks/lib/multiply_conjugate_cc_impl.cc b/gr-blocks/lib/multiply_conjugate_cc_impl.cc index 7f9652152b..5586343503 100644 --- a/gr-blocks/lib/multiply_conjugate_cc_impl.cc +++ b/gr-blocks/lib/multiply_conjugate_cc_impl.cc @@ -56,9 +56,9 @@ namespace gr { gr_complex *in1 = (gr_complex *) input_items[1]; gr_complex *out = (gr_complex *) output_items[0]; int noi = d_vlen*noutput_items; - + volk_32fc_x2_multiply_conjugate_32fc(out, in0, in1, noi); - + return noutput_items; } diff --git a/gr-blocks/lib/multiply_conjugate_cc_impl.h b/gr-blocks/lib/multiply_conjugate_cc_impl.h index f3d3b64d6b..ef4d73bb32 100644 --- a/gr-blocks/lib/multiply_conjugate_cc_impl.h +++ b/gr-blocks/lib/multiply_conjugate_cc_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_BLOCKS_MULTIPLY_CONJUGATE_CC_IMPL_H */ diff --git a/gr-blocks/lib/multiply_const_XX_impl.cc.t b/gr-blocks/lib/multiply_const_XX_impl.cc.t index f58dd33945..941cb9622e 100644 --- a/gr-blocks/lib/multiply_const_XX_impl.cc.t +++ b/gr-blocks/lib/multiply_const_XX_impl.cc.t @@ -52,9 +52,9 @@ namespace gr { { @I_TYPE@ *iptr = (@I_TYPE@ *) input_items[0]; @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0]; - + int size = noutput_items; - + while (size >= 8){ *optr++ = *iptr++ * d_k; *optr++ = *iptr++ * d_k; @@ -69,7 +69,7 @@ namespace gr { while (size-- > 0) *optr++ = *iptr++ * d_k; - + return noutput_items; } diff --git a/gr-blocks/lib/multiply_const_vXX_impl.cc.t b/gr-blocks/lib/multiply_const_vXX_impl.cc.t index 55b3d3e41d..2de0684144 100644 --- a/gr-blocks/lib/multiply_const_vXX_impl.cc.t +++ b/gr-blocks/lib/multiply_const_vXX_impl.cc.t @@ -52,13 +52,13 @@ namespace gr { { @I_TYPE@ *iptr = (@I_TYPE@ *)input_items[0]; @O_TYPE@ *optr = (@O_TYPE@ *)output_items[0]; - + int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(@I_TYPE@); - + for (int i = 0; i < noutput_items; i++) for (int j = 0; j < nitems_per_block; j++) *optr++ = *iptr++ * d_k[j]; - + return noutput_items; } diff --git a/gr-blocks/lib/multiply_ff_impl.cc b/gr-blocks/lib/multiply_ff_impl.cc index 22100497c5..edc0749f2c 100644 --- a/gr-blocks/lib/multiply_ff_impl.cc +++ b/gr-blocks/lib/multiply_ff_impl.cc @@ -54,7 +54,7 @@ namespace gr { { float *out = (float *) output_items[0]; int noi = d_vlen*noutput_items; - + memcpy(out, input_items[0], noi*sizeof(float)); for(size_t i = 1; i < input_items.size(); i++) volk_32f_x2_multiply_32f(out, out, (float*)input_items[i], noi); diff --git a/gr-blocks/lib/multiply_ff_impl.h b/gr-blocks/lib/multiply_ff_impl.h index e084b0e494..1213eef842 100644 --- a/gr-blocks/lib/multiply_ff_impl.h +++ b/gr-blocks/lib/multiply_ff_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_BLOCKS_MULTIPLY_FF_IMPL_H */ diff --git a/gr-blocks/lib/nlog10_ff_impl.h b/gr-blocks/lib/nlog10_ff_impl.h index 2935904366..dd260bea1f 100644 --- a/gr-blocks/lib/nlog10_ff_impl.h +++ b/gr-blocks/lib/nlog10_ff_impl.h @@ -44,6 +44,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_NLOG10_FF_IMPL_H */ diff --git a/gr-blocks/lib/or_XX_impl.cc.t b/gr-blocks/lib/or_XX_impl.cc.t index 95586e4fae..2782e1ee5f 100644 --- a/gr-blocks/lib/or_XX_impl.cc.t +++ b/gr-blocks/lib/or_XX_impl.cc.t @@ -51,14 +51,14 @@ namespace gr { gr_vector_void_star &output_items) { @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0]; - + int ninputs = input_items.size (); - + for (size_t i = 0; i < noutput_items*d_vlen; i++){ @I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i]; for (int j = 1; j < ninputs; j++) acc |= ((@I_TYPE@ *) input_items[j])[i]; - + *optr++ = (@O_TYPE@) acc; } diff --git a/gr-blocks/lib/packed_to_unpacked_XX_impl.cc.t b/gr-blocks/lib/packed_to_unpacked_XX_impl.cc.t index 8ac22bdf8d..de96135ce8 100644 --- a/gr-blocks/lib/packed_to_unpacked_XX_impl.cc.t +++ b/gr-blocks/lib/packed_to_unpacked_XX_impl.cc.t @@ -66,7 +66,7 @@ namespace gr { @NAME_IMPL@::forecast(int noutput_items, gr_vector_int &ninput_items_required) { - int input_required = (int)ceil((d_index + noutput_items * d_bits_per_chunk) + int input_required = (int)ceil((d_index + noutput_items * d_bits_per_chunk) / (1.0 * BITS_PER_TYPE)); unsigned ninputs = ninput_items_required.size(); for(unsigned int i = 0; i < ninputs; i++) { diff --git a/gr-blocks/lib/patterned_interleaver_impl.cc b/gr-blocks/lib/patterned_interleaver_impl.cc index ba298afc8e..9ed45abb85 100644 --- a/gr-blocks/lib/patterned_interleaver_impl.cc +++ b/gr-blocks/lib/patterned_interleaver_impl.cc @@ -53,14 +53,14 @@ namespace gr { gr_vector_void_star &output_items) { size_t nblks = noutput_items/d_pattern.size(); - + std::vector<const char*> ii; for(size_t i=0; i<input_items.size(); i++){ ii.push_back((const char*)input_items[i]); } char *oo = (char *) output_items[0]; - + for(size_t i=0; i<nblks; i++){ for(size_t j=0; j<d_pattern.size(); j++){ memcpy(oo, ii[d_pattern[j]], d_itemsize); @@ -68,7 +68,7 @@ namespace gr { ii[d_pattern[j]] += d_itemsize; } } - + for(size_t i=0; i<d_counts.size(); i++){ consume(i, d_counts[i]*nblks ); } diff --git a/gr-blocks/lib/patterned_interleaver_impl.h b/gr-blocks/lib/patterned_interleaver_impl.h index 2401480ad9..4b78b65e0b 100644 --- a/gr-blocks/lib/patterned_interleaver_impl.h +++ b/gr-blocks/lib/patterned_interleaver_impl.h @@ -58,4 +58,4 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ -#endif +#endif diff --git a/gr-blocks/lib/pdu.cc b/gr-blocks/lib/pdu.cc index 0c3e3aa334..54e0bad5d0 100644 --- a/gr-blocks/lib/pdu.cc +++ b/gr-blocks/lib/pdu.cc @@ -30,7 +30,7 @@ namespace gr { namespace blocks { namespace pdu { - size_t + size_t itemsize(vector_type type) { switch(type) { diff --git a/gr-blocks/lib/pdu_filter_impl.cc b/gr-blocks/lib/pdu_filter_impl.cc index 5db8915b31..507238d212 100644 --- a/gr-blocks/lib/pdu_filter_impl.cc +++ b/gr-blocks/lib/pdu_filter_impl.cc @@ -48,7 +48,7 @@ namespace gr { set_msg_handler(pmt::mp("pdus"), boost::bind(&pdu_filter_impl::handle_msg, this, _1)); } - void + void pdu_filter_impl::handle_msg(pmt::pmt_t pdu) { pmt::pmt_t meta = pmt::car(pdu); @@ -66,6 +66,6 @@ namespace gr { message_port_pub(pmt::mp("pdus"), pdu); } } - + } /* namespace blocks */ }/* namespace gr */ diff --git a/gr-blocks/lib/pdu_remove_impl.cc b/gr-blocks/lib/pdu_remove_impl.cc index 0a922a5392..c3a87ed69e 100644 --- a/gr-blocks/lib/pdu_remove_impl.cc +++ b/gr-blocks/lib/pdu_remove_impl.cc @@ -48,7 +48,7 @@ namespace gr { set_msg_handler(pmt::mp("pdus"), boost::bind(&pdu_remove_impl::handle_msg, this, _1)); } - void + void pdu_remove_impl::handle_msg(pmt::pmt_t pdu) { // add the field and publish @@ -61,6 +61,6 @@ namespace gr { meta = pmt::dict_delete(meta, d_k); message_port_pub(pmt::mp("pdus"), pmt::cons(meta, pmt::cdr(pdu))); } - + } /* namespace blocks */ }/* namespace gr */ diff --git a/gr-blocks/lib/pdu_set_impl.cc b/gr-blocks/lib/pdu_set_impl.cc index e84fe2125c..dce4df09a3 100644 --- a/gr-blocks/lib/pdu_set_impl.cc +++ b/gr-blocks/lib/pdu_set_impl.cc @@ -48,7 +48,7 @@ namespace gr { set_msg_handler(pmt::mp("pdus"), boost::bind(&pdu_set_impl::handle_msg, this, _1)); } - void + void pdu_set_impl::handle_msg(pmt::pmt_t pdu) { // add the field and publish @@ -61,6 +61,6 @@ namespace gr { meta = pmt::dict_add(meta, d_k, d_v); message_port_pub(pmt::mp("pdus"), pmt::cons(meta, pmt::cdr(pdu))); } - + } /* namespace blocks */ }/* namespace gr */ diff --git a/gr-blocks/lib/pdu_to_tagged_stream_impl.cc b/gr-blocks/lib/pdu_to_tagged_stream_impl.cc index ba87287278..8baa9773d6 100644 --- a/gr-blocks/lib/pdu_to_tagged_stream_impl.cc +++ b/gr-blocks/lib/pdu_to_tagged_stream_impl.cc @@ -52,7 +52,7 @@ namespace gr { pdu_to_tagged_stream_impl::work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) - { + { char *out = (char *)output_items[0]; int nout = 0; @@ -76,7 +76,7 @@ namespace gr { // make sure type is valid if (!pmt::is_pair(msg)) // TODO: implement pdu::is_valid() throw std::runtime_error("received a malformed pdu message"); - + // grab the components of the pdu message pmt::pmt_t meta(pmt::car(msg)); pmt::pmt_t vect(pmt::cdr(msg)); @@ -100,20 +100,20 @@ namespace gr { // copy vector output size_t ncopy = std::min((size_t)noutput_items, (size_t)pmt::length(vect)); size_t nsave = pmt::length(vect) - ncopy; - + // copy output size_t io(0); nout += ncopy; const uint8_t* ptr = (uint8_t*) uniform_vector_elements(vect, io); memcpy(out, ptr, ncopy*d_itemsize); - + // save leftover items if needed for next work call if (nsave > 0) { d_remain.resize(nsave*d_itemsize, 0); memcpy(&d_remain[0], ptr + ncopy*d_itemsize, nsave*d_itemsize); } } - + return nout; } diff --git a/gr-blocks/lib/pdu_to_tagged_stream_impl.h b/gr-blocks/lib/pdu_to_tagged_stream_impl.h index eb0514ecb9..4bfd9cfd4e 100644 --- a/gr-blocks/lib/pdu_to_tagged_stream_impl.h +++ b/gr-blocks/lib/pdu_to_tagged_stream_impl.h @@ -46,4 +46,4 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ -#endif +#endif diff --git a/gr-blocks/lib/probe_rate_impl.cc b/gr-blocks/lib/probe_rate_impl.cc index 418d9d4013..84977beae2 100644 --- a/gr-blocks/lib/probe_rate_impl.cc +++ b/gr-blocks/lib/probe_rate_impl.cc @@ -30,14 +30,14 @@ namespace gr { namespace blocks { - probe_rate::sptr + probe_rate::sptr probe_rate::make(size_t itemsize, double update_rate_ms, double alpha) { return gnuradio::get_initial_sptr (new probe_rate_impl(itemsize,update_rate_ms,alpha)); } - probe_rate_impl::probe_rate_impl(size_t itemsize, double update_rate_ms, double alpha) : + probe_rate_impl::probe_rate_impl(size_t itemsize, double update_rate_ms, double alpha) : sync_block("probe_rate", io_signature::make(1,1,itemsize), io_signature::make(0,0,itemsize)), @@ -95,7 +95,7 @@ namespace gr { double probe_rate_impl::rate(){ return d_avg; } - double probe_rate_impl::timesincelast(){ + double probe_rate_impl::timesincelast(){ boost::posix_time::ptime now(boost::posix_time::microsec_clock::local_time()); boost::posix_time::time_duration diff = now - d_last_update; return diff.total_milliseconds(); diff --git a/gr-blocks/lib/qa_rotator.h b/gr-blocks/lib/qa_rotator.h index 06214bc2fc..96fe9628b9 100644 --- a/gr-blocks/lib/qa_rotator.h +++ b/gr-blocks/lib/qa_rotator.h @@ -26,7 +26,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -class qa_rotator : public CppUnit::TestCase +class qa_rotator : public CppUnit::TestCase { CPPUNIT_TEST_SUITE(qa_rotator); CPPUNIT_TEST(t1); diff --git a/gr-blocks/lib/random_pdu_impl.cc b/gr-blocks/lib/random_pdu_impl.cc index 6efed0664d..91a404c5dd 100644 --- a/gr-blocks/lib/random_pdu_impl.cc +++ b/gr-blocks/lib/random_pdu_impl.cc @@ -58,7 +58,7 @@ namespace gr { } bool - random_pdu_impl::start() + random_pdu_impl::start() { output_random(); return true; @@ -75,7 +75,7 @@ namespace gr { std::vector<unsigned char> vec(len); for (int i=0; i<len; i++) vec[i] = ((unsigned char) d_bvar()) & d_mask; - + // send the vector pmt::pmt_t vecpmt(pmt::make_blob(&vec[0], len)); pmt::pmt_t pdu(pmt::cons(pmt::PMT_NIL, vecpmt)); diff --git a/gr-blocks/lib/regenerate_bb_impl.cc b/gr-blocks/lib/regenerate_bb_impl.cc index 8b65940749..1e2427d4ad 100644 --- a/gr-blocks/lib/regenerate_bb_impl.cc +++ b/gr-blocks/lib/regenerate_bb_impl.cc @@ -52,7 +52,7 @@ namespace gr { { } - void + void regenerate_bb_impl::set_max_regen(unsigned int regen) { d_max_regen = regen; diff --git a/gr-blocks/lib/repeat_impl.cc b/gr-blocks/lib/repeat_impl.cc index f77903544f..9c2ccc63c8 100644 --- a/gr-blocks/lib/repeat_impl.cc +++ b/gr-blocks/lib/repeat_impl.cc @@ -52,16 +52,16 @@ namespace gr { { const char *in = (const char *) input_items[0]; char *out = (char *)output_items[0]; - + for (int i = 0; i < noutput_items/d_interp; i++) { for (int j = 0; j < d_interp; j++) { memcpy(out, in, d_itemsize); out += d_itemsize; } - + in += d_itemsize; } - + return noutput_items; } diff --git a/gr-blocks/lib/rms_cf_impl.h b/gr-blocks/lib/rms_cf_impl.h index 66ee12463e..75bc8f3524 100644 --- a/gr-blocks/lib/rms_cf_impl.h +++ b/gr-blocks/lib/rms_cf_impl.h @@ -42,7 +42,7 @@ namespace gr { ~rms_cf_impl(); void set_alpha(double alpha); - + int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); diff --git a/gr-blocks/lib/rotator_cc_impl.h b/gr-blocks/lib/rotator_cc_impl.h index 086b207703..105fd1c534 100644 --- a/gr-blocks/lib/rotator_cc_impl.h +++ b/gr-blocks/lib/rotator_cc_impl.h @@ -43,7 +43,7 @@ namespace gr { ~rotator_cc_impl(); void set_phase_inc(double phase_inc); - + int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); diff --git a/gr-blocks/lib/short_to_char_impl.cc b/gr-blocks/lib/short_to_char_impl.cc index 982ed5c20e..5ef6f203d5 100644 --- a/gr-blocks/lib/short_to_char_impl.cc +++ b/gr-blocks/lib/short_to_char_impl.cc @@ -54,9 +54,9 @@ namespace gr { { const int16_t *in = (const int16_t *) input_items[0]; int8_t *out = (int8_t *) output_items[0]; - + volk_16i_convert_8i(out, in, d_vlen*noutput_items); - + return noutput_items; } diff --git a/gr-blocks/lib/short_to_char_impl.h b/gr-blocks/lib/short_to_char_impl.h index 491d9bb250..387b5b4cb3 100644 --- a/gr-blocks/lib/short_to_char_impl.h +++ b/gr-blocks/lib/short_to_char_impl.h @@ -42,6 +42,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_SHORT_TO_CHAR_IMPL_H */ diff --git a/gr-blocks/lib/short_to_float_impl.cc b/gr-blocks/lib/short_to_float_impl.cc index fce0da77b3..609cc7fdb6 100644 --- a/gr-blocks/lib/short_to_float_impl.cc +++ b/gr-blocks/lib/short_to_float_impl.cc @@ -54,7 +54,7 @@ namespace gr { { const short *in = (const short *) input_items[0]; float *out = (float *) output_items[0]; - + volk_16i_s32f_convert_32f(out, in, d_scale, d_vlen*noutput_items); return noutput_items; diff --git a/gr-blocks/lib/short_to_float_impl.h b/gr-blocks/lib/short_to_float_impl.h index 1b34a4f420..7976b58a09 100644 --- a/gr-blocks/lib/short_to_float_impl.h +++ b/gr-blocks/lib/short_to_float_impl.h @@ -46,6 +46,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_SHORT_TO_FLOAT_IMPL_H */ diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc index a467452c3f..756e2dfd0f 100644 --- a/gr-blocks/lib/socket_pdu_impl.cc +++ b/gr-blocks/lib/socket_pdu_impl.cc @@ -45,7 +45,7 @@ namespace gr { d_tcp_no_delay(tcp_no_delay) { d_rxbuf.resize(MTU); - + message_port_register_in(PDU_PORT_ID); message_port_register_out(PDU_PORT_ID); @@ -83,9 +83,9 @@ namespace gr { if (type == "TCP_SERVER") { d_acceptor_tcp.reset(new boost::asio::ip::tcp::acceptor(d_io_service, d_tcp_endpoint)); d_acceptor_tcp->set_option(boost::asio::ip::tcp::acceptor::reuse_address(true)); - + start_tcp_accept(); - + set_msg_handler(PDU_PORT_ID, boost::bind(&socket_pdu_impl::tcp_server_send, this, _1)); } else if (type =="TCP_CLIENT") { @@ -99,26 +99,26 @@ namespace gr { set_msg_handler(PDU_PORT_ID, boost::bind(&socket_pdu_impl::tcp_client_send, this, _1)); d_tcp_socket->async_read_some(boost::asio::buffer(d_rxbuf), - boost::bind(&socket_pdu_impl::handle_tcp_read, this, - boost::asio::placeholders::error, + boost::bind(&socket_pdu_impl::handle_tcp_read, this, + boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)); } else if (type =="UDP_SERVER") { d_udp_socket.reset(new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint)); - d_udp_socket->async_receive_from(boost::asio::buffer(d_rxbuf), d_udp_endpoint_other, + d_udp_socket->async_receive_from(boost::asio::buffer(d_rxbuf), d_udp_endpoint_other, boost::bind(&socket_pdu_impl::handle_udp_read, this, boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)); - + set_msg_handler(PDU_PORT_ID, boost::bind(&socket_pdu_impl::udp_send, this, _1)); } else if (type =="UDP_CLIENT") { d_udp_socket.reset(new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint)); - d_udp_socket->async_receive_from(boost::asio::buffer(d_rxbuf), d_udp_endpoint_other, + d_udp_socket->async_receive_from(boost::asio::buffer(d_rxbuf), d_udp_endpoint_other, boost::bind(&socket_pdu_impl::handle_udp_read, this, boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)); - + set_msg_handler(PDU_PORT_ID, boost::bind(&socket_pdu_impl::udp_send, this, _1)); } else @@ -151,7 +151,7 @@ namespace gr { tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay); d_acceptor_tcp->async_accept(new_connection->socket(), - boost::bind(&socket_pdu_impl::handle_tcp_accept, this, + boost::bind(&socket_pdu_impl::handle_tcp_accept, this, new_connection, boost::asio::placeholders::error)); } @@ -195,7 +195,7 @@ namespace gr { { if (d_udp_endpoint_other.address().to_string() == "0.0.0.0") return; - + pmt::pmt_t vector = pmt::cdr(msg); size_t len = pmt::length(vector); size_t offset = 0; @@ -214,14 +214,14 @@ namespace gr { if (!error) { pmt::pmt_t vector = pmt::init_u8vector(bytes_transferred, (const uint8_t*)&d_rxbuf[0]); pmt::pmt_t pdu = pmt::cons(pmt::PMT_NIL, vector); - + message_port_pub(PDU_PORT_ID, pdu); - + d_udp_socket->async_receive_from(boost::asio::buffer(d_rxbuf), d_udp_endpoint_other, boost::bind(&socket_pdu_impl::handle_udp_read, this, boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)); - } + } } } /* namespace blocks */ diff --git a/gr-blocks/lib/socket_pdu_impl.h b/gr-blocks/lib/socket_pdu_impl.h index 2d5bc33518..c0262ce59a 100644 --- a/gr-blocks/lib/socket_pdu_impl.h +++ b/gr-blocks/lib/socket_pdu_impl.h @@ -59,7 +59,7 @@ namespace gr { boost::shared_ptr<boost::asio::ip::udp::socket> d_udp_socket; void handle_udp_read(const boost::system::error_code& error, size_t bytes_transferred); void udp_send(pmt::pmt_t msg); - + public: socket_pdu_impl(std::string type, std::string addr, std::string port, int MTU = 10000, bool tcp_no_delay = false); }; diff --git a/gr-blocks/lib/stream_pdu_base.cc b/gr-blocks/lib/stream_pdu_base.cc index a07fa86950..a698f85d55 100644 --- a/gr-blocks/lib/stream_pdu_base.cc +++ b/gr-blocks/lib/stream_pdu_base.cc @@ -44,13 +44,13 @@ namespace gr { stream_pdu_base::stream_pdu_base(int MTU) : d_fd(-1), - d_started(false), + d_started(false), d_finished(false) { - // reserve space for rx buffer + // reserve space for rx buffer d_rxbuf.resize(MTU,0); } - + stream_pdu_base::~stream_pdu_base() { stop_rxthread(); @@ -87,11 +87,11 @@ namespace gr { if (result <= 0) throw std::runtime_error("stream_pdu_base, bad socket read!"); - pmt::pmt_t vector = pmt::init_u8vector(result, &d_rxbuf[0]); + pmt::pmt_t vector = pmt::init_u8vector(result, &d_rxbuf[0]); pmt::pmt_t pdu = pmt::cons(pmt::PMT_NIL, vector); d_blk->message_port_pub(d_port, pdu); - } + } } bool @@ -101,12 +101,12 @@ namespace gr { timeval tv; tv.tv_sec = 0; tv.tv_usec = timeout_us; - + //setup rset for timeout fd_set rset; FD_ZERO(&rset); FD_SET(d_fd, &rset); - + //call select with timeout on receive socket return ::select(d_fd+1, &rset, NULL, NULL, &tv) > 0; } @@ -118,7 +118,7 @@ namespace gr { size_t offset(0); size_t itemsize(pdu::itemsize(pdu::type_from_pmt(vector))); int len(pmt::length(vector)*itemsize); - + const int rv = write(d_fd, pmt::uniform_vector_elements(vector, offset), len); if (rv != len) { std::cerr << boost::format("WARNING: stream_pdu_base::send(pdu) write failed! (d_fd=%d, len=%d, rv=%d)") diff --git a/gr-blocks/lib/stream_pdu_base.h b/gr-blocks/lib/stream_pdu_base.h index cd976eed42..6a2bf9b15e 100644 --- a/gr-blocks/lib/stream_pdu_base.h +++ b/gr-blocks/lib/stream_pdu_base.h @@ -53,7 +53,7 @@ namespace gr { void start_rxthread(basic_block *blk, pmt::pmt_t rxport); void stop_rxthread(); }; - + } /* namespace blocks */ } /* namespace gr */ diff --git a/gr-blocks/lib/stream_to_streams_impl.cc b/gr-blocks/lib/stream_to_streams_impl.cc index 76974ce0ad..2832a21563 100644 --- a/gr-blocks/lib/stream_to_streams_impl.cc +++ b/gr-blocks/lib/stream_to_streams_impl.cc @@ -56,7 +56,7 @@ namespace gr { const char *in = (const char *)input_items[0]; char **outv = (char **)&output_items[0]; int nstreams = output_items.size(); - + for (int i = 0; i < noutput_items; i++) { for (int j = 0; j < nstreams; j++) { memcpy(outv[j], in, item_size); @@ -64,7 +64,7 @@ namespace gr { in += item_size; } } - + return noutput_items; } diff --git a/gr-blocks/lib/stream_to_tagged_stream_impl.cc b/gr-blocks/lib/stream_to_tagged_stream_impl.cc index 08395bf653..82344447cc 100644 --- a/gr-blocks/lib/stream_to_tagged_stream_impl.cc +++ b/gr-blocks/lib/stream_to_tagged_stream_impl.cc @@ -1,17 +1,17 @@ /* -*- c++ -*- */ -/* +/* * Copyright 2013 <+YOU OR YOUR COMPANY+>. - * + * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this software; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/lib/stream_to_vector_impl.cc b/gr-blocks/lib/stream_to_vector_impl.cc index 8576c7fbf5..60b330c246 100644 --- a/gr-blocks/lib/stream_to_vector_impl.cc +++ b/gr-blocks/lib/stream_to_vector_impl.cc @@ -34,7 +34,7 @@ namespace gr { { return gnuradio::get_initial_sptr(new stream_to_vector_impl(itemsize, nitems_per_block)); } - + stream_to_vector_impl::stream_to_vector_impl(size_t itemsize, size_t nitems_per_block) : sync_decimator ("stream_to_vector", io_signature::make (1, 1, itemsize), @@ -42,19 +42,19 @@ namespace gr { nitems_per_block) { } - + int stream_to_vector_impl::work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { size_t block_size = output_signature()->sizeof_stream_item (0); - + const char *in = (const char *) input_items[0]; char *out = (char *) output_items[0]; - + memcpy (out, in, noutput_items * block_size); - + return noutput_items; } diff --git a/gr-blocks/lib/streams_to_stream_impl.cc b/gr-blocks/lib/streams_to_stream_impl.cc index 8d2f330443..cbd31c4b72 100644 --- a/gr-blocks/lib/streams_to_stream_impl.cc +++ b/gr-blocks/lib/streams_to_stream_impl.cc @@ -49,14 +49,14 @@ namespace gr { gr_vector_void_star &output_items) { size_t itemsize = output_signature()->sizeof_stream_item (0); - + const char **inv = (const char **) &input_items[0]; char *out = (char *) output_items[0]; int nstreams = input_items.size(); - + assert (noutput_items % nstreams == 0); int ni = noutput_items / nstreams; - + for (int i = 0; i < ni; i++){ for (int j = 0; j < nstreams; j++){ memcpy(out, inv[j], itemsize); @@ -64,7 +64,7 @@ namespace gr { inv[j] += itemsize; } } - + return noutput_items; } diff --git a/gr-blocks/lib/streams_to_vector_impl.cc b/gr-blocks/lib/streams_to_vector_impl.cc index a65e11b57c..fc6c5c44a9 100644 --- a/gr-blocks/lib/streams_to_vector_impl.cc +++ b/gr-blocks/lib/streams_to_vector_impl.cc @@ -49,10 +49,10 @@ namespace gr { { size_t itemsize = input_signature()->sizeof_stream_item(0); int nstreams = input_items.size(); - + const char **inv = (const char **) &input_items[0]; char *out = (char *) output_items[0]; - + for (int i = 0; i < noutput_items; i++){ for (int j = 0; j < nstreams; j++){ memcpy(out, inv[j], itemsize); diff --git a/gr-blocks/lib/stretch_ff_impl.h b/gr-blocks/lib/stretch_ff_impl.h index b44de80314..69cf95ac73 100644 --- a/gr-blocks/lib/stretch_ff_impl.h +++ b/gr-blocks/lib/stretch_ff_impl.h @@ -27,7 +27,7 @@ namespace gr { namespace blocks { - + class stretch_ff_impl : public stretch_ff { private: @@ -37,7 +37,7 @@ namespace gr { public: stretch_ff_impl(float lo, size_t vlen); ~stretch_ff_impl(); - + float lo() const { return d_lo; } void set_lo(float lo) { d_lo = lo; } size_t vlen() const { return d_vlen; } diff --git a/gr-blocks/lib/sub_XX_impl.cc.t b/gr-blocks/lib/sub_XX_impl.cc.t index d0fa167495..6c7484a5d4 100644 --- a/gr-blocks/lib/sub_XX_impl.cc.t +++ b/gr-blocks/lib/sub_XX_impl.cc.t @@ -51,14 +51,14 @@ namespace gr { gr_vector_void_star &output_items) { @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0]; - + int ninputs = input_items.size (); - + for (size_t i = 0; i < noutput_items*d_vlen; i++){ @I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i]; for (int j = 1; j < ninputs; j++) acc -= ((@I_TYPE@ *) input_items[j])[i]; - + *optr++ = (@O_TYPE@) acc; } diff --git a/gr-blocks/lib/tag_debug_impl.cc b/gr-blocks/lib/tag_debug_impl.cc index 7f4502c346..d2409adb8b 100644 --- a/gr-blocks/lib/tag_debug_impl.cc +++ b/gr-blocks/lib/tag_debug_impl.cc @@ -118,11 +118,11 @@ namespace gr { get_tags_in_range(d_tags, i, abs_N, end_N, d_filter); if(d_display) { - sout << "Input Stream: " << std::setw(2) << std::setfill('0') + sout << "Input Stream: " << std::setw(2) << std::setfill('0') << i << std::setfill(' ') << std::endl; for(d_tags_itr = d_tags.begin(); d_tags_itr != d_tags.end(); d_tags_itr++) { sout << std::setw(10) << "Offset: " << d_tags_itr->offset - << std::setw(10) << "Source: " + << std::setw(10) << "Source: " << (pmt::is_symbol(d_tags_itr->srcid) ? pmt::symbol_to_string(d_tags_itr->srcid) : "n/a") << std::setw(10) << "Key: " << pmt::symbol_to_string(d_tags_itr->key) << std::setw(10) << "Value: "; diff --git a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc index 18a8eef1e9..b9136151fa 100644 --- a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc +++ b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc @@ -47,7 +47,7 @@ namespace gr { set_tag_propagation_policy(TPP_DONT); set_relative_rate(1); message_port_register_in(pmt::intern("set_scalar")); - set_msg_handler(pmt::intern("set_scalar"), + set_msg_handler(pmt::intern("set_scalar"), boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, this, _1)); } @@ -60,7 +60,7 @@ namespace gr { gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) - { + { const void* in = input_items[0]; void* out = output_items[0]; diff --git a/gr-blocks/lib/tagged_stream_to_pdu_impl.h b/gr-blocks/lib/tagged_stream_to_pdu_impl.h index 0a83a87beb..2c3a7ca44a 100644 --- a/gr-blocks/lib/tagged_stream_to_pdu_impl.h +++ b/gr-blocks/lib/tagged_stream_to_pdu_impl.h @@ -49,4 +49,4 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ -#endif +#endif diff --git a/gr-blocks/lib/tags_strobe_impl.cc b/gr-blocks/lib/tags_strobe_impl.cc index cfe335781c..ddae7fe21f 100644 --- a/gr-blocks/lib/tags_strobe_impl.cc +++ b/gr-blocks/lib/tags_strobe_impl.cc @@ -47,7 +47,7 @@ namespace gr { } tags_strobe_impl::tags_strobe_impl(size_t sizeof_stream_item, - pmt::pmt_t value, uint64_t nsamps, + pmt::pmt_t value, uint64_t nsamps, pmt::pmt_t key) : sync_block("tags_strobe", io_signature::make(0, 0, 0), @@ -77,7 +77,7 @@ namespace gr { { d_tag.key = key; } - + void tags_strobe_impl::set_nsamps(uint64_t nsamps) { @@ -99,7 +99,7 @@ namespace gr { d_tag.offset = d_offset; add_item_tag(0, d_tag); } - + return noutput_items; } diff --git a/gr-blocks/lib/tcp_connection.cc b/gr-blocks/lib/tcp_connection.cc index 970732e656..27bdf6a57d 100644 --- a/gr-blocks/lib/tcp_connection.cc +++ b/gr-blocks/lib/tcp_connection.cc @@ -73,7 +73,7 @@ namespace gr { d_block = block; d_socket.set_option(boost::asio::ip::tcp::no_delay(d_no_delay)); d_socket.async_read_some(boost::asio::buffer(d_buf), - boost::bind(&tcp_connection::handle_read, this, + boost::bind(&tcp_connection::handle_read, this, boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)); } diff --git a/gr-blocks/lib/tcp_connection.h b/gr-blocks/lib/tcp_connection.h index 9193928c41..6eeb64e54f 100644 --- a/gr-blocks/lib/tcp_connection.h +++ b/gr-blocks/lib/tcp_connection.h @@ -28,7 +28,7 @@ #include <pmt/pmt.h> namespace gr { - + class basic_block; namespace blocks { @@ -42,10 +42,10 @@ namespace gr { bool d_no_delay; tcp_connection(boost::asio::io_service& io_service, int MTU=10000, bool no_delay=false); - + public: typedef boost::shared_ptr<tcp_connection> sptr; - + static sptr make(boost::asio::io_service& io_service, int MTU=10000, bool no_delay=false); boost::asio::ip::tcp::socket& socket() { return d_socket; }; diff --git a/gr-blocks/lib/tuntap_pdu_impl.cc b/gr-blocks/lib/tuntap_pdu_impl.cc index 0e2b63fab7..0b9ef424ef 100644 --- a/gr-blocks/lib/tuntap_pdu_impl.cc +++ b/gr-blocks/lib/tuntap_pdu_impl.cc @@ -79,7 +79,7 @@ namespace gr { // set up output message port message_port_register_out(PDU_PORT_ID); start_rxthread(this, PDU_PORT_ID); - + // set up input message port message_port_register_in(PDU_PORT_ID); set_msg_handler(PDU_PORT_ID, boost::bind(&tuntap_pdu_impl::send, this, _1)); @@ -134,6 +134,6 @@ namespace gr { return fd; } #endif - + } /* namespace blocks */ }/* namespace gr */ diff --git a/gr-blocks/lib/uchar_to_float_impl.cc b/gr-blocks/lib/uchar_to_float_impl.cc index 20887881d9..0068094861 100644 --- a/gr-blocks/lib/uchar_to_float_impl.cc +++ b/gr-blocks/lib/uchar_to_float_impl.cc @@ -50,9 +50,9 @@ namespace gr { { const unsigned char *in = (const unsigned char *) input_items[0]; float *out = (float *) output_items[0]; - + uchar_array_to_float (in, out, noutput_items); - + return noutput_items; } diff --git a/gr-blocks/lib/uchar_to_float_impl.h b/gr-blocks/lib/uchar_to_float_impl.h index 1e3f4d59c5..602662c54f 100644 --- a/gr-blocks/lib/uchar_to_float_impl.h +++ b/gr-blocks/lib/uchar_to_float_impl.h @@ -40,6 +40,6 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ - + #endif /* INCLUDED_UCHAR_TO_FLOAT_IMPL_H */ diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc index 5fa06072ae..c3ab8953e7 100644 --- a/gr-blocks/lib/udp_source_impl.cc +++ b/gr-blocks/lib/udp_source_impl.cc @@ -212,7 +212,7 @@ namespace gr { else { d_sent += to_send; } - + return nitems; } diff --git a/gr-blocks/lib/vector_insert_X_impl.cc.t b/gr-blocks/lib/vector_insert_X_impl.cc.t index a4645816d8..4e1eb45da3 100644 --- a/gr-blocks/lib/vector_insert_X_impl.cc.t +++ b/gr-blocks/lib/vector_insert_X_impl.cc.t @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2012 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -75,7 +75,7 @@ namespace gr { while((oo < noutput_items) && (ii < ninput_items[0])) { //printf("oo = %d, ii = %d, d_offset = %d, noutput_items = %d, ninput_items[0] = %d", oo, ii, d_offset, noutput_items, ninput_items[0]); //printf(", d_periodicity = %d\n", d_periodicity); - + if(d_offset >= ((int)d_data.size())) { // if we are in the copy region int max_copy = std::min(std::min(noutput_items - oo, ninput_items[0] - ii), d_periodicity - d_offset); @@ -85,17 +85,17 @@ namespace gr { ii += max_copy; oo += max_copy; d_offset = (d_offset + max_copy)%d_periodicity; - } + } else { // if we are in the insertion region int max_copy = std::min(noutput_items - oo, ((int)d_data.size()) - d_offset); //printf("copy %d from d_data[%d] to out[%d]\n", max_copy, d_offset, oo); memcpy(&out[oo], &d_data[d_offset], sizeof(@TYPE@)*max_copy); //printf(" * memcpy returned.\n"); - oo += max_copy; + oo += max_copy; d_offset = (d_offset + max_copy)%d_periodicity; //printf(" ## (inelse) oo = %d, d_offset = %d\n", oo, d_offset); } - + //printf(" # exit else, on to next loop.\n"); } //printf(" # got out of loop\n"); diff --git a/gr-blocks/lib/vector_insert_X_impl.h.t b/gr-blocks/lib/vector_insert_X_impl.h.t index 12a7bbe6bc..fa03f52693 100644 --- a/gr-blocks/lib/vector_insert_X_impl.h.t +++ b/gr-blocks/lib/vector_insert_X_impl.h.t @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2012,2013 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/lib/vector_map_impl.cc b/gr-blocks/lib/vector_map_impl.cc index 05a320141c..883d6a3195 100644 --- a/gr-blocks/lib/vector_map_impl.cc +++ b/gr-blocks/lib/vector_map_impl.cc @@ -50,7 +50,7 @@ namespace gr { out_sizeofs.push_back(mapping[i].size()*item_size); } return out_sizeofs; - } + } vector_map::sptr vector_map::make(size_t item_size, std::vector<size_t> in_vlens, diff --git a/gr-blocks/lib/vector_sink_X_impl.cc.t b/gr-blocks/lib/vector_sink_X_impl.cc.t index a8d674f15a..62c6d17dc7 100644 --- a/gr-blocks/lib/vector_sink_X_impl.cc.t +++ b/gr-blocks/lib/vector_sink_X_impl.cc.t @@ -40,7 +40,7 @@ namespace gr { return gnuradio::get_initial_sptr (new @NAME_IMPL@(vlen)); } - + @NAME_IMPL@::@NAME_IMPL@(int vlen) : sync_block("@NAME@", io_signature::make(1, 1, sizeof(@TYPE@) * vlen), diff --git a/gr-blocks/lib/vector_to_stream_impl.cc b/gr-blocks/lib/vector_to_stream_impl.cc index 637a252052..941a1f1752 100644 --- a/gr-blocks/lib/vector_to_stream_impl.cc +++ b/gr-blocks/lib/vector_to_stream_impl.cc @@ -49,12 +49,12 @@ namespace gr { gr_vector_void_star &output_items) { size_t block_size = output_signature()->sizeof_stream_item (0); - + const char *in = (const char *) input_items[0]; char *out = (char *) output_items[0]; - + memcpy (out, in, noutput_items * block_size); - + return noutput_items; } diff --git a/gr-blocks/lib/vector_to_streams_impl.cc b/gr-blocks/lib/vector_to_streams_impl.cc index 99f35b0ab3..87f3e8e23c 100644 --- a/gr-blocks/lib/vector_to_streams_impl.cc +++ b/gr-blocks/lib/vector_to_streams_impl.cc @@ -50,10 +50,10 @@ namespace gr { { size_t itemsize = output_signature()->sizeof_stream_item(0); int nstreams = output_items.size(); - + const char *in = (const char *) input_items[0]; char **outv = (char **) &output_items[0]; - + for (int i = 0; i < noutput_items; i++){ for (int j = 0; j < nstreams; j++){ memcpy(outv[j], in, itemsize); diff --git a/gr-blocks/lib/wavfile_sink_impl.cc b/gr-blocks/lib/wavfile_sink_impl.cc index 57bdb5f291..0851fd3283 100644 --- a/gr-blocks/lib/wavfile_sink_impl.cc +++ b/gr-blocks/lib/wavfile_sink_impl.cc @@ -175,7 +175,7 @@ namespace gr { } close(); - + return true; } diff --git a/gr-blocks/lib/xor_XX_impl.cc.t b/gr-blocks/lib/xor_XX_impl.cc.t index 6b9df4f4fb..aa7a542ed9 100644 --- a/gr-blocks/lib/xor_XX_impl.cc.t +++ b/gr-blocks/lib/xor_XX_impl.cc.t @@ -51,14 +51,14 @@ namespace gr { gr_vector_void_star &output_items) { @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0]; - + int ninputs = input_items.size (); - + for (size_t i = 0; i < noutput_items*d_vlen; i++){ @I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i]; for (int j = 1; j < ninputs; j++) acc ^= ((@I_TYPE@ *) input_items[j])[i]; - + *optr++ = (@O_TYPE@) acc; } diff --git a/gr-blocks/python/blocks/CMakeLists.txt b/gr-blocks/python/blocks/CMakeLists.txt index 9287975730..44977313cf 100644 --- a/gr-blocks/python/blocks/CMakeLists.txt +++ b/gr-blocks/python/blocks/CMakeLists.txt @@ -51,7 +51,7 @@ if(ENABLE_TESTING) ${CMAKE_CURRENT_SOURCE_DIR}/qa_ctrlport_probes.py ) endif(NOT ENABLE_GR_CTRLPORT) - + foreach(py_qa_test_file ${py_qa_test_files}) get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) diff --git a/gr-blocks/python/blocks/__init__.py b/gr-blocks/python/blocks/__init__.py index b7ba794ea2..fc4cc7ab66 100644 --- a/gr-blocks/python/blocks/__init__.py +++ b/gr-blocks/python/blocks/__init__.py @@ -30,7 +30,7 @@ except ImportError: dirname, filename = os.path.split(os.path.abspath(__file__)) __path__.append(os.path.join(dirname, "..", "..", "swig")) from blocks_swig import * - + from stream_to_vector_decimator import * #alias old add_vXX and multiply_vXX diff --git a/gr-blocks/python/blocks/qa_burst_tagger.py b/gr-blocks/python/blocks/qa_burst_tagger.py index 50aaf893bd..b1a4f942f1 100644 --- a/gr-blocks/python/blocks/qa_burst_tagger.py +++ b/gr-blocks/python/blocks/qa_burst_tagger.py @@ -43,7 +43,7 @@ class test_burst_tagger(gr_unittest.TestCase): self.tb.connect(trg, (op,1)) self.tb.connect(op, snk) self.tb.run() - + x = snk.current_tags() self.assertEqual(2, x[0].offset) self.assertEqual(4, x[1].offset) diff --git a/gr-blocks/python/blocks/qa_cpp_py_binding.py b/gr-blocks/python/blocks/qa_cpp_py_binding.py index c15633df82..35e073d584 100755 --- a/gr-blocks/python/blocks/qa_cpp_py_binding.py +++ b/gr-blocks/python/blocks/qa_cpp_py_binding.py @@ -20,7 +20,7 @@ # Boston, MA 02110-1301, USA. # -# +# # This program tests mixed python and c++ ctrlport exports in a single app # @@ -126,7 +126,7 @@ class test_cpp_py_binding(gr_unittest.TestCase): val = get5() rval = v5.get() self.assertComplexTuplesAlmostEqual(val, rval, 5) - + val = get6() rval = v6.get() self.assertComplexTuplesAlmostEqual(val, rval, 5) diff --git a/gr-blocks/python/blocks/qa_cpp_py_binding_set.py b/gr-blocks/python/blocks/qa_cpp_py_binding_set.py index 2e4198c04d..69ed6d1d2b 100755 --- a/gr-blocks/python/blocks/qa_cpp_py_binding_set.py +++ b/gr-blocks/python/blocks/qa_cpp_py_binding_set.py @@ -20,7 +20,7 @@ # Boston, MA 02110-1301, USA. # -# +# # This program tests mixed python and c++ GRCP sets in a single app # diff --git a/gr-blocks/python/blocks/qa_endian_swap.py b/gr-blocks/python/blocks/qa_endian_swap.py index ea6e10fb8f..dd6ee349b2 100644 --- a/gr-blocks/python/blocks/qa_endian_swap.py +++ b/gr-blocks/python/blocks/qa_endian_swap.py @@ -57,7 +57,7 @@ class test_endian_swap(gr_unittest.TestCase): self.tb.connect(src, op, dst) self.tb.run() result_data = list(dst.data()) - + self.assertEqual(expected_result, result_data) if __name__ == '__main__': diff --git a/gr-blocks/python/blocks/qa_file_metadata.py b/gr-blocks/python/blocks/qa_file_metadata.py index a36eb48fc5..0d7628bbdc 100644 --- a/gr-blocks/python/blocks/qa_file_metadata.py +++ b/gr-blocks/python/blocks/qa_file_metadata.py @@ -57,7 +57,7 @@ class test_file_metadata(gr_unittest.TestCase): data = sig_source_c(samp_rate, 1000, 1, N) src = blocks.vector_source_c(data) fsnk = blocks.file_meta_sink(gr.sizeof_gr_complex, outfile, - samp_rate, 1, + samp_rate, 1, blocks.GR_FILE_FLOAT, True, 1000000, extras_str, detached) fsnk.set_unbuffered(True) @@ -136,7 +136,7 @@ class test_file_metadata(gr_unittest.TestCase): data = sig_source_c(samp_rate, 1000, 1, N) src = blocks.vector_source_c(data) fsnk = blocks.file_meta_sink(gr.sizeof_gr_complex, outfile, - samp_rate, 1, + samp_rate, 1, blocks.GR_FILE_FLOAT, True, 1000000, extras_str, detached) fsnk.set_unbuffered(True) diff --git a/gr-blocks/python/blocks/qa_hier_block2_message_connections.py b/gr-blocks/python/blocks/qa_hier_block2_message_connections.py index bc575b779a..0f8a4b8543 100644 --- a/gr-blocks/python/blocks/qa_hier_block2_message_connections.py +++ b/gr-blocks/python/blocks/qa_hier_block2_message_connections.py @@ -102,7 +102,7 @@ class test_hier_block2_message_connections(gr_unittest.TestCase): receive_port): """assert that the given sender block has a subscription for the given receiver block on the appropriate send and receive ports - + :param sender: a block sptr to the message sender :param string send_port: the port messages are being sent on :param receiver: a block sptr to the message receiver @@ -116,7 +116,7 @@ class test_hier_block2_message_connections(gr_unittest.TestCase): def assert_has_num_subscriptions(self, block, port, number): """assert that the given block has the given number of subscriptions on the given port - + :param block: a block sptr :param string port: the port name :param number: the number of subscriptions expected diff --git a/gr-blocks/python/blocks/qa_message.py b/gr-blocks/python/blocks/qa_message.py index abfc652199..1d677007b4 100755 --- a/gr-blocks/python/blocks/qa_message.py +++ b/gr-blocks/python/blocks/qa_message.py @@ -143,7 +143,7 @@ class test_message(gr_unittest.TestCase): rec_msg = snk.get_message(0) self.assertTrue(pmt.eqv(rec_msg, msg)) - + if __name__ == '__main__': gr_unittest.run(test_message, "test_message.xml") diff --git a/gr-blocks/python/blocks/qa_pack_k_bits.py b/gr-blocks/python/blocks/qa_pack_k_bits.py index b73bf3d5a9..ab0b638a09 100755 --- a/gr-blocks/python/blocks/qa_pack_k_bits.py +++ b/gr-blocks/python/blocks/qa_pack_k_bits.py @@ -62,7 +62,7 @@ class test_pack(gr_unittest.TestCase): self.tb.connect(src,unpack,pack,snk); self.tb.run() self.assertEqual(list(expected_results), list(snk.data())); - + if __name__ == '__main__': gr_unittest.run(test_pack, "test_pack.xml") diff --git a/gr-blocks/python/blocks/qa_patterned_interleaver.py b/gr-blocks/python/blocks/qa_patterned_interleaver.py index c9fe7b123b..2d3168db40 100755 --- a/gr-blocks/python/blocks/qa_patterned_interleaver.py +++ b/gr-blocks/python/blocks/qa_patterned_interleaver.py @@ -40,14 +40,14 @@ class test_patterned_interleaver (gr_unittest.TestCase): itg = blocks.patterned_interleaver(gr.sizeof_float, dst_data) dst = blocks.vector_sink_f() head = blocks.head(gr.sizeof_float, 8); - + self.tb.connect( src0, (itg,0) ); self.tb.connect( src1, (itg,1) ); self.tb.connect( src2, (itg,2) ); self.tb.connect( itg, head, dst ); - + self.tb.run() self.assertEqual(list(dst_data), list(dst.data())) - + if __name__ == '__main__': gr_unittest.run(test_patterned_interleaver, "test_patterned_interleaver.xml") diff --git a/gr-blocks/python/blocks/qa_python_message_passing.py b/gr-blocks/python/blocks/qa_python_message_passing.py index e391c5f952..7bb5fbe10e 100644 --- a/gr-blocks/python/blocks/qa_python_message_passing.py +++ b/gr-blocks/python/blocks/qa_python_message_passing.py @@ -69,7 +69,7 @@ class message_consumer(gr.sync_block): self.msg_list.append(pmt.from_long(pmt.to_long(msg))) class test_python_message_passing(gr_unittest.TestCase): - + def setUp(self): self.tb = gr.top_block() @@ -90,17 +90,17 @@ class test_python_message_passing(gr_unittest.TestCase): src = blocks.vector_source_f(src_data, False) msg_gen = message_generator(msg_list, msg_interval) msg_cons = message_consumer() - + # Connect vector source to message gen self.tb.connect(src, msg_gen) - + # Connect message generator to message consumer self.tb.msg_connect(msg_gen, 'out_port', msg_cons, 'in_port') # Verify that the messgae port query functions work self.assertEqual(pmt.to_python(msg_gen.message_ports_out())[0], 'out_port') self.assertEqual('in_port' in pmt.to_python(msg_cons.message_ports_in()), True) - + # Run to verify message passing self.tb.start() @@ -108,13 +108,13 @@ class test_python_message_passing(gr_unittest.TestCase): while msg_gen.msg_ctr < num_msgs: time.sleep(0.5) self.tb.stop() - self.tb.wait() - + self.tb.wait() + # Verify that the message consumer got all the messages self.assertEqual(num_msgs, len(msg_cons.msg_list)) for i in range(num_msgs): self.assertTrue(pmt.equal(msg_list[i], msg_cons.msg_list[i])) - + if __name__ == '__main__': - gr_unittest.run(test_python_message_passing, + gr_unittest.run(test_python_message_passing, 'test_python_message_passing.xml') diff --git a/gr-blocks/python/blocks/qa_sample_and_hold.py b/gr-blocks/python/blocks/qa_sample_and_hold.py index d6aedc23cc..f645148695 100644 --- a/gr-blocks/python/blocks/qa_sample_and_hold.py +++ b/gr-blocks/python/blocks/qa_sample_and_hold.py @@ -45,7 +45,7 @@ class test_sample_and_hold(gr_unittest.TestCase): self.tb.connect(ctrl, (op,1)) self.tb.connect(op, dst) self.tb.run() - + result = dst.data() self.assertFloatTuplesAlmostEqual(expected_result, result, places=6) diff --git a/gr-blocks/python/blocks/qa_stretch.py b/gr-blocks/python/blocks/qa_stretch.py index 66a04d53f6..e91a375abf 100755 --- a/gr-blocks/python/blocks/qa_stretch.py +++ b/gr-blocks/python/blocks/qa_stretch.py @@ -47,7 +47,7 @@ class test_stretch(gr_unittest.TestCase): deinter = blocks.vector_to_streams(gr.sizeof_float, 2) dst0 = blocks.vector_sink_f() dst1 = blocks.vector_sink_f() - + tb.connect(src0, (inter,0)) tb.connect(src1, (inter,1)) tb.connect(inter, op) diff --git a/gr-blocks/python/blocks/qa_tag_gate.py b/gr-blocks/python/blocks/qa_tag_gate.py index 74fe5a7bcd..4d22c73adb 100755 --- a/gr-blocks/python/blocks/qa_tag_gate.py +++ b/gr-blocks/python/blocks/qa_tag_gate.py @@ -1,22 +1,22 @@ #!/usr/bin/env python -# +# # Copyright 2013 <+YOU OR YOUR COMPANY+>. -# +# # This is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # This software is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this software; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -# +# from gnuradio import gr, gr_unittest, blocks import pmt diff --git a/gr-blocks/python/blocks/qa_tags_strobe.py b/gr-blocks/python/blocks/qa_tags_strobe.py index 51b1c63bad..c4e1b5d8bc 100644 --- a/gr-blocks/python/blocks/qa_tags_strobe.py +++ b/gr-blocks/python/blocks/qa_tags_strobe.py @@ -41,7 +41,7 @@ class test_tags_strobe(gr_unittest.TestCase): pmt.intern("TEST"), nsamps) hed = blocks.head(gr.sizeof_float, N) dst = blocks.vector_sink_f() - + self.tb.connect(src, hed, dst) self.tb.run() @@ -61,7 +61,7 @@ class test_tags_strobe(gr_unittest.TestCase): pmt.intern("TEST"), nsamps) hed = blocks.head(gr.sizeof_float, N) dst = blocks.vector_sink_f() - + self.tb.connect(src, hed, dst) self.tb.run() @@ -81,7 +81,7 @@ class test_tags_strobe(gr_unittest.TestCase): pmt.intern("TEST"), nsamps) hed = blocks.head(gr.sizeof_float, N) dst = blocks.vector_sink_f() - + self.tb.connect(src, hed, dst) self.tb.run() diff --git a/gr-blocks/python/blocks/qa_vector_insert.py b/gr-blocks/python/blocks/qa_vector_insert.py index 5f6e84665c..e4c4055125 100755 --- a/gr-blocks/python/blocks/qa_vector_insert.py +++ b/gr-blocks/python/blocks/qa_vector_insert.py @@ -1,24 +1,24 @@ #!/usr/bin/env python # # Copyright 2012-2013 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -# +# from gnuradio import gr, gr_unittest, blocks import math diff --git a/gr-blocks/python/blocks/qa_vector_map.py b/gr-blocks/python/blocks/qa_vector_map.py index 94bdb1989b..1c07de826f 100644 --- a/gr-blocks/python/blocks/qa_vector_map.py +++ b/gr-blocks/python/blocks/qa_vector_map.py @@ -67,7 +67,7 @@ class test_vector_map(gr_unittest.TestCase): for n in range(0, N): result_data = list(dsts[n].data()) self.assertEqual(expected_results[n], result_data) - + def test_interleaving(self): # Takes 3 streams (a, b and c) # Outputs 2 streams. @@ -90,8 +90,8 @@ class test_vector_map(gr_unittest.TestCase): dstD = blocks.vector_sink_f(2) dstE = blocks.vector_sink_f(4) self.tb.connect(srcA, (vmap, 0)) - self.tb.connect(srcB, (vmap, 1)) - self.tb.connect(srcC, (vmap, 2)) + self.tb.connect(srcB, (vmap, 1)) + self.tb.connect(srcC, (vmap, 2)) self.tb.connect((vmap, 0), dstD) self.tb.connect((vmap, 1), dstE) self.tb.run() diff --git a/gr-blocks/python/blocks/stream_to_vector_decimator.py b/gr-blocks/python/blocks/stream_to_vector_decimator.py index 984d84b4bb..bcbfd96b8b 100644 --- a/gr-blocks/python/blocks/stream_to_vector_decimator.py +++ b/gr-blocks/python/blocks/stream_to_vector_decimator.py @@ -30,7 +30,7 @@ class stream_to_vector_decimator(gr.hier_block2): def __init__(self, item_size, sample_rate, vec_rate, vec_len): """ Create the block chain. - + Args: item_size: the number of bytes per sample sample_rate: the rate of incoming samples @@ -53,7 +53,7 @@ class stream_to_vector_decimator(gr.hier_block2): def set_sample_rate(self, sample_rate): """ Set the new sampling rate and update the decimator. - + Args: sample_rate: the new rate """ @@ -63,7 +63,7 @@ class stream_to_vector_decimator(gr.hier_block2): def set_vec_rate(self, vec_rate): """ Set the new vector rate and update the decimator. - + Args: vec_rate: the new rate """ @@ -73,7 +73,7 @@ class stream_to_vector_decimator(gr.hier_block2): def set_decimation(self, decim): """ Set the decimation parameter directly. - + Args: decim: the new decimation """ diff --git a/gr-blocks/swig/CMakeLists.txt b/gr-blocks/swig/CMakeLists.txt index a3cf23b33c..f4c428c878 100644 --- a/gr-blocks/swig/CMakeLists.txt +++ b/gr-blocks/swig/CMakeLists.txt @@ -59,7 +59,7 @@ foreach(swigfile ${GR_SWIG_BLOCK_IFILES}) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${swigfile}_doc.i) set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/blocks - ${CMAKE_CURRENT_BINARY_DIR}/../include/gnuradio/blocks + ${CMAKE_CURRENT_BINARY_DIR}/../include/gnuradio/blocks ) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_TARGET_DEPS blocks_generated_includes) |