summaryrefslogtreecommitdiffstats
path: root/host/include
diff options
context:
space:
mode:
Diffstat (limited to 'host/include')
-rw-r--r--host/include/uhd/config.hpp6
-rw-r--r--host/include/uhd/transport/udp_simple.hpp4
-rw-r--r--host/include/uhd/types/CMakeLists.txt1
-rw-r--r--host/include/uhd/types/dict.ipp11
-rw-r--r--host/include/uhd/types/metadata.hpp4
-rw-r--r--host/include/uhd/types/ranges.hpp104
-rw-r--r--host/include/uhd/types/ranges.ipp185
-rw-r--r--host/include/uhd/usrp/CMakeLists.txt2
-rw-r--r--host/include/uhd/usrp/dsp_utils.hpp5
-rw-r--r--host/include/uhd/usrp/mimo_usrp.hpp525
-rw-r--r--host/include/uhd/usrp/simple_usrp.hpp388
11 files changed, 295 insertions, 940 deletions
diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp
index 2918c2340..316d60c2b 100644
--- a/host/include/uhd/config.hpp
+++ b/host/include/uhd/config.hpp
@@ -56,14 +56,17 @@
#define UHD_HELPER_DLL_IMPORT __declspec(dllimport)
#define UHD_HELPER_DLL_EXPORT __declspec(dllexport)
#define UHD_HELPER_DLL_LOCAL
+ #define UHD_HELPER_EXIMP_TMPL
#elif defined(__GNUG__) && __GNUG__ >= 4
#define UHD_HELPER_DLL_IMPORT __attribute__ ((visibility("default")))
#define UHD_HELPER_DLL_EXPORT __attribute__ ((visibility("default")))
#define UHD_HELPER_DLL_LOCAL __attribute__ ((visibility("hidden")))
+ #define UHD_HELPER_EXIMP_TMPL extern
#else
#define UHD_HELPER_DLL_IMPORT
#define UHD_HELPER_DLL_EXPORT
#define UHD_HELPER_DLL_LOCAL
+ #define UHD_HELPER_EXIMP_TMPL extern
#endif
// Now we use the generic helper definitions above to define UHD_API and UHD_LOCAL.
@@ -75,13 +78,16 @@
#ifdef UHD_DLL // defined if UHD is compiled as a DLL
#ifdef UHD_DLL_EXPORTS // defined if we are building the UHD DLL (instead of using it)
#define UHD_API UHD_HELPER_DLL_EXPORT
+ #define UHD_EXIMP_TMPL UHD_HELPER_EXIMP_TMPL
#else
#define UHD_API UHD_HELPER_DLL_IMPORT
+ #define UHD_EXIMP_TMPL
#endif // UHD_DLL_EXPORTS
#define UHD_LOCAL UHD_HELPER_DLL_LOCAL
#else // UHD_DLL is not defined: this means UHD is a static lib.
#define UHD_API
#define UHD_LOCAL
+ #define UHD_EXIMP_TMPL
#endif // UHD_DLL
// Define force inline macro
diff --git a/host/include/uhd/transport/udp_simple.hpp b/host/include/uhd/transport/udp_simple.hpp
index c84393ecf..83f895ba9 100644
--- a/host/include/uhd/transport/udp_simple.hpp
+++ b/host/include/uhd/transport/udp_simple.hpp
@@ -73,10 +73,10 @@ public:
* Receive into the provided buffer.
* Blocks until data is received or a timeout occurs.
* \param buff a mutable buffer to receive into
- * \param timeout_ms the timeout in milliseconds
+ * \param timeout the timeout in seconds
* \return the number of bytes received or zero on timeout
*/
- virtual size_t recv(const boost::asio::mutable_buffer &buff, size_t timeout_ms) = 0;
+ virtual size_t recv(const boost::asio::mutable_buffer &buff, double timeout = 0.1) = 0;
};
}} //namespace
diff --git a/host/include/uhd/types/CMakeLists.txt b/host/include/uhd/types/CMakeLists.txt
index a96976b5e..1d2c0c41c 100644
--- a/host/include/uhd/types/CMakeLists.txt
+++ b/host/include/uhd/types/CMakeLists.txt
@@ -25,6 +25,7 @@ INSTALL(FILES
mac_addr.hpp
metadata.hpp
otw_type.hpp
+ ranges.ipp
ranges.hpp
serial.hpp
stream_cmd.hpp
diff --git a/host/include/uhd/types/dict.ipp b/host/include/uhd/types/dict.ipp
index ba05d5272..f037d7988 100644
--- a/host/include/uhd/types/dict.ipp
+++ b/host/include/uhd/types/dict.ipp
@@ -46,12 +46,11 @@ namespace uhd{
/* NOP */
}
- template <typename Key, typename Val>
- template <typename InputIterator>
- dict<Key, Val>::dict(InputIterator first, InputIterator last){
- for(InputIterator it = first; it != last; it++){
- _map.push_back(*it);
- }
+ template <typename Key, typename Val> template <typename InputIterator>
+ dict<Key, Val>::dict(InputIterator first, InputIterator last):
+ _map(first, last)
+ {
+ /* NOP */
}
template <typename Key, typename Val>
diff --git a/host/include/uhd/types/metadata.hpp b/host/include/uhd/types/metadata.hpp
index 3f250d13e..f4e084430 100644
--- a/host/include/uhd/types/metadata.hpp
+++ b/host/include/uhd/types/metadata.hpp
@@ -132,8 +132,8 @@ namespace uhd{
* The type of event for a receive async message call.
*/
enum event_code_t {
- //! A packet was successfully transmitted.
- EVENT_CODE_SUCCESS = 0x1,
+ //! A burst was successfully transmitted.
+ EVENT_CODE_BURST_ACK = 0x1,
//! An internal send buffer has emptied.
EVENT_CODE_UNDERFLOW = 0x2,
//! Packet loss between host and device.
diff --git a/host/include/uhd/types/ranges.hpp b/host/include/uhd/types/ranges.hpp
index a2057d1c8..03aa69ba8 100644
--- a/host/include/uhd/types/ranges.hpp
+++ b/host/include/uhd/types/ranges.hpp
@@ -19,28 +19,110 @@
#define INCLUDED_UHD_TYPES_RANGES_HPP
#include <uhd/config.hpp>
+#include <uhd/utils/pimpl.hpp>
+#include <string>
+#include <vector>
+#include <string>
namespace uhd{
/*!
- * The gain range struct describes possible gain settings.
- * The mimumum gain, maximum gain, and step size are in dB.
+ * A range object describes a set of discrete values of the form:
+ * y = start + step*n, where n is an integer between 0 and (stop - start)/step
*/
- struct UHD_API gain_range_t{
- float min, max, step;
- gain_range_t(float min = 0.0, float max = 0.0, float step = 0.0);
+ template <typename T> class range_t{
+ public:
+ /*!
+ * Create a range from a single value.
+ * The step size will be taken as zero.
+ * \param value the only possible value in this range
+ */
+ range_t(const T &value = T(0));
+
+ /*!
+ * Create a range from a full set of values.
+ * A step size of zero implies infinite precision.
+ * \param start the minimum value for this range
+ * \param stop the maximum value for this range
+ * \param step the step size for this range
+ */
+ range_t(const T &start, const T &stop, const T &step = T(0));
+
+ //! Get the start value for this range.
+ const T start(void) const;
+
+ //! Get the stop value for this range.
+ const T stop(void) const;
+
+ //! Get the step value for this range.
+ const T step(void) const;
+
+ //! Convert this range to a printable string
+ const std::string to_pp_string(void) const;
+
+ private:
+ UHD_PIMPL_DECL(impl) _impl;
};
/*!
- * The frequency range struct describes possible frequency settings.
- * Because tuning is very granular (sub-Hz), step size is not listed.
- * The mimumum frequency and maximum frequency are in Hz.
+ * A meta-range object holds a list of individual ranges.
*/
- struct UHD_API freq_range_t{
- double min, max;
- freq_range_t(double min = 0.0, double max = 0.0);
+ template <typename T> struct meta_range_t : std::vector<range_t<T> >{
+
+ //! A default constructor for an empty meta-range
+ meta_range_t(void);
+
+ /*!
+ * Input iterator constructor:
+ * Makes boost::assign::list_of work.
+ * \param first the begin iterator
+ * \param last the end iterator
+ */
+ template <typename InputIterator>
+ meta_range_t(InputIterator first, InputIterator last);
+
+ /*!
+ * A convenience constructor for a single range.
+ * A step size of zero implies infinite precision.
+ * \param start the minimum value for this range
+ * \param stop the maximum value for this range
+ * \param step the step size for this range
+ */
+ meta_range_t(const T &start, const T &stop, const T &step = T(0));
+
+ //! Get the overall start value for this meta-range.
+ const T start(void) const;
+
+ //! Get the overall stop value for this meta-range.
+ const T stop(void) const;
+
+ //! Get the overall step value for this meta-range.
+ const T step(void) const;
+
+ /*!
+ * Clip the target value to a possible range value.
+ * \param value the value to clip to this range
+ * \param clip_step if true, clip to steps as well
+ * \return a value that is in one of the ranges
+ */
+ const T clip(const T &value, bool clip_step = false) const;
+
+ //! Convert this meta-range to a printable string
+ const std::string to_pp_string(void) const;
+
};
+ //! export a symbol for the gain range type
+ UHD_EXIMP_TMPL template struct UHD_API meta_range_t<float>;
+ typedef meta_range_t<float> gain_range_t;
+
+ //! export a symbol for the freq range type
+ UHD_EXIMP_TMPL template struct UHD_API meta_range_t<double>;
+ typedef meta_range_t<double> freq_range_t;
+
+
} //namespace uhd
+#include <uhd/types/ranges.ipp>
+
#endif /* INCLUDED_UHD_TYPES_RANGES_HPP */
diff --git a/host/include/uhd/types/ranges.ipp b/host/include/uhd/types/ranges.ipp
new file mode 100644
index 000000000..29f389fca
--- /dev/null
+++ b/host/include/uhd/types/ranges.ipp
@@ -0,0 +1,185 @@
+//
+// Copyright 2010 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
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_TYPES_RANGES_IPP
+#define INCLUDED_UHD_TYPES_RANGES_IPP
+
+#include <boost/math/special_functions/round.hpp>
+#include <boost/foreach.hpp>
+#include <algorithm>
+#include <stdexcept>
+#include <sstream>
+
+namespace uhd{
+
+ /*******************************************************************
+ * range_t implementation code
+ ******************************************************************/
+ template <typename T> struct range_t<T>::impl{
+ impl(const T &start, const T &stop, const T &step):
+ start(start), stop(stop), step(step)
+ {
+ /* NOP */
+ }
+ const T start, stop, step;
+ };
+
+ template <typename T> range_t<T>::range_t(const T &value):
+ _impl(UHD_PIMPL_MAKE(impl, (value, value, T(0))))
+ {
+ /* NOP */
+ }
+
+ template <typename T> range_t<T>::range_t(
+ const T &start, const T &stop, const T &step
+ ):
+ _impl(UHD_PIMPL_MAKE(impl, (start, stop, step)))
+ {
+ if (stop < start){
+ throw std::invalid_argument("cannot make range where stop < start");
+ }
+ }
+
+ template <typename T> const T range_t<T>::start(void) const{
+ return _impl->start;
+ }
+
+ template <typename T> const T range_t<T>::stop(void) const{
+ return _impl->stop;
+ }
+
+ template <typename T> const T range_t<T>::step(void) const{
+ return _impl->step;
+ }
+
+ template <typename T> const std::string range_t<T>::to_pp_string(void) const{
+ std::stringstream ss;
+ ss << "(" << this->start();
+ if (this->start() != this->stop()) ss << ", " << this->stop();
+ if (this->step() != T(0)) ss << ", " << this->step();
+ ss << ")";
+ return ss.str();
+ }
+
+ /*******************************************************************
+ * meta_range_t implementation code
+ ******************************************************************/
+
+ namespace /*anon*/{
+ template <typename T> inline
+ void check_meta_range_monotonic(const meta_range_t<T> &mr){
+ if (mr.empty()){
+ throw std::runtime_error("meta-range cannot be empty");
+ }
+ for (size_t i = 1; i < mr.size(); i++){
+ if (mr.at(i).start() < mr.at(i-1).stop()){
+ throw std::runtime_error("meta-range is not monotonic");
+ }
+ }
+ }
+ } //namespace /*anon*/
+
+
+ template <typename T> meta_range_t<T>::meta_range_t(void){
+ /* NOP */
+ }
+
+ template <typename T> template <typename InputIterator>
+ meta_range_t<T>::meta_range_t(
+ InputIterator first, InputIterator last
+ ):
+ std::vector<range_t<T> >(first, last)
+ {
+ /* NOP */
+ }
+
+ template <typename T> meta_range_t<T>::meta_range_t(
+ const T &start, const T &stop, const T &step
+ ):
+ std::vector<range_t<T> > (1, range_t<T>(start, stop, step))
+ {
+ /* NOP */
+ }
+
+ template <typename T> const T meta_range_t<T>::start(void) const{
+ check_meta_range_monotonic(*this);
+ T min_start = this->front().start();
+ BOOST_FOREACH(const range_t<T> &r, (*this)){
+ min_start = std::min(min_start, r.start());
+ }
+ return min_start;
+ }
+
+ template <typename T> const T meta_range_t<T>::stop(void) const{
+ check_meta_range_monotonic(*this);
+ T max_stop = this->front().stop();
+ BOOST_FOREACH(const range_t<T> &r, (*this)){
+ max_stop = std::max(max_stop, r.stop());
+ }
+ return max_stop;
+ }
+
+ template <typename T> const T meta_range_t<T>::step(void) const{
+ check_meta_range_monotonic(*this);
+ std::vector<T> non_zero_steps;
+ range_t<T> last = this->front();
+ BOOST_FOREACH(const range_t<T> &r, (*this)){
+ //steps at each range
+ if (r.step() > T(0)) non_zero_steps.push_back(r.step());
+ //and steps in-between ranges
+ T ibtw_step = r.start() - last.stop();
+ if (ibtw_step > T(0)) non_zero_steps.push_back(ibtw_step);
+ //store ref to last
+ last = r;
+ }
+ if (non_zero_steps.empty()) return T(0); //all zero steps, its zero...
+ return *std::min_element(non_zero_steps.begin(), non_zero_steps.end());
+ }
+
+ template <typename T> const T meta_range_t<T>::clip(
+ const T &value, bool clip_step
+ ) const{
+ check_meta_range_monotonic(*this);
+ T last_stop = this->front().stop();
+ BOOST_FOREACH(const range_t<T> &r, (*this)){
+ //in-between ranges, clip to nearest
+ if (value < r.start()){
+ return (std::abs(value - r.start()) < std::abs(value - last_stop))?
+ r.start() : last_stop;
+ }
+ //in this range, clip here
+ if (value <= r.stop()){
+ if (not clip_step or r.step() == T(0)) return value;
+ return boost::math::round((value - r.start())/r.step())*r.step() + r.start();
+ }
+ //continue on to the next range
+ last_stop = r.stop();
+ }
+ return last_stop;
+ }
+
+ template <typename T> const std::string meta_range_t<T>::to_pp_string(void) const{
+ std::stringstream ss;
+ BOOST_FOREACH(const range_t<T> &r, (*this)){
+ ss << r.to_pp_string() << std::endl;
+ }
+ return ss.str();
+ }
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_TYPES_RANGES_IPP */
diff --git a/host/include/uhd/usrp/CMakeLists.txt b/host/include/uhd/usrp/CMakeLists.txt
index cdf31df87..c8d7281d3 100644
--- a/host/include/uhd/usrp/CMakeLists.txt
+++ b/host/include/uhd/usrp/CMakeLists.txt
@@ -40,9 +40,7 @@ INSTALL(FILES
tune_helper.hpp
### interfaces ###
- simple_usrp.hpp
single_usrp.hpp
- mimo_usrp.hpp
multi_usrp.hpp
DESTINATION ${INCLUDE_DIR}/uhd/usrp
diff --git a/host/include/uhd/usrp/dsp_utils.hpp b/host/include/uhd/usrp/dsp_utils.hpp
index 8ec04dd2f..5b81ce322 100644
--- a/host/include/uhd/usrp/dsp_utils.hpp
+++ b/host/include/uhd/usrp/dsp_utils.hpp
@@ -85,12 +85,9 @@ namespace dsp_type1{
/*!
* Calculate the stream command word from the stream command struct.
* \param stream_cmd the requested stream command with mode, flags, timestamp
- * \param num_samps_continuous number of samples to request in continuous mode
* \return the 32-bit stream command word
*/
- UHD_API boost::uint32_t calc_stream_cmd_word(
- const stream_cmd_t &stream_cmd, size_t num_samps_continuous
- );
+ UHD_API boost::uint32_t calc_stream_cmd_word(const stream_cmd_t &stream_cmd);
} //namespace dsp_type1
diff --git a/host/include/uhd/usrp/mimo_usrp.hpp b/host/include/uhd/usrp/mimo_usrp.hpp
deleted file mode 100644
index a2092f04f..000000000
--- a/host/include/uhd/usrp/mimo_usrp.hpp
+++ /dev/null
@@ -1,525 +0,0 @@
-//
-// Copyright 2010 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//
-
-#ifndef INCLUDED_UHD_USRP_MIMO_USRP_HPP
-#define INCLUDED_UHD_USRP_MIMO_USRP_HPP
-
-#include <uhd/config.hpp>
-#include <uhd/device.hpp>
-#include <uhd/types/ranges.hpp>
-#include <uhd/types/stream_cmd.hpp>
-#include <uhd/types/clock_config.hpp>
-#include <uhd/types/tune_result.hpp>
-#include <uhd/usrp/subdev_spec.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
-#include <vector>
-
-namespace uhd{ namespace usrp{
-
-/*!
- * The MIMO USRP device class (DEPRECATED):
- * A mimo usrp facilitates ease-of-use for multi-usrp scenarios.
- * The wrapper provides convenience functions to control the group
- * of underlying devices as if they consisted of a single device.
- */
-class UHD_API UHD_DEPRECATED mimo_usrp : boost::noncopyable{
-public:
- typedef boost::shared_ptr<mimo_usrp> sptr;
-
- /*!
- * Make a new mimo usrp from the device address.
- * \param dev_addr the device address
- * \return a new mimo usrp object
- */
- static sptr make(const device_addr_t &dev_addr);
-
- /*!
- * Get the underlying device object.
- * This is needed to get access to the streaming API and properties.
- * \return the device object within this simple usrp
- */
- virtual device::sptr get_device(void) = 0;
-
- /*!
- * Get a printable name for this mimo usrp.
- * \return a printable string
- */
- virtual std::string get_pp_string(void) = 0;
-
- /*!
- * Get the number of channels in this mimo configuration.
- * The number of rx channels == the number of tx channels.
- * \return the number of channels
- */
- virtual size_t get_num_channels(void) = 0;
-
- /*******************************************************************
- * Misc
- ******************************************************************/
- /*!
- * Gets the current time in the usrp time registers.
- * \return a timespec representing current usrp time
- */
- virtual time_spec_t get_time_now(void) = 0;
-
- /*!
- * Set the time registers on the usrp at the next pps tick.
- * The values will not be latched in until the pulse occurs.
- * It is recommended that the user sleep(1) after calling to ensure
- * that the time registers will be in a known state prior to use.
- * This call works across all mboards in the mimo configuration.
- *
- * Note: Because this call sets the time on the "next" pps,
- * the seconds in the time spec should be current seconds + 1.
- *
- * \param time_spec the time to latch into the usrp device
- */
- virtual void set_time_next_pps(const time_spec_t &time_spec) = 0;
-
- /*!
- * Synchronize the times across all motherboards in this configuration.
- * Use this method to sync the times when the edge of the PPS is unknown.
- *
- * Ex: Host machine is not attached to serial port of GPSDO
- * and can therefore not query the GPSDO for the PPS edge.
- *
- * This is a 3-step process, and will take at most 3 seconds to complete.
- * Upon completion, the times will be synchronized to the time provided.
- *
- * - Step1: set the time at the next pps (potential race condition)
- * - Step2: wait for the seconds to rollover to catch the pps edge
- * - Step3: set the time at the next pps (synchronous for all boards)
- *
- * \param time_spec the time to latch into the usrp device
- */
- virtual void set_time_unknown_pps(const time_spec_t &time_spec) = 0;
-
- /*!
- * Issue a stream command to the usrp device.
- * This tells the usrp to send samples into the host.
- * See the documentation for stream_cmd_t for more info.
- * \param stream_cmd the stream command to issue
- */
- virtual void issue_stream_cmd(const stream_cmd_t &stream_cmd) = 0;
-
- /*******************************************************************
- * RX methods
- ******************************************************************/
- virtual void set_rx_subdev_spec(size_t chan, const uhd::usrp::subdev_spec_t &spec) = 0;
- virtual uhd::usrp::subdev_spec_t get_rx_subdev_spec(size_t chan) = 0;
-
- virtual void set_rx_rate_all(double rate) = 0;
- virtual double get_rx_rate_all(void) = 0;
-
- virtual tune_result_t set_rx_freq(size_t chan, double freq) = 0;
- //virtual tune_result_t set_rx_freq(size_t chan, double freq, double lo_off) = 0;
- virtual double get_rx_freq(size_t chan) = 0;
- virtual freq_range_t get_rx_freq_range(size_t chan) = 0;
-
- virtual void set_rx_gain(size_t chan, float gain) = 0;
- virtual float get_rx_gain(size_t chan) = 0;
- virtual gain_range_t get_rx_gain_range(size_t chan) = 0;
-
- virtual void set_rx_antenna(size_t chan, const std::string &ant) = 0;
- virtual std::string get_rx_antenna(size_t chan) = 0;
- virtual std::vector<std::string> get_rx_antennas(size_t chan) = 0;
-
- virtual bool get_rx_lo_locked(size_t chan) = 0;
-
- /*!
- * Read the RSSI value from a usrp device.
- * Or throw if the dboard does not support an RSSI readback.
- * \param chan which mimo channel 0 to N-1
- * \return the rssi in dB
- */
- virtual float read_rssi(size_t chan) = 0;
-
- virtual void set_rx_bandwidth(size_t chan, float bandwidth) = 0;
-
- /*******************************************************************
- * TX methods
- ******************************************************************/
- virtual void set_tx_subdev_spec(size_t chan, const uhd::usrp::subdev_spec_t &spec) = 0;
- virtual uhd::usrp::subdev_spec_t get_tx_subdev_spec(size_t chan) = 0;
-
- virtual void set_tx_rate_all(double rate) = 0;
- virtual double get_tx_rate_all(void) = 0;
-
- virtual tune_result_t set_tx_freq(size_t chan, double freq) = 0;
- //virtual tune_result_t set_tx_freq(size_t chan, double freq, double lo_off) = 0;
- virtual double get_tx_freq(size_t chan) = 0;
- virtual freq_range_t get_tx_freq_range(size_t chan) = 0;
-
- virtual void set_tx_gain(size_t chan, float gain) = 0;
- virtual float get_tx_gain(size_t chan) = 0;
- virtual gain_range_t get_tx_gain_range(size_t chan) = 0;
-
- virtual void set_tx_antenna(size_t chan, const std::string &ant) = 0;
- virtual std::string get_tx_antenna(size_t chan) = 0;
- virtual std::vector<std::string> get_tx_antennas(size_t chan) = 0;
-
- virtual bool get_tx_lo_locked(size_t chan) = 0;
-
-};
-
-}}
-
-#include <uhd/utils/warning.hpp>
-#include <uhd/usrp/tune_helper.hpp>
-#include <uhd/utils/assert.hpp>
-#include <uhd/utils/gain_group.hpp>
-#include <uhd/utils/algorithm.hpp>
-#include <uhd/utils/warning.hpp>
-#include <uhd/usrp/subdev_props.hpp>
-#include <uhd/usrp/mboard_props.hpp>
-#include <uhd/usrp/device_props.hpp>
-#include <uhd/usrp/dboard_props.hpp>
-#include <uhd/usrp/dsp_props.hpp>
-#include <boost/foreach.hpp>
-#include <boost/format.hpp>
-#include <boost/thread.hpp>
-#include <stdexcept>
-#include <iostream>
-
-namespace uhd{ namespace usrp{ namespace /*anon*/{
-
-static inline freq_range_t add_dsp_shift(const freq_range_t &range, wax::obj dsp){
- double codec_rate = dsp[DSP_PROP_CODEC_RATE].as<double>();
- return freq_range_t(range.min - codec_rate/2.0, range.max + codec_rate/2.0);
-}
-
-/***********************************************************************
- * MIMO USRP Implementation
- **********************************************************************/
-class mimo_usrp_impl : public mimo_usrp{
-public:
- mimo_usrp_impl(const device_addr_t &addr){
- _dev = device::make(addr);
-
- //set the clock config across all mboards (TODO set through api)
- clock_config_t clock_config;
- clock_config.ref_source = clock_config_t::REF_SMA;
- clock_config.pps_source = clock_config_t::PPS_SMA;
- for (size_t chan = 0; chan < get_num_channels(); chan++){
- _mboard(chan)[MBOARD_PROP_CLOCK_CONFIG] = clock_config;
- }
- }
-
- ~mimo_usrp_impl(void){
- /* NOP */
- }
-
- device::sptr get_device(void){
- return _dev;
- }
-
- std::string get_pp_string(void){
- std::string buff = str(boost::format(
- "MIMO USRP:\n"
- " Device: %s\n"
- )
- % (*_dev)[DEVICE_PROP_NAME].as<std::string>()
- );
- for (size_t chan = 0; chan < get_num_channels(); chan++){
- buff += str(boost::format(
- " Channel: %u\n"
- " Mboard: %s\n"
- " RX DSP: %s\n"
- " RX Dboard: %s\n"
- " RX Subdev: %s\n"
- " TX DSP: %s\n"
- " TX Dboard: %s\n"
- " TX Subdev: %s\n"
- ) % chan
- % _mboard(chan)[MBOARD_PROP_NAME].as<std::string>()
- % _rx_dsp(chan)[DSP_PROP_NAME].as<std::string>()
- % _rx_dboard(chan)[DBOARD_PROP_NAME].as<std::string>()
- % _rx_subdev(chan)[SUBDEV_PROP_NAME].as<std::string>()
- % _tx_dsp(chan)[DSP_PROP_NAME].as<std::string>()
- % _tx_dboard(chan)[DBOARD_PROP_NAME].as<std::string>()
- % _tx_subdev(chan)[SUBDEV_PROP_NAME].as<std::string>()
- );
- }
- return buff;
- }
-
- size_t get_num_channels(void){
- return (*_dev)[DEVICE_PROP_MBOARD_NAMES].as<prop_names_t>().size();
- }
-
- /*******************************************************************
- * Misc
- ******************************************************************/
- time_spec_t get_time_now(void){
- //the time on the first mboard better be the same on all
- return _mboard(0)[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
- }
-
- void set_time_next_pps(const time_spec_t &time_spec){
- for (size_t chan = 0; chan < get_num_channels(); chan++){
- _mboard(chan)[MBOARD_PROP_TIME_NEXT_PPS] = time_spec;
- }
- }
-
- void set_time_unknown_pps(const time_spec_t &time_spec){
- std::cout << "Set time with unknown pps edge:" << std::endl;
- std::cout << " 1) set times next pps (race condition)" << std::endl;
- set_time_next_pps(time_spec);
- boost::this_thread::sleep(boost::posix_time::seconds(1));
-
- std::cout << " 2) catch seconds rollover at pps edge" << std::endl;
- time_t last_secs = 0, curr_secs = 0;
- while(curr_secs == last_secs){
- last_secs = curr_secs;
- curr_secs = get_time_now().get_full_secs();
- }
-
- std::cout << " 3) set times next pps (synchronously)" << std::endl;
- set_time_next_pps(time_spec);
- boost::this_thread::sleep(boost::posix_time::seconds(1));
-
- //verify that the time registers are read to be within a few RTT
- for (size_t chan = 1; chan < get_num_channels(); chan++){
- time_spec_t time_0 = _mboard(0)[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
- time_spec_t time_i = _mboard(chan)[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
- if (time_i < time_0 or (time_i - time_0) > time_spec_t(0.01)){ //10 ms: greater than RTT but not too big
- uhd::warning::post(str(boost::format(
- "Detected time deviation between board %d and board 0.\n"
- "Board 0 time is %f seconds.\n"
- "Board %d time is %f seconds.\n"
- ) % chan % time_0.get_real_secs() % chan % time_i.get_real_secs()));
- }
- }
- }
-
- void issue_stream_cmd(const stream_cmd_t &stream_cmd){
- for (size_t chan = 0; chan < get_num_channels(); chan++){
- _mboard(chan)[MBOARD_PROP_STREAM_CMD] = stream_cmd;
- }
- }
-
- /*******************************************************************
- * RX methods
- ******************************************************************/
- void set_rx_subdev_spec(size_t chan, const subdev_spec_t &spec){
- UHD_ASSERT_THROW(spec.size() <= 1);
- _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC] = spec;
- }
-
- subdev_spec_t get_rx_subdev_spec(size_t chan){
- return _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>();
- }
-
- void set_rx_rate_all(double rate){
- std::vector<double> _actual_rates;
- for (size_t chan = 0; chan < get_num_channels(); chan++){
- _rx_dsp(chan)[DSP_PROP_HOST_RATE] = rate;
- _actual_rates.push_back(_rx_dsp(chan)[DSP_PROP_HOST_RATE].as<double>());
- }
- _rx_rate = _actual_rates.front();
- if (std::count(_actual_rates, _rx_rate) != _actual_rates.size()) throw std::runtime_error(
- "MIMO configuratio error: rx rate inconsistent across mboards"
- );
- }
-
- double get_rx_rate_all(void){
- return _rx_rate;
- }
-
- tune_result_t set_rx_freq(size_t chan, double target_freq){
- return tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(chan), 0, target_freq);
- }
-
- //tune_result_t set_rx_freq(size_t chan, double target_freq, double lo_off){
- // return tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(chan), 0, target_freq, lo_off);
- //}
-
- double get_rx_freq(size_t chan){
- return derive_freq_from_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(chan), 0);
- }
-
- freq_range_t get_rx_freq_range(size_t chan){
- return add_dsp_shift(_rx_subdev(chan)[SUBDEV_PROP_FREQ_RANGE].as<freq_range_t>(), _rx_dsp(chan));
- }
-
- void set_rx_gain(size_t chan, float gain){
- return _rx_gain_group(chan)->set_value(gain);
- }
-
- float get_rx_gain(size_t chan){
- return _rx_gain_group(chan)->get_value();
- }
-
- gain_range_t get_rx_gain_range(size_t chan){
- return _rx_gain_group(chan)->get_range();
- }
-
- void set_rx_antenna(size_t chan, const std::string &ant){
- _rx_subdev(chan)[SUBDEV_PROP_ANTENNA] = ant;
- }
-
- std::string get_rx_antenna(size_t chan){
- return _rx_subdev(chan)[SUBDEV_PROP_ANTENNA].as<std::string>();
- }
-
- std::vector<std::string> get_rx_antennas(size_t chan){
- return _rx_subdev(chan)[SUBDEV_PROP_ANTENNA_NAMES].as<prop_names_t>();
- }
-
- bool get_rx_lo_locked(size_t chan){
- return _rx_subdev(chan)[SUBDEV_PROP_LO_LOCKED].as<bool>();
- }
-
- float read_rssi(size_t chan){
- return _rx_subdev(chan)[SUBDEV_PROP_RSSI].as<float>();
- }
-
- void set_rx_bandwidth(size_t chan, float bandwidth){
- _rx_subdev(chan)[SUBDEV_PROP_BANDWIDTH] = bandwidth;
- }
-
- /*******************************************************************
- * TX methods
- ******************************************************************/
- void set_tx_subdev_spec(size_t chan, const subdev_spec_t &spec){
- UHD_ASSERT_THROW(spec.size() <= 1);
- _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC] = spec;
- }
-
- subdev_spec_t get_tx_subdev_spec(size_t chan){
- return _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>();
- }
-
- void set_tx_rate_all(double rate){
- std::vector<double> _actual_rates;
- for (size_t chan = 0; chan < get_num_channels(); chan++){
- _tx_dsp(chan)[DSP_PROP_HOST_RATE] = rate;
- _actual_rates.push_back(_tx_dsp(chan)[DSP_PROP_HOST_RATE].as<double>());
- }
- _tx_rate = _actual_rates.front();
- if (std::count(_actual_rates, _tx_rate) != _actual_rates.size()) throw std::runtime_error(
- "MIMO configuratio error: tx rate inconsistent across mboards"
- );
- }
-
- double get_tx_rate_all(void){
- return _tx_rate;
- }
-
- tune_result_t set_tx_freq(size_t chan, double target_freq){
- return tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(chan), 0, target_freq);
- }
-
- //tune_result_t set_tx_freq(size_t chan, double target_freq, double lo_off){
- // return tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(chan), 0, target_freq, lo_off);
- //}
-
- double get_tx_freq(size_t chan){
- return derive_freq_from_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(chan), 0);
- }
-
- freq_range_t get_tx_freq_range(size_t chan){
- return add_dsp_shift(_tx_subdev(chan)[SUBDEV_PROP_FREQ_RANGE].as<freq_range_t>(), _tx_dsp(chan));
- }
-
- void set_tx_gain(size_t chan, float gain){
- return _tx_gain_group(chan)->set_value(gain);
- }
-
- float get_tx_gain(size_t chan){
- return _tx_gain_group(chan)->get_value();
- }
-
- gain_range_t get_tx_gain_range(size_t chan){
- return _tx_gain_group(chan)->get_range();
- }
-
- void set_tx_antenna(size_t chan, const std::string &ant){
- _tx_subdev(chan)[SUBDEV_PROP_ANTENNA] = ant;
- }
-
- std::string get_tx_antenna(size_t chan){
- return _tx_subdev(chan)[SUBDEV_PROP_ANTENNA].as<std::string>();
- }
-
- std::vector<std::string> get_tx_antennas(size_t chan){
- return _tx_subdev(chan)[SUBDEV_PROP_ANTENNA_NAMES].as<prop_names_t>();
- }
-
- bool get_tx_lo_locked(size_t chan){
- return _tx_subdev(chan)[SUBDEV_PROP_LO_LOCKED].as<bool>();
- }
-
-private:
- device::sptr _dev;
- wax::obj _mboard(size_t chan){
- prop_names_t names = (*_dev)[DEVICE_PROP_MBOARD_NAMES].as<prop_names_t>();
- return (*_dev)[named_prop_t(DEVICE_PROP_MBOARD, names.at(chan))];
- }
- wax::obj _rx_dsp(size_t chan){
- return _mboard(chan)[MBOARD_PROP_RX_DSP];
- }
- wax::obj _tx_dsp(size_t chan){
- return _mboard(chan)[MBOARD_PROP_TX_DSP];
- }
- wax::obj _rx_dboard(size_t chan){
- std::string db_name = _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>().front().db_name;
- return _mboard(chan)[named_prop_t(MBOARD_PROP_RX_DBOARD, db_name)];
- }
- wax::obj _tx_dboard(size_t chan){
- std::string db_name = _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>().front().db_name;
- return _mboard(chan)[named_prop_t(MBOARD_PROP_TX_DBOARD, db_name)];
- }
- wax::obj _rx_subdev(size_t chan){
- std::string sd_name = _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>().front().sd_name;
- return _rx_dboard(chan)[named_prop_t(DBOARD_PROP_SUBDEV, sd_name)];
- }
- wax::obj _tx_subdev(size_t chan){
- std::string sd_name = _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>().front().sd_name;
- return _tx_dboard(chan)[named_prop_t(DBOARD_PROP_SUBDEV, sd_name)];
- }
- gain_group::sptr _rx_gain_group(size_t chan){
- std::string sd_name = _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>().front().sd_name;
- return _rx_dboard(chan)[named_prop_t(DBOARD_PROP_GAIN_GROUP, sd_name)].as<gain_group::sptr>();
- }
- gain_group::sptr _tx_gain_group(size_t chan){
- std::string sd_name = _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>().front().sd_name;
- return _tx_dboard(chan)[named_prop_t(DBOARD_PROP_GAIN_GROUP, sd_name)].as<gain_group::sptr>();
- }
-
- //shadows
- double _rx_rate, _tx_rate;
-};
-}}}
-
-namespace uhd{ namespace usrp{
-/***********************************************************************
- * The Make Function
- **********************************************************************/
-inline mimo_usrp::sptr mimo_usrp::make(const device_addr_t &dev_addr){
- uhd::warning::post(
- "The mimo USRP interface has been deprecated.\n"
- "Please switch to the multi USRP interface.\n"
- "#include <uhd/usrp/multi_usrp.hpp>\n"
- "multi_usrp::sptr sdev = multi_usrp::make(args);\n"
- );
- return sptr(new mimo_usrp_impl(dev_addr));
-}
-}}
-
-#endif /* INCLUDED_UHD_USRP_MIMO_USRP_HPP */
diff --git a/host/include/uhd/usrp/simple_usrp.hpp b/host/include/uhd/usrp/simple_usrp.hpp
deleted file mode 100644
index 77416dbbd..000000000
--- a/host/include/uhd/usrp/simple_usrp.hpp
+++ /dev/null
@@ -1,388 +0,0 @@
-//
-// Copyright 2010 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//
-
-#ifndef INCLUDED_UHD_USRP_SIMPLE_USRP_HPP
-#define INCLUDED_UHD_USRP_SIMPLE_USRP_HPP
-
-#include <uhd/config.hpp>
-#include <uhd/device.hpp>
-#include <uhd/types/ranges.hpp>
-#include <uhd/types/stream_cmd.hpp>
-#include <uhd/types/clock_config.hpp>
-#include <uhd/types/tune_result.hpp>
-#include <uhd/usrp/subdev_spec.hpp>
-#include <uhd/usrp/dboard_iface.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
-#include <vector>
-
-namespace uhd{ namespace usrp{
-
-/*!
- * The simple USRP device class (DEPRECATED):
- * This interface has been deprecated in favor of the single USRP interface.
- * A simple usrp facilitates ease-of-use for most use-case scenarios.
- * The wrapper provides convenience functions to tune the devices
- * as well as to set the dboard gains, antennas, and other properties.
- */
-class UHD_API UHD_DEPRECATED simple_usrp : boost::noncopyable{
-public:
- typedef boost::shared_ptr<simple_usrp> sptr;
-
- /*!
- * Make a new simple usrp from the device address.
- * \param dev_addr the device address
- * \return a new simple usrp object
- */
- static sptr make(const device_addr_t &dev_addr);
-
- /*!
- * Get the underlying device object.
- * This is needed to get access to the streaming API and properties.
- * \return the device object within this simple usrp
- */
- virtual device::sptr get_device(void) = 0;
-
- /*!
- * Get a printable name for this simple usrp.
- * \return a printable string
- */
- virtual std::string get_pp_string(void) = 0;
-
- /*******************************************************************
- * Misc
- ******************************************************************/
- /*!
- * Gets the current time in the usrp time registers.
- * \return a timespec representing current usrp time
- */
- virtual time_spec_t get_time_now(void) = 0;
-
- /*!
- * Sets the time registers on the usrp immediately.
- * \param time_spec the time to latch into the usrp device
- */
- virtual void set_time_now(const time_spec_t &time_spec) = 0;
-
- /*!
- * Set the time registers on the usrp at the next pps tick.
- * The values will not be latched in until the pulse occurs.
- * It is recommended that the user sleep(1) after calling to ensure
- * that the time registers will be in a known state prior to use.
- *
- * Note: Because this call sets the time on the "next" pps,
- * the seconds in the time spec should be current seconds + 1.
- *
- * \param time_spec the time to latch into the usrp device
- */
- virtual void set_time_next_pps(const time_spec_t &time_spec) = 0;
-
- /*!
- * Issue a stream command to the usrp device.
- * This tells the usrp to send samples into the host.
- * See the documentation for stream_cmd_t for more info.
- * \param stream_cmd the stream command to issue
- */
- virtual void issue_stream_cmd(const stream_cmd_t &stream_cmd) = 0;
-
- /*!
- * Set the clock configuration for the usrp device.
- * This tells the usrp how to get a 10Mhz reference and PPS clock.
- * See the documentation for clock_config_t for more info.
- * \param clock_config the clock configuration to set
- */
- virtual void set_clock_config(const clock_config_t &clock_config) = 0;
-
- /*******************************************************************
- * RX methods
- ******************************************************************/
- virtual void set_rx_subdev_spec(const uhd::usrp::subdev_spec_t &spec) = 0;
- virtual uhd::usrp::subdev_spec_t get_rx_subdev_spec(void) = 0;
-
- virtual void set_rx_rate(double rate) = 0;
- virtual double get_rx_rate(void) = 0;
-
- virtual tune_result_t set_rx_freq(double freq) = 0;
- //virtual tune_result_t set_rx_freq(double freq, double lo_off) = 0;
- virtual double get_rx_freq(void) = 0;
- virtual freq_range_t get_rx_freq_range(void) = 0;
-
- virtual void set_rx_gain(float gain) = 0;
- virtual float get_rx_gain(void) = 0;
- virtual gain_range_t get_rx_gain_range(void) = 0;
-
- virtual void set_rx_antenna(const std::string &ant) = 0;
- virtual std::string get_rx_antenna(void) = 0;
- virtual std::vector<std::string> get_rx_antennas(void) = 0;
-
- virtual bool get_rx_lo_locked(void) = 0;
-
- /*!
- * Read the RSSI value from a usrp device.
- * Or throw if the dboard does not support an RSSI readback.
- * \return the rssi in dB
- */
- virtual float read_rssi(void) = 0;
-
- virtual dboard_iface::sptr get_rx_dboard_iface(void) = 0;
-
- virtual void set_rx_bandwidth(float) = 0;
-
- /*******************************************************************
- * TX methods
- ******************************************************************/
- virtual void set_tx_subdev_spec(const uhd::usrp::subdev_spec_t &spec) = 0;
- virtual uhd::usrp::subdev_spec_t get_tx_subdev_spec(void) = 0;
-
- virtual void set_tx_rate(double rate) = 0;
- virtual double get_tx_rate(void) = 0;
-
- virtual tune_result_t set_tx_freq(double freq) = 0;
- //virtual tune_result_t set_tx_freq(double freq, double lo_off) = 0;
- virtual double get_tx_freq(void) = 0;
- virtual freq_range_t get_tx_freq_range(void) = 0;
-
- virtual void set_tx_gain(float gain) = 0;
- virtual float get_tx_gain(void) = 0;
- virtual gain_range_t get_tx_gain_range(void) = 0;
-
- virtual void set_tx_antenna(const std::string &ant) = 0;
- virtual std::string get_tx_antenna(void) = 0;
- virtual std::vector<std::string> get_tx_antennas(void) = 0;
-
- virtual bool get_tx_lo_locked(void) = 0;
-
- virtual dboard_iface::sptr get_tx_dboard_iface(void) = 0;
-};
-
-}}
-
-#include <uhd/usrp/single_usrp.hpp>
-#include <uhd/utils/warning.hpp>
-
-namespace uhd{ namespace usrp{ namespace /*anon*/{
-
-/***********************************************************************
- * Simple USRP Implementation
- **********************************************************************/
-class simple_usrp_impl : public simple_usrp{
-public:
- simple_usrp_impl(const device_addr_t &addr){
- _sdev = single_usrp::make(addr);
- }
-
- ~simple_usrp_impl(void){
- /* NOP */
- }
-
- device::sptr get_device(void){
- return _sdev->get_device();
- }
-
- std::string get_pp_string(void){
- return _sdev->get_pp_string();
- }
-
- /*******************************************************************
- * Misc
- ******************************************************************/
- time_spec_t get_time_now(void){
- return _sdev->get_time_now();
- }
-
- void set_time_now(const time_spec_t &time_spec){
- return _sdev->set_time_now(time_spec);
- }
-
- void set_time_next_pps(const time_spec_t &time_spec){
- return _sdev->set_time_next_pps(time_spec);
- }
-
- void issue_stream_cmd(const stream_cmd_t &stream_cmd){
- return _sdev->issue_stream_cmd(stream_cmd);
- }
-
- void set_clock_config(const clock_config_t &clock_config){
- return _sdev->set_clock_config(clock_config);
- }
-
- /*******************************************************************
- * RX methods
- ******************************************************************/
- void set_rx_subdev_spec(const subdev_spec_t &spec){
- return _sdev->set_rx_subdev_spec(spec);
- }
-
- subdev_spec_t get_rx_subdev_spec(void){
- return _sdev->get_rx_subdev_spec();
- }
-
- void set_rx_rate(double rate){
- return _sdev->set_rx_rate(rate);
- }
-
- double get_rx_rate(void){
- return _sdev->get_rx_rate();
- }
-
- tune_result_t set_rx_freq(double target_freq){
- return _sdev->set_rx_freq(target_freq);
- }
-
- //tune_result_t set_rx_freq(double target_freq, double lo_off){
- // return _sdev->set_rx_freq(target_freq, lo_off);
- //}
-
- double get_rx_freq(void){
- return _sdev->get_rx_freq();
- }
-
- freq_range_t get_rx_freq_range(void){
- return _sdev->get_rx_freq_range();
- }
-
- void set_rx_gain(float gain){
- return _sdev->set_rx_gain(gain);
- }
-
- float get_rx_gain(void){
- return _sdev->get_rx_gain();
- }
-
- gain_range_t get_rx_gain_range(void){
- return _sdev->get_rx_gain_range();
- }
-
- void set_rx_antenna(const std::string &ant){
- return _sdev->set_rx_antenna(ant);
- }
-
- std::string get_rx_antenna(void){
- return _sdev->get_rx_antenna();
- }
-
- std::vector<std::string> get_rx_antennas(void){
- return _sdev->get_rx_antennas();
- }
-
- bool get_rx_lo_locked(void){
- return _sdev->get_rx_lo_locked();
- }
-
- float read_rssi(void){
- return _sdev->read_rssi();
- }
-
- dboard_iface::sptr get_rx_dboard_iface(void){
- return _sdev->get_rx_dboard_iface();
- }
-
- void set_rx_bandwidth(float bandwidth) {
- return _sdev->set_rx_bandwidth(bandwidth);
- }
-
- /*******************************************************************
- * TX methods
- ******************************************************************/
- void set_tx_subdev_spec(const subdev_spec_t &spec){
- return _sdev->set_tx_subdev_spec(spec);
- }
-
- subdev_spec_t get_tx_subdev_spec(void){
- return _sdev->get_tx_subdev_spec();
- }
-
- void set_tx_rate(double rate){
- return _sdev->set_tx_rate(rate);
- }
-
- double get_tx_rate(void){
- return _sdev->get_tx_rate();
- }
-
- tune_result_t set_tx_freq(double target_freq){
- return _sdev->set_tx_freq(target_freq);
- }
-
- //tune_result_t set_tx_freq(double target_freq, double lo_off){
- // return _sdev->set_tx_freq(target_freq, lo_off);
- //}
-
- double get_tx_freq(void){
- return _sdev->get_tx_freq();
- }
-
- freq_range_t get_tx_freq_range(void){
- return _sdev->get_tx_freq_range();
- }
-
- void set_tx_gain(float gain){
- return _sdev->set_tx_gain(gain);
- }
-
- float get_tx_gain(void){
- return _sdev->get_tx_gain();
- }
-
- gain_range_t get_tx_gain_range(void){
- return _sdev->get_tx_gain_range();
- }
-
- void set_tx_antenna(const std::string &ant){
- return _sdev->set_tx_antenna(ant);
- }
-
- std::string get_tx_antenna(void){
- return _sdev->get_tx_antenna();
- }
-
- std::vector<std::string> get_tx_antennas(void){
- return _sdev->get_tx_antennas();
- }
-
- bool get_tx_lo_locked(void){
- return _sdev->get_tx_lo_locked();
- }
-
- dboard_iface::sptr get_tx_dboard_iface(void){
- return _sdev->get_tx_dboard_iface();
- }
-
-private:
- single_usrp::sptr _sdev;
-};
-
-}}}
-
-namespace uhd{ namespace usrp{
-
-/***********************************************************************
- * The Make Function
- **********************************************************************/
-inline simple_usrp::sptr simple_usrp::make(const device_addr_t &dev_addr){
- uhd::warning::post(
- "The simple USRP interface has been deprecated.\n"
- "Please switch to the single USRP interface.\n"
- "#include <uhd/usrp/single_usrp.hpp>\n"
- "single_usrp::sptr sdev = single_usrp::make(args);\n"
- );
- return sptr(new simple_usrp_impl(dev_addr));
-}
-
-}}
-
-#endif /* INCLUDED_UHD_USRP_SIMPLE_USRP_HPP */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 09:46:07 +0000