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_network.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_network.cpp')
-rw-r--r-- | host/lib/usrp/e300/e300_network.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/host/lib/usrp/e300/e300_network.cpp b/host/lib/usrp/e300/e300_network.cpp index 2a63abc25..d68dc4541 100644 --- a/host/lib/usrp/e300/e300_network.cpp +++ b/host/lib/usrp/e300/e300_network.cpp @@ -220,6 +220,9 @@ static void e300_codec_ctrl_tunnel( case codec_xact_t::ACTION_TUNE: out->freq = _codec_ctrl->tune(which_str, in->freq); break; + case codec_xact_t::ACTION_GET_FREQ: + out->freq = _codec_ctrl->get_freq(which_str); + break; case codec_xact_t::ACTION_SET_LOOPBACK: _codec_ctrl->data_port_loopback( uhd::ntohx<boost::uint32_t>(in->bits) & 1); |