From d1711722dd432ba63b54f93d92270d4050465204 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 6 Aug 2010 15:02:33 -0700 Subject: uhd: use int to round down for gain group --- host/lib/utils/gain_group.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'host/lib/utils/gain_group.cpp') diff --git a/host/lib/utils/gain_group.cpp b/host/lib/utils/gain_group.cpp index 5a14fa96f..1be09dee2 100644 --- a/host/lib/utils/gain_group.cpp +++ b/host/lib/utils/gain_group.cpp @@ -21,13 +21,10 @@ #include #include #include -#include #include #include #include -#define rint(x) boost::math::iround(x) - using namespace uhd; static const bool verbose = false; @@ -86,7 +83,7 @@ public: BOOST_FOREACH(const gain_fcns_t &fcns, all_fcns){ const gain_range_t range = fcns.get_range(); gain_bucket.push_back( - max_step*rint(std::clip(gain_left_to_distribute, range.min, range.max)/max_step) + max_step*int(std::clip(gain_left_to_distribute, range.min, range.max)/max_step) ); gain_left_to_distribute -= gain_bucket.back(); } @@ -109,7 +106,7 @@ public: //fill in the largest step sizes first that are less than the remainder BOOST_FOREACH(size_t i, indexes_step_size_dec){ const gain_range_t range = all_fcns.at(i).get_range(); - float additional_gain = range.step*rint( + float additional_gain = range.step*int( std::clip(gain_bucket.at(i) + gain_left_to_distribute, range.min, range.max )/range.step) - gain_bucket.at(i); gain_bucket.at(i) += additional_gain; -- cgit v1.2.3 From 1c241c282e5c7aaddc554885e15fae1c8aa93734 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sun, 8 Aug 2010 11:03:38 -0700 Subject: uhd: fix device recv docs on timeout, also fix typo --- host/include/uhd/device.hpp | 7 +------ host/lib/utils/gain_group.cpp | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'host/lib/utils/gain_group.cpp') diff --git a/host/include/uhd/device.hpp b/host/include/uhd/device.hpp index 78bb83c66..c48b3dfff 100644 --- a/host/include/uhd/device.hpp +++ b/host/include/uhd/device.hpp @@ -161,12 +161,7 @@ public: * See the rx metadata fragment flags and offset fields for details. * * This is a blocking call and will not return until the number - * of samples returned have been written into each buffer. - * However, a call to receive may timeout and return zero samples. - * The timeout duration is decided by the underlying transport layer. - * The caller should assume that the call to receive will not return - * immediately when no packets are available to the transport layer, - * and that the timeout duration is reasonably tuned for performance. + * of samples returned have been written into each buffer or timeout. * * When using the full buffer recv mode, the metadata only applies * to the first packet received and written into the recv buffers. diff --git a/host/lib/utils/gain_group.cpp b/host/lib/utils/gain_group.cpp index 1be09dee2..c113719c8 100644 --- a/host/lib/utils/gain_group.cpp +++ b/host/lib/utils/gain_group.cpp @@ -131,7 +131,7 @@ private: //! get the gain function sets in order (highest priority first) std::vector get_all_fcns(void){ std::vector all_fcns; - BOOST_FOREACH(ssize_t key, std::sorted(_registry.keys())){ + BOOST_FOREACH(size_t key, std::sorted(_registry.keys())){ const std::vector &fcns = _registry[key]; all_fcns.insert(all_fcns.begin(), fcns.begin(), fcns.end()); } -- cgit v1.2.3