From 7ffea3746be77cf926db946987ee83d48a33c798 Mon Sep 17 00:00:00 2001 From: Trung N Tran Date: Thu, 11 Jan 2018 10:57:07 -0800 Subject: 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 Reviewed-by: Daniel Jepson Reviewed-by: Mark Meserve --- mpm/lib/mykonos/ad937x_ctrl.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mpm/lib/mykonos/ad937x_ctrl.cpp') 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 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 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(spi_mutex, iface, gain_pins); + return std::make_shared(spi_mutex, deserializer_lane_xbar, iface, gain_pins); } -- cgit v1.2.3