aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/convert/convert_unpack_sc12.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/convert/convert_unpack_sc12.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/convert/convert_unpack_sc12.cpp')
-rw-r--r--host/lib/convert/convert_unpack_sc12.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/host/lib/convert/convert_unpack_sc12.cpp b/host/lib/convert/convert_unpack_sc12.cpp
index 9f7a84300..acc815951 100644
--- a/host/lib/convert/convert_unpack_sc12.cpp
+++ b/host/lib/convert/convert_unpack_sc12.cpp
@@ -23,7 +23,7 @@
using namespace uhd::convert;
-typedef boost::uint32_t (*tohost32_type)(boost::uint32_t);
+typedef uint32_t (*tohost32_type)(uint32_t);
/* C language specification requires this to be packed
* (i.e., line0, line1, line2 will be in adjacent memory locations).
@@ -63,21 +63,21 @@ void convert_sc12_item32_3_to_star_4
const item32_t line0 = tohost(input.line0);
const item32_t line1 = tohost(input.line1);
const item32_t line2 = tohost(input.line2);
- const boost::uint64_t line01 = (boost::uint64_t(line0) << 32) | line1;
- const boost::uint64_t line12 = (boost::uint64_t(line1) << 32) | line2;
+ const uint64_t line01 = (uint64_t(line0) << 32) | line1;
+ const uint64_t line12 = (uint64_t(line1) << 32) | line2;
//step 1: shift out and mask off the individual numbers
- const type i0 = type(boost::int16_t((line0 >> 16) & 0xfff0)*scalar);
- const type q0 = type(boost::int16_t((line0 >> 4) & 0xfff0)*scalar);
+ const type i0 = type(int16_t((line0 >> 16) & 0xfff0)*scalar);
+ const type q0 = type(int16_t((line0 >> 4) & 0xfff0)*scalar);
- const type i1 = type(boost::int16_t((line01 >> 24) & 0xfff0)*scalar);
- const type q1 = type(boost::int16_t((line1 >> 12) & 0xfff0)*scalar);
+ const type i1 = type(int16_t((line01 >> 24) & 0xfff0)*scalar);
+ const type q1 = type(int16_t((line1 >> 12) & 0xfff0)*scalar);
- const type i2 = type(boost::int16_t((line1 >> 0) & 0xfff0)*scalar);
- const type q2 = type(boost::int16_t((line12 >> 20) & 0xfff0)*scalar);
+ const type i2 = type(int16_t((line1 >> 0) & 0xfff0)*scalar);
+ const type q2 = type(int16_t((line12 >> 20) & 0xfff0)*scalar);
- const type i3 = type(boost::int16_t((line2 >> 8) & 0xfff0)*scalar);
- const type q3 = type(boost::int16_t((line2 << 4) & 0xfff0)*scalar);
+ const type i3 = type(int16_t((line2 >> 8) & 0xfff0)*scalar);
+ const type q3 = type(int16_t((line2 << 4) & 0xfff0)*scalar);
//step 2: load the outputs
out0 = std::complex<type>(i0, q0);