added set clock rate, and get clock rates to dboard iface, usrp2 needs clock ctrl implementation...

4 files changed, 81 insertions, 3 deletions

diff --git a/host/include/uhd/usrp/dboard_iface.hpp b/host/include/uhd/usrp/dboard_iface.hpp
index 7ecfcd3c0..edbd6c967 100644
--- a/host/include/uhd/usrp/dboard_iface.hpp
+++ b/host/include/uhd/usrp/dboard_iface.hpp
@@ -22,6 +22,7 @@
 #include <uhd/types/serial.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/cstdint.hpp>
+#include <vector>
 
 namespace uhd{ namespace usrp{
 
@@ -159,6 +160,14 @@ public:
     ) = 0;
 
     /*!
+     * Set the rate of a dboard clock.
+     *
+     * \param unit which unit rx or tx
+     * \param rate the clock rate in Hz
+     */
+    virtual void set_clock_rate(unit_t unit, double rate) = 0;
+
+    /*!
      * Get the rate of a dboard clock.
      *
      * \param unit which unit rx or tx
@@ -167,6 +176,14 @@ public:
     virtual double get_clock_rate(unit_t unit) = 0;
 
     /*!
+     * Get a list of possible rates for the dboard clock.
+     *
+     * \param unit which unit rx or tx
+     * \return a list of clock rates in Hz
+     */
+    virtual std::vector<double> get_clock_rates(unit_t unit) = 0;
+
+    /*!
      * Enable or disable a dboard clock.
      *
      * \param unit which unit rx or tx
diff --git a/host/lib/usrp/usrp2/clock_ctrl.cpp b/host/lib/usrp/usrp2/clock_ctrl.cpp
index d9baa66cf..783fb9b21 100644
--- a/host/lib/usrp/usrp2/clock_ctrl.cpp
+++ b/host/lib/usrp/usrp2/clock_ctrl.cpp
@@ -85,6 +85,14 @@ public:
         this->update_regs();
     }
 
+    void set_rate_rx_dboard_clock(double rate){
+        //TODO
+    }
+
+    std::vector<double> get_rates_rx_dboard_clock(void){
+        //TODO
+    }
+
     //uses output clock 6 (cmos)
     void enable_tx_dboard_clock(bool enb){
         _ad9510_regs.power_down_lvds_cmos_out6 = enb? 0 : 1;
@@ -96,6 +104,14 @@ public:
         this->update_regs();
     }
 
+    void set_rate_tx_dboard_clock(double rate){
+        //TODO
+    }
+
+    std::vector<double> get_rates_tx_dboard_clock(void){
+        //TODO
+    }
+
     /*!
      * If we are to use an external reference, enable the charge pump.
      * \param enb true to enable the CP
diff --git a/host/lib/usrp/usrp2/clock_ctrl.hpp b/host/lib/usrp/usrp2/clock_ctrl.hpp
index 0ad8d9532..70a104a81 100644
--- a/host/lib/usrp/usrp2/clock_ctrl.hpp
+++ b/host/lib/usrp/usrp2/clock_ctrl.hpp
@@ -21,6 +21,7 @@
 #include "usrp2_iface.hpp"
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
+#include <vector>
 
 class usrp2_clock_ctrl : boost::noncopyable{
 public:
@@ -46,12 +47,38 @@ public:
     virtual void enable_rx_dboard_clock(bool enb) = 0;
 
     /*!
+     * Set the clock rate on the rx dboard clock.
+     * \param rate the new clock rate
+     * \throw exception when rate invalid
+     */
+    virtual void set_rate_rx_dboard_clock(double rate) = 0;
+
+    /*!
+     * Get a list of possible rx dboard clock rates.
+     * \return a list of clock rates in Hz
+     */
+    virtual std::vector<double> get_rates_rx_dboard_clock(void) = 0;
+
+    /*!
      * Enable/disable the tx dboard clock.
      * \param enb true to enable
      */
     virtual void enable_tx_dboard_clock(bool enb) = 0;
 
     /*!
+     * Set the clock rate on the tx dboard clock.
+     * \param rate the new clock rate
+     * \throw exception when rate invalid
+     */
+    virtual void set_rate_tx_dboard_clock(double rate) = 0;
+
+    /*!
+     * Get a list of possible tx dboard clock rates.
+     * \return a list of clock rates in Hz
+     */
+    virtual std::vector<double> get_rates_tx_dboard_clock(void) = 0;
+
+    /*!
      * Enable/disable external reference.
      * \param enb true to enable
      */
diff --git a/host/lib/usrp/usrp2/dboard_iface.cpp b/host/lib/usrp/usrp2/dboard_iface.cpp
index 114f83f41..faebf698b 100644
--- a/host/lib/usrp/usrp2/dboard_iface.cpp
+++ b/host/lib/usrp/usrp2/dboard_iface.cpp
@@ -48,9 +48,10 @@ public:
     void write_i2c(boost::uint8_t, const byte_vector_t &);
     byte_vector_t read_i2c(boost::uint8_t, size_t);
 
+    void set_clock_rate(unit_t, double);
     double get_clock_rate(unit_t);
+    std::vector<double> get_clock_rates(unit_t);
     void set_clock_enabled(unit_t, bool);
-    bool get_clock_enabled(unit_t);
 
     void write_spi(
         unit_t unit,
@@ -73,6 +74,7 @@ private:
     boost::uint32_t _gpio_shadow;
 
     uhd::dict<unit_t, ad5623_regs_t> _dac_regs;
+    uhd::dict<unit_t, double> _clock_rates;
     void _write_aux_dac(unit_t);
 };
 
@@ -116,8 +118,24 @@ usrp2_dboard_iface::~usrp2_dboard_iface(void){
 /***********************************************************************
  * Clocks
  **********************************************************************/
-double usrp2_dboard_iface::get_clock_rate(unit_t){
-    return _clock_ctrl->get_master_clock_rate();
+void usrp2_dboard_iface::set_clock_rate(unit_t unit, double rate){
+    _clock_rates[unit] = rate; //set to shadow
+    switch(unit){
+    case UNIT_RX: _clock_ctrl->set_rate_rx_dboard_clock(rate); return;
+    case UNIT_TX: _clock_ctrl->set_rate_tx_dboard_clock(rate); return;
+    }
+}
+
+double usrp2_dboard_iface::get_clock_rate(unit_t unit){
+    return _clock_rates[unit]; //get from shadow
+}
+
+std::vector<double> usrp2_dboard_iface::get_clock_rates(unit_t unit){
+    switch(unit){
+    case UNIT_RX: return _clock_ctrl->get_rates_rx_dboard_clock();
+    case UNIT_TX: return _clock_ctrl->get_rates_tx_dboard_clock();
+    default: UHD_THROW_INVALID_CODE_PATH();
+    }
 }
 
 void usrp2_dboard_iface::set_clock_enabled(unit_t unit, bool enb){