diff options
author | Martin Braun <martin.braun@ettus.com> | 2016-08-12 17:54:17 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2016-08-12 17:54:17 -0700 |
commit | 17a5d711151c98c3f9cf24d33fd7c9f092bc2796 (patch) | |
tree | 65bb8b0d2258539bcdb8dea4f03ba023ad41cc88 /host/lib | |
parent | 85a88b58bab7c03c59991e38b83a7d50a46cf498 (diff) | |
parent | 73ea894be3f234c63399076148cf4f1f018ea9e2 (diff) | |
download | uhd-17a5d711151c98c3f9cf24d33fd7c9f092bc2796.tar.gz uhd-17a5d711151c98c3f9cf24d33fd7c9f092bc2796.tar.bz2 uhd-17a5d711151c98c3f9cf24d33fd7c9f092bc2796.zip |
Merge branch 'maint'
Diffstat (limited to 'host/lib')
-rw-r--r-- | host/lib/usrp/x300/x300_radio_ctrl_impl.cpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/x300/x300_radio_ctrl_impl.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp index 388b66929..e1b724db6 100644 --- a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp +++ b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp @@ -109,7 +109,7 @@ UHD_RFNOC_RADIO_BLOCK_CONSTRUCTOR(x300_radio_ctrl) // create front-end objects //////////////////////////////////////////////////////////////// for (size_t i = 0; i < _get_num_radios(); i++) { - _rx_fe_map[i].core = rx_frontend_core_3000::make(_get_ctrl(i), regs::sr_addr(x300_regs::RX_RE_BASE)); + _rx_fe_map[i].core = rx_frontend_core_3000::make(_get_ctrl(i), regs::sr_addr(x300_regs::RX_FE_BASE)); _rx_fe_map[i].core->set_adc_rate(_radio_clk_rate); _rx_fe_map[i].core->set_dc_offset(rx_frontend_core_3000::DEFAULT_DC_OFFSET_VALUE); _rx_fe_map[i].core->set_dc_offset_auto(rx_frontend_core_3000::DEFAULT_DC_OFFSET_ENABLE); diff --git a/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp b/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp index ff41096bd..770519eba 100644 --- a/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp +++ b/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp @@ -143,7 +143,7 @@ private: struct x300_regs { static const uint32_t TX_FE_BASE = 224; - static const uint32_t RX_RE_BASE = 232; + static const uint32_t RX_FE_BASE = 232; }; void _update_atr_leds(const std::string &rx_ant); |