diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-09-27 17:13:13 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-09-27 17:13:13 -0700 |
| commit | a9c83aca8f95a408c06fbdf470f69b71514a5f46 (patch) | |
| tree | 0ad7ad28f4084831f65db0e4738b788f9338ebf9 /host/lib/usrp/x300/x300_radio_ctrl_impl.cpp | |
| parent | f70dd85daa8a6b9e1762c9339532027e40a67018 (diff) | |
| parent | 102b03f59afdfd3bc633639a1a126bfdff57af45 (diff) | |
| download | uhd-a9c83aca8f95a408c06fbdf470f69b71514a5f46.tar.gz uhd-a9c83aca8f95a408c06fbdf470f69b71514a5f46.tar.bz2 uhd-a9c83aca8f95a408c06fbdf470f69b71514a5f46.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/x300/x300_radio_ctrl_impl.cpp')
| -rw-r--r-- | host/lib/usrp/x300/x300_radio_ctrl_impl.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp index e1b724db6..e11548703 100644 --- a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp +++ b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp @@ -297,9 +297,14 @@ double x300_radio_ctrl_impl::get_output_samp_rate(size_t chan) /**************************************************************************** * Radio control and setup ***************************************************************************/ -void x300_radio_ctrl_impl::setup_radio(uhd::i2c_iface::sptr zpu_i2c, x300_clock_ctrl::sptr clock, bool verbose) +void x300_radio_ctrl_impl::setup_radio( + uhd::i2c_iface::sptr zpu_i2c, + x300_clock_ctrl::sptr clock, + bool ignore_cal_file, + bool verbose) { _self_cal_adc_capture_delay(verbose); + _ignore_cal_file = ignore_cal_file; //////////////////////////////////////////////////////////////////// // create RF frontend interfacing @@ -322,8 +327,8 @@ void x300_radio_ctrl_impl::setup_radio(uhd::i2c_iface::sptr zpu_i2c, x300_clock_ //Add to tree _tree->create<dboard_eeprom_t>(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 @@ -855,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 ***************************************************************************/ |