From 78e95562617d084d6bd83227a676f62bb552b26d Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 29 Aug 2011 09:43:54 -0700 Subject: usrp: preserve sub-ranges when calculating overall tune range --- host/lib/usrp/multi_usrp.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'host') diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index d0141108e..1a1bd0967 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -70,11 +70,15 @@ static meta_range_t make_overall_tune_range( const meta_range_t &dsp_range, const double bw ){ - return meta_range_t( - fe_range.start() + std::max(dsp_range.start(), -bw), - fe_range.stop() + std::min(dsp_range.stop(), bw), - dsp_range.step() - ); + meta_range_t range; + BOOST_FOREACH(const range_t &sub_range, fe_range){ + range.push_back(range_t( + sub_range.start() + std::max(dsp_range.start(), -bw), + sub_range.stop() + std::min(dsp_range.stop(), bw), + dsp_range.step() + )); + } + return range; } /*********************************************************************** -- cgit v1.2.3