summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2014-07-22 15:15:48 -0700
committermichael-west <michael.west@ettus.com>2014-07-22 15:15:48 -0700
commit138f1c57db6c8a654b0587a0e01a9849569893c5 (patch)
tree412cbd1e793013ff9e2931022a528789bedce510
parente06c3b84a4afd2c8128b5ebb94be283247ec4d1b (diff)
downloaduhd-138f1c57db6c8a654b0587a0e01a9849569893c5.tar.gz
uhd-138f1c57db6c8a654b0587a0e01a9849569893c5.tar.bz2
uhd-138f1c57db6c8a654b0587a0e01a9849569893c5.zip
Fix for BUG #517: B200: Regression of power level on RX
- Fixed scalar for RX DSP core
-rw-r--r--host/lib/usrp/cores/rx_dsp_core_3000.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/cores/rx_dsp_core_3000.cpp b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
index 584dd6a94..07399d462 100644
--- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp
+++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
@@ -177,7 +177,7 @@ public:
void update_scalar(void){
const double factor = 1.0 + std::max(ceil_log2(_scaling_adjustment), 0.0);
- const double target_scalar = (1 << 15)*_scaling_adjustment/_dsp_extra_scaling/factor;
+ const double target_scalar = (1 << (_is_b200 ? 17 : 15))*_scaling_adjustment/_dsp_extra_scaling/factor;
const boost::int32_t actual_scalar = boost::math::iround(target_scalar);
_fxpt_scalar_correction = target_scalar/actual_scalar*factor; //should be small
_iface->poke32(REG_DSP_RX_SCALE_IQ, actual_scalar);