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/lib/mykonos/config | |
| 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/lib/mykonos/config')
| -rw-r--r-- | mpm/lib/mykonos/config/ad937x_config_t.cpp | 3 | ||||
| -rw-r--r-- | mpm/lib/mykonos/config/ad937x_config_t.hpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mpm/lib/mykonos/config/ad937x_config_t.cpp b/mpm/lib/mykonos/config/ad937x_config_t.cpp index 941690d06..eac294299 100644 --- a/mpm/lib/mykonos/config/ad937x_config_t.cpp +++ b/mpm/lib/mykonos/config/ad937x_config_t.cpp @@ -24,6 +24,8 @@ ad937x_config_t::ad937x_config_t(spiSettings_t* sps) _assign_default_configuration(); _init_pointers(); + + device = &_device; } void ad937x_config_t::_assign_default_configuration() @@ -70,7 +72,6 @@ void ad937x_config_t::_assign_default_configuration() void ad937x_config_t::_init_pointers() { - _device.spiSettings = &_spiSettings; _device.rx = &_rx; _device.tx = &_tx; _device.obsRx = &_obsRx; diff --git a/mpm/lib/mykonos/config/ad937x_config_t.hpp b/mpm/lib/mykonos/config/ad937x_config_t.hpp index 5663517c7..94d14c733 100644 --- a/mpm/lib/mykonos/config/ad937x_config_t.hpp +++ b/mpm/lib/mykonos/config/ad937x_config_t.hpp @@ -28,7 +28,8 @@ class ad937x_config_t : public boost::noncopyable // a user could technically modify the pointers in the structs, but we have no way of preventing that public: ad937x_config_t(spiSettings_t* sps); - mykonosDevice_t * const device = &_device; + //mykonosDevice_t * const device = &_device; + mykonosDevice_t * device; ad937x_fir rx_fir_config; ad937x_fir tx_fir_config; @@ -40,7 +41,6 @@ private: // in general, this organization stinks // TODO: group and make more sense of these fields and pointers - spiSettings_t _spiSettings; mykonosRxSettings_t _rx; mykonosTxSettings_t _tx; mykonosObsRxSettings_t _obsRx; |