TwinRX: Added ADF5356 synth and TwinRX Rev C support

ADF5355 and ADF5356 support merged into adf535x class
Default register values moved into regmap

Reviewed-By: Martin Braun <martin.braun@ettus.com>
Reviewed-By: Ashish Chaudhari <ashish@ettus.com>
Reviewed-By: Mark Meserve <mark.meserve@ni.com>

1 files changed, 16 insertions, 10 deletions

diff --git a/host/lib/usrp/dboard/db_twinrx.cpp b/host/lib/usrp/dboard/db_twinrx.cpp
index cedc26c36..254bb0344 100644
--- a/host/lib/usrp/dboard/db_twinrx.cpp
+++ b/host/lib/usrp/dboard/db_twinrx.cpp
@@ -18,6 +18,7 @@
 #include "twinrx/twinrx_experts.hpp"
 #include "twinrx/twinrx_ctrl.hpp"
 #include "twinrx/twinrx_io.hpp"
+#include "twinrx/twinrx_ids.hpp"
 #include <expert_factory.hpp>
 #include <uhd/types/device_addr.hpp>
 #include <uhd/types/ranges.hpp>
@@ -38,9 +39,6 @@ using namespace uhd::usrp;
 using namespace uhd::usrp::dboard::twinrx;
 using namespace uhd::experts;
 
-static const dboard_id_t TWINRX_V100_000_ID(0x91);
-static const dboard_id_t TWINRX_V100_100_ID(0x93);
-
 /*!
  * twinrx_rcvr_fe is the dbaord class (dboard_base) that
  * represents each front-end of a TwinRX board. UHD will
@@ -227,7 +225,7 @@ public:
         twinrx_gpio::sptr gpio_iface = boost::make_shared<twinrx_gpio>(_db_iface);
         twinrx_cpld_regmap::sptr cpld_regs = boost::make_shared<twinrx_cpld_regmap>();
         cpld_regs->initialize(*gpio_iface, false);
-        _ctrl = twinrx_ctrl::make(_db_iface, gpio_iface, cpld_regs);
+        _ctrl = twinrx_ctrl::make(_db_iface, gpio_iface, cpld_regs, get_rx_id());
         _expert = expert_factory::create_container("twinrx_expert");
     }
 
@@ -335,18 +333,26 @@ static dboard_base::sptr make_twinrx_container(dboard_base::ctor_args_t args)
 UHD_STATIC_BLOCK(reg_twinrx_dboards)
 {
     dboard_manager::register_dboard_restricted(
-        TWINRX_V100_000_ID,
+        twinrx::TWINRX_REV_A_ID,
+        &twinrx_rcvr::make_twinrx_fe,
+        "TwinRX Rev A",
+        {"0", "1"},
+        &make_twinrx_container
+    );
+
+    dboard_manager::register_dboard_restricted(
+        twinrx::TWINRX_REV_B_ID,
         &twinrx_rcvr::make_twinrx_fe,
-        "TwinRX v1.0",
-        boost::assign::list_of("0")("1"),
+        "TwinRX Rev B",
+        {"0", "1"},
         &make_twinrx_container
     );
 
     dboard_manager::register_dboard_restricted(
-        TWINRX_V100_100_ID,
+        twinrx::TWINRX_REV_C_ID,
         &twinrx_rcvr::make_twinrx_fe,
-        "TwinRX v1.1",
-        boost::assign::list_of("0")("1"),
+        "TwinRX Rev C",
+        {"0", "1"},
         &make_twinrx_container
     );
 }