aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-07-20 14:13:37 -0700
committerJosh Blum <josh@joshknows.com>2011-07-20 14:13:37 -0700
commit9851de0713b4c6d14a870a1d8816451ca518ff52 (patch)
tree41d1ff8e4d4febd8babfb46a9779def2c2314a2b /host/lib/usrp
parent117f6a3359a8a21acf396b0e0f084c32770e0b3a (diff)
downloaduhd-9851de0713b4c6d14a870a1d8816451ca518ff52.tar.gz
uhd-9851de0713b4c6d14a870a1d8816451ca518ff52.tar.bz2
uhd-9851de0713b4c6d14a870a1d8816451ca518ff52.zip
uhd: add get_tree call directly to the device
Does away with the need for wax cast to get the tree. You can still do this but it will eventually be removed. There was some compiler issue on ubuntu 10.04 with any cast and a shared ptr to property tree.
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/b100/b100_impl.hpp3
-rw-r--r--host/lib/usrp/e100/e100_impl.hpp3
-rw-r--r--host/lib/usrp/usrp1/usrp1_impl.hpp3
-rw-r--r--host/lib/usrp/usrp2/usrp2_impl.hpp3
4 files changed, 12 insertions, 0 deletions
diff --git a/host/lib/usrp/b100/b100_impl.hpp b/host/lib/usrp/b100/b100_impl.hpp
index 62a22674e..26f363479 100644
--- a/host/lib/usrp/b100/b100_impl.hpp
+++ b/host/lib/usrp/b100/b100_impl.hpp
@@ -113,6 +113,9 @@ private:
void get(const wax::obj &, wax::obj &val){
val = _tree; //entry point into property tree
}
+ uhd::property_tree::sptr get_tree(void) const{
+ return _tree;
+ }
void check_fw_compat(void);
void check_fpga_compat(void);
diff --git a/host/lib/usrp/e100/e100_impl.hpp b/host/lib/usrp/e100/e100_impl.hpp
index e24360223..d60d6a63c 100644
--- a/host/lib/usrp/e100/e100_impl.hpp
+++ b/host/lib/usrp/e100/e100_impl.hpp
@@ -113,6 +113,9 @@ private:
void get(const wax::obj &, wax::obj &val){
val = _tree; //entry point into property tree
}
+ uhd::property_tree::sptr get_tree(void) const{
+ return _tree;
+ }
double update_rx_codec_gain(const double); //sets A and B at once
void set_mb_eeprom(const uhd::usrp::mboard_eeprom_t &);
diff --git a/host/lib/usrp/usrp1/usrp1_impl.hpp b/host/lib/usrp/usrp1/usrp1_impl.hpp
index 1fe0c1784..261223883 100644
--- a/host/lib/usrp/usrp1/usrp1_impl.hpp
+++ b/host/lib/usrp/usrp1/usrp1_impl.hpp
@@ -79,6 +79,9 @@ private:
void get(const wax::obj &, wax::obj &val){
val = _tree; //entry point into property tree
}
+ uhd::property_tree::sptr get_tree(void) const{
+ return _tree;
+ }
//controllers
uhd::usrp::fx2_ctrl::sptr _fx2_ctrl;
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index 644eab824..cdbcc895f 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -117,6 +117,9 @@ private:
void get(const wax::obj &, wax::obj &val){
val = _tree; //entry point into property tree
}
+ uhd::property_tree::sptr get_tree(void) const{
+ return _tree;
+ }
//io impl methods and members
uhd::otw_type_t _rx_otw_type, _tx_otw_type;