diff options
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h | 15 | ||||
| -rw-r--r-- | grc/python/Block.py | 2 | ||||
| -rwxr-xr-x | volk/bootstrap | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h b/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h index 7c203fefe..e543f5cfb 100644 --- a/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h +++ b/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h @@ -33,9 +33,11 @@ typedef boost::shared_ptr<gr_correlate_access_code_tag_bb> gr_correlate_access_c /*! * \param access_code is represented with 1 byte per bit, e.g., "010101010111000100" * \param threshold maximum number of bits that may be wrong + * \param tag_name key of the tag inserted into the tag stream */ GR_CORE_API gr_correlate_access_code_tag_bb_sptr -gr_make_correlate_access_code_tag_bb (const std::string &access_code, int threshold, const std::string &tag_name); +gr_make_correlate_access_code_tag_bb (const std::string &access_code, int threshold, + const std::string &tag_name); /*! * \brief Examine input for specified access code, one bit at a time. @@ -44,13 +46,15 @@ gr_make_correlate_access_code_tag_bb (const std::string &access_code, int thresh * input: stream of bits, 1 bit per input byte (data in LSB) * output: unaltered stream of bits (plus tags) * - * This block annotates the input stream with tags. The tags have key name [tag_name], - * specified in the constructor. Used for searching an input data stream for preambles, etc. + * This block annotates the input stream with tags. The tags have key + * name [tag_name], specified in the constructor. Used for searching + * an input data stream for preambles, etc. */ class GR_CORE_API gr_correlate_access_code_tag_bb : public gr_sync_block { friend GR_CORE_API gr_correlate_access_code_tag_bb_sptr - gr_make_correlate_access_code_tag_bb (const std::string &access_code, int threshold, const std::string &tag_name); + gr_make_correlate_access_code_tag_bb (const std::string &access_code, int threshold, + const std::string &tag_name); private: unsigned long long d_access_code; // access code to locate start of packet // access code is left justified in the word @@ -63,7 +67,8 @@ class GR_CORE_API gr_correlate_access_code_tag_bb : public gr_sync_block pmt::pmt_t d_key, d_me; //d_key is the tag name, d_me is the block name + unique ID protected: - gr_correlate_access_code_tag_bb(const std::string &access_code, int threshold, const std::string &tag_name); + gr_correlate_access_code_tag_bb(const std::string &access_code, int threshold, + const std::string &tag_name); public: ~gr_correlate_access_code_tag_bb(); diff --git a/grc/python/Block.py b/grc/python/Block.py index 14a5859e4..424706d68 100644 --- a/grc/python/Block.py +++ b/grc/python/Block.py @@ -108,7 +108,7 @@ class Block(_Block, _GUIBlock): if nports == num_ports: continue #remove excess ports and connections if nports < num_ports: - for key in map(str, range(index_first+nports, index_first+num_ports)): + for key in reversed(map(str, range(index_first+nports, index_first+num_ports))): remove_port(get_ports, get_port, key) continue #add more ports diff --git a/volk/bootstrap b/volk/bootstrap index 1afd49277..838f03aa2 100755 --- a/volk/bootstrap +++ b/volk/bootstrap @@ -23,8 +23,8 @@ rm -fr config.cache autom4te*.cache #alternative to -B that wont break on python 2.5 PYTHONDONTWRITEBYTECODE=1 export PYTHONDONTWRITEBYTECODE - python gen/volk_register.py + mv gen/lib/Makefile.am lib/ aclocal -I config -I gen/config |