diff options
author | Josh Blum <josh@joshknows.com> | 2011-02-22 11:55:54 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-02-22 11:55:54 -0800 |
commit | 76ebda895cae3bd0014a5e428b07440445f3b631 (patch) | |
tree | b788354f6fd4cd5786bd6539cf5c77e37fd4300f /host/include | |
parent | 557d62ee648cef2a8edfd15602544064550f82fc (diff) | |
download | uhd-76ebda895cae3bd0014a5e428b07440445f3b631.tar.gz uhd-76ebda895cae3bd0014a5e428b07440445f3b631.tar.bz2 uhd-76ebda895cae3bd0014a5e428b07440445f3b631.zip |
uhd: switch dboard id prop to whole eeprom struct
modified implementation code and burner app
also made dboard manager use safe constructor that will use none ids if construction fails
Diffstat (limited to 'host/include')
-rw-r--r-- | host/include/uhd/usrp/dboard_props.hpp | 2 | ||||
-rw-r--r-- | host/include/uhd/usrp/mboard_props.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/host/include/uhd/usrp/dboard_props.hpp b/host/include/uhd/usrp/dboard_props.hpp index 32ec1c1bf..35721ab47 100644 --- a/host/include/uhd/usrp/dboard_props.hpp +++ b/host/include/uhd/usrp/dboard_props.hpp @@ -31,7 +31,7 @@ namespace uhd{ namespace usrp{ DBOARD_PROP_NAME, //ro, std::string DBOARD_PROP_SUBDEV, //ro, wax::obj DBOARD_PROP_SUBDEV_NAMES, //ro, prop_names_t - DBOARD_PROP_DBOARD_ID, //rw, dboard_id_t + DBOARD_PROP_DBOARD_EEPROM, //rw, dboard_eeprom_t DBOARD_PROP_DBOARD_IFACE, //ro, dboard_iface::sptr DBOARD_PROP_CODEC, //ro, wax::obj DBOARD_PROP_GAIN_GROUP //ro, gain_group diff --git a/host/include/uhd/usrp/mboard_props.hpp b/host/include/uhd/usrp/mboard_props.hpp index 559c96ecb..8855e2b75 100644 --- a/host/include/uhd/usrp/mboard_props.hpp +++ b/host/include/uhd/usrp/mboard_props.hpp @@ -48,7 +48,7 @@ namespace uhd{ namespace usrp{ MBOARD_PROP_TIME_NOW, //rw, time_spec_t MBOARD_PROP_TIME_PPS, //wo, time_spec_t MBOARD_PROP_STREAM_CMD, //wo, stream_cmd_t - MBOARD_PROP_EEPROM_MAP //wr, mboard_eeprom_t::sptr + MBOARD_PROP_EEPROM_MAP //wr, mboard_eeprom_t }; }} //namespace |