aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2018-06-29 14:28:49 -0700
committerMartin Braun <martin.braun@ettus.com>2018-07-06 12:10:53 -0700
commit4bbde64c709ebe6298e6b650a0fb8e1ef2f92ae4 (patch)
tree326f102f1a85de853e26b7e7fbbf3b654342ebaa
parentba5722f6133f9051a999cbba3ba13a4ee56f63c8 (diff)
downloaduhd-4bbde64c709ebe6298e6b650a0fb8e1ef2f92ae4.tar.gz
uhd-4bbde64c709ebe6298e6b650a0fb8e1ef2f92ae4.tar.bz2
uhd-4bbde64c709ebe6298e6b650a0fb8e1ef2f92ae4.zip
fixup! e300: merge files from rfnoc-devel
-rw-r--r--host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp3
-rw-r--r--host/lib/usrp/e300/e300_remote_codec_ctrl.cpp5
2 files changed, 8 insertions, 0 deletions
diff --git a/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp b/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp
index 451dae2f7..1d9585d35 100644
--- a/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp
+++ b/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp
@@ -105,6 +105,9 @@ public:
//! set which RX and TX chains/antennas are active
virtual void set_active_chains(bool tx1, bool tx2, bool rx1, bool rx2) = 0;
+ //! set which timing mode is used
+ virtual void set_timing_mode(const std::string &timing_mode) = 0;
+
//! tune the given frontend, return the exact value
virtual double tune(const std::string &which, const double value) = 0;
diff --git a/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp b/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp
index 575abe24e..5692a138e 100644
--- a/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp
+++ b/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp
@@ -238,6 +238,11 @@ public:
UHD_THROW_INVALID_CODE_PATH();
}
+ void set_timing_mode(UHD_UNUSED(const std::string &timing_mode))
+ {
+ UHD_THROW_INVALID_CODE_PATH();
+ }
+
private:
void _transact() {
{