Merge branch 'master' into vivado

Conflicts:
	host/lib/usrp/x300/x300_clock_ctrl.cpp

1 files changed, 13 insertions, 0 deletions

diff --git a/host/lib/usrp/x300/x300_clock_ctrl.hpp b/host/lib/usrp/x300/x300_clock_ctrl.hpp
index 40b62b09a..9c08aa356 100644
--- a/host/lib/usrp/x300/x300_clock_ctrl.hpp
+++ b/host/lib/usrp/x300/x300_clock_ctrl.hpp
@@ -71,11 +71,24 @@ public:
      */
     virtual void set_dboard_rate(const x300_clock_which_t which, double rate) = 0;
 
+    /*! Get the clock rate on the given daughterboard clock.
+     * \throw exception when rate invalid
+     * \return the clock rate in Hz
+     */
+    virtual double get_dboard_rate(const x300_clock_which_t which) = 0;
+
     /*! Get a list of possible daughterboard clock rates.
      * \return a list of clock rates in Hz
      */
     virtual std::vector<double> get_dboard_rates(const x300_clock_which_t which) = 0;
 
+    /*! Enable or disable daughterboard clock.
+     * \param which which clock
+     * \param enable true=enable, false=disable
+     * \return a list of clock rates in Hz
+     */
+    virtual void enable_dboard_clock(const x300_clock_which_t which, const bool enable) = 0;
+
     /*! Turn the reference output on/off
      * \param true = on, false = off
      */