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/e300/e300_fifo_config.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/e300/e300_fifo_config.cpp')
| -rw-r--r-- | host/lib/usrp/e300/e300_fifo_config.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/host/lib/usrp/e300/e300_fifo_config.cpp b/host/lib/usrp/e300/e300_fifo_config.cpp index ac4ace7f2..4138bb581 100644 --- a/host/lib/usrp/e300/e300_fifo_config.cpp +++ b/host/lib/usrp/e300/e300_fifo_config.cpp @@ -17,7 +17,7 @@ #ifdef E300_NATIVE -#include <boost/cstdint.hpp> +#include <stdint.h> #include <uhd/config.hpp> // constants coded into the fpga parameters @@ -141,15 +141,15 @@ struct __mem_addrz_t /*********************************************************************** * peek n' poke mmapped space **********************************************************************/ -UHD_INLINE void zf_poke32(const boost::uint32_t addr, const boost::uint32_t data) +UHD_INLINE void zf_poke32(const uint32_t addr, const uint32_t data) { - volatile boost::uint32_t *p = reinterpret_cast<boost::uint32_t *>(addr); + volatile uint32_t *p = reinterpret_cast<uint32_t *>(addr); *p = data; } -UHD_INLINE boost::uint32_t zf_peek32(const boost::uint32_t addr) +UHD_INLINE uint32_t zf_peek32(const uint32_t addr) { - volatile const boost::uint32_t *p = reinterpret_cast<const boost::uint32_t *>(addr); + volatile const uint32_t *p = reinterpret_cast<const uint32_t *>(addr); return *p; } @@ -206,7 +206,7 @@ public: //UHD_MSG(status) << boost::format("data 0x%x") % addrs.data << std::endl; //UHD_MSG(status) << boost::format("ctrl 0x%x") % addrs.ctrl << std::endl; - const boost::uint32_t sig = zf_peek32(_addrs.ctrl + ARBITER_RD_SIG); + const uint32_t sig = zf_peek32(_addrs.ctrl + ARBITER_RD_SIG); UHD_ASSERT_THROW((sig >> 16) == 0xACE0); zf_poke32(_addrs.ctrl + ARBITER_WR_CLEAR, 1); @@ -240,7 +240,7 @@ public: { if (zf_peek32(_addrs.ctrl + ARBITER_RB_STATUS_OCC)) { - const boost::uint32_t sts = zf_peek32(_addrs.ctrl + ARBITER_RB_STATUS); + const uint32_t sts = zf_peek32(_addrs.ctrl + ARBITER_RB_STATUS); UHD_ASSERT_THROW((sts >> 7) & 0x1); //assert OK UHD_ASSERT_THROW((sts & 0xf) == _addrs.which); //expected tag zf_poke32(_addrs.ctrl + ARBITER_WR_STS_RDY, 1); //pop from sts fifo |