aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/cores
diff options
context:
space:
mode:
authorBen Hilburn <ben.hilburn@ettus.com>2014-07-22 15:32:44 -0700
committerBen Hilburn <ben.hilburn@ettus.com>2014-07-22 15:32:44 -0700
commit272bd734cf74cfe94bf39ec776639d9cb727cd05 (patch)
treec76ddb36d1fc1b2b8d922f7eaec8885e65825501 /host/lib/usrp/cores
parentc20b74040478b8fa50bfca5d9e085c548b6dba03 (diff)
parent89b0a915e2e58f08b8caecc13f7befbf7b05e055 (diff)
downloaduhd-272bd734cf74cfe94bf39ec776639d9cb727cd05.tar.gz
uhd-272bd734cf74cfe94bf39ec776639d9cb727cd05.tar.bz2
uhd-272bd734cf74cfe94bf39ec776639d9cb727cd05.zip
Merge branch 'origin/maint'
Diffstat (limited to 'host/lib/usrp/cores')
-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);