Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e

1 files changed, 9 insertions, 5 deletions

diff --git a/host/lib/usrp/usrp2/clock_ctrl.cpp b/host/lib/usrp/usrp2/clock_ctrl.cpp
index 4c5207203..d9baa66cf 100644
--- a/host/lib/usrp/usrp2/clock_ctrl.cpp
+++ b/host/lib/usrp/usrp2/clock_ctrl.cpp
@@ -25,9 +25,9 @@ using namespace uhd;
 /*!
  * A usrp2 clock control specific to the ad9510 ic.
  */
-class clock_ctrl_impl : public clock_ctrl{
+class usrp2_clock_ctrl_impl : public usrp2_clock_ctrl{
 public:
-    clock_ctrl_impl(usrp2_iface::sptr iface){
+    usrp2_clock_ctrl_impl(usrp2_iface::sptr iface){
         _iface = iface;
 
         _ad9510_regs.cp_current_setting = ad9510_regs_t::CP_CURRENT_SETTING_3_0MA;
@@ -68,7 +68,7 @@ public:
 
     }
 
-    ~clock_ctrl_impl(void){
+    ~usrp2_clock_ctrl_impl(void){
         /* private clock enables, must be set here */
         this->enable_dac_clock(false);
         this->enable_adc_clock(false);
@@ -110,6 +110,10 @@ public:
         this->update_regs();
     }
 
+    double get_master_clock_rate(void){
+        return 100e6;
+    }
+
 private:
     /*!
      * Write a single register to the spi regs.
@@ -158,6 +162,6 @@ private:
 /***********************************************************************
  * Public make function for the ad9510 clock control
  **********************************************************************/
-clock_ctrl::sptr clock_ctrl::make(usrp2_iface::sptr iface){
-    return sptr(new clock_ctrl_impl(iface));
+usrp2_clock_ctrl::sptr usrp2_clock_ctrl::make(usrp2_iface::sptr iface){
+    return sptr(new usrp2_clock_ctrl_impl(iface));
 }