From 138f1c57db6c8a654b0587a0e01a9849569893c5 Mon Sep 17 00:00:00 2001
From: michael-west <michael.west@ettus.com>
Date: Tue, 22 Jul 2014 15:15:48 -0700
Subject: Fix for BUG #517: B200: Regression of power level on RX - Fixed
scalar for RX DSP core
---
host/lib/usrp/cores/rx_dsp_core_3000.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'host/lib')
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);
--
cgit v1.2.3
From 89b0a915e2e58f08b8caecc13f7befbf7b05e055 Mon Sep 17 00:00:00 2001
From: michael-west <michael.west@ettus.com>
Date: Tue, 22 Jul 2014 15:25:05 -0700
Subject: Commented out warning if X300 reference clock fails to lock within 1
second during initialization. Sometimes it takes longer and that is OK.
---
host/lib/usrp/x300/x300_impl.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'host/lib')
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp
index a624ebf6b..0de81e11f 100644
--- a/host/lib/usrp/x300/x300_impl.cpp
+++ b/host/lib/usrp/x300/x300_impl.cpp
@@ -839,8 +839,9 @@ void x300_impl::setup_mb(const size_t mb_i, const uhd::device_addr_t &dev_addr)
try {
wait_for_ref_locked(mb.zpu_ctrl, 1.0);
} catch (uhd::exception::runtime_error &e) {
- UHD_MSG(warning) << "Clock reference failed to lock to internal source during device initialization. " <<
- "Check for the lock before operation or ignore this warning if using another clock source." << std::endl;
+ // Ignore for now - It can sometimes take longer than 1 second to lock and that is OK.
+ //UHD_MSG(warning) << "Clock reference failed to lock to internal source during device initialization. " <<
+ // "Check for the lock before operation or ignore this warning if using another clock source." << std::endl;
}
_tree->access<std::string>(mb_path / "time_source" / "value").set("internal");
UHD_MSG(status) << "References initialized to internal sources" << std::endl;
--
cgit v1.2.3