diff options
author | Thomas Tsou <ttsou@vt.edu> | 2010-08-26 12:34:06 -0700 |
---|---|---|
committer | Thomas Tsou <ttsou@vt.edu> | 2010-08-26 12:34:06 -0700 |
commit | af44e589a2ed47f08fa060629b33e441fb2dc4ea (patch) | |
tree | ad970811fc253d03400ee70a41e96066e8cd7b6f /host/include | |
parent | 4434e8233fadc4eec81d345a6c4e63922d8c01ab (diff) | |
parent | 738f4a86558aca8d2fdfecd480613766bfc82510 (diff) | |
download | uhd-af44e589a2ed47f08fa060629b33e441fb2dc4ea.tar.gz uhd-af44e589a2ed47f08fa060629b33e441fb2dc4ea.tar.bz2 uhd-af44e589a2ed47f08fa060629b33e441fb2dc4ea.zip |
Merge branch 'convert_types' into usrp1
Diffstat (limited to 'host/include')
-rw-r--r-- | host/include/uhd/usrp/dboard_iface.hpp | 8 | ||||
-rw-r--r-- | host/include/uhd/usrp/simple_usrp.hpp | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/host/include/uhd/usrp/dboard_iface.hpp b/host/include/uhd/usrp/dboard_iface.hpp index e776ecc42..c7db244f2 100644 --- a/host/include/uhd/usrp/dboard_iface.hpp +++ b/host/include/uhd/usrp/dboard_iface.hpp @@ -148,6 +148,14 @@ public: virtual void write_gpio(unit_t unit, boost::uint16_t value) = 0; /*! + * Setup the GPIO debug mux. + * + * \param unit which unit rx or tx + * \param which which debug: 0, 1 + */ + virtual void set_gpio_debug(unit_t unit, int which) = 0; + + /*! * Read daughterboard GPIO pin values. * * \param unit which unit rx or tx diff --git a/host/include/uhd/usrp/simple_usrp.hpp b/host/include/uhd/usrp/simple_usrp.hpp index 4da63c929..08b9c01ea 100644 --- a/host/include/uhd/usrp/simple_usrp.hpp +++ b/host/include/uhd/usrp/simple_usrp.hpp @@ -25,6 +25,7 @@ #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> @@ -136,6 +137,8 @@ public: */ virtual float read_rssi(void) = 0; + virtual dboard_iface::sptr get_rx_dboard_iface(void) = 0; + /******************************************************************* * TX methods ******************************************************************/ @@ -159,6 +162,8 @@ public: 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; }; }} |