diff options
| author | Mark Meserve <mark.meserve@ni.com> | 2017-03-29 12:20:51 -0500 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-12-22 15:03:45 -0800 |
| commit | 51586a989e118a5b848a95f0c5e8fd274c7cde2b (patch) | |
| tree | 369014ca873806e8c0af19e7a27af1ae01cf1ac3 /mpm/include | |
| parent | 306468d564a28de96ff9d272503d15b2ecb81ff3 (diff) | |
| download | uhd-51586a989e118a5b848a95f0c5e8fd274c7cde2b.tar.gz uhd-51586a989e118a5b848a95f0c5e8fd274c7cde2b.tar.bz2 uhd-51586a989e118a5b848a95f0c5e8fd274c7cde2b.zip | |
mpm: clean up spi
remove spi_lock
remove ad9371 spi_config types
Diffstat (limited to 'mpm/include')
| -rw-r--r-- | mpm/include/mpm/ad937x/ad937x_ctrl.hpp | 2 | ||||
| -rw-r--r-- | mpm/include/mpm/ad937x/adi_ctrl.hpp | 1 | ||||
| -rw-r--r-- | mpm/include/mpm/dboards/magnesium_manager.hpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/mpm/include/mpm/ad937x/ad937x_ctrl.hpp b/mpm/include/mpm/ad937x/ad937x_ctrl.hpp index 10cbb0717..43ed37a94 100644 --- a/mpm/include/mpm/ad937x/ad937x_ctrl.hpp +++ b/mpm/include/mpm/ad937x/ad937x_ctrl.hpp @@ -33,7 +33,7 @@ class ad937x_ctrl : public boost::noncopyable { public: typedef std::shared_ptr<ad937x_ctrl> sptr; - static sptr make(spi_lock::sptr spi_l, uhd::spi_iface::sptr iface); + static sptr make(std::shared_ptr<std::mutex> spi_mutex, uhd::spi_iface::sptr iface); virtual ~ad937x_ctrl(void) {} static uhd::meta_range_t get_rf_freq_range(void); diff --git a/mpm/include/mpm/ad937x/adi_ctrl.hpp b/mpm/include/mpm/ad937x/adi_ctrl.hpp index d2514a321..616f59ea4 100644 --- a/mpm/include/mpm/ad937x/adi_ctrl.hpp +++ b/mpm/include/mpm/ad937x/adi_ctrl.hpp @@ -17,7 +17,6 @@ #pragma once -// TODO: fix path of UHD include #include <uhd/types/serial.hpp> #include <chrono> diff --git a/mpm/include/mpm/dboards/magnesium_manager.hpp b/mpm/include/mpm/dboards/magnesium_manager.hpp index 356727618..be8f9f8e8 100644 --- a/mpm/include/mpm/dboards/magnesium_manager.hpp +++ b/mpm/include/mpm/dboards/magnesium_manager.hpp @@ -39,7 +39,7 @@ namespace mpm { namespace dboards { private: //cpld control - spi_lock::sptr _spi_lock; + std::shared_ptr<std::mutex> _spi_mutex; lmk04828_spi_iface::sptr _clock_spi; lmk04828_iface::sptr _clock_ctrl; mpm::spi::spidev_iface::sptr _mykonos_spi; |