diff options
Diffstat (limited to 'mpm/lib/dboards/e31x_db_manager.cpp')
| -rw-r--r-- | mpm/lib/dboards/e31x_db_manager.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/mpm/lib/dboards/e31x_db_manager.cpp b/mpm/lib/dboards/e31x_db_manager.cpp index b433dde30..3c6346bd3 100644 --- a/mpm/lib/dboards/e31x_db_manager.cpp +++ b/mpm/lib/dboards/e31x_db_manager.cpp @@ -1,5 +1,6 @@ // // Copyright 2018 Ettus Research, a National Instruments Company +// Copyright 2019 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: GPL-3.0-or-later // @@ -57,23 +58,19 @@ private: uint32_t _slave_num; }; -e31x_db_manager::e31x_db_manager(const std::string &catalina_spidev) +e31x_db_manager::e31x_db_manager(const std::string& catalina_spidev) { // Make the MPM-style low level SPI Regs iface - auto spi_iface = mpm::spi::make_spi_regs_iface( - mpm::spi::spi_iface::make_spidev(catalina_spidev, AD9361_SPI_SPEED_HZ, AD9361_SPI_MODE), + auto spi_iface = mpm::spi::make_spi_regs_iface( + mpm::spi::spi_iface::make_spidev( + catalina_spidev, AD9361_SPI_SPEED_HZ, AD9361_SPI_MODE), AD9361_SPI_ADDR_SHIFT, AD9361_SPI_DATA_SHIFT, AD9361_SPI_READ_CMD, AD9361_SPI_WRITE_CMD); // Make the SPI interface auto spi_io_iface = std::make_shared<e310_ad9361_io_spi>(spi_iface, 0); - // Translate from a std shared_ptr to Boost (for legacy compatability) - auto spi_io_iface_boost = boost::shared_ptr<e310_ad9361_io_spi>( - spi_io_iface.get(), - [spi_io_iface](...) mutable { spi_io_iface.reset(); }); // Make the actual Catalina Ctrl object - _catalina_ctrl = ad9361_ctrl::make_spi( - boost::make_shared<e31x_ad9361_client_t>(), - spi_io_iface_boost); + _catalina_ctrl = + ad9361_ctrl::make_spi(std::make_shared<e31x_ad9361_client_t>(), spi_io_iface); } |