diff options
| author | Josh Blum <josh@joshknows.com> | 2010-10-18 16:49:08 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-10-18 16:49:08 -0700 |
| commit | 7f46efca9cb0c87e9130c117ac41650f6e0c25cc (patch) | |
| tree | 09c6b235935167f6fe022739c67696c12ad4dcc5 /gr-uhd/lib/uhd_multi_usrp_source.cc | |
| parent | 1e5db4248e2488e0f1b44ac1405d78e16c2408d8 (diff) | |
uhd: renamed make function params, cleanup, clock config for multi usrp
Diffstat (limited to 'gr-uhd/lib/uhd_multi_usrp_source.cc')
| -rw-r--r-- | gr-uhd/lib/uhd_multi_usrp_source.cc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gr-uhd/lib/uhd_multi_usrp_source.cc b/gr-uhd/lib/uhd_multi_usrp_source.cc index c10c08c500..1fcb576501 100644 --- a/gr-uhd/lib/uhd_multi_usrp_source.cc +++ b/gr-uhd/lib/uhd_multi_usrp_source.cc @@ -39,12 +39,16 @@ uhd_multi_usrp_source::uhd_multi_usrp_source(gr_io_signature_sptr sig) class uhd_multi_usrp_source_impl : public uhd_multi_usrp_source{ public: uhd_multi_usrp_source_impl( - const std::string &args, - const uhd::io_type_t &type, + const std::string &device_addr, + const uhd::io_type_t &io_type, size_t num_channels - ) : uhd_multi_usrp_source(gr_make_io_signature(num_channels, num_channels, type.size)), _type(type) + ): + uhd_multi_usrp_source(gr_make_io_signature( + num_channels, num_channels, io_type.size + )), + _type(io_type) { - _dev = uhd::usrp::multi_usrp::make(args); + _dev = uhd::usrp::multi_usrp::make(device_addr); } void set_subdev_spec(const std::string &spec, size_t mboard){ @@ -168,11 +172,11 @@ private: * Make UHD Multi USRP Source **********************************************************************/ boost::shared_ptr<uhd_multi_usrp_source> uhd_make_multi_usrp_source( - const std::string &args, - const uhd::io_type_t::tid_t &type, + const std::string &device_addr, + const uhd::io_type_t::tid_t &io_type, size_t num_channels ){ return boost::shared_ptr<uhd_multi_usrp_source>( - new uhd_multi_usrp_source_impl(args, type, num_channels) + new uhd_multi_usrp_source_impl(device_addr, io_type, num_channels) ); } |