diff options
author | Josh Blum <josh@joshknows.com> | 2011-06-27 20:26:52 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-06-27 20:26:52 -0700 |
commit | 5aab802b600dae2d8728ae11550cc2a4e6ba6895 (patch) | |
tree | 80454dc7c8f2388fdc77cbf796dbab3a59637180 /host/include | |
parent | 9b4c8c7c9c9e9645b0ee27a6d6ad06bbfbf1ae66 (diff) | |
download | uhd-5aab802b600dae2d8728ae11550cc2a4e6ba6895.tar.gz uhd-5aab802b600dae2d8728ae11550cc2a4e6ba6895.tar.bz2 uhd-5aab802b600dae2d8728ae11550cc2a4e6ba6895.zip |
usrp: populate a tree from a subdev
Diffstat (limited to 'host/include')
-rw-r--r-- | host/include/uhd/types/sensors.hpp | 3 | ||||
-rw-r--r-- | host/include/uhd/usrp/dboard_eeprom.hpp | 2 | ||||
-rw-r--r-- | host/include/uhd/usrp/dboard_manager.hpp | 8 |
3 files changed, 12 insertions, 1 deletions
diff --git a/host/include/uhd/types/sensors.hpp b/host/include/uhd/types/sensors.hpp index 529e1e3e3..a43546262 100644 --- a/host/include/uhd/types/sensors.hpp +++ b/host/include/uhd/types/sensors.hpp @@ -37,6 +37,9 @@ namespace uhd{ */ struct UHD_API sensor_value_t{ + //! Default constructor + sensor_value_t(void); + /*! * Create a sensor value from a boolean. * \param name the name of the sensor diff --git a/host/include/uhd/usrp/dboard_eeprom.hpp b/host/include/uhd/usrp/dboard_eeprom.hpp index 394d71dd6..f0190e233 100644 --- a/host/include/uhd/usrp/dboard_eeprom.hpp +++ b/host/include/uhd/usrp/dboard_eeprom.hpp @@ -50,7 +50,7 @@ struct UHD_API dboard_eeprom_t{ * \param iface the serial interface with i2c * \param addr the i2c address for the eeprom */ - void store(i2c_iface &iface, boost::uint8_t addr); + void store(i2c_iface &iface, boost::uint8_t addr) const; }; diff --git a/host/include/uhd/usrp/dboard_manager.hpp b/host/include/uhd/usrp/dboard_manager.hpp index 3c41c65a8..84808ea72 100644 --- a/host/include/uhd/usrp/dboard_manager.hpp +++ b/host/include/uhd/usrp/dboard_manager.hpp @@ -19,6 +19,7 @@ #define INCLUDED_UHD_USRP_DBOARD_MANAGER_HPP #include <uhd/config.hpp> +#include <uhd/property_tree.hpp> #include <uhd/utils/props.hpp> #include <uhd/usrp/dboard_base.hpp> #include <uhd/usrp/dboard_id.hpp> @@ -36,6 +37,13 @@ class UHD_API dboard_manager : boost::noncopyable{ public: typedef boost::shared_ptr<dboard_manager> sptr; + //! It does what it says... + static void populate_prop_tree_from_subdev( + property_tree::sptr tree, + const property_tree::path_type &root, + wax::obj subdev + ); + //dboard constructor (each dboard should have a ::make with this signature) typedef dboard_base::sptr(*dboard_ctor_t)(dboard_base::ctor_args_t); |