diff options
author | Martin Braun <martin.braun@ettus.com> | 2015-06-09 16:17:53 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2015-06-09 16:17:53 -0700 |
commit | 533548a681f0045f1194c4b47f857fa16314784d (patch) | |
tree | d5dbc598b17605d5c4be85fad08f1c766025bb6c /host/lib/usrp/e300/e300_remote_codec_ctrl.cpp | |
parent | 13f9f07c42c4928ef3adcb1bbee3343198c9ecae (diff) | |
parent | 4d0dadb3cc0106c9026bc41d7d74d55918d13b43 (diff) | |
download | uhd-533548a681f0045f1194c4b47f857fa16314784d.tar.gz uhd-533548a681f0045f1194c4b47f857fa16314784d.tar.bz2 uhd-533548a681f0045f1194c4b47f857fa16314784d.zip |
Merge branch 'maint'
Conflicts:
host/lib/usrp/common/ad9361_ctrl.hpp
host/lib/usrp/common/ad9361_driver/ad9361_device.h
host/lib/usrp/e300/e300_remote_codec_ctrl.hpp
Diffstat (limited to 'host/lib/usrp/e300/e300_remote_codec_ctrl.cpp')
-rw-r--r-- | host/lib/usrp/e300/e300_remote_codec_ctrl.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp b/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp index d3efdb812..9708634dd 100644 --- a/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp +++ b/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp @@ -96,6 +96,20 @@ public: return _retval.freq; } + double get_freq(const std::string &which) + { + _clear(); + _args.action = uhd::htonx<boost::uint32_t>(transaction_t::ACTION_GET_FREQ); + if (which == "TX1") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_TX1); + else if (which == "TX2") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_TX2); + else if (which == "RX1") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_RX1); + else if (which == "RX2") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_RX2); + else throw std::runtime_error("e300_remote_codec_ctrl_impl incorrect chain string."); + + _transact(); + return _retval.freq; + } + void data_port_loopback(const bool on) { _clear(); |