diff options
| author | Johnathan Corgan | 2012-04-05 11:47:01 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-04-05 11:47:01 -0700 |
| commit | 99ebcc1c3ff453ea10e934ef1904b42821d589f1 (patch) | |
| tree | ea9e910e71470a03f57b9418d948713932457651 /gr-uhd/lib | |
| parent | c662d1c1625b1dbd0aa5d6345da60b985879460e (diff) | |
| parent | a69f26230680fa177c53cf75a3a5c6f469b8afb3 (diff) | |
| download | gnuradio-99ebcc1c3ff453ea10e934ef1904b42821d589f1.tar.gz gnuradio-99ebcc1c3ff453ea10e934ef1904b42821d589f1.tar.bz2 gnuradio-99ebcc1c3ff453ea10e934ef1904b42821d589f1.zip | |
Merge remote branch 'ncorgan/gr-uhd_swig'
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 d86165f65..752817664 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 49558cee6..d06983cd3 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 |