lib: transport: convert: apply clang-format

This is a continuation of 967be2a4. Applying clang-format to files
needed for endianness changes.

$ clang-format -i --style=file \
    host/include/uhd/types/endianness.hpp \
    host/include/uhd/utils/byteswap.hpp \
    host/include/uhd/utils/byteswap.ipp
$ clang-format -i --style=file \
    host/lib/convert/convert_with_tables.cpp \
    host/lib/transport/chdr.cpp

1 files changed, 165 insertions, 119 deletions

diff --git a/host/lib/convert/convert_with_tables.cpp b/host/lib/convert/convert_with_tables.cpp
index dc7b04c93..40efc5190 100644
--- a/host/lib/convert/convert_with_tables.cpp
+++ b/host/lib/convert/convert_with_tables.cpp
@@ -20,45 +20,48 @@ typedef uint16_t (*tohost16_type)(uint16_t);
  * Implementation for sc16 to sc8 lookup table
  *  - Lookup the real and imaginary parts individually
  **********************************************************************/
-template <bool swap>
-class convert_sc16_1_to_sc8_item32_1 : public converter{
+template <bool swap> class convert_sc16_1_to_sc8_item32_1 : public converter
+{
 public:
-    convert_sc16_1_to_sc8_item32_1(void): _table(sc16_table_len){}
+    convert_sc16_1_to_sc8_item32_1(void) : _table(sc16_table_len) {}
 
-    void set_scalar(const double scalar){
-        for (size_t i = 0; i < sc16_table_len; i++){
+    void set_scalar(const double scalar)
+    {
+        for (size_t i = 0; i < sc16_table_len; i++) {
             const int16_t val = uint16_t(i);
-            _table[i] = int8_t(boost::math::iround(val * scalar / 32767.));
+            _table[i]         = int8_t(boost::math::iround(val * scalar / 32767.));
         }
     }
 
-    void operator()(const input_type &inputs, const output_type &outputs, const size_t nsamps){
-        const sc16_t *input = reinterpret_cast<const sc16_t *>(inputs[0]);
-        item32_t *output = reinterpret_cast<item32_t *>(outputs[0]);
+    void operator()(
+        const input_type& inputs, const output_type& outputs, const size_t nsamps)
+    {
+        const sc16_t* input = reinterpret_cast<const sc16_t*>(inputs[0]);
+        item32_t* output    = reinterpret_cast<item32_t*>(outputs[0]);
 
-        const size_t num_pairs = nsamps/2;
-        for (size_t i = 0, j = 0; i < num_pairs; i++, j+=2){
-            output[i] = this->lookup(input[j], input[j+1]);
+        const size_t num_pairs = nsamps / 2;
+        for (size_t i = 0, j = 0; i < num_pairs; i++, j += 2) {
+            output[i] = this->lookup(input[j], input[j + 1]);
         }
 
-        if (nsamps != num_pairs*2){
-            output[num_pairs] = this->lookup(input[nsamps-1], 0);;
+        if (nsamps != num_pairs * 2) {
+            output[num_pairs] = this->lookup(input[nsamps - 1], 0);
+            ;
         }
     }
 
-    item32_t lookup(const sc16_t &in0, const sc16_t &in1){
-        if (swap){ //hope this compiles out, its a template constant
-            return
-            (item32_t(_table[uint16_t(in1.real())]) << 16) |
-            (item32_t(_table[uint16_t(in1.imag())]) << 24) |
-            (item32_t(_table[uint16_t(in0.real())]) << 0) |
-            (item32_t(_table[uint16_t(in0.imag())]) << 8) ;
+    item32_t lookup(const sc16_t& in0, const sc16_t& in1)
+    {
+        if (swap) { // hope this compiles out, its a template constant
+            return (item32_t(_table[uint16_t(in1.real())]) << 16)
+                   | (item32_t(_table[uint16_t(in1.imag())]) << 24)
+                   | (item32_t(_table[uint16_t(in0.real())]) << 0)
+                   | (item32_t(_table[uint16_t(in0.imag())]) << 8);
         }
-        return
-            (item32_t(_table[uint16_t(in1.real())]) << 8) |
-            (item32_t(_table[uint16_t(in1.imag())]) << 0) |
-            (item32_t(_table[uint16_t(in0.real())]) << 24) |
-            (item32_t(_table[uint16_t(in0.imag())]) << 16) ;
+        return (item32_t(_table[uint16_t(in1.real())]) << 8)
+               | (item32_t(_table[uint16_t(in1.imag())]) << 0)
+               | (item32_t(_table[uint16_t(in0.real())]) << 24)
+               | (item32_t(_table[uint16_t(in0.imag())]) << 16);
     }
 
 private:
@@ -70,27 +73,29 @@ private:
  *  - Lookup the real and imaginary parts individually
  **********************************************************************/
 template <typename type, tohost16_type tohost, size_t re_shift, size_t im_shift>
-class convert_sc16_item32_1_to_fcxx_1 : public converter{
+class convert_sc16_item32_1_to_fcxx_1 : public converter
+{
 public:
-    convert_sc16_item32_1_to_fcxx_1(void): _table(sc16_table_len){}
+    convert_sc16_item32_1_to_fcxx_1(void) : _table(sc16_table_len) {}
 
-    void set_scalar(const double scalar){
-        for (size_t i = 0; i < sc16_table_len; i++){
+    void set_scalar(const double scalar)
+    {
+        for (size_t i = 0; i < sc16_table_len; i++) {
             const uint16_t val = tohost(uint16_t(i & 0xffff));
-            _table[i] = type(int16_t(val)*scalar);
+            _table[i]          = type(int16_t(val) * scalar);
         }
     }
 
-    void operator()(const input_type &inputs, const output_type &outputs, const size_t nsamps){
-        const item32_t *input = reinterpret_cast<const item32_t *>(inputs[0]);
-        std::complex<type> *output = reinterpret_cast<std::complex<type> *>(outputs[0]);
+    void operator()(
+        const input_type& inputs, const output_type& outputs, const size_t nsamps)
+    {
+        const item32_t* input      = reinterpret_cast<const item32_t*>(inputs[0]);
+        std::complex<type>* output = reinterpret_cast<std::complex<type>*>(outputs[0]);
 
-        for (size_t i = 0; i < nsamps; i++){
+        for (size_t i = 0; i < nsamps; i++) {
             const item32_t item = input[i];
-            output[i] = std::complex<type>(
-                _table[uint16_t(item >> re_shift)],
-                _table[uint16_t(item >> im_shift)]
-            );
+            output[i]           = std::complex<type>(
+                _table[uint16_t(item >> re_shift)], _table[uint16_t(item >> im_shift)]);
         }
     }
 
@@ -103,54 +108,60 @@ private:
  *  - Lookup the real and imaginary parts together
  **********************************************************************/
 template <typename type, tohost16_type tohost, size_t lo_shift, size_t hi_shift>
-class convert_sc8_item32_1_to_fcxx_1 : public converter{
+class convert_sc8_item32_1_to_fcxx_1 : public converter
+{
 public:
-    convert_sc8_item32_1_to_fcxx_1(void): _table(sc16_table_len){}
+    convert_sc8_item32_1_to_fcxx_1(void) : _table(sc16_table_len) {}
 
-    //special case for sc16 type, 32767 undoes float normalization
-    static type conv(const int8_t &num, const double scalar){
-        if (sizeof(type) == sizeof(s16_t)){
-            return type(boost::math::iround(num*scalar*32767));
+    // special case for sc16 type, 32767 undoes float normalization
+    static type conv(const int8_t& num, const double scalar)
+    {
+        if (sizeof(type) == sizeof(s16_t)) {
+            return type(boost::math::iround(num * scalar * 32767));
         }
-        return type(num*scalar);
+        return type(num * scalar);
     }
 
-    void set_scalar(const double scalar){
-        for (size_t i = 0; i < sc16_table_len; i++){
+    void set_scalar(const double scalar)
+    {
+        for (size_t i = 0; i < sc16_table_len; i++) {
             const uint16_t val = tohost(uint16_t(i & 0xffff));
-            const type real = conv(int8_t(val >> 8), scalar);
-            const type imag = conv(int8_t(val >> 0), scalar);
-            _table[i] = std::complex<type>(real, imag);
+            const type real    = conv(int8_t(val >> 8), scalar);
+            const type imag    = conv(int8_t(val >> 0), scalar);
+            _table[i]          = std::complex<type>(real, imag);
         }
     }
 
-    void operator()(const input_type &inputs, const output_type &outputs, const size_t nsamps){
-        const item32_t *input = reinterpret_cast<const item32_t *>(size_t(inputs[0]) & ~0x3);
-        std::complex<type> *output = reinterpret_cast<std::complex<type> *>(outputs[0]);
+    void operator()(
+        const input_type& inputs, const output_type& outputs, const size_t nsamps)
+    {
+        const item32_t* input =
+            reinterpret_cast<const item32_t*>(size_t(inputs[0]) & ~0x3);
+        std::complex<type>* output = reinterpret_cast<std::complex<type>*>(outputs[0]);
 
         size_t num_samps = nsamps;
 
-        if ((size_t(inputs[0]) & 0x3) != 0){
+        if ((size_t(inputs[0]) & 0x3) != 0) {
             const item32_t item0 = *input++;
-            *output++ = _table[uint16_t(item0 >> hi_shift)];
+            *output++            = _table[uint16_t(item0 >> hi_shift)];
             num_samps--;
         }
 
-        const size_t num_pairs = num_samps/2;
-        for (size_t i = 0, j = 0; i < num_pairs; i++, j+=2){
+        const size_t num_pairs = num_samps / 2;
+        for (size_t i = 0, j = 0; i < num_pairs; i++, j += 2) {
             const item32_t item_i = (input[i]);
-            output[j] = _table[uint16_t(item_i >> lo_shift)];
-            output[j + 1] = _table[uint16_t(item_i >> hi_shift)];
+            output[j]             = _table[uint16_t(item_i >> lo_shift)];
+            output[j + 1]         = _table[uint16_t(item_i >> hi_shift)];
         }
 
-        if (num_samps != num_pairs*2){
+        if (num_samps != num_pairs * 2) {
             const item32_t item_n = input[num_pairs];
-            output[num_samps-1] = _table[uint16_t(item_n >> lo_shift)];
+            output[num_samps - 1] = _table[uint16_t(item_n >> lo_shift)];
         }
     }
 
 private:
-    std::vector<std::complex<type> > _table;
+    std::vector<std::complex<type>> _table;
 };
 
 /***********************************************************************
@@ -158,115 +169,150 @@ private:
  **********************************************************************/
 
 #ifdef BOOST_BIG_ENDIAN
-#  define SHIFT_PAIR0 16, 0
-#  define SHIFT_PAIR1 0, 16
-#  define BE_SWAP false
-#  define LE_SWAP true
+#    define SHIFT_PAIR0 16, 0
+#    define SHIFT_PAIR1 0, 16
+#    define BE_SWAP false
+#    define LE_SWAP true
 #else
-#  define SHIFT_PAIR0 0, 16
-#  define SHIFT_PAIR1 16, 0
-#  define BE_SWAP true
-#  define LE_SWAP false
+#    define SHIFT_PAIR0 0, 16
+#    define SHIFT_PAIR1 16, 0
+#    define BE_SWAP true
+#    define LE_SWAP false
 #endif
 
-static converter::sptr make_convert_sc16_item32_be_1_to_fc32_1(void){
-    return converter::sptr(new convert_sc16_item32_1_to_fcxx_1<float, uhd::ntohx, SHIFT_PAIR0>());
+static converter::sptr make_convert_sc16_item32_be_1_to_fc32_1(void)
+{
+    return converter::sptr(
+        new convert_sc16_item32_1_to_fcxx_1<float, uhd::ntohx, SHIFT_PAIR0>());
 }
 
-static converter::sptr make_convert_sc16_item32_be_1_to_fc64_1(void){
-    return converter::sptr(new convert_sc16_item32_1_to_fcxx_1<double, uhd::ntohx, SHIFT_PAIR0>());
+static converter::sptr make_convert_sc16_item32_be_1_to_fc64_1(void)
+{
+    return converter::sptr(
+        new convert_sc16_item32_1_to_fcxx_1<double, uhd::ntohx, SHIFT_PAIR0>());
 }
 
-static converter::sptr make_convert_sc16_item32_le_1_to_fc32_1(void){
-    return converter::sptr(new convert_sc16_item32_1_to_fcxx_1<float, uhd::wtohx, SHIFT_PAIR1>());
+static converter::sptr make_convert_sc16_item32_le_1_to_fc32_1(void)
+{
+    return converter::sptr(
+        new convert_sc16_item32_1_to_fcxx_1<float, uhd::wtohx, SHIFT_PAIR1>());
 }
 
-static converter::sptr make_convert_sc16_item32_le_1_to_fc64_1(void){
-    return converter::sptr(new convert_sc16_item32_1_to_fcxx_1<double, uhd::wtohx, SHIFT_PAIR1>());
+static converter::sptr make_convert_sc16_item32_le_1_to_fc64_1(void)
+{
+    return converter::sptr(
+        new convert_sc16_item32_1_to_fcxx_1<double, uhd::wtohx, SHIFT_PAIR1>());
 }
 
-static converter::sptr make_convert_sc8_item32_be_1_to_fc32_1(void){
-    return converter::sptr(new convert_sc8_item32_1_to_fcxx_1<float, uhd::ntohx, SHIFT_PAIR0>());
+static converter::sptr make_convert_sc8_item32_be_1_to_fc32_1(void)
+{
+    return converter::sptr(
+        new convert_sc8_item32_1_to_fcxx_1<float, uhd::ntohx, SHIFT_PAIR0>());
 }
 
-static converter::sptr make_convert_sc8_item32_be_1_to_fc64_1(void){
-    return converter::sptr(new convert_sc8_item32_1_to_fcxx_1<double, uhd::ntohx, SHIFT_PAIR0>());
+static converter::sptr make_convert_sc8_item32_be_1_to_fc64_1(void)
+{
+    return converter::sptr(
+        new convert_sc8_item32_1_to_fcxx_1<double, uhd::ntohx, SHIFT_PAIR0>());
 }
 
-static converter::sptr make_convert_sc8_item32_le_1_to_fc32_1(void){
-    return converter::sptr(new convert_sc8_item32_1_to_fcxx_1<float, uhd::wtohx, SHIFT_PAIR1>());
+static converter::sptr make_convert_sc8_item32_le_1_to_fc32_1(void)
+{
+    return converter::sptr(
+        new convert_sc8_item32_1_to_fcxx_1<float, uhd::wtohx, SHIFT_PAIR1>());
 }
 
-static converter::sptr make_convert_sc8_item32_le_1_to_fc64_1(void){
-    return converter::sptr(new convert_sc8_item32_1_to_fcxx_1<double, uhd::wtohx, SHIFT_PAIR1>());
+static converter::sptr make_convert_sc8_item32_le_1_to_fc64_1(void)
+{
+    return converter::sptr(
+        new convert_sc8_item32_1_to_fcxx_1<double, uhd::wtohx, SHIFT_PAIR1>());
 }
 
-static converter::sptr make_convert_sc8_item32_be_1_to_sc16_1(void){
-    return converter::sptr(new convert_sc8_item32_1_to_fcxx_1<s16_t, uhd::ntohx, SHIFT_PAIR0>());
+static converter::sptr make_convert_sc8_item32_be_1_to_sc16_1(void)
+{
+    return converter::sptr(
+        new convert_sc8_item32_1_to_fcxx_1<s16_t, uhd::ntohx, SHIFT_PAIR0>());
 }
 
-static converter::sptr make_convert_sc8_item32_le_1_to_sc16_1(void){
-    return converter::sptr(new convert_sc8_item32_1_to_fcxx_1<s16_t, uhd::wtohx, SHIFT_PAIR1>());
+static converter::sptr make_convert_sc8_item32_le_1_to_sc16_1(void)
+{
+    return converter::sptr(
+        new convert_sc8_item32_1_to_fcxx_1<s16_t, uhd::wtohx, SHIFT_PAIR1>());
 }
 
-static converter::sptr make_convert_sc16_1_to_sc8_item32_be_1(void){
+static converter::sptr make_convert_sc16_1_to_sc8_item32_be_1(void)
+{
     return converter::sptr(new convert_sc16_1_to_sc8_item32_1<BE_SWAP>());
 }
 
-static converter::sptr make_convert_sc16_1_to_sc8_item32_le_1(void){
+static converter::sptr make_convert_sc16_1_to_sc8_item32_le_1(void)
+{
     return converter::sptr(new convert_sc16_1_to_sc8_item32_1<LE_SWAP>());
 }
 
-UHD_STATIC_BLOCK(register_convert_sc16_item32_1_to_fcxx_1){
+UHD_STATIC_BLOCK(register_convert_sc16_item32_1_to_fcxx_1)
+{
     uhd::convert::id_type id;
-    id.num_inputs = 1;
+    id.num_inputs  = 1;
     id.num_outputs = 1;
 
     id.output_format = "fc32";
-    id.input_format = "sc16_item32_be";
-    uhd::convert::register_converter(id, &make_convert_sc16_item32_be_1_to_fc32_1, PRIORITY_TABLE);
+    id.input_format  = "sc16_item32_be";
+    uhd::convert::register_converter(
+        id, &make_convert_sc16_item32_be_1_to_fc32_1, PRIORITY_TABLE);
 
     id.output_format = "fc64";
-    id.input_format = "sc16_item32_be";
-    uhd::convert::register_converter(id, &make_convert_sc16_item32_be_1_to_fc64_1, PRIORITY_TABLE);
+    id.input_format  = "sc16_item32_be";
+    uhd::convert::register_converter(
+        id, &make_convert_sc16_item32_be_1_to_fc64_1, PRIORITY_TABLE);
 
     id.output_format = "fc32";
-    id.input_format = "sc16_item32_le";
-    uhd::convert::register_converter(id, &make_convert_sc16_item32_le_1_to_fc32_1, PRIORITY_TABLE);
+    id.input_format  = "sc16_item32_le";
+    uhd::convert::register_converter(
+        id, &make_convert_sc16_item32_le_1_to_fc32_1, PRIORITY_TABLE);
 
     id.output_format = "fc64";
-    id.input_format = "sc16_item32_le";
-    uhd::convert::register_converter(id, &make_convert_sc16_item32_le_1_to_fc64_1, PRIORITY_TABLE);
+    id.input_format  = "sc16_item32_le";
+    uhd::convert::register_converter(
+        id, &make_convert_sc16_item32_le_1_to_fc64_1, PRIORITY_TABLE);
 
     id.output_format = "fc32";
-    id.input_format = "sc8_item32_be";
-    uhd::convert::register_converter(id, &make_convert_sc8_item32_be_1_to_fc32_1, PRIORITY_TABLE);
+    id.input_format  = "sc8_item32_be";
+    uhd::convert::register_converter(
+        id, &make_convert_sc8_item32_be_1_to_fc32_1, PRIORITY_TABLE);
 
     id.output_format = "fc64";
-    id.input_format = "sc8_item32_be";
-    uhd::convert::register_converter(id, &make_convert_sc8_item32_be_1_to_fc64_1, PRIORITY_TABLE);
+    id.input_format  = "sc8_item32_be";
+    uhd::convert::register_converter(
+        id, &make_convert_sc8_item32_be_1_to_fc64_1, PRIORITY_TABLE);
 
     id.output_format = "fc32";
-    id.input_format = "sc8_item32_le";
-    uhd::convert::register_converter(id, &make_convert_sc8_item32_le_1_to_fc32_1, PRIORITY_TABLE);
+    id.input_format  = "sc8_item32_le";
+    uhd::convert::register_converter(
+        id, &make_convert_sc8_item32_le_1_to_fc32_1, PRIORITY_TABLE);
 
     id.output_format = "fc64";
-    id.input_format = "sc8_item32_le";
-    uhd::convert::register_converter(id, &make_convert_sc8_item32_le_1_to_fc64_1, PRIORITY_TABLE);
+    id.input_format  = "sc8_item32_le";
+    uhd::convert::register_converter(
+        id, &make_convert_sc8_item32_le_1_to_fc64_1, PRIORITY_TABLE);
 
     id.output_format = "sc16";
-    id.input_format = "sc8_item32_be";
-    uhd::convert::register_converter(id, &make_convert_sc8_item32_be_1_to_sc16_1, PRIORITY_TABLE);
+    id.input_format  = "sc8_item32_be";
+    uhd::convert::register_converter(
+        id, &make_convert_sc8_item32_be_1_to_sc16_1, PRIORITY_TABLE);
 
     id.output_format = "sc16";
-    id.input_format = "sc8_item32_le";
-    uhd::convert::register_converter(id, &make_convert_sc8_item32_le_1_to_sc16_1, PRIORITY_TABLE);
+    id.input_format  = "sc8_item32_le";
+    uhd::convert::register_converter(
+        id, &make_convert_sc8_item32_le_1_to_sc16_1, PRIORITY_TABLE);
 
-    id.input_format = "sc16";
+    id.input_format  = "sc16";
     id.output_format = "sc8_item32_be";
-    uhd::convert::register_converter(id, &make_convert_sc16_1_to_sc8_item32_be_1, PRIORITY_TABLE);
+    uhd::convert::register_converter(
+        id, &make_convert_sc16_1_to_sc8_item32_be_1, PRIORITY_TABLE);
 
-    id.input_format = "sc16";
+    id.input_format  = "sc16";
     id.output_format = "sc8_item32_le";
-    uhd::convert::register_converter(id, &make_convert_sc16_1_to_sc8_item32_le_1, PRIORITY_TABLE);
+    uhd::convert::register_converter(
+        id, &make_convert_sc16_1_to_sc8_item32_le_1, PRIORITY_TABLE);
 }