diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-06-27 12:00:18 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-06-27 12:00:18 -0700 |
| commit | 5a0be9b1de7be7ba6c266dd742456a96e25373fc (patch) | |
| tree | 6bcd3b02f399cc2677a6c747411d7e2ced1923f5 /host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp | |
| parent | e48659cec5207b598d877d8beca7e0b3807b617e (diff) | |
| parent | 24db48766dff45b8fe8ed3031e09617ca92b84b6 (diff) | |
| download | uhd-5a0be9b1de7be7ba6c266dd742456a96e25373fc.tar.gz uhd-5a0be9b1de7be7ba6c266dd742456a96e25373fc.tar.bz2 uhd-5a0be9b1de7be7ba6c266dd742456a96e25373fc.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp')
| -rw-r--r-- | host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp b/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp index ddbbfaefb..00be82e1a 100644 --- a/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp +++ b/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp @@ -309,7 +309,7 @@ public: boost::lock_guard<boost::mutex> lock(_mutex); if (ch == CH1 or ch == BOTH) { _cpld_regs->rf1_reg5.set(rm::rf1_reg5_t::SW14_CTRL_CH2, bool2bin(source!=LO_COMPANION)); - _cpld_regs->rf1_reg1.set(rm::rf1_reg1_t::SW15_CTRL_CH1, bool2bin(source==LO_EXTERNAL)); + _cpld_regs->rf1_reg1.set(rm::rf1_reg1_t::SW15_CTRL_CH1, bool2bin(source==LO_EXTERNAL||source==LO_REIMPORT)); _cpld_regs->rf1_reg1.set(rm::rf1_reg1_t::SW16_CTRL_CH1, bool2bin(source!=LO_INTERNAL)); _lo1_src[size_t(CH1)] = source; } @@ -332,7 +332,7 @@ public: _lo2_src[size_t(CH1)] = source; } if (ch == CH2 or ch == BOTH) { - _cpld_regs->if0_reg4.set(rm::if0_reg4_t::SW19_CTRL_CH1, bool2bin(source==LO_EXTERNAL)); + _cpld_regs->if0_reg4.set(rm::if0_reg4_t::SW19_CTRL_CH1, bool2bin(source==LO_EXTERNAL||source==LO_REIMPORT)); _cpld_regs->if0_reg0.set(rm::if0_reg0_t::SW20_CTRL_CH2, bool2bin(source==LO_INTERNAL||source==LO_DISABLED)); _cpld_regs->if0_reg4.set(rm::if0_reg4_t::SW21_CTRL_CH2, bool2bin(source==LO_INTERNAL)); _lo2_src[size_t(CH2)] = source; |