uhd: math: Replace wrap-frequency math with a single function

In multiple places in the UHD code, we were doing the same calculation
for a wrapped frequency (wrap it into the first Nyquist zone). This math
was using boost::math, too. Instead of editing every instance, we create
a new function, uhd::math::wrap_frequency(), and replace all of its
separate implementations with this function. The new function also no
longer relies on boost::math::sign.

1 files changed, 1 insertions, 5 deletions

diff --git a/host/lib/usrp/cores/dsp_core_utils.cpp b/host/lib/usrp/cores/dsp_core_utils.cpp
index 84331fcec..868e47234 100644
--- a/host/lib/usrp/cores/dsp_core_utils.cpp
+++ b/host/lib/usrp/cores/dsp_core_utils.cpp
@@ -8,7 +8,6 @@
 #include <uhd/exception.hpp>
 #include <uhd/utils/math.hpp>
 #include <uhdlib/usrp/cores/dsp_core_utils.hpp>
-#include <boost/math/special_functions/sign.hpp>
 #include <cmath>
 #include <limits>
 
@@ -20,10 +19,7 @@ void get_freq_and_freq_word(const double requested_freq,
     double& actual_freq,
     int32_t& freq_word)
 {
-    // correct for outside of rate (wrap around)
-    double freq = std::fmod(requested_freq, tick_rate);
-    if (std::abs(freq) > tick_rate / 2.0)
-        freq -= boost::math::sign(freq) * tick_rate;
+    const double freq = uhd::math::wrap_frequency(requested_freq, tick_rate);
 
     // confirm that the target frequency is within range of the CORDIC
     UHD_ASSERT_THROW(std::abs(freq) <= tick_rate / 2.0);