diff options
| author | Martin Braun <martin.braun@ettus.com> | 2019-06-01 12:28:31 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-06-12 16:41:50 -0700 |
| commit | 444e26cb301537d9b87687c08bd5ec69d9b6e69d (patch) | |
| tree | 6a5522f2d01e8ca8469a7002807a7b99c6312115 /host | |
| parent | a382249f373c4fe1b43a412724dac2ecc6c9bda5 (diff) | |
| download | uhd-444e26cb301537d9b87687c08bd5ec69d9b6e69d.tar.gz uhd-444e26cb301537d9b87687c08bd5ec69d9b6e69d.tar.bz2 uhd-444e26cb301537d9b87687c08bd5ec69d9b6e69d.zip | |
x300: dac: Replace uhd::get_system_time() with steady_clock
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/usrp/x300/x300_dac_ctrl.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/host/lib/usrp/x300/x300_dac_ctrl.cpp b/host/lib/usrp/x300/x300_dac_ctrl.cpp index f951a44a2..3a3dc7389 100644 --- a/host/lib/usrp/x300/x300_dac_ctrl.cpp +++ b/host/lib/usrp/x300/x300_dac_ctrl.cpp @@ -11,7 +11,6 @@ #include <uhd/types/time_spec.hpp> #include <uhd/utils/log.hpp> #include <uhd/utils/safe_call.hpp> -#include <uhdlib/utils/system_time.hpp> #include <boost/format.hpp> #include <chrono> #include <thread> @@ -216,14 +215,14 @@ public: // Verify PLL is Locked. 1 sec timeout. // NOTE: Data sheet inconsistent about which pins give PLL lock status. FIXME! - const time_spec_t exit_time = uhd::get_system_time() + time_spec_t(1.0); + const auto exit_time = std::chrono::steady_clock::now() + std::chrono::seconds(1); while (true) { const size_t reg_e = read_ad9146_reg(0x0E); // PLL Status (Expect bit 7 = 1) const size_t reg_6 = read_ad9146_reg(0x06); // Event Flags (Expect bit 7 = 0 and bit 6 = 1) if ((((reg_e >> 7) & 0x1) == 0x1) && (((reg_6 >> 6) & 0x3) == 0x1)) break; - if (exit_time < uhd::get_system_time()) + if (exit_time < std::chrono::steady_clock::now()) throw uhd::runtime_error( "x300_dac_ctrl: timeout waiting for DAC PLL to lock"); if (reg_6 & (1 << 7)) // Lock lost? @@ -241,7 +240,7 @@ public: write_ad9146_reg(0x06, 0x30); write_ad9146_reg(0x12, 0x00); - const time_spec_t exit_time = uhd::get_system_time() + time_spec_t(1.0); + const auto exit_time = std::chrono::steady_clock::now() + std::chrono::seconds(1); while (true) { std::this_thread::sleep_for( std::chrono::milliseconds(1)); // wait for sync to complete @@ -251,7 +250,7 @@ public: read_ad9146_reg(0x06); // Event Flags (Expect bit 5 = 0 and bit 4 = 1) if ((((reg_12 >> 6) & 0x3) == 0x1) && (((reg_6 >> 4) & 0x3) == 0x1)) break; - if (exit_time < uhd::get_system_time()) + if (exit_time < std::chrono::steady_clock::now()) throw uhd::runtime_error( "x300_dac_ctrl: timeout waiting for backend synchronization"); if (reg_6 & (1 << 5)) |