diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-04 17:08:42 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-04 17:08:42 -0700 |
| commit | 29c887da604206aa6f3ad1859f70958231a7a1cb (patch) | |
| tree | bea8f24090bf4c1755a9445d16c15339e86d648d /gr-uhd/lib | |
| parent | c787fb66bf3512b5cd4870ef74cd1e4d91802820 (diff) | |
| parent | b711a8683c8c4578c7a4ff0f3664f1321da1dcad (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/lib')
| -rw-r--r-- | gr-uhd/lib/gr_uhd_usrp_sink.cc | 8 | ||||
| -rw-r--r-- | gr-uhd/lib/gr_uhd_usrp_source.cc | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/gr-uhd/lib/gr_uhd_usrp_sink.cc b/gr-uhd/lib/gr_uhd_usrp_sink.cc index 66be056df6..d86165f656 100644 --- a/gr-uhd/lib/gr_uhd_usrp_sink.cc +++ b/gr-uhd/lib/gr_uhd_usrp_sink.cc @@ -66,9 +66,9 @@ public: _dev = uhd::usrp::multi_usrp::make(device_addr); } - uhd::dict<std::string, std::string> get_usrp_info(size_t mboard, size_t chan){ + uhd::dict<std::string, std::string> get_usrp_tx_info(size_t chan){ #ifdef UHD_USRP_MULTI_USRP_GET_USRP_INFO_API - return _dev->get_usrp_info(mboard, chan); + return _dev->get_usrp_tx_info(chan); #else throw std::runtime_error("not implemented in this version"); #endif @@ -78,6 +78,10 @@ public: return _dev->set_tx_subdev_spec(spec, mboard); } + std::string get_subdev_spec(size_t mboard){ + return _dev->get_tx_subdev_spec(mboard).to_string(); + } + void set_samp_rate(double rate){ _dev->set_tx_rate(rate); _sample_rate = this->get_samp_rate(); diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc index ba87ae8e09..49558cee6e 100644 --- a/gr-uhd/lib/gr_uhd_usrp_source.cc +++ b/gr-uhd/lib/gr_uhd_usrp_source.cc @@ -70,9 +70,9 @@ public: _dev = uhd::usrp::multi_usrp::make(device_addr); } - uhd::dict<std::string, std::string> get_usrp_info(size_t mboard, size_t chan){ + uhd::dict<std::string, std::string> get_usrp_rx_info(size_t chan){ #ifdef UHD_USRP_MULTI_USRP_GET_USRP_INFO_API - return _dev->get_usrp_info(mboard, chan); + return _dev->get_usrp_rx_info(chan); #else throw std::runtime_error("not implemented in this version"); #endif @@ -82,6 +82,10 @@ public: return _dev->set_rx_subdev_spec(spec, mboard); } + std::string get_subdev_spec(size_t mboard){ + return _dev->get_rx_subdev_spec(mboard).to_string(); + } + void set_samp_rate(double rate){ _dev->set_rx_rate(rate); } |