diff options
Diffstat (limited to 'mpm/lib')
| -rw-r--r-- | mpm/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | mpm/lib/catalina/CMakeLists.txt | 50 | ||||
| -rw-r--r-- | mpm/lib/dboards/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | mpm/lib/dboards/neon_manager.cpp | 79 |
4 files changed, 137 insertions, 2 deletions
diff --git a/mpm/lib/CMakeLists.txt b/mpm/lib/CMakeLists.txt index cf252f6e6..26ab591d8 100644 --- a/mpm/lib/CMakeLists.txt +++ b/mpm/lib/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017-2018 Ettus Research, a National Instruments Company # # SPDX-License-Identifier: GPL-3.0 # @@ -13,6 +13,8 @@ ADD_SUBDIRECTORY(types) if(ENABLE_MYKONOS) ADD_SUBDIRECTORY(mykonos) +elseif(ENABLE_E320) + ADD_SUBDIRECTORY(catalina) endif(ENABLE_MYKONOS) USRP_PERIPHS_ADD_OBJECT(periphs diff --git a/mpm/lib/catalina/CMakeLists.txt b/mpm/lib/catalina/CMakeLists.txt new file mode 100644 index 000000000..615843bea --- /dev/null +++ b/mpm/lib/catalina/CMakeLists.txt @@ -0,0 +1,50 @@ +# +# Copyright 2018 Ettus Research, a National Instruments Company +# +# SPDX-License-Identifier: GPL-3.0-or-later +# + +######################################################################## +# This file included, use CMake directory variables +######################################################################## + +MACRO(CATALINA_APPEND_SOURCES) + SET(catalina_sources ${catalina_sources}) + LIST(APPEND catalina_sources ${ARGV}) + SET(catalina_sources ${catalina_sources} PARENT_SCOPE) +ENDMACRO(CATALINA_APPEND_SOURCES) + +SET (CMAKE_CATALINA_SOURCE_DIR + ${UHD_HOST_ROOT}/lib/usrp/common +) + +CONFIGURE_FILE( + ${UHD_HOST_ROOT}/include/uhd/version.hpp.in + ${CMAKE_BINARY_DIR}/include/uhd/version.hpp +) + +# TODO: Do something better than listing all the files individually +SET(catalina_sources + ${CMAKE_CATALINA_SOURCE_DIR}/ad9361_ctrl.cpp + ${CMAKE_CATALINA_SOURCE_DIR}/ad936x_manager.cpp + ${CMAKE_CATALINA_SOURCE_DIR}/ad9361_driver/ad9361_device.cpp + ${UHD_HOST_ROOT}/lib/types/filters.cpp + ${UHD_HOST_ROOT}/lib/types/ranges.cpp + ${UHD_HOST_ROOT}/lib/types/sensors.cpp + ${UHD_HOST_ROOT}/lib/types/serial.cpp + ${UHD_HOST_ROOT}/lib/property_tree.cpp + ${UHD_HOST_ROOT}/lib/utils/log.cpp + ${UHD_HOST_ROOT}/lib/version.cpp +) + +USRP_PERIPHS_ADD_OBJECT(catalina ${catalina_sources}) + +TARGET_INCLUDE_DIRECTORIES(catalina PUBLIC + $<BUILD_INTERFACE:${UHD_HOST_ROOT}/lib/include>) +TARGET_INCLUDE_DIRECTORIES(catalina PUBLIC + $<BUILD_INTERFACE:${UHD_HOST_ROOT}/lib/usrp/common/ad9361_driver>) + +TARGET_INCLUDE_DIRECTORIES(catalina PUBLIC + $<BUILD_INTERFACE:${UHD_HOST_ROOT}/lib/include>) +TARGET_INCLUDE_DIRECTORIES(dboards PUBLIC + $<BUILD_INTERFACE:${UHD_HOST_ROOT}/lib/usrp/common/ad9361_driver>) diff --git a/mpm/lib/dboards/CMakeLists.txt b/mpm/lib/dboards/CMakeLists.txt index 7af3f98b7..38fea22d3 100644 --- a/mpm/lib/dboards/CMakeLists.txt +++ b/mpm/lib/dboards/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017-2018 Ettus Research, a National Instruments Company # # SPDX-License-Identifier: GPL-3.0 # @@ -12,4 +12,8 @@ if(ENABLE_MAGNESIUM) USRP_PERIPHS_ADD_OBJECT(dboards magnesium_manager.cpp ) +elseif(ENABLE_E320) + USRP_PERIPHS_ADD_OBJECT(dboards + neon_manager.cpp + ) endif(ENABLE_MAGNESIUM) diff --git a/mpm/lib/dboards/neon_manager.cpp b/mpm/lib/dboards/neon_manager.cpp new file mode 100644 index 000000000..bdd82f0b7 --- /dev/null +++ b/mpm/lib/dboards/neon_manager.cpp @@ -0,0 +1,79 @@ +// +// Copyright 2018 Ettus Research, a National Instruments Company +// +// SPDX-License-Identifier: GPL-3.0-or-later +// + +#include <mpm/ad9361/e320_defaults.hpp> +#include <mpm/dboards/neon_manager.hpp> +#include <mpm/spi/spi_iface.hpp> +#include <mpm/spi/spi_regs_iface.hpp> +#include <mpm/types/regs_iface.hpp> +#include <boost/make_shared.hpp> +#include <memory> + +using namespace mpm::dboards; +using namespace mpm::chips; +using namespace mpm::types; +using namespace mpm::types::e320; + +namespace { /*anon*/ + +constexpr uint32_t AD9361_SPI_WRITE_CMD = 0x00800000; +constexpr uint32_t AD9361_SPI_READ_CMD = 0x00000000; +constexpr uint32_t AD9361_SPI_ADDR_MASK = 0x003FFF00; +constexpr uint32_t AD9361_SPI_ADDR_SHIFT = 8; +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; + +} // namespace /*anon*/ + +/*! MPM-style E320 SPI Iface for AD9361 CTRL + * + */ +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() {/*nop*/} + + uint8_t peek8(uint32_t reg) + { + return _regs_iface->peek8(reg); + } + + void poke8(uint32_t reg, uint8_t val) + { + _regs_iface->poke8(reg, val); + } + +private: + regs_iface::sptr _regs_iface; + uint32_t _slave_num; +}; + +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), + 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<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(); }); + // Make the actual Catalina Ctrl object + _catalina_ctrl = ad9361_ctrl::make_spi( + boost::make_shared<e320_ad9361_client_t>(), + spi_io_iface_boost); +} |