diff options
author | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
commit | 9b852f5f243e5cf68662b7152b5fa331a83e55fb (patch) | |
tree | 159ffe0761f78dd87e2ecc97abea14494abab4ff /host/lib/usrp/dboard/db_twinrx.cpp | |
parent | c66cb1bad0d881394f3519bd94f4693cceab4c64 (diff) | |
parent | 99c2730bc9db270560671f2d7d173768465ed51f (diff) | |
download | uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.gz uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.bz2 uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.zip |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/dboard/db_twinrx.cpp')
-rw-r--r-- | host/lib/usrp/dboard/db_twinrx.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/host/lib/usrp/dboard/db_twinrx.cpp b/host/lib/usrp/dboard/db_twinrx.cpp index 477412de0..2af6bc4ff 100644 --- a/host/lib/usrp/dboard/db_twinrx.cpp +++ b/host/lib/usrp/dboard/db_twinrx.cpp @@ -39,6 +39,7 @@ 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 @@ -170,13 +171,13 @@ public: prepend_ch("ch/preamp2", _ch_name), false); expert_factory::add_data_node<bool>(_expert, prepend_ch("ant/preamp2", _ch_name), false); - expert_factory::add_data_node<boost::uint8_t>(_expert, + expert_factory::add_data_node<uint8_t>(_expert, prepend_ch("ch/input_atten", _ch_name), 0); - expert_factory::add_data_node<boost::uint8_t>(_expert, + expert_factory::add_data_node<uint8_t>(_expert, prepend_ch("ant/input_atten", _ch_name), 0); - expert_factory::add_data_node<boost::uint8_t>(_expert, + expert_factory::add_data_node<uint8_t>(_expert, prepend_ch("ch/lb_atten", _ch_name), 0); - expert_factory::add_data_node<boost::uint8_t>(_expert, + expert_factory::add_data_node<uint8_t>(_expert, prepend_ch("ch/hb_atten", _ch_name), 0); expert_factory::add_data_node<twinrx_ctrl::lo_source_t>(_expert, prepend_ch("ch/LO1/source", _ch_name), twinrx_ctrl::LO_INTERNAL); @@ -340,4 +341,12 @@ UHD_STATIC_BLOCK(reg_twinrx_dboards) boost::assign::list_of("0")("1"), &make_twinrx_container ); + + dboard_manager::register_dboard_restricted( + TWINRX_V100_100_ID, + &twinrx_rcvr::make_twinrx_fe, + "TwinRX v1.1", + boost::assign::list_of("0")("1"), + &make_twinrx_container + ); } |