Merge remote branch 'origin/usrp_e_next' into usrp_e_next

1 files changed, 35 insertions, 7 deletions

diff --git a/host/lib/types.cpp b/host/lib/types.cpp
index f957cd83f..4188568aa 100644
--- a/host/lib/types.cpp
+++ b/host/lib/types.cpp
@@ -17,6 +17,7 @@
 
 #include <uhd/utils/assert.hpp>
 #include <uhd/types/ranges.hpp>
+#include <uhd/types/tune_request.hpp>
 #include <uhd/types/tune_result.hpp>
 #include <uhd/types/clock_config.hpp>
 #include <uhd/types/stream_cmd.hpp>
@@ -58,6 +59,26 @@ freq_range_t::freq_range_t(double min, double max):
 }
 
 /***********************************************************************
+ * tune request
+ **********************************************************************/
+tune_request_t::tune_request_t(double target_freq):
+    target_freq(target_freq),
+    inter_freq_policy(POLICY_AUTO),
+    dsp_freq_policy(POLICY_AUTO)
+{
+    /* NOP */
+}
+
+tune_request_t::tune_request_t(double target_freq, double lo_off):
+    target_freq(target_freq),
+    inter_freq_policy(POLICY_MANUAL),
+    inter_freq(target_freq + lo_off),
+    dsp_freq_policy(POLICY_AUTO)
+{
+    /* NOP */
+}
+
+/***********************************************************************
  * tune result
  **********************************************************************/
 std::string tune_result_t::to_pp_string(void) const{
@@ -124,14 +145,14 @@ time_spec_t::time_spec_t(time_t full_secs, double frac_secs):
     /* NOP */
 }
 
-time_spec_t::time_spec_t(time_t full_secs, size_t tick_count, double tick_rate):
+time_spec_t::time_spec_t(time_t full_secs, long tick_count, double tick_rate):
     _full_secs(full_secs),
     _frac_secs(double(tick_count)/tick_rate)
 {
     /* NOP */
 }
 
-size_t time_spec_t::get_tick_count(double tick_rate) const{
+long time_spec_t::get_tick_count(double tick_rate) const{
     return boost::math::iround(this->get_frac_secs()*tick_rate);
 }
 
@@ -140,7 +161,9 @@ double time_spec_t::get_real_secs(void) const{
 }
 
 time_t time_spec_t::get_full_secs(void) const{
-    return this->_full_secs + time_t(std::floor(this->_frac_secs));
+    double intpart;
+    std::modf(this->_frac_secs, &intpart);
+    return this->_full_secs + time_t(intpart);
 }
 
 double time_spec_t::get_frac_secs(void) const{
@@ -160,13 +183,18 @@ time_spec_t &time_spec_t::operator-=(const time_spec_t &rhs){
 }
 
 bool uhd::operator==(const time_spec_t &lhs, const time_spec_t &rhs){
-    return lhs.get_full_secs() == rhs.get_full_secs() and lhs.get_frac_secs() == rhs.get_frac_secs();
+    return
+        lhs.get_full_secs() == rhs.get_full_secs() and
+        lhs.get_frac_secs() == rhs.get_frac_secs()
+    ;
 }
 
 bool uhd::operator<(const time_spec_t &lhs, const time_spec_t &rhs){
-    if (lhs.get_full_secs() < rhs.get_full_secs()) return true;
-    if (lhs.get_full_secs() > rhs.get_full_secs()) return false;
-    return lhs.get_frac_secs() < rhs.get_frac_secs();
+    return (
+        (lhs.get_full_secs() < rhs.get_full_secs()) or (
+        (lhs.get_full_secs() == rhs.get_full_secs()) and
+        (lhs.get_frac_secs() < rhs.get_frac_secs())
+    ));
 }
 
 /***********************************************************************