diff options
Diffstat (limited to 'host/lib/usrp/usrp2')
| -rw-r--r-- | host/lib/usrp/usrp2/clock_ctrl.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/codec_ctrl.cpp | 8 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/dboard_iface.cpp | 16 |
3 files changed, 13 insertions, 13 deletions
diff --git a/host/lib/usrp/usrp2/clock_ctrl.cpp b/host/lib/usrp/usrp2/clock_ctrl.cpp index aaafbae53..abda53bf2 100644 --- a/host/lib/usrp/usrp2/clock_ctrl.cpp +++ b/host/lib/usrp/usrp2/clock_ctrl.cpp @@ -305,7 +305,7 @@ private: */ void write_reg(boost::uint8_t addr){ boost::uint32_t data = _ad9510_regs.get_write_reg(addr); - _iface->transact_spi(SPI_SS_AD9510, spi_config_t::EDGE_RISE, data, 24, false /*no rb*/); + _iface->write_spi(SPI_SS_AD9510, spi_config_t::EDGE_RISE, data, 24); } /*! 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 ); } }; diff --git a/host/lib/usrp/usrp2/dboard_iface.cpp b/host/lib/usrp/usrp2/dboard_iface.cpp index 8b2df61d6..924a6e901 100644 --- a/host/lib/usrp/usrp2/dboard_iface.cpp +++ b/host/lib/usrp/usrp2/dboard_iface.cpp @@ -257,7 +257,7 @@ void usrp2_dboard_iface::write_spi( boost::uint32_t data, size_t num_bits ){ - _iface->transact_spi(unit_to_spi_dev[unit], config, data, num_bits, false /*no rb*/); + _iface->write_spi(unit_to_spi_dev[unit], config, data, num_bits); } boost::uint32_t usrp2_dboard_iface::read_write_spi( @@ -266,7 +266,7 @@ boost::uint32_t usrp2_dboard_iface::read_write_spi( boost::uint32_t data, size_t num_bits ){ - return _iface->transact_spi(unit_to_spi_dev[unit], config, data, num_bits, true /*rb*/); + return _iface->read_spi(unit_to_spi_dev[unit], config, data, num_bits); } /*********************************************************************** @@ -288,9 +288,9 @@ void usrp2_dboard_iface::_write_aux_dac(unit_t unit){ (UNIT_RX, SPI_SS_RX_DAC) (UNIT_TX, SPI_SS_TX_DAC) ; - _iface->transact_spi( + _iface->write_spi( unit_to_spi_dac[unit], spi_config_t::EDGE_FALL, - _dac_regs[unit].get_reg(), 24, false /*no rb*/ + _dac_regs[unit].get_reg(), 24 ); } @@ -336,13 +336,13 @@ double usrp2_dboard_iface::read_aux_adc(unit_t unit, aux_adc_t which){ } ad7922_regs.chn = ad7922_regs.mod; //normal mode: mod == chn //write and read spi - _iface->transact_spi( + _iface->write_spi( unit_to_spi_adc[unit], config, - ad7922_regs.get_reg(), 16, false /*no rb*/ + ad7922_regs.get_reg(), 16 ); - ad7922_regs.set_reg(boost::uint16_t(_iface->transact_spi( + ad7922_regs.set_reg(boost::uint16_t(_iface->read_spi( unit_to_spi_adc[unit], config, - ad7922_regs.get_reg(), 16, true /*rb*/ + ad7922_regs.get_reg(), 16 ))); //convert to voltage and return |