diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-10-17 17:26:14 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-10-17 17:26:14 -0700 |
| commit | d172b44f157a1429de69599cf0a06aa61fa7a274 (patch) | |
| tree | 239d6edf32ac2ca18eed392ce0ee090bdfb4c1ab /host/lib/usrp | |
| parent | 1b70b3e70df40aae4d1e53037212d77af2fdc4e4 (diff) | |
| parent | 9e73914791be936216ea11eea9bd38061ef5f323 (diff) | |
| download | uhd-d172b44f157a1429de69599cf0a06aa61fa7a274.tar.gz uhd-d172b44f157a1429de69599cf0a06aa61fa7a274.tar.bz2 uhd-d172b44f157a1429de69599cf0a06aa61fa7a274.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index e4f6d6fb8..776fac928 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -986,9 +986,17 @@ void x300_impl::setup_mb(const size_t mb_i, const uhd::device_addr_t &dev_addr) mb.radios.at(i)->self_test_adc(); } } + + //////////////////////////////////////////////////////////////////// + // Synchronize times (dboard initialization can desynchronize them) + //////////////////////////////////////////////////////////////////// + if (radio_ids.size() == 2) { + this->sync_times(mb, mb.radios[0]->get_time_now()); + } + } else { UHD_MSG(status) << "No Radio Block found. Assuming radio-less operation." << std::endl; - } + } /* end of radio block(s) initialization */ mb.initialization_done = true; } |