summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2012-09-11 12:59:56 -0700
committerJosh Blum <josh@joshknows.com>2012-09-11 12:59:56 -0700
commitc2e197c09ea5d0c2f4056ad07e92c7a61492f53d (patch)
tree1c2950a37a8da776362c2bf94e9fa58dd8490021
parent5f64270976200206d5395467f2c63eaa7ca86366 (diff)
parentf969650555e1fbf87548d861e6b5126e8a641b3e (diff)
downloaduhd-c2e197c09ea5d0c2f4056ad07e92c7a61492f53d.tar.gz
uhd-c2e197c09ea5d0c2f4056ad07e92c7a61492f53d.tar.bz2
uhd-c2e197c09ea5d0c2f4056ad07e92c7a61492f53d.zip
Merge branch 'maint'
-rw-r--r--host/lib/usrp/cores/rx_dsp_core_200.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/cores/rx_dsp_core_200.cpp b/host/lib/usrp/cores/rx_dsp_core_200.cpp
index a89405039..ae67c46ef 100644
--- a/host/lib/usrp/cores/rx_dsp_core_200.cpp
+++ b/host/lib/usrp/cores/rx_dsp_core_200.cpp
@@ -194,7 +194,7 @@ public:
}
void update_scalar(void){
- const double target_scalar = (1 << 16)*_scaling_adjustment/_dsp_extra_scaling;
+ const double target_scalar = (1 << 17)*_scaling_adjustment/_dsp_extra_scaling;
const boost::int32_t actual_scalar = boost::math::iround(target_scalar);
_fxpt_scalar_correction = target_scalar/actual_scalar; //should be small
_iface->poke32(REG_DSP_RX_SCALE_IQ, actual_scalar);