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>

2 files changed, 4 insertions, 2 deletions

diff --git a/mpm/include/mpm/ad937x/ad937x_ctrl.hpp b/mpm/include/mpm/ad937x/ad937x_ctrl.hpp
index c8a787e49..6b863efdb 100644
--- a/mpm/include/mpm/ad937x/ad937x_ctrl.hpp
+++ b/mpm/include/mpm/ad937x/ad937x_ctrl.hpp
@@ -92,6 +92,7 @@ public:
      */
     static sptr 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);
     virtual ~ad937x_ctrl(void) {}
diff --git a/mpm/include/mpm/dboards/magnesium_manager.hpp b/mpm/include/mpm/dboards/magnesium_manager.hpp
index db86618fc..dba56f6a8 100644
--- a/mpm/include/mpm/dboards/magnesium_manager.hpp
+++ b/mpm/include/mpm/dboards/magnesium_manager.hpp
@@ -17,7 +17,8 @@ namespace mpm { namespace dboards {
     {
     public:
         magnesium_manager(
-            const std::string &mykonos_spidev
+            const std::string &mykonos_spidev,
+            const size_t deserializer_lane_xbar
         );
 
         /*! Return a reference to the SPI mutex
@@ -43,7 +44,7 @@ namespace mpm { namespace dboards {
 void export_magnesium(){
     LIBMPM_BOOST_PREAMBLE("dboards")
     using namespace mpm::dboards;
-    bp::class_<mpm::dboards::magnesium_manager>("magnesium_manager", bp::init<std::string>())
+    bp::class_<mpm::dboards::magnesium_manager>("magnesium_manager", bp::init<std::string,size_t>())
         .def("get_spi_lock", &mpm::dboards::magnesium_manager::get_spi_lock)
         .def("get_radio_ctrl", &mpm::dboards::magnesium_manager::get_radio_ctrl)
     ;