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.hpp | |
| 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.hpp')
| -rw-r--r-- | host/lib/usrp/x300/x300_radio_ctrl_impl.hpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp b/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp index 770519eba..46540a0c7 100644 --- a/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp +++ b/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp @@ -73,7 +73,11 @@ public: /*! Set up the radio. No API calls may be made before this one. */ void setup_radio( - uhd::i2c_iface::sptr zpu_i2c, x300_clock_ctrl::sptr clock, bool verbose); + uhd::i2c_iface::sptr zpu_i2c, + x300_clock_ctrl::sptr clock, + bool ignore_cal_file, + bool verbose + ); void reset_codec(); @@ -152,6 +156,8 @@ private: void _check_adc(const boost::uint32_t val); + void _set_db_eeprom(uhd::i2c_iface::sptr i2c, const size_t, const uhd::usrp::dboard_eeprom_t &); + void set_rx_fe_corrections(const uhd::fs_path &db_path, const uhd::fs_path &rx_fe_corr_path, const double lo_freq); void set_tx_fe_corrections(const uhd::fs_path &db_path, const uhd::fs_path &tx_fe_corr_path, const double lo_freq); |