From 2876c159ec268e70ade5139ac73b146fd00b83ca Mon Sep 17 00:00:00 2001 From: Ashish Chaudhari Date: Mon, 26 Sep 2016 15:17:23 -0700 Subject: bugfix: db eeprom id not being written for X3x0 - The value of db_eeprom_t being written was stale due to a caching bug - Updated subscriber for db_eeprom_t to write the EEPROM state *and* cache it locally Signed-off-by: Moritz Fischer --- host/lib/usrp/x300/x300_radio_ctrl_impl.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'host/lib/usrp/x300/x300_radio_ctrl_impl.cpp') diff --git a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp index 88dc73896..e11548703 100644 --- a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp +++ b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp @@ -327,8 +327,8 @@ void x300_radio_ctrl_impl::setup_radio( //Add to tree _tree->create(db_path / EEPROM_PATHS[i]) .set(_db_eeproms[addr]) - .add_coerced_subscriber(boost::bind(&dboard_eeprom_t::store, - _db_eeproms[addr], boost::ref(*zpu_i2c), (BASE_ADDR | addr))); + .add_coerced_subscriber(boost::bind(&x300_radio_ctrl_impl::_set_db_eeprom, + this, zpu_i2c, (BASE_ADDR | addr), _1)); } //create a new dboard interface @@ -860,6 +860,12 @@ void x300_radio_ctrl_impl::_check_adc(const boost::uint32_t val) } } +void x300_radio_ctrl_impl::_set_db_eeprom(i2c_iface::sptr i2c, const size_t addr, const uhd::usrp::dboard_eeprom_t &db_eeprom) +{ + db_eeprom.store(*i2c, addr); + _db_eeproms[addr] = db_eeprom; +} + /**************************************************************************** * Helpers ***************************************************************************/ -- cgit v1.2.3