diff options
| author | Josh Blum | 2010-09-23 19:05:10 -0700 |
|---|---|---|
| committer | Josh Blum | 2010-09-23 19:05:10 -0700 |
| commit | 1fe3790faed05b92ca4ad3a27da6eb23632d7e57 (patch) | |
| tree | a0cacc33e46459853e7d51613bcf393fed54f271 /gr-uhd/lib | |
| parent | 2831c9313d09685090cea531a177469b57792c9a (diff) | |
| download | gnuradio-1fe3790faed05b92ca4ad3a27da6eb23632d7e57.tar.gz gnuradio-1fe3790faed05b92ca4ad3a27da6eb23632d7e57.tar.bz2 gnuradio-1fe3790faed05b92ca4ad3a27da6eb23632d7e57.zip | |
uhd: multi channel single usrp source and sink working
Diffstat (limited to 'gr-uhd/lib')
| -rw-r--r-- | gr-uhd/lib/uhd_single_usrp_sink.cc | 10 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_single_usrp_sink.h | 3 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_single_usrp_source.cc | 10 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_single_usrp_source.h | 3 |
4 files changed, 16 insertions, 10 deletions
diff --git a/gr-uhd/lib/uhd_single_usrp_sink.cc b/gr-uhd/lib/uhd_single_usrp_sink.cc index 1cd5afc87..8cb3726d1 100644 --- a/gr-uhd/lib/uhd_single_usrp_sink.cc +++ b/gr-uhd/lib/uhd_single_usrp_sink.cc @@ -39,8 +39,9 @@ class uhd_single_usrp_sink_impl : public uhd_single_usrp_sink{ public: uhd_single_usrp_sink_impl( const std::string &args, - const uhd::io_type_t &type - ) : uhd_single_usrp_sink(gr_make_io_signature(1, 1, type.size)), _type(type) + const uhd::io_type_t &type, + size_t num_channels + ) : uhd_single_usrp_sink(gr_make_io_signature(num_channels, num_channels, type.size)), _type(type) { _dev = uhd::usrp::single_usrp::make(args); } @@ -143,9 +144,10 @@ protected: **********************************************************************/ boost::shared_ptr<uhd_single_usrp_sink> uhd_make_single_usrp_sink( const std::string &args, - const uhd::io_type_t::tid_t &type + const uhd::io_type_t::tid_t &type, + size_t num_channels ){ return boost::shared_ptr<uhd_single_usrp_sink>( - new uhd_single_usrp_sink_impl(args, type) + new uhd_single_usrp_sink_impl(args, type, num_channels) ); } diff --git a/gr-uhd/lib/uhd_single_usrp_sink.h b/gr-uhd/lib/uhd_single_usrp_sink.h index 61417168a..bec788193 100644 --- a/gr-uhd/lib/uhd_single_usrp_sink.h +++ b/gr-uhd/lib/uhd_single_usrp_sink.h @@ -29,7 +29,8 @@ class uhd_single_usrp_sink; boost::shared_ptr<uhd_single_usrp_sink> uhd_make_single_usrp_sink( const std::string &args, - const uhd::io_type_t::tid_t &type + const uhd::io_type_t::tid_t &type, + size_t num_channels = 1 ); class uhd_single_usrp_sink : public gr_sync_block{ diff --git a/gr-uhd/lib/uhd_single_usrp_source.cc b/gr-uhd/lib/uhd_single_usrp_source.cc index 13e4d6d43..5da4385b2 100644 --- a/gr-uhd/lib/uhd_single_usrp_source.cc +++ b/gr-uhd/lib/uhd_single_usrp_source.cc @@ -39,8 +39,9 @@ class uhd_single_usrp_source_impl : public uhd_single_usrp_source{ public: uhd_single_usrp_source_impl( const std::string &args, - const uhd::io_type_t &type - ) : uhd_single_usrp_source(gr_make_io_signature(1, 1, type.size)), _type(type) + const uhd::io_type_t &type, + size_t num_channels + ) : uhd_single_usrp_source(gr_make_io_signature(num_channels, num_channels, type.size)), _type(type) { _dev = uhd::usrp::single_usrp::make(args); set_streaming(false); @@ -157,9 +158,10 @@ private: **********************************************************************/ boost::shared_ptr<uhd_single_usrp_source> uhd_make_single_usrp_source( const std::string &args, - const uhd::io_type_t::tid_t &type + const uhd::io_type_t::tid_t &type, + size_t num_channels ){ return boost::shared_ptr<uhd_single_usrp_source>( - new uhd_single_usrp_source_impl(args, type) + new uhd_single_usrp_source_impl(args, type, num_channels) ); } diff --git a/gr-uhd/lib/uhd_single_usrp_source.h b/gr-uhd/lib/uhd_single_usrp_source.h index 5da7e2b9a..196b7c675 100644 --- a/gr-uhd/lib/uhd_single_usrp_source.h +++ b/gr-uhd/lib/uhd_single_usrp_source.h @@ -29,7 +29,8 @@ class uhd_single_usrp_source; boost::shared_ptr<uhd_single_usrp_source> uhd_make_single_usrp_source( const std::string &args, - const uhd::io_type_t::tid_t &type + const uhd::io_type_t::tid_t &type, + size_t num_channels = 1 ); class uhd_single_usrp_source : public gr_sync_block{ |