diff options
author | Trung N Tran <trung.tran@ettus.com> | 2018-01-11 10:57:07 -0800 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2018-01-12 16:21:15 -0800 |
commit | 7ffea3746be77cf926db946987ee83d48a33c798 (patch) | |
tree | 6266671108fc9c5fad0e75bf4325fe056972d1ab /mpm/lib/dboards/magnesium_manager.cpp | |
parent | b3e0f60a7b41359e8f7806dc77c402468bf7f444 (diff) | |
download | uhd-7ffea3746be77cf926db946987ee83d48a33c798.tar.gz uhd-7ffea3746be77cf926db946987ee83d48a33c798.tar.bz2 uhd-7ffea3746be77cf926db946987ee83d48a33c798.zip |
mpm: mg: Pass deserializer_lane_xbar to ad937x_config
Slot A and Slot B are different in how the JESD lanes are connected.
We now pass in different deserializer_lane_xbar config values for each slot.
Reviewed-by: Martin Braun <martin.braun@ettus.com>
Reviewed-by: Daniel Jepson <daniel.jepson@ettus.com>
Reviewed-by: Mark Meserve <mark.meserve@ni.com>
Diffstat (limited to 'mpm/lib/dboards/magnesium_manager.cpp')
-rw-r--r-- | mpm/lib/dboards/magnesium_manager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mpm/lib/dboards/magnesium_manager.cpp b/mpm/lib/dboards/magnesium_manager.cpp index b130d62ad..2d12712ab 100644 --- a/mpm/lib/dboards/magnesium_manager.cpp +++ b/mpm/lib/dboards/magnesium_manager.cpp @@ -11,15 +11,16 @@ using namespace mpm::dboards; using namespace mpm::chips; magnesium_manager::magnesium_manager( - const std::string &mykonos_spidev + 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() )) { - } |