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

1 files changed, 6 insertions, 10 deletions

diff --git a/host/lib/usrp/simple_usrp.cpp b/host/lib/usrp/simple_usrp.cpp
index 5b4a58805..e573d0fc0 100644
--- a/host/lib/usrp/simple_usrp.cpp
+++ b/host/lib/usrp/simple_usrp.cpp
@@ -168,6 +168,10 @@ public:
         return _rx_subdev()[SUBDEV_PROP_RSSI].as<float>();
     }
 
+    dboard_iface::sptr get_rx_dboard_iface(void){
+        return _rx_dboard()[DBOARD_PROP_DBOARD_IFACE].as<dboard_iface::sptr>();
+    }
+
     /*******************************************************************
      * TX methods
      ******************************************************************/
@@ -232,16 +236,8 @@ public:
         return _tx_subdev()[SUBDEV_PROP_LO_LOCKED].as<bool>();
     }
 
-    /*******************************************************************
-     * Interface access methods
-     ******************************************************************/
-
-    wax::obj get_rx_dboard_iface(void) {
-        return _rx_dboard();
-    }
-
-    wax::obj get_tx_dboard_iface(void) {
-        return _tx_dboard();
+    dboard_iface::sptr get_tx_dboard_iface(void){
+        return _tx_dboard()[DBOARD_PROP_DBOARD_IFACE].as<dboard_iface::sptr>();
     }
 
 private: