fifo ctrl: spi core work and host implementation

1 files changed, 8 insertions, 6 deletions

diff --git a/host/lib/usrp/usrp2/codec_ctrl.cpp b/host/lib/usrp/usrp2/codec_ctrl.cpp
index 06bf83b15..b53c4d9df 100644
--- a/host/lib/usrp/usrp2/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp2/codec_ctrl.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010-2011 Ettus Research LLC
+// Copyright 2010-2012 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -32,8 +32,9 @@ using namespace uhd;
  */
 class usrp2_codec_ctrl_impl : public usrp2_codec_ctrl{
 public:
-    usrp2_codec_ctrl_impl(usrp2_iface::sptr iface){
+    usrp2_codec_ctrl_impl(usrp2_iface::sptr iface, uhd::spi_iface::sptr spiface){
         _iface = iface;
+        _spiface = spiface;
 
         //setup the ad9777 dac
         _ad9777_regs.x_1r_2r_mode = ad9777_regs_t::X_1R_2R_MODE_1R;
@@ -189,11 +190,12 @@ private:
     ad9777_regs_t _ad9777_regs;
     ads62p44_regs_t _ads62p44_regs;
     usrp2_iface::sptr _iface;
+    uhd::spi_iface::sptr _spiface;
 
     void send_ad9777_reg(boost::uint8_t addr){
         boost::uint16_t reg = _ad9777_regs.get_write_reg(addr);
         UHD_LOGV(always) << "send_ad9777_reg: " << std::hex << reg << std::endl;
-        _iface->write_spi(
+        _spiface->write_spi(
             SPI_SS_AD9777, spi_config_t::EDGE_RISE,
             reg, 16
         );
@@ -201,7 +203,7 @@ private:
 
     void send_ads62p44_reg(boost::uint8_t addr) {
         boost::uint16_t reg = _ads62p44_regs.get_write_reg(addr);
-        _iface->write_spi(
+        _spiface->write_spi(
             SPI_SS_ADS62P44, spi_config_t::EDGE_FALL,
             reg, 16
         );
@@ -211,6 +213,6 @@ private:
 /***********************************************************************
  * Public make function for the usrp2 codec control
  **********************************************************************/
-usrp2_codec_ctrl::sptr usrp2_codec_ctrl::make(usrp2_iface::sptr iface){
-    return sptr(new usrp2_codec_ctrl_impl(iface));
+usrp2_codec_ctrl::sptr usrp2_codec_ctrl::make(usrp2_iface::sptr iface, uhd::spi_iface::sptr spiface){
+    return sptr(new usrp2_codec_ctrl_impl(iface, spiface));
 }