diff options
Diffstat (limited to 'mpm/lib/dboards')
| -rw-r--r-- | mpm/lib/dboards/magnesium_manager.cpp | 20 | ||||
| -rw-r--r-- | mpm/lib/dboards/neon_manager.cpp | 27 |
2 files changed, 23 insertions, 24 deletions
diff --git a/mpm/lib/dboards/magnesium_manager.cpp b/mpm/lib/dboards/magnesium_manager.cpp index 49ab7f9ec..c9f9a93b6 100644 --- a/mpm/lib/dboards/magnesium_manager.cpp +++ b/mpm/lib/dboards/magnesium_manager.cpp @@ -4,23 +4,19 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#include <mpm/dboards/magnesium_manager.hpp> #include <mpm/ad937x/ad937x_spi_iface.hpp> +#include <mpm/dboards/magnesium_manager.hpp> using namespace mpm::dboards; using namespace mpm::chips; magnesium_manager::magnesium_manager( - const std::string &mykonos_spidev, - const size_t deserializer_lane_xbar -) : _spi_mutex(std::make_shared<std::mutex>()) - , _spi_lock(mpm::types::lockable::make(_spi_mutex)) - , _mykonos_ctrl(ad937x_ctrl::make( - _spi_mutex, - deserializer_lane_xbar, - make_ad937x_iface(mykonos_spidev), - mpm::ad937x::gpio::gain_pins_t() - )) + const std::string& mykonos_spidev, const size_t deserializer_lane_xbar) + : _spi_mutex(std::make_shared<std::mutex>()) + , _spi_lock(mpm::types::lockable::make(_spi_mutex)) + , _mykonos_ctrl(ad937x_ctrl::make(_spi_mutex, + deserializer_lane_xbar, + make_ad937x_iface(mykonos_spidev), + mpm::ad937x::gpio::gain_pins_t())) { } - diff --git a/mpm/lib/dboards/neon_manager.cpp b/mpm/lib/dboards/neon_manager.cpp index bdd82f0b7..671e44d8d 100644 --- a/mpm/lib/dboards/neon_manager.cpp +++ b/mpm/lib/dboards/neon_manager.cpp @@ -27,9 +27,9 @@ constexpr uint32_t AD9361_SPI_DATA_MASK = 0x000000FF; constexpr uint32_t AD9361_SPI_DATA_SHIFT = 0; constexpr uint32_t AD9361_SPI_NUM_BITS = 24; constexpr uint32_t AD9361_SPI_SPEED_HZ = 2000000; -constexpr int AD9361_SPI_MODE = 1; +constexpr int AD9361_SPI_MODE = 1; -} // namespace /*anon*/ +} // namespace /*! MPM-style E320 SPI Iface for AD9361 CTRL * @@ -37,10 +37,14 @@ constexpr int AD9361_SPI_MODE = 1; class e320_ad9361_io_spi : public ad9361_io { public: - e320_ad9361_io_spi(regs_iface::sptr regs_iface, uint32_t slave_num) : - _regs_iface(regs_iface), _slave_num(slave_num) { } + e320_ad9361_io_spi(regs_iface::sptr regs_iface, uint32_t slave_num) + : _regs_iface(regs_iface), _slave_num(slave_num) + { + } - ~e320_ad9361_io_spi() {/*nop*/} + ~e320_ad9361_io_spi() + { /*nop*/ + } uint8_t peek8(uint32_t reg) { @@ -57,11 +61,12 @@ private: uint32_t _slave_num; }; -neon_manager::neon_manager(const std::string &catalina_spidev) +neon_manager::neon_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, @@ -70,10 +75,8 @@ neon_manager::neon_manager(const std::string &catalina_spidev) auto spi_io_iface = std::make_shared<e320_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<e320_ad9361_io_spi>( - spi_io_iface.get(), - [spi_io_iface](...) mutable { spi_io_iface.reset(); }); + 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<e320_ad9361_client_t>(), - spi_io_iface_boost); + boost::make_shared<e320_ad9361_client_t>(), spi_io_iface_boost); } |