Merge branch 'mb_iface' into next

Conflicts:
	host/lib/usrp/usrp2/usrp2_iface.hpp

1 files changed, 4 insertions, 4 deletions

diff --git a/host/lib/usrp/usrp_e100/codec_ctrl.cpp b/host/lib/usrp/usrp_e100/codec_ctrl.cpp
index 71a370f88..50442546a 100644
--- a/host/lib/usrp/usrp_e100/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp_e100/codec_ctrl.cpp
@@ -269,20 +269,20 @@ void usrp_e100_codec_ctrl_impl::write_aux_dac(aux_dac_t which, double volts){
 void usrp_e100_codec_ctrl_impl::send_reg(boost::uint8_t addr){
     boost::uint32_t reg = _ad9862_regs.get_write_reg(addr);
     if (codec_debug) std::cout << "codec control write reg: " << std::hex << reg << std::endl;
-    _iface->transact_spi(
+    _iface->write_spi(
         UE_SPI_SS_AD9862,
         spi_config_t::EDGE_RISE,
-        reg, 16, false /*no rb*/
+        reg, 16
     );
 }
 
 void usrp_e100_codec_ctrl_impl::recv_reg(boost::uint8_t addr){
     boost::uint32_t reg = _ad9862_regs.get_read_reg(addr);
     if (codec_debug) std::cout << "codec control read reg: " << std::hex << reg << std::endl;
-    boost::uint32_t ret = _iface->transact_spi(
+    boost::uint32_t ret = _iface->read_spi(
         UE_SPI_SS_AD9862,
         spi_config_t::EDGE_RISE,
-        reg, 16, true /*rb*/
+        reg, 16
     );
     if (codec_debug) std::cout << "codec control read ret: " << std::hex << ret << std::endl;
     _ad9862_regs.set_reg(addr, boost::uint16_t(ret));