diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 | 
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 | 
| commit | 9b852f5f243e5cf68662b7152b5fa331a83e55fb (patch) | |
| tree | 159ffe0761f78dd87e2ecc97abea14494abab4ff /host/lib/usrp/common/ad936x_manager.cpp | |
| parent | c66cb1bad0d881394f3519bd94f4693cceab4c64 (diff) | |
| parent | 99c2730bc9db270560671f2d7d173768465ed51f (diff) | |
| download | uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.gz uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.bz2 uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.zip  | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/common/ad936x_manager.cpp')
| -rw-r--r-- | host/lib/usrp/common/ad936x_manager.cpp | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/common/ad936x_manager.cpp b/host/lib/usrp/common/ad936x_manager.cpp index e7af411fa..2b6d69c15 100644 --- a/host/lib/usrp/common/ad936x_manager.cpp +++ b/host/lib/usrp/common/ad936x_manager.cpp @@ -113,15 +113,15 @@ class ad936x_manager_impl : public ad936x_manager          {              // Create test word              boost::hash_combine(hash, i); -            const boost::uint32_t word32 = boost::uint32_t(hash) & 0xfff0fff0; +            const uint32_t word32 = uint32_t(hash) & 0xfff0fff0;              // Write test word to codec_idle idle register (on TX side)              poker_functor(word32);              // Read back values - TX is lower 32-bits and RX is upper 32-bits -            const boost::uint64_t rb_word64 = peeker_functor(); -            const boost::uint32_t rb_tx = boost::uint32_t(rb_word64 >> 32); -            const boost::uint32_t rb_rx = boost::uint32_t(rb_word64 & 0xffffffff); +            const uint64_t rb_word64 = peeker_functor(); +            const uint32_t rb_tx = uint32_t(rb_word64 >> 32); +            const uint32_t rb_rx = uint32_t(rb_word64 & 0xffffffff);              // Compare TX and RX values to test word              bool test_fail = word32 != rb_tx or word32 != rb_rx;  | 
