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/n230/n230_stream_manager.hpp | |
| 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/n230/n230_stream_manager.hpp')
| -rw-r--r-- | host/lib/usrp/n230/n230_stream_manager.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/n230/n230_stream_manager.hpp b/host/lib/usrp/n230/n230_stream_manager.hpp index 7a496c4e9..c3588474e 100644 --- a/host/lib/usrp/n230/n230_stream_manager.hpp +++ b/host/lib/usrp/n230/n230_stream_manager.hpp @@ -123,11 +123,11 @@ private: size_t hw_buff_size); static void _cvita_hdr_unpack( - const boost::uint32_t *packet_buff, + const uint32_t *packet_buff, transport::vrt::if_packet_info_t &if_packet_info); static void _cvita_hdr_pack( - boost::uint32_t *packet_buff, + uint32_t *packet_buff, transport::vrt::if_packet_info_t &if_packet_info); const n230_device_args_t _dev_args; @@ -143,7 +143,7 @@ private: stream_args_t _tx_stream_cached_args[fpga::NUM_RADIOS]; stream_args_t _rx_stream_cached_args[fpga::NUM_RADIOS]; - static const boost::uint32_t HW_SEQ_NUM_MASK = 0xFFF; + static const uint32_t HW_SEQ_NUM_MASK = 0xFFF; }; }}} //namespace |