1 files changed, 8 insertions, 16 deletions

diff --git a/host/lib/usrp/usrp1/codec_ctrl.cpp b/host/lib/usrp/usrp1/codec_ctrl.cpp
index 448135185..2e9355063 100644
--- a/host/lib/usrp/usrp1/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp1/codec_ctrl.cpp
@@ -43,9 +43,7 @@ const gain_range_t usrp1_codec_ctrl::rx_pga_gain_range(0, 20, 1);
 class usrp1_codec_ctrl_impl : public usrp1_codec_ctrl {
 public:
     //structors
-    usrp1_codec_ctrl_impl(usrp1_iface::sptr iface,
-                          usrp1_clock_ctrl::sptr clock,
-                          int spi_slave);
+    usrp1_codec_ctrl_impl(spi_iface::sptr iface, int spi_slave);
     ~usrp1_codec_ctrl_impl(void);
 
     //aux adc and dac control
@@ -53,7 +51,7 @@ public:
     void write_aux_dac(aux_dac_t which, double volts);
 
     //duc control
-    void set_duc_freq(double freq);
+    void set_duc_freq(double freq, double);
     void enable_tx_digital(bool enb);
 
     //pga gain control
@@ -66,8 +64,7 @@ public:
     void bypass_adc_buffers(bool bypass);
 
 private:
-    usrp1_iface::sptr _iface;
-    usrp1_clock_ctrl::sptr _clock_ctrl;
+    spi_iface::sptr _iface;
     int _spi_slave;
     ad9862_regs_t _ad9862_regs;
     void send_reg(boost::uint8_t addr);
@@ -80,12 +77,8 @@ private:
 /***********************************************************************
  * Codec Control Structors
  **********************************************************************/
-usrp1_codec_ctrl_impl::usrp1_codec_ctrl_impl(usrp1_iface::sptr iface,
-                                             usrp1_clock_ctrl::sptr clock,
-                                             int spi_slave)
-{
+usrp1_codec_ctrl_impl::usrp1_codec_ctrl_impl(spi_iface::sptr iface, int spi_slave){
     _iface = iface;
-    _clock_ctrl = clock;
     _spi_slave = spi_slave;
 
     //soft reset
@@ -381,9 +374,9 @@ double usrp1_codec_ctrl_impl::fine_tune(double codec_rate, double target_freq)
     return actual_freq;
 }
 
-void usrp1_codec_ctrl_impl::set_duc_freq(double freq)
+void usrp1_codec_ctrl_impl::set_duc_freq(double freq, double rate)
 {
-    double codec_rate = _clock_ctrl->get_master_clock_freq() * 2;
+    double codec_rate = rate * 2;
     double coarse_freq = coarse_tune(codec_rate, freq);
     double fine_freq = fine_tune(codec_rate / 4, freq - coarse_freq);
 
@@ -421,9 +414,8 @@ void usrp1_codec_ctrl_impl::bypass_adc_buffers(bool bypass) {
 /***********************************************************************
  * Codec Control Make
  **********************************************************************/
-usrp1_codec_ctrl::sptr usrp1_codec_ctrl::make(usrp1_iface::sptr iface,
-                                              usrp1_clock_ctrl::sptr clock,
+usrp1_codec_ctrl::sptr usrp1_codec_ctrl::make(spi_iface::sptr iface,
                                               int spi_slave)
 {
-    return sptr(new usrp1_codec_ctrl_impl(iface, clock, spi_slave));
+    return sptr(new usrp1_codec_ctrl_impl(iface, spi_slave));
 }