diff options
author | Josh Blum <josh@joshknows.com> | 2011-03-03 16:28:26 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-03-03 16:28:26 -0800 |
commit | 98028b366f840efc3b289cc7051bed73aad0963c (patch) | |
tree | 5d26773de13c4f78326896c6eb0ff78213d0912f /host/lib/usrp/usrp2/codec_ctrl.cpp | |
parent | f938ed7938021c10bb0a0ce47e6d40d10f89abc2 (diff) | |
parent | 1b63cd2560886d851f3e2ba98bfddf772c44df34 (diff) | |
download | uhd-98028b366f840efc3b289cc7051bed73aad0963c.tar.gz uhd-98028b366f840efc3b289cc7051bed73aad0963c.tar.bz2 uhd-98028b366f840efc3b289cc7051bed73aad0963c.zip |
Merge branch 'mb_iface' into next
Conflicts:
host/lib/usrp/usrp2/usrp2_iface.hpp
Diffstat (limited to 'host/lib/usrp/usrp2/codec_ctrl.cpp')
-rw-r--r-- | host/lib/usrp/usrp2/codec_ctrl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/codec_ctrl.cpp b/host/lib/usrp/usrp2/codec_ctrl.cpp index be5c2c899..0fdcedf62 100644 --- a/host/lib/usrp/usrp2/codec_ctrl.cpp +++ b/host/lib/usrp/usrp2/codec_ctrl.cpp @@ -168,17 +168,17 @@ private: void send_ad9777_reg(boost::uint8_t addr){ boost::uint16_t reg = _ad9777_regs.get_write_reg(addr); if (codec_ctrl_debug) std::cout << "send_ad9777_reg: " << std::hex << reg << std::endl; - _iface->transact_spi( + _iface->write_spi( SPI_SS_AD9777, spi_config_t::EDGE_RISE, - reg, 16, false /*no rb*/ + reg, 16 ); } void send_ads62p44_reg(boost::uint8_t addr) { boost::uint16_t reg = _ads62p44_regs.get_write_reg(addr); - _iface->transact_spi( + _iface->write_spi( SPI_SS_ADS62P44, spi_config_t::EDGE_FALL, - reg, 16, false /*no rb*/ + reg, 16 ); } }; |