Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p

Conflicts:
	host/include/uhd/usrp/simple_usrp.hpp
	host/lib/usrp/simple_usrp.cpp

2 files changed, 12 insertions, 5 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 c2c7505af..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
      ******************************************************************/
@@ -160,11 +163,7 @@ public:
 
     virtual bool get_tx_lo_locked(void) = 0;
 
-    /*******************************************************************
-     * Interface access methods
-     ******************************************************************/
-    virtual wax::obj get_rx_dboard_iface(void) = 0;
-    virtual wax::obj get_tx_dboard_iface(void) = 0;
+    virtual dboard_iface::sptr get_tx_dboard_iface(void) = 0;
 };
 
 }}