diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-04-19 18:55:16 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-12-22 15:03:46 -0800 |
| commit | 36365930a6035e18dc3ec07d401d73e7730af8cf (patch) | |
| tree | 5d1c2e3653c3f2edce464328fdf03eafaaffd476 /mpm/include | |
| parent | 0cdf67ad33628af28cf92ef4ad7eaa63c712b8b5 (diff) | |
| download | uhd-36365930a6035e18dc3ec07d401d73e7730af8cf.tar.gz uhd-36365930a6035e18dc3ec07d401d73e7730af8cf.tar.bz2 uhd-36365930a6035e18dc3ec07d401d73e7730af8cf.zip | |
mpm: Fixed a plethora of SPI-related issues
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 | 6 | ||||
| -rw-r--r-- | mpm/include/mpm/lmk04828/lmk04828_spi_iface.hpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mpm/include/mpm/ad937x/ad937x_ctrl.hpp b/mpm/include/mpm/ad937x/ad937x_ctrl.hpp index 837d617c9..995f4c379 100644 --- a/mpm/include/mpm/ad937x/ad937x_ctrl.hpp +++ b/mpm/include/mpm/ad937x/ad937x_ctrl.hpp @@ -177,7 +177,7 @@ void export_mykonos(){ .def("get_multichip_sync_status", &ad937x_ctrl::get_multichip_sync_status) .def("get_framer_status", &ad937x_ctrl::get_framer_status) .def("get_deframer_status", &ad937x_ctrl::get_deframer_status) - .def("get_deframer_irq", &ad937x_ctrl::get_deframer_irq) + //.def("get_deframer_irq", &ad937x_ctrl::get_deframer_irq) .def("get_ilas_config_match", &ad937x_ctrl::get_ilas_config_match) .def("enable_jesd_loopback", &ad937x_ctrl::enable_jesd_loopback) .def("get_rf_freq_range", &ad937x_ctrl::get_rf_freq_range) diff --git a/mpm/include/mpm/ad937x/adi_ctrl.hpp b/mpm/include/mpm/ad937x/adi_ctrl.hpp index 616f59ea4..34d9d891c 100644 --- a/mpm/include/mpm/ad937x/adi_ctrl.hpp +++ b/mpm/include/mpm/ad937x/adi_ctrl.hpp @@ -27,12 +27,12 @@ struct ad9371_spiSettings_t return reinterpret_cast<ad9371_spiSettings_t *>(sps); } - explicit ad9371_spiSettings_t(uhd::spi_iface::sptr uhd_iface); + explicit ad9371_spiSettings_t(uhd::spi_iface* uhd_iface); // spiSetting_t MUST be the first data member so that the - // reintrepret_cast in make() works + // reinterpret_cast in make() works spiSettings_t spi_settings; - uhd::spi_iface::sptr spi_iface; + uhd::spi_iface* spi_iface; std::chrono::time_point<std::chrono::steady_clock> timeout_start; std::chrono::microseconds timeout_duration; }; diff --git a/mpm/include/mpm/lmk04828/lmk04828_spi_iface.hpp b/mpm/include/mpm/lmk04828/lmk04828_spi_iface.hpp index af068c9e0..4fe124298 100644 --- a/mpm/include/mpm/lmk04828/lmk04828_spi_iface.hpp +++ b/mpm/include/mpm/lmk04828/lmk04828_spi_iface.hpp @@ -35,7 +35,7 @@ void export_lmk(){ .def("verify_chip_id", &lmk04828_iface::verify_chip_id) .def("get_chip_id", &lmk04828_iface::get_chip_id) .def("init", &lmk04828_iface::init) - .def("send_sysref_pulse", &lmk04828_iface::send_sysref_pulse) + .def("enable_sysref_pulse", &lmk04828_iface::enable_sysref_pulse) ; } // .def("make", &lmk04828_iface::make) |