diff options
| author | Josh Blum | 2011-01-05 19:08:26 -0800 |
|---|---|---|
| committer | Josh Blum | 2011-01-19 22:24:57 -0800 |
| commit | dfcc8cc28d8e5d0ca1de62b1622438be2439ebd1 (patch) | |
| tree | 4357ccb7a3a5847e0f1480755f718171f4617e75 /gr-uhd/lib/uhd_multi_usrp_source.cc | |
| parent | cf33e1e5f75c627907811e07e4c3c7a6b6175e8a (diff) | |
| download | gnuradio-dfcc8cc28d8e5d0ca1de62b1622438be2439ebd1.tar.gz gnuradio-dfcc8cc28d8e5d0ca1de62b1622438be2439ebd1.tar.bz2 gnuradio-dfcc8cc28d8e5d0ca1de62b1622438be2439ebd1.zip | |
uhd: use the actual device and io types, do hacks in the init.py, also use clock config convenience
Diffstat (limited to 'gr-uhd/lib/uhd_multi_usrp_source.cc')
| -rw-r--r-- | gr-uhd/lib/uhd_multi_usrp_source.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-uhd/lib/uhd_multi_usrp_source.cc b/gr-uhd/lib/uhd_multi_usrp_source.cc index 029a763e3..770314057 100644 --- a/gr-uhd/lib/uhd_multi_usrp_source.cc +++ b/gr-uhd/lib/uhd_multi_usrp_source.cc @@ -1,5 +1,5 @@ /* - * Copyright 2010 Free Software Foundation, Inc. + * Copyright 2010-2011 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -39,7 +39,7 @@ 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 &device_addr, + const uhd::device_addr_t &device_addr, const uhd::io_type_t &io_type, size_t num_channels ): @@ -177,8 +177,8 @@ private: * Make UHD Multi USRP Source **********************************************************************/ boost::shared_ptr<uhd_multi_usrp_source> uhd_make_multi_usrp_source( - const std::string &device_addr, - const uhd::io_type_t::tid_t &io_type, + const uhd::device_addr_t &device_addr, + const uhd::io_type_t &io_type, size_t num_channels ){ return boost::shared_ptr<uhd_multi_usrp_source>( |