diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-05 11:53:24 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-05 11:53:24 -0700 |
| commit | c6ae4c28efac7ed8603b0ae5db4709205af6123d (patch) | |
| tree | c38eef38a3e259cee416404e292e650bc0c13015 /gr-uhd/lib | |
| parent | 5b11e7e7f69ef1ebe34c24c6a97da0450ab2e419 (diff) | |
| parent | 99ebcc1c3ff453ea10e934ef1904b42821d589f1 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/lib')
| -rw-r--r-- | gr-uhd/lib/gr_uhd_usrp_sink.cc | 2 | ||||
| -rw-r--r-- | gr-uhd/lib/gr_uhd_usrp_source.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-uhd/lib/gr_uhd_usrp_sink.cc b/gr-uhd/lib/gr_uhd_usrp_sink.cc index d86165f656..7528176643 100644 --- a/gr-uhd/lib/gr_uhd_usrp_sink.cc +++ b/gr-uhd/lib/gr_uhd_usrp_sink.cc @@ -66,7 +66,7 @@ public: _dev = uhd::usrp::multi_usrp::make(device_addr); } - uhd::dict<std::string, std::string> get_usrp_tx_info(size_t chan){ + uhd::dict<std::string, std::string> get_usrp_info(size_t chan){ #ifdef UHD_USRP_MULTI_USRP_GET_USRP_INFO_API return _dev->get_usrp_tx_info(chan); #else diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc index 49558cee6e..d06983cd31 100644 --- a/gr-uhd/lib/gr_uhd_usrp_source.cc +++ b/gr-uhd/lib/gr_uhd_usrp_source.cc @@ -70,7 +70,7 @@ public: _dev = uhd::usrp::multi_usrp::make(device_addr); } - uhd::dict<std::string, std::string> get_usrp_rx_info(size_t chan){ + uhd::dict<std::string, std::string> get_usrp_info(size_t chan){ #ifdef UHD_USRP_MULTI_USRP_GET_USRP_INFO_API return _dev->get_usrp_rx_info(chan); #else |