Merge branch 'master' of gnuradio.org:gnuradio

2 files changed, 24 insertions, 0 deletions

diff --git a/gr-uhd/lib/gr_uhd_usrp_sink.cc b/gr-uhd/lib/gr_uhd_usrp_sink.cc
index 7e7875898..d86165f65 100644
--- a/gr-uhd/lib/gr_uhd_usrp_sink.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_sink.cc
@@ -66,10 +66,22 @@ public:
         _dev = uhd::usrp::multi_usrp::make(device_addr);
     }
 
+    uhd::dict<std::string, std::string> get_usrp_tx_info(size_t chan){
+        #ifdef UHD_USRP_MULTI_USRP_GET_USRP_INFO_API
+        return _dev->get_usrp_tx_info(chan);
+        #else
+        throw std::runtime_error("not implemented in this version");
+        #endif
+    }
+
     void set_subdev_spec(const std::string &spec, size_t mboard){
         return _dev->set_tx_subdev_spec(spec, mboard);
     }
 
+    std::string get_subdev_spec(size_t mboard){
+        return _dev->get_tx_subdev_spec(mboard).to_string();
+    }
+
     void set_samp_rate(double rate){
         _dev->set_tx_rate(rate);
         _sample_rate = this->get_samp_rate();
diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc
index bd7f4e21d..49558cee6 100644
--- a/gr-uhd/lib/gr_uhd_usrp_source.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_source.cc
@@ -70,10 +70,22 @@ public:
         _dev = uhd::usrp::multi_usrp::make(device_addr);
     }
 
+    uhd::dict<std::string, std::string> get_usrp_rx_info(size_t chan){
+        #ifdef UHD_USRP_MULTI_USRP_GET_USRP_INFO_API
+        return _dev->get_usrp_rx_info(chan);
+        #else
+        throw std::runtime_error("not implemented in this version");
+        #endif
+    }
+
     void set_subdev_spec(const std::string &spec, size_t mboard){
         return _dev->set_rx_subdev_spec(spec, mboard);
     }
 
+    std::string get_subdev_spec(size_t mboard){
+        return _dev->get_rx_subdev_spec(mboard).to_string();
+    }
+
     void set_samp_rate(double rate){
         _dev->set_rx_rate(rate);
     }