usrp: support for multiple dsps in props and implemented in usrp1

usrp1 previously had 1 rx and 1 tx dsp with multiple freq params,
it now has N and M dsps each with one freq param.
This is more consistent with the multi-dsp model.
The hack here is to only apply stream commands and sample rate changes to dsp0.

2 files changed, 5 insertions, 11 deletions

diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp
index e2b26f5fb..b06975b6c 100644
--- a/host/include/uhd/usrp/multi_usrp.hpp
+++ b/host/include/uhd/usrp/multi_usrp.hpp
@@ -497,7 +497,7 @@ public:
      * \param chan the channel index 0 to N-1
      * \return the rate in Sps
      */
-    virtual double get_tx_rate(size_t chan) = 0;
+    virtual double get_tx_rate(size_t chan = 0) = 0;
 
     /*!
      * Set the TX center frequency.
diff --git a/host/include/uhd/usrp/tune_helper.hpp b/host/include/uhd/usrp/tune_helper.hpp
index db12241c1..e97ab0298 100644
--- a/host/include/uhd/usrp/tune_helper.hpp
+++ b/host/include/uhd/usrp/tune_helper.hpp
@@ -32,24 +32,21 @@ namespace uhd{ namespace usrp{
      * The ddc cordic is setup to bring the IF down to baseband.
      * \param subdev the dboard subdevice object with properties
      * \param ddc the mboard dsp object with properties
-     * \param chan the channel of the dsp to tune
      * \param tune_request tune request instructions
      * \return a tune result struct
      */
     UHD_API tune_result_t tune_rx_subdev_and_dsp(
-        wax::obj subdev, wax::obj ddc, size_t chan,
-        const tune_request_t &tune_request
+        wax::obj subdev, wax::obj ddc, const tune_request_t &tune_request
     );
 
     /*!
      * Calculate the overall frequency from the combination of dboard IF and DDC shift.
      * \param subdev the dboard subdevice object with properties
      * \param ddc the mboard dsp object with properties
-     * \param chan the channel of the dsp to tune
      * \return the overall tune frequency of the system in Hz
      */
     UHD_API double derive_freq_from_rx_subdev_and_dsp(
-        wax::obj subdev, wax::obj ddc, size_t chan
+        wax::obj subdev, wax::obj ddc
     );
 
     /*!
@@ -59,24 +56,21 @@ namespace uhd{ namespace usrp{
      * The duc cordic is setup to bring the baseband up to IF.
      * \param subdev the dboard subdevice object with properties
      * \param duc the mboard dsp object with properties
-     * \param chan the channel of the dsp to tune
      * \param tune_request tune request instructions
      * \return a tune result struct
      */
     UHD_API tune_result_t tune_tx_subdev_and_dsp(
-        wax::obj subdev, wax::obj duc, size_t chan,
-        const tune_request_t &tune_request
+        wax::obj subdev, wax::obj duc, const tune_request_t &tune_request
     );
 
     /*!
      * Calculate the overall frequency from the combination of dboard IF and DUC shift.
      * \param subdev the dboard subdevice object with properties
      * \param duc the mboard dsp object with properties
-     * \param chan the channel of the dsp to tune
      * \return the overall tune frequency of the system in Hz
      */
     UHD_API double derive_freq_from_tx_subdev_and_dsp(
-        wax::obj subdev, wax::obj duc, size_t chan
+        wax::obj subdev, wax::obj duc
     );
 
 }}