From 76ebda895cae3bd0014a5e428b07440445f3b631 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 22 Feb 2011 11:55:54 -0800 Subject: 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 --- host/include/uhd/usrp/dboard_props.hpp | 2 +- host/include/uhd/usrp/mboard_props.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'host/include') 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 -- cgit v1.2.3