diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2012-04-03 15:53:33 -0700 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2012-04-03 15:53:33 -0700 |
| commit | c5ad101e0f93b26521507672813ef28ea533482a (patch) | |
| tree | ec31b27226dcea6fcf028b3761a4b66b45e3f2bc /gr-uhd | |
| parent | 27608bfcc97e09372630237618eddce8a02d2fe6 (diff) | |
gr-uhd: uhd_usrp_source and uhd_usrp_sink can now multi_usrp's list_property_tree and get_usrp_info functions
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/include/gr_uhd_usrp_sink.h | 3 | ||||
| -rw-r--r-- | gr-uhd/include/gr_uhd_usrp_source.h | 3 | ||||
| -rw-r--r-- | gr-uhd/lib/gr_uhd_usrp_sink.cc | 8 | ||||
| -rw-r--r-- | gr-uhd/lib/gr_uhd_usrp_source.cc | 8 |
4 files changed, 22 insertions, 0 deletions
diff --git a/gr-uhd/include/gr_uhd_usrp_sink.h b/gr-uhd/include/gr_uhd_usrp_sink.h index ff4856f9bf..381260c3b4 100644 --- a/gr-uhd/include/gr_uhd_usrp_sink.h +++ b/gr-uhd/include/gr_uhd_usrp_sink.h @@ -130,6 +130,9 @@ public: */ virtual void set_start_time(const uhd::time_spec_t &time) = 0; + virtual std::vector<std::string> list_property_tree(const std::string &path) = 0; + virtual uhd::dict<std::string, std::string> get_usrp_info(size_t mboard = 0, size_t chan = 0) = 0; + /*! * Set the frontend specification. * \param spec the subdev spec markup string diff --git a/gr-uhd/include/gr_uhd_usrp_source.h b/gr-uhd/include/gr_uhd_usrp_source.h index 415503bc1d..69a9ffcbdc 100644 --- a/gr-uhd/include/gr_uhd_usrp_source.h +++ b/gr-uhd/include/gr_uhd_usrp_source.h @@ -122,6 +122,9 @@ public: */ virtual void set_start_time(const uhd::time_spec_t &time) = 0; + virtual std::vector<std::string> list_property_tree(const std::string &path) = 0; + virtual uhd::dict<std::string, std::string> get_usrp_info(size_t mboard = 0, size_t chan = 0) = 0; + /*! * Set the frontend specification. * \param spec the subdev spec markup string diff --git a/gr-uhd/lib/gr_uhd_usrp_sink.cc b/gr-uhd/lib/gr_uhd_usrp_sink.cc index 7e7875898b..a354746642 100644 --- a/gr-uhd/lib/gr_uhd_usrp_sink.cc +++ b/gr-uhd/lib/gr_uhd_usrp_sink.cc @@ -66,6 +66,14 @@ public: _dev = uhd::usrp::multi_usrp::make(device_addr); } + std::vector<std::string> list_property_tree(const std::string &path){ + return _dev->list_property_tree(path); + } + + uhd::dict<std::string, std::string> get_usrp_info(size_t mboard, size_t chan){ + return _dev->get_usrp_info(mboard, chan); + } + void set_subdev_spec(const std::string &spec, size_t mboard){ return _dev->set_tx_subdev_spec(spec, mboard); } diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc index bd7f4e21da..fd0cf9d940 100644 --- a/gr-uhd/lib/gr_uhd_usrp_source.cc +++ b/gr-uhd/lib/gr_uhd_usrp_source.cc @@ -70,6 +70,14 @@ public: _dev = uhd::usrp::multi_usrp::make(device_addr); } + std::vector<std::string> list_property_tree(const std::string &path){ + return _dev->list_property_tree(path); + } + + uhd::dict<std::string, std::string> get_usrp_info(size_t mboard, size_t chan){ + return _dev->get_usrp_info(mboard, chan); + } + void set_subdev_spec(const std::string &spec, size_t mboard){ return _dev->set_rx_subdev_spec(spec, mboard); } |