diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-07-25 09:28:19 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-07-25 09:28:19 -0700 |
| commit | 9b4def474fae59717f60c18d11f909a02a178d6f (patch) | |
| tree | d59eda6fad7ad4666b6e864d3884287051c8cef4 /host/lib/usrp/cores | |
| parent | 42b47cea158d3a767a87ff4da71a00b3243e14f1 (diff) | |
| parent | 83e07d3dc70a9254fd1dcafcd7597d2fa1892550 (diff) | |
| download | uhd-9b4def474fae59717f60c18d11f909a02a178d6f.tar.gz uhd-9b4def474fae59717f60c18d11f909a02a178d6f.tar.bz2 uhd-9b4def474fae59717f60c18d11f909a02a178d6f.zip | |
Merge 'maint' into x300/bug513
Diffstat (limited to 'host/lib/usrp/cores')
| -rw-r--r-- | host/lib/usrp/cores/rx_dsp_core_3000.cpp | 2 |
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); |