diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-04-06 11:36:04 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-04-06 18:39:11 -0700 |
| commit | d4eaee390db2fefd4564b6054d8d066c437d8cff (patch) | |
| tree | a549bdb025674630ccff63d699a6ba63eab4d35f /host/lib/usrp | |
| parent | bf1d22ffe871c9b4293d87ff0f5abe7511dab00b (diff) | |
| download | uhd-d4eaee390db2fefd4564b6054d8d066c437d8cff.tar.gz uhd-d4eaee390db2fefd4564b6054d8d066c437d8cff.tar.bz2 uhd-d4eaee390db2fefd4564b6054d8d066c437d8cff.zip | |
lib: move atomic.hpp and system_time.hpp to uhdlib
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/b100/usb_zero_copy_wrapper.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/e300/e300_fifo_config.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/usrp1/soft_time_ctrl.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_dac_ctrl.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp b/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp index 7efd061c0..54c367077 100644 --- a/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp +++ b/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp @@ -10,7 +10,7 @@ #include <uhd/utils/byteswap.hpp> #include <uhd/utils/log.hpp> #include <uhd/utils/tasks.hpp> -#include <uhd/utils/atomic.hpp> +#include <uhdlib/utils/atomic.hpp> #include <boost/make_shared.hpp> #include <boost/thread/mutex.hpp> #include <boost/thread/condition_variable.hpp> diff --git a/host/lib/usrp/e300/e300_fifo_config.cpp b/host/lib/usrp/e300/e300_fifo_config.cpp index c02c943dd..044ce01ee 100644 --- a/host/lib/usrp/e300/e300_fifo_config.cpp +++ b/host/lib/usrp/e300/e300_fifo_config.cpp @@ -7,7 +7,7 @@ #ifdef E300_NATIVE -#include <uhd/utils/system_time.hpp> +#include <uhdlib/utils/system_time.hpp> #include <uhd/config.hpp> #include <stdint.h> #include <atomic> @@ -78,7 +78,7 @@ static UHD_INLINE size_t ZF_STREAM_OFF(const size_t which) #include <boost/thread/thread.hpp> //sleep #include <uhd/types/time_spec.hpp> //timeout #include <uhd/utils/log.hpp> -#include <uhd/utils/atomic.hpp> +#include <uhdlib/utils/atomic.hpp> //locking stuff for shared irq #include <boost/thread/mutex.hpp> diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.cpp b/host/lib/usrp/usrp1/soft_time_ctrl.cpp index 061075e32..851f0f507 100644 --- a/host/lib/usrp/usrp1/soft_time_ctrl.cpp +++ b/host/lib/usrp/usrp1/soft_time_ctrl.cpp @@ -6,7 +6,7 @@ // #include "soft_time_ctrl.hpp" -#include <uhd/utils/system_time.hpp> +#include <uhdlib/utils/system_time.hpp> #include <uhd/utils/tasks.hpp> #include <boost/make_shared.hpp> #include <boost/thread/condition_variable.hpp> diff --git a/host/lib/usrp/x300/x300_dac_ctrl.cpp b/host/lib/usrp/x300/x300_dac_ctrl.cpp index 400e48282..c200a696a 100644 --- a/host/lib/usrp/x300/x300_dac_ctrl.cpp +++ b/host/lib/usrp/x300/x300_dac_ctrl.cpp @@ -7,7 +7,7 @@ #include "x300_dac_ctrl.hpp" #include "x300_regs.hpp" -#include <uhd/utils/system_time.hpp> +#include <uhdlib/utils/system_time.hpp> #include <uhd/types/time_spec.hpp> #include <uhd/utils/log.hpp> #include <uhd/utils/safe_call.hpp> |