diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-17 13:43:52 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-29 14:52:56 -0400 |
| commit | f3e2e07201c50033bf6c9d0c6a6f068557b4f17f (patch) | |
| tree | 140b3c2d20a951ffd4abd564c3378ee2e2f9fc7c /gr-uhd/examples/c++ | |
| parent | 35303ae975a5b1bdecc2492bc96e2b8e89b62a3d (diff) | |
runtime: converting runtime core to gr namespace, gnuradio include dir.
Diffstat (limited to 'gr-uhd/examples/c++')
| -rw-r--r-- | gr-uhd/examples/c++/tag_sink_demo.h | 17 | ||||
| -rw-r--r-- | gr-uhd/examples/c++/tag_source_demo.h | 26 | ||||
| -rw-r--r-- | gr-uhd/examples/c++/tags_demo.cc | 4 |
3 files changed, 26 insertions, 21 deletions
diff --git a/gr-uhd/examples/c++/tag_sink_demo.h b/gr-uhd/examples/c++/tag_sink_demo.h index 676005e06c..e96cd9ec3c 100644 --- a/gr-uhd/examples/c++/tag_sink_demo.h +++ b/gr-uhd/examples/c++/tag_sink_demo.h @@ -19,21 +19,22 @@ * Boston, MA 02110-1301, USA. */ -#include <gr_sync_block.h> -#include <gr_io_signature.h> +#include <gnuradio/sync_block.h> +#include <gnuradio/io_signature.h> #include <boost/foreach.hpp> #include <boost/format.hpp> #include <iostream> #include <complex> -class tag_sink_demo : public gr_sync_block{ +class tag_sink_demo : public gr::sync_block +{ public: tag_sink_demo(void): - gr_sync_block( + sync_block( "uhd tag sink demo", - gr_make_io_signature(1, 1, sizeof(std::complex<float>)), - gr_make_io_signature(0, 0, 0) + gr::io_signature::make(1, 1, sizeof(std::complex<float>)), + gr::io_signature::make(0, 0, 0) ) { //NOP @@ -46,11 +47,11 @@ public: ){ //grab all "rx time" tags in this work call const uint64_t samp0_count = this->nitems_read(0); - std::vector<gr_tag_t> rx_time_tags; + std::vector<gr::tag_t> rx_time_tags; get_tags_in_range(rx_time_tags, 0, samp0_count, samp0_count + ninput_items, pmt::string_to_symbol("rx_time")); //print all tags - BOOST_FOREACH(const gr_tag_t &rx_time_tag, rx_time_tags){ + BOOST_FOREACH(const gr::tag_t &rx_time_tag, rx_time_tags){ const uint64_t offset = rx_time_tag.offset; const pmt::pmt_t &value = rx_time_tag.value; diff --git a/gr-uhd/examples/c++/tag_source_demo.h b/gr-uhd/examples/c++/tag_source_demo.h index 6efe4667e5..71fb94482a 100644 --- a/gr-uhd/examples/c++/tag_source_demo.h +++ b/gr-uhd/examples/c++/tag_source_demo.h @@ -19,14 +19,15 @@ * Boston, MA 02110-1301, USA. */ -#include <gr_sync_block.h> -#include <gr_io_signature.h> +#include <gnuradio/sync_block.h> +#include <gnuradio/io_signature.h> #include <boost/foreach.hpp> #include <boost/format.hpp> #include <iostream> #include <complex> -class tag_source_demo : public gr_sync_block{ +class tag_source_demo : public gr::sync_block +{ public: tag_source_demo( @@ -36,10 +37,10 @@ public: const double idle_duration, const double burst_duration ): - gr_sync_block( + sync_block( "uhd tag source demo", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, sizeof(std::complex<float>)) + gr::io_signature::make(0, 0, 0), + gr::io_signature::make(1, 1, sizeof(std::complex<float>)) ), _time_secs(start_secs), _time_fracs(start_fracs), @@ -52,7 +53,8 @@ public: //NOP } - void make_time_tag(const uint64_t tag_count){; + void make_time_tag(const uint64_t tag_count) + { const pmt::pmt_t key = pmt::string_to_symbol("tx_time"); const pmt::pmt_t value = pmt::make_tuple( pmt::from_uint64(_time_secs), @@ -62,14 +64,16 @@ public: this->add_item_tag(0/*chan0*/, tag_count, key, value, srcid); } - void make_sob_tag(const uint64_t tag_count){ + void make_sob_tag(const uint64_t tag_count) + { const pmt::pmt_t key = pmt::string_to_symbol("tx_sob"); const pmt::pmt_t value = pmt::PMT_T; const pmt::pmt_t srcid = pmt::string_to_symbol(this->name()); this->add_item_tag(0/*chan0*/, tag_count, key, value, srcid); } - void make_eob_tag(const uint64_t tag_count){; + void make_eob_tag(const uint64_t tag_count) + { const pmt::pmt_t key = pmt::string_to_symbol("tx_eob"); const pmt::pmt_t value = pmt::PMT_T; const pmt::pmt_t srcid = pmt::string_to_symbol(this->name()); @@ -79,8 +83,8 @@ public: int work( int noutput_items, gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items - ){ + gr_vector_void_star &output_items) + { //load the output with a constant std::complex<float> *output = reinterpret_cast<std::complex<float> *>(output_items[0]); for (size_t i = 0; i < size_t(noutput_items); i++){ diff --git a/gr-uhd/examples/c++/tags_demo.cc b/gr-uhd/examples/c++/tags_demo.cc index 890cc12dea..aa0f0c8ecf 100644 --- a/gr-uhd/examples/c++/tags_demo.cc +++ b/gr-uhd/examples/c++/tags_demo.cc @@ -19,7 +19,7 @@ * Boston, MA 02110-1301, USA. */ -#include <gr_top_block.h> +#include <gnuradio/top_block.h> #include <uhd/usrp_source.h> #include <uhd/usrp_sink.h> #include <tag_source_demo.h> @@ -74,7 +74,7 @@ int main(int argc, char *argv[]){ //------------------------------------------------------------------ //-- make a top block //------------------------------------------------------------------ - gr_top_block_sptr tb = gr_make_top_block("tags_demo"); + gr::top_block_sptr tb = gr::make_top_block("tags_demo"); //------------------------------------------------------------------ //-- make the usrp source test blocks |