aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/transport/chdr.cpp
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2016-10-31 14:30:52 -0700
committerMartin Braun <martin.braun@ettus.com>2016-11-08 08:02:22 -0800
commit99c2730bc9db270560671f2d7d173768465ed51f (patch)
treebc4df495734a075ebe2f7917cf67dec6fb7d8177 /host/lib/transport/chdr.cpp
parent218f4b0b63927110df9dbbaa8353c346eee2d98a (diff)
downloaduhd-99c2730bc9db270560671f2d7d173768465ed51f.tar.gz
uhd-99c2730bc9db270560671f2d7d173768465ed51f.tar.bz2
uhd-99c2730bc9db270560671f2d7d173768465ed51f.zip
Remove all boost:: namespace prefix for uint32_t, int32_t etc. (fixed-width types)
- Also removes all references to boost/cstdint.hpp and replaces it with stdint.h (The 'correct' replacement would be <cstdint>, but not all of our compilers support that).
Diffstat (limited to 'host/lib/transport/chdr.cpp')
-rw-r--r--host/lib/transport/chdr.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/host/lib/transport/chdr.cpp b/host/lib/transport/chdr.cpp
index 632887e56..0c4643ba7 100644
--- a/host/lib/transport/chdr.cpp
+++ b/host/lib/transport/chdr.cpp
@@ -30,16 +30,16 @@
using namespace uhd::transport::vrt;
-static const boost::uint32_t HDR_FLAG_TSF = (1 << 29);
-static const boost::uint32_t HDR_FLAG_EOB = (1 << 28);
-static const boost::uint32_t HDR_FLAG_ERROR = (1 << 28);
+static const uint32_t HDR_FLAG_TSF = (1 << 29);
+static const uint32_t HDR_FLAG_EOB = (1 << 28);
+static const uint32_t HDR_FLAG_ERROR = (1 << 28);
/***************************************************************************/
/* Packing */
/***************************************************************************/
/*! Translate the contents of \p if_packet_info into a 32-Bit word and return it.
*/
-UHD_INLINE boost::uint32_t _hdr_pack_chdr(
+UHD_INLINE uint32_t _hdr_pack_chdr(
if_packet_info_t &if_packet_info
) {
// Set fields in if_packet_info
@@ -48,9 +48,9 @@ UHD_INLINE boost::uint32_t _hdr_pack_chdr(
if_packet_info.num_header_words32 +
if_packet_info.num_payload_words32;
- boost::uint16_t pkt_length =
+ uint16_t pkt_length =
if_packet_info.num_payload_bytes + (4 * if_packet_info.num_header_words32);
- boost::uint32_t chdr = 0
+ uint32_t chdr = 0
// 2 Bits: Packet type
| (if_packet_info.packet_type << 30)
// 1 Bit: Has time
@@ -65,7 +65,7 @@ UHD_INLINE boost::uint32_t _hdr_pack_chdr(
}
void chdr::if_hdr_pack_be(
- boost::uint32_t *packet_buff,
+ uint32_t *packet_buff,
if_packet_info_t &if_packet_info
) {
// Write header and update if_packet_info
@@ -76,13 +76,13 @@ void chdr::if_hdr_pack_be(
// Write time
if (if_packet_info.has_tsf) {
- packet_buff[2] = BE_MACRO(boost::uint32_t(if_packet_info.tsf >> 32));
- packet_buff[3] = BE_MACRO(boost::uint32_t(if_packet_info.tsf >> 0));
+ packet_buff[2] = BE_MACRO(uint32_t(if_packet_info.tsf >> 32));
+ packet_buff[3] = BE_MACRO(uint32_t(if_packet_info.tsf >> 0));
}
}
void chdr::if_hdr_pack_le(
- boost::uint32_t *packet_buff,
+ uint32_t *packet_buff,
if_packet_info_t &if_packet_info
) {
// Write header and update if_packet_info
@@ -93,8 +93,8 @@ void chdr::if_hdr_pack_le(
// Write time
if (if_packet_info.has_tsf) {
- packet_buff[2] = LE_MACRO(boost::uint32_t(if_packet_info.tsf >> 32));
- packet_buff[3] = LE_MACRO(boost::uint32_t(if_packet_info.tsf >> 0));
+ packet_buff[2] = LE_MACRO(uint32_t(if_packet_info.tsf >> 32));
+ packet_buff[3] = LE_MACRO(uint32_t(if_packet_info.tsf >> 0));
}
}
@@ -103,7 +103,7 @@ void chdr::if_hdr_pack_le(
/* Unpacking */
/***************************************************************************/
UHD_INLINE void _hdr_unpack_chdr(
- const boost::uint32_t chdr,
+ const uint32_t chdr,
if_packet_info_t &if_packet_info
) {
// Set constant members
@@ -143,11 +143,11 @@ UHD_INLINE void _hdr_unpack_chdr(
}
void chdr::if_hdr_unpack_be(
- const boost::uint32_t *packet_buff,
+ const uint32_t *packet_buff,
if_packet_info_t &if_packet_info
) {
// Read header and update if_packet_info
- boost::uint32_t chdr = BE_MACRO(packet_buff[0]);
+ uint32_t chdr = BE_MACRO(packet_buff[0]);
_hdr_unpack_chdr(chdr, if_packet_info);
// Read SID
@@ -156,17 +156,17 @@ void chdr::if_hdr_unpack_be(
// Read time (has_tsf was updated earlier)
if (if_packet_info.has_tsf) {
if_packet_info.tsf = 0
- | boost::uint64_t(BE_MACRO(packet_buff[2])) << 32
+ | uint64_t(BE_MACRO(packet_buff[2])) << 32
| BE_MACRO(packet_buff[3]);
}
}
void chdr::if_hdr_unpack_le(
- const boost::uint32_t *packet_buff,
+ const uint32_t *packet_buff,
if_packet_info_t &if_packet_info
) {
// Read header and update if_packet_info
- boost::uint32_t chdr = LE_MACRO(packet_buff[0]);
+ uint32_t chdr = LE_MACRO(packet_buff[0]);
_hdr_unpack_chdr(chdr, if_packet_info);
// Read SID
@@ -175,7 +175,7 @@ void chdr::if_hdr_unpack_le(
// Read time (has_tsf was updated earlier)
if (if_packet_info.has_tsf) {
if_packet_info.tsf = 0
- | boost::uint64_t(LE_MACRO(packet_buff[2])) << 32
+ | uint64_t(LE_MACRO(packet_buff[2])) << 32
| LE_MACRO(packet_buff[3]);
}
}