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/lib/usrp/misc_utils.cpp | |
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/lib/usrp/misc_utils.cpp')
-rw-r--r-- | host/lib/usrp/misc_utils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/misc_utils.cpp b/host/lib/usrp/misc_utils.cpp index 02f4b216d..2bad83b3c 100644 --- a/host/lib/usrp/misc_utils.cpp +++ b/host/lib/usrp/misc_utils.cpp @@ -19,7 +19,7 @@ #include <uhd/utils/assert.hpp> #include <uhd/utils/algorithm.hpp> #include <uhd/utils/gain_group.hpp> -#include <uhd/usrp/dboard_id.hpp> +#include <uhd/usrp/dboard_eeprom.hpp> #include <uhd/usrp/subdev_props.hpp> #include <uhd/usrp/mboard_props.hpp> #include <uhd/usrp/dboard_props.hpp> @@ -147,7 +147,7 @@ static void verify_xx_subdev_spec( wax::obj dboard = mboard[named_prop_t(dboard_prop, db_name)]; //if the dboard slot is populated, take the first subdevice - if (dboard[DBOARD_PROP_DBOARD_ID].as<dboard_id_t>() != dboard_id_t::none()){ + if (dboard[DBOARD_PROP_DBOARD_EEPROM].as<dboard_eeprom_t>().id != dboard_id_t::none()){ std::string sd_name = dboard[DBOARD_PROP_SUBDEV_NAMES].as<prop_names_t>().front(); subdev_spec.push_back(subdev_spec_pair_t(db_name, sd_name)); break; |