Merge branch 'master' into next

3 files changed, 11 insertions, 13 deletions

diff --git a/host/include/uhd/types/clock_config.hpp b/host/include/uhd/types/clock_config.hpp
index 577416d77..24bd96d14 100644
--- a/host/include/uhd/types/clock_config.hpp
+++ b/host/include/uhd/types/clock_config.hpp
@@ -44,10 +44,12 @@ namespace uhd{
             REF_AUTO = int('a'), //automatic (device specific)
             REF_INT  = int('i'), //internal reference
             REF_SMA  = int('s'), //external sma port
+            REF_MIMO = int('m'), //reference from mimo cable
         } ref_source;
         enum pps_source_t {
             PPS_INT  = int('i'), //there is no internal
             PPS_SMA  = int('s'), //external sma port
+            PPS_MIMO = int('m'), //time sync from mimo cable
         } pps_source;
         enum pps_polarity_t {
             PPS_NEG = int('n'), //negative edge
diff --git a/host/include/uhd/types/tune_request.hpp b/host/include/uhd/types/tune_request.hpp
index b59f37c2e..9c498bfe9 100644
--- a/host/include/uhd/types/tune_request.hpp
+++ b/host/include/uhd/types/tune_request.hpp
@@ -32,7 +32,7 @@ namespace uhd{
     struct UHD_API tune_request_t{
         /*!
          * Make a new tune request for a particular center frequency.
-         * Use an automatic policy for the intermediate and DSP frequency
+         * Use an automatic policy for the RF and DSP frequency
          * to tune the chain as close as possible to the target frequency.
          * \param target_freq the target frequency in Hz
          */
@@ -40,7 +40,7 @@ namespace uhd{
 
         /*!
          * Make a new tune request for a particular center frequency.
-         * Use a manual policy for the intermediate frequency,
+         * Use a manual policy for the RF frequency,
          * and an automatic policy for the DSP frequency,
          * to tune the chain as close as possible to the target frequency.
          * \param target_freq the target frequency in Hz
@@ -65,16 +65,16 @@ namespace uhd{
         double target_freq;
 
         /*!
-         * The policy for the intermediate frequency.
+         * The policy for the RF frequency.
          * Automatic behavior: the target frequency + default LO offset.
          */
-        policy_t inter_freq_policy;
+        policy_t rf_freq_policy;
 
         /*!
-         * The intermediate frequency in Hz.
+         * The RF frequency in Hz.
          * Set when the policy is set to manual.
          */
-        double inter_freq;
+        double rf_freq;
 
         /*!
          * The policy for the DSP frequency.
diff --git a/host/include/uhd/types/tune_result.hpp b/host/include/uhd/types/tune_result.hpp
index 9eebc161a..e51473085 100644
--- a/host/include/uhd/types/tune_result.hpp
+++ b/host/include/uhd/types/tune_result.hpp
@@ -24,15 +24,11 @@
 namespace uhd{
 
     /*!
-     * The tune result struct holds result of a 2-phase tuning:
-     * The struct hold the result of tuning the dboard as
-     * the target and actual intermediate frequency.
-     * The struct hold the result of tuning the DSP as
-     * the target and actual digital converter frequency.
+     * The tune result struct holds result of a 2-phase tuning.
      */
     struct UHD_API tune_result_t{
-        double target_inter_freq;
-        double actual_inter_freq;
+        double target_rf_freq;
+        double actual_rf_freq;
         double target_dsp_freq;
         double actual_dsp_freq;