Merge branch 'usrp2_dual_dsp' into next

Conflicts:
	host/include/uhd/usrp/mboard_props.hpp

5 files changed, 30 insertions, 23 deletions

diff --git a/host/include/uhd/types/device_addr.hpp b/host/include/uhd/types/device_addr.hpp
index eb3394230..2c0841146 100644
--- a/host/include/uhd/types/device_addr.hpp
+++ b/host/include/uhd/types/device_addr.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Ettus Research LLC
+// Copyright 2010-2011 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -84,9 +84,15 @@ namespace uhd{
         }
     };
 
-    //handy typedef for a vector of device addresses
+    //! A typedef for a vector of device addresses
     typedef std::vector<device_addr_t> device_addrs_t;
 
+    //! Separate an indexed device address into a vector of device addresses
+    UHD_API device_addrs_t separate_device_addr(const device_addr_t &dev_addr);
+
+    //! Combine a vector of device addresses into an indexed device address
+    UHD_API device_addr_t combine_device_addrs(const device_addrs_t &dev_addrs);
+
 } //namespace uhd
 
 #endif /* INCLUDED_UHD_TYPES_DEVICE_ADDR_HPP */
diff --git a/host/include/uhd/usrp/dsp_props.hpp b/host/include/uhd/usrp/dsp_props.hpp
index 3e1690317..e68e11deb 100644
--- a/host/include/uhd/usrp/dsp_props.hpp
+++ b/host/include/uhd/usrp/dsp_props.hpp
@@ -39,8 +39,8 @@ namespace uhd{ namespace usrp{
     enum dsp_prop_t{
         DSP_PROP_NAME,               //ro, std::string
         DSP_PROP_OTHERS,             //ro, prop_names_t
+        DSP_PROP_STREAM_CMD,         //wo, stream_cmd_t
         DSP_PROP_FREQ_SHIFT,         //rw, double Hz
-        DSP_PROP_FREQ_SHIFT_NAMES,   //ro, prop_names_t
         DSP_PROP_CODEC_RATE,         //ro, double Sps
         DSP_PROP_HOST_RATE           //rw, double Sps
     };
diff --git a/host/include/uhd/usrp/mboard_props.hpp b/host/include/uhd/usrp/mboard_props.hpp
index 8855e2b75..180c4eeb3 100644
--- a/host/include/uhd/usrp/mboard_props.hpp
+++ b/host/include/uhd/usrp/mboard_props.hpp
@@ -47,7 +47,6 @@ namespace uhd{ namespace usrp{
         MBOARD_PROP_CLOCK_CONFIG,            //rw, clock_config_t
         MBOARD_PROP_TIME_NOW,                //rw, time_spec_t
         MBOARD_PROP_TIME_PPS,                //wo, time_spec_t
-        MBOARD_PROP_STREAM_CMD,              //wo, stream_cmd_t
         MBOARD_PROP_EEPROM_MAP               //wr, mboard_eeprom_t
     };
 
diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp
index 3c8dd5fac..b06975b6c 100644
--- a/host/include/uhd/usrp/multi_usrp.hpp
+++ b/host/include/uhd/usrp/multi_usrp.hpp
@@ -87,6 +87,9 @@ public:
     //! A wildcard motherboard index
     static const size_t ALL_MBOARDS = size_t(~0);
 
+    //! A wildcard channel index
+    static const size_t ALL_CHANS = size_t(~0);
+
     //! A wildcard gain element name
     static const std::string ALL_GAINS;
 
@@ -215,8 +218,9 @@ public:
      * to ensure that the packets can be aligned by their time specs.
      *
      * \param stream_cmd the stream command to issue
+     * \param chan the channel index 0 to N-1
      */
-    virtual void issue_stream_cmd(const stream_cmd_t &stream_cmd) = 0;
+    virtual void issue_stream_cmd(const stream_cmd_t &stream_cmd, size_t chan = ALL_CHANS) = 0;
 
     /*!
      * Set the clock configuration for the usrp device.
@@ -282,16 +286,18 @@ public:
     virtual std::string get_rx_subdev_name(size_t chan = 0) = 0;
 
     /*!
-     * Set the RX sample rate across all channels.
+     * Set the RX sample rate.
      * \param rate the rate in Sps
+     * \param chan the channel index 0 to N-1
      */
-    virtual void set_rx_rate(double rate) = 0;
+    virtual void set_rx_rate(double rate, size_t chan = ALL_CHANS) = 0;
 
     /*!
-     * Gets the RX sample rate for all channels.
+     * Gets the RX sample rate.
+     * \param chan the channel index 0 to N-1
      * \return the rate in Sps
      */
-    virtual double get_rx_rate(void) = 0;
+    virtual double get_rx_rate(size_t chan = 0) = 0;
 
     /*!
      * Set the RX center frequency.
@@ -480,16 +486,18 @@ public:
     virtual std::string get_tx_subdev_name(size_t chan = 0) = 0;
 
     /*!
-     * Set the TX sample rate across all channels.
+     * Set the TX sample rate.
      * \param rate the rate in Sps
+     * \param chan the channel index 0 to N-1
      */
-    virtual void set_tx_rate(double rate) = 0;
+    virtual void set_tx_rate(double rate, size_t chan = ALL_CHANS) = 0;
 
     /*!
-     * Gets the TX sample rate for all channels.
+     * Gets the TX sample rate.
+     * \param chan the channel index 0 to N-1
      * \return the rate in Sps
      */
-    virtual double get_tx_rate(void) = 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
     );
 
 }}