aboutsummaryrefslogtreecommitdiffstats
path: root/mpm/lib/mykonos/ad937x_ctrl.cpp
diff options
context:
space:
mode:
authorTrung N Tran <trung.tran@ettus.com>2018-01-11 10:57:07 -0800
committerMartin Braun <martin.braun@ettus.com>2018-01-12 16:21:15 -0800
commit7ffea3746be77cf926db946987ee83d48a33c798 (patch)
tree6266671108fc9c5fad0e75bf4325fe056972d1ab /mpm/lib/mykonos/ad937x_ctrl.cpp
parentb3e0f60a7b41359e8f7806dc77c402468bf7f444 (diff)
downloaduhd-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/mykonos/ad937x_ctrl.cpp')
-rw-r--r--mpm/lib/mykonos/ad937x_ctrl.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/mpm/lib/mykonos/ad937x_ctrl.cpp b/mpm/lib/mykonos/ad937x_ctrl.cpp
index 729d3a6f3..ecb328fc8 100644
--- a/mpm/lib/mykonos/ad937x_ctrl.cpp
+++ b/mpm/lib/mykonos/ad937x_ctrl.cpp
@@ -172,10 +172,11 @@ class ad937x_ctrl_impl : public ad937x_ctrl
public:
ad937x_ctrl_impl(
std::shared_ptr<std::mutex> spi_mutex,
+ const size_t deserializer_lane_xbar,
mpm::types::regs_iface::sptr iface,
mpm::ad937x::gpio::gain_pins_t gain_pins) :
spi_mutex(spi_mutex),
- device(iface.get(), gain_pins),
+ device(iface.get(), deserializer_lane_xbar, gain_pins),
_iface(iface)
{
/* nop */
@@ -550,10 +551,11 @@ private:
ad937x_ctrl::sptr ad937x_ctrl::make(
std::shared_ptr<std::mutex> spi_mutex,
+ const size_t deserializer_lane_xbar,
mpm::types::regs_iface::sptr iface,
mpm::ad937x::gpio::gain_pins_t gain_pins
) {
- return std::make_shared<ad937x_ctrl_impl>(spi_mutex, iface, gain_pins);
+ return std::make_shared<ad937x_ctrl_impl>(spi_mutex, deserializer_lane_xbar, iface, gain_pins);
}