diff options
| author | Josh Blum <josh@joshknows.com> | 2011-08-31 18:13:02 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-08-31 18:13:02 -0700 |
| commit | 208885b6dc8a01a1d7095cff5b36c8451601259c (patch) | |
| tree | 264f26bf0f906580345696603adf0e5d3335194d /host | |
| parent | 92735f83fcbf27beda59bea02653bce10782bb44 (diff) | |
| parent | dfb30a5d35c4dfeac567c250b792e5d9a68e8a69 (diff) | |
| download | uhd-208885b6dc8a01a1d7095cff5b36c8451601259c.tar.gz uhd-208885b6dc8a01a1d7095cff5b36c8451601259c.tar.bz2 uhd-208885b6dc8a01a1d7095cff5b36c8451601259c.zip | |
Merge branch 'patch_release'
Diffstat (limited to 'host')
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 2 | ||||
| -rw-r--r-- | host/lib/usrp/multi_usrp.cpp | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index 84878c84a..0dfdbefa0 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -27,7 +27,7 @@ FIND_PACKAGE(Git QUIET) ######################################################################## SET(UHD_VERSION_MAJOR 003) SET(UHD_VERSION_MINOR 002) -SET(UHD_VERSION_PATCH 002) +SET(UHD_VERSION_PATCH 003) ######################################################################## # Version information discovery through git log 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; } /*********************************************************************** |