diff options
author | Martin Braun <martin.braun@ettus.com> | 2018-04-26 09:30:48 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2018-04-30 17:10:26 -0700 |
commit | 0303f1ed558b21e40f80c388b096432b4bf6e883 (patch) | |
tree | 05afcc4d2401bb86f9e38e3b04ec5b07e9268302 /host/lib/usrp/common | |
parent | fc67052345373c6d5c1b62064a9f9ef6f888e3ff (diff) | |
download | uhd-0303f1ed558b21e40f80c388b096432b4bf6e883.tar.gz uhd-0303f1ed558b21e40f80c388b096432b4bf6e883.tar.bz2 uhd-0303f1ed558b21e40f80c388b096432b4bf6e883.zip |
lib: Purge all references to boost::this_thread::sleep()
Replace with std::this_thread::sleep_for().
Diffstat (limited to 'host/lib/usrp/common')
-rw-r--r-- | host/lib/usrp/common/ad9361_driver/ad9361_device.cpp | 44 | ||||
-rw-r--r-- | host/lib/usrp/common/fx2_ctrl.cpp | 9 |
2 files changed, 27 insertions, 26 deletions
diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp index cbb720894..54f15d1a8 100644 --- a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp +++ b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp @@ -11,16 +11,16 @@ #include "ad9361_client.h" #include "ad9361_device.h" #define _USE_MATH_DEFINES -#include <cmath> #include <uhd/exception.hpp> #include <uhd/utils/log.hpp> -#include <stdint.h> -#include <boost/date_time/posix_time/posix_time.hpp> -#include <boost/thread/thread.hpp> #include <boost/scoped_array.hpp> #include <boost/format.hpp> #include <boost/math/special_functions.hpp> +#include <chrono> +#include <thread> +#include <cmath> +#include <stdint.h> //////////////////////////////////////////////////////////// // the following macros evaluate to a compile time constant @@ -127,7 +127,7 @@ void ad9361_device_t::_program_fir_filter(direction_t direction, chain_t chain, /* Turn on the filter clock. */ _io_iface->poke8(base + 5, reg_numtaps | reg_chain | 0x02); - boost::this_thread::sleep(boost::posix_time::milliseconds(1)); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); /* Zero the unused taps just in case they have stale data */ int addr; @@ -258,7 +258,7 @@ void ad9361_device_t::_calibrate_lock_bbpll() break; } count++; - boost::this_thread::sleep(boost::posix_time::milliseconds(2)); + std::this_thread::sleep_for(std::chrono::milliseconds(2)); } } @@ -283,7 +283,7 @@ void ad9361_device_t::_calibrate_synth_charge_pumps() break; } count++; - boost::this_thread::sleep(boost::posix_time::milliseconds(1)); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); } _io_iface->poke8(0x23d, 0x00); @@ -296,7 +296,7 @@ void ad9361_device_t::_calibrate_synth_charge_pumps() break; } count++; - boost::this_thread::sleep(boost::posix_time::milliseconds(1)); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); } _io_iface->poke8(0x27d, 0x00); } @@ -357,7 +357,7 @@ double ad9361_device_t::_calibrate_baseband_rx_analog_filter(double req_rfbw) break; } count++; - boost::this_thread::sleep(boost::posix_time::milliseconds(1)); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); } /* Disable RX1 & RX2 filter tuners. */ @@ -414,7 +414,7 @@ double ad9361_device_t::_calibrate_baseband_tx_analog_filter(double req_rfbw) } count++; - boost::this_thread::sleep(boost::posix_time::milliseconds(1)); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); } /* Disable the filter tuner. */ @@ -734,7 +734,7 @@ void ad9361_device_t::_calibrate_baseband_dc_offset() break; } count++; - boost::this_thread::sleep(boost::posix_time::milliseconds(5)); + std::this_thread::sleep_for(std::chrono::milliseconds(5)); } } @@ -767,7 +767,7 @@ void ad9361_device_t::_calibrate_rf_dc_offset() break; } count++; - boost::this_thread::sleep(boost::posix_time::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(50)); } _io_iface->poke8(0x18b, 0x8d); // Enable RF DC tracking @@ -818,7 +818,7 @@ void ad9361_device_t::_calibrate_rx_quadrature() break; } count++; - boost::this_thread::sleep(boost::posix_time::milliseconds(5)); + std::this_thread::sleep_for(std::chrono::milliseconds(5)); } _io_iface->poke8(0x057, 0x30); // Re-enable Tx mixers @@ -886,7 +886,7 @@ void ad9361_device_t::_tx_quadrature_cal_routine() { break; } count++; - boost::this_thread::sleep(boost::posix_time::milliseconds(10)); + std::this_thread::sleep_for(std::chrono::milliseconds(10)); } } @@ -1309,7 +1309,7 @@ double ad9361_device_t::_tune_helper(direction_t direction, const double value) _io_iface->poke8(0x005, _regs.vcodivs); /* Lock the PLL! */ - boost::this_thread::sleep(boost::posix_time::milliseconds(2)); + std::this_thread::sleep_for(std::chrono::milliseconds(2)); if ((_io_iface->peek8(0x247) & 0x02) == 0) { throw uhd::runtime_error("[ad9361_device_t] RX PLL NOT LOCKED"); } @@ -1350,7 +1350,7 @@ double ad9361_device_t::_tune_helper(direction_t direction, const double value) _io_iface->poke8(0x005, _regs.vcodivs); /* Lock the PLL! */ - boost::this_thread::sleep(boost::posix_time::milliseconds(2)); + std::this_thread::sleep_for(std::chrono::milliseconds(2)); if ((_io_iface->peek8(0x287) & 0x02) == 0) { throw uhd::runtime_error("[ad9361_device_t] TX PLL NOT LOCKED"); } @@ -1555,7 +1555,7 @@ void ad9361_device_t::initialize() /* Reset the device. */ _io_iface->poke8(0x000, 0x01); _io_iface->poke8(0x000, 0x00); - boost::this_thread::sleep(boost::posix_time::milliseconds(20)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); /* Check device ID to make sure iface works */ uint32_t device_id = (_io_iface->peek8(0x037) & 0x8); @@ -1590,7 +1590,7 @@ void ad9361_device_t::initialize() default: throw uhd::runtime_error("[ad9361_device_t] NOT IMPLEMENTED"); } - boost::this_thread::sleep(boost::posix_time::milliseconds(20)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); /* Tune the BBPLL, write TX and RX FIRS. */ _setup_rates(50e6); @@ -1698,7 +1698,7 @@ void ad9361_device_t::initialize() _io_iface->poke8(0x015, 0x04); // dual synth mode, synth en ctrl en _io_iface->poke8(0x014, 0x05); // use SPI for TXNRX ctrl, to ALERT, TX on _io_iface->poke8(0x013, 0x01); // enable ENSM - boost::this_thread::sleep(boost::posix_time::milliseconds(1)); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); _calibrate_synth_charge_pumps(); @@ -1808,7 +1808,7 @@ double ad9361_device_t::set_clock_rate(const double req_rate) case 0x05: /* We are in the ALERT state. */ _io_iface->poke8(0x014, 0x21); - boost::this_thread::sleep(boost::posix_time::milliseconds(5)); + std::this_thread::sleep_for(std::chrono::milliseconds(5)); _io_iface->poke8(0x014, 0x00); break; @@ -1838,7 +1838,7 @@ double ad9361_device_t::set_clock_rate(const double req_rate) _io_iface->poke8(0x015, 0x04); //dual synth mode, synth en ctrl en _io_iface->poke8(0x014, 0x05); //use SPI for TXNRX ctrl, to ALERT, TX on _io_iface->poke8(0x013, 0x01); //enable ENSM - boost::this_thread::sleep(boost::posix_time::milliseconds(1)); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); _calibrate_synth_charge_pumps(); @@ -2192,7 +2192,7 @@ double ad9361_device_t::_get_temperature(const double cal_offset, const double t boost::posix_time::time_duration elapsed; //wait for valid data (toggle of bit 1 in 0x00C) while(((_io_iface->peek8(0x00C) >> 1) & 0x01) == 0) { - boost::this_thread::sleep(boost::posix_time::microseconds(100)); + std::this_thread::sleep_for(std::chrono::microseconds(100)); elapsed = boost::posix_time::microsec_clock::local_time() - start_time; if(elapsed.total_milliseconds() > (timeout*1000)) { diff --git a/host/lib/usrp/common/fx2_ctrl.cpp b/host/lib/usrp/common/fx2_ctrl.cpp index 6e1b374ca..77501d981 100644 --- a/host/lib/usrp/common/fx2_ctrl.cpp +++ b/host/lib/usrp/common/fx2_ctrl.cpp @@ -10,13 +10,14 @@ #include <uhd/exception.hpp> #include <uhd/transport/usb_control.hpp> #include <boost/functional/hash.hpp> -#include <boost/thread/thread.hpp> #include <stdint.h> #include <fstream> #include <sstream> #include <string> #include <vector> #include <cstring> +#include <chrono> +#include <thread> using namespace uhd; using namespace uhd::usrp; @@ -137,7 +138,7 @@ public: usrp_control_write(FX2_FIRMWARE_LOAD, 0xe600, 0, &reset_y, 1); usrp_control_write(FX2_FIRMWARE_LOAD, 0xe600, 0, &reset_n, 1); //wait for things to settle - boost::this_thread::sleep(boost::posix_time::milliseconds(2000)); + std::this_thread::sleep_for(std::chrono::milliseconds(2000)); } void usrp_load_firmware(std::string filestring, bool force) @@ -194,7 +195,7 @@ public: file.close(); //wait for things to settle - boost::this_thread::sleep(boost::posix_time::milliseconds(1000)); + std::this_thread::sleep_for(std::chrono::milliseconds(1000)); if (load_img_msg) UHD_LOGGER_INFO("FX2") << "Firmware loaded"; return; } @@ -302,7 +303,7 @@ public: } addr += pagesize; len -= pagesize; - boost::this_thread::sleep(boost::posix_time::milliseconds(100)); + std::this_thread::sleep_for(std::chrono::milliseconds(100)); } file.close(); if (load_img_msg) UHD_LOGGER_INFO("FX2") << "EEPROM image loaded"; |