diff options
| author | Johnathan Corgan | 2012-04-05 11:53:24 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-04-05 11:53:24 -0700 |
| commit | c6ae4c28efac7ed8603b0ae5db4709205af6123d (patch) | |
| tree | c38eef38a3e259cee416404e292e650bc0c13015 /gr-uhd/include | |
| parent | 5b11e7e7f69ef1ebe34c24c6a97da0450ab2e419 (diff) | |
| parent | 99ebcc1c3ff453ea10e934ef1904b42821d589f1 (diff) | |
| download | gnuradio-c6ae4c28efac7ed8603b0ae5db4709205af6123d.tar.gz gnuradio-c6ae4c28efac7ed8603b0ae5db4709205af6123d.tar.bz2 gnuradio-c6ae4c28efac7ed8603b0ae5db4709205af6123d.zip | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/include')
| -rw-r--r-- | gr-uhd/include/gr_uhd_usrp_sink.h | 2 | ||||
| -rw-r--r-- | gr-uhd/include/gr_uhd_usrp_source.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-uhd/include/gr_uhd_usrp_sink.h b/gr-uhd/include/gr_uhd_usrp_sink.h index fff567438..dffdf810f 100644 --- a/gr-uhd/include/gr_uhd_usrp_sink.h +++ b/gr-uhd/include/gr_uhd_usrp_sink.h @@ -137,7 +137,7 @@ public: * \param chan channel index 0 to N-1 * \return TX info */ - virtual uhd::dict<std::string, std::string> get_usrp_tx_info(size_t chan = 0) = 0; + virtual uhd::dict<std::string, std::string> get_usrp_info(size_t chan = 0) = 0; /*! * Set the frontend specification. diff --git a/gr-uhd/include/gr_uhd_usrp_source.h b/gr-uhd/include/gr_uhd_usrp_source.h index 0dde4b194..64e9fb098 100644 --- a/gr-uhd/include/gr_uhd_usrp_source.h +++ b/gr-uhd/include/gr_uhd_usrp_source.h @@ -129,7 +129,7 @@ public: * \param chan channel index 0 to N-1 * \return RX info */ - virtual uhd::dict<std::string, std::string> get_usrp_rx_info(size_t chan = 0) = 0; + virtual uhd::dict<std::string, std::string> get_usrp_info(size_t chan = 0) = 0; /*! * Set the frontend specification. |