paradigm shift for the dsp abstraction

4 files changed, 19 insertions, 11 deletions

diff --git a/host/include/uhd/usrp/dsp_props.hpp b/host/include/uhd/usrp/dsp_props.hpp
index 60c0df942..75d8c0a60 100644
--- a/host/include/uhd/usrp/dsp_props.hpp
+++ b/host/include/uhd/usrp/dsp_props.hpp
@@ -24,15 +24,24 @@ namespace uhd{ namespace usrp{
 
     /*!
      * Possible device dsp properties:
-     *   A dsp can have a wide range of possible properties.
-     *   A ddc would have a properties "decim", "freq", "taps"...
-     *   Other properties could be gains, complex scalars, enables...
-     *   For this reason the only required properties of a dsp is a name
-     *   and a property to get list of other possible properties.
+     *   A dsp is a black box fpga component found between
+     *   the over-the-wire data and the codec pins.
+     *
+     *   The host rate can be modified to control resampling.
+     *   Resampling can take the form of decimation, interpolation,
+     *   or more complex fractional resampling techniques.
+     *   As usual, read back the host rate after setting it
+     *   to get the actual rate that was set (implementation dependent).
+     *
+     *   A dsp can also shift the digital stream in frequency.
+     *   Set the shift property and read it back to get actual shift.
      */
     enum dsp_prop_t{
-        DSP_PROP_NAME   = 'n', //ro, std::string
-        DSP_PROP_OTHERS = 'o'  //ro, prop_names_t
+        DSP_PROP_NAME         = 'n', //ro, std::string
+        DSP_PROP_OTHERS       = 'o', //ro, prop_names_t
+        DSP_PROP_FREQ_SHIFT   = 'f', //rw, double Hz
+        DSP_PROP_CODEC_RATE   = 'c', //ro, double Sps
+        DSP_PROP_HOST_RATE    = 'h'  //rw, double Sps
     };
 
 }} //namespace
diff --git a/host/include/uhd/usrp/mboard_props.hpp b/host/include/uhd/usrp/mboard_props.hpp
index cfc1f412e..55c11b822 100644
--- a/host/include/uhd/usrp/mboard_props.hpp
+++ b/host/include/uhd/usrp/mboard_props.hpp
@@ -42,7 +42,8 @@ namespace uhd{ namespace usrp{
         MBOARD_PROP_TX_DBOARD_NAMES = 'V', //ro, prop_names_t
         MBOARD_PROP_CLOCK_CONFIG    = 'C', //rw, clock_config_t
         MBOARD_PROP_TIME_NOW        = 't', //wo, time_spec_t
-        MBOARD_PROP_TIME_NEXT_PPS   = 'T'  //wo, time_spec_t
+        MBOARD_PROP_TIME_NEXT_PPS   = 'T', //wo, time_spec_t
+        MBOARD_PROP_STREAM_CMD      = 's'  //wo, stream_cmd_t
     };
 
 }} //namespace
diff --git a/host/include/uhd/usrp/simple_usrp.hpp b/host/include/uhd/usrp/simple_usrp.hpp
index 2d6ad2a0f..6f74a406b 100644
--- a/host/include/uhd/usrp/simple_usrp.hpp
+++ b/host/include/uhd/usrp/simple_usrp.hpp
@@ -59,7 +59,6 @@ public:
      ******************************************************************/
     virtual void set_rx_rate(double rate) = 0;
     virtual double get_rx_rate(void) = 0;
-    virtual std::vector<double> get_rx_rates(void) = 0;
 
     virtual tune_result_t set_rx_freq(double freq) = 0;
     virtual freq_range_t get_rx_freq_range(void) = 0;
@@ -77,7 +76,6 @@ public:
      ******************************************************************/
     virtual void set_tx_rate(double rate) = 0;
     virtual double get_tx_rate(void) = 0;
-    virtual std::vector<double> get_tx_rates(void) = 0;
 
     virtual tune_result_t set_tx_freq(double freq) = 0;
     virtual freq_range_t get_tx_freq_range(void) = 0;
diff --git a/host/include/uhd/usrp/subdev_props.hpp b/host/include/uhd/usrp/subdev_props.hpp
index 92d18340b..d35793c6b 100644
--- a/host/include/uhd/usrp/subdev_props.hpp
+++ b/host/include/uhd/usrp/subdev_props.hpp
@@ -39,7 +39,7 @@ namespace uhd{ namespace usrp{
         SUBDEV_PROP_QUADRATURE        = 'q', //ro, bool
         SUBDEV_PROP_IQ_SWAPPED        = 'i', //ro, bool
         SUBDEV_PROP_SPECTRUM_INVERTED = 's', //ro, bool
-        SUBDEV_PROP_LO_INTERFERES     = 'l'  //ro, bool
+        SUBDEV_PROP_USE_LO_OFFSET     = 'l'  //ro, bool
         //SUBDEV_PROP_RSSI,              //ro, float //----> not on all boards, use named prop
         //SUBDEV_PROP_BANDWIDTH          //rw, double //----> not on all boards, use named prop
     };