diff options
| author | Martin Braun <martin.braun@ettus.com> | 2020-03-02 15:25:13 -0800 | 
|---|---|---|
| committer | atrnati <54334261+atrnati@users.noreply.github.com> | 2020-03-03 08:51:32 -0600 | 
| commit | 876d4150aa3da531ddd687b48afada6e43f79146 (patch) | |
| tree | fd72a71419f4cd800d4e500cfcaded4dfc8dc367 /host/lib/convert/convert_pack_sc12.cpp | |
| parent | 1393553d623bdf4ba40d5435c9719b6ce990d9ac (diff) | |
| download | uhd-876d4150aa3da531ddd687b48afada6e43f79146.tar.gz uhd-876d4150aa3da531ddd687b48afada6e43f79146.tar.bz2 uhd-876d4150aa3da531ddd687b48afada6e43f79146.zip | |
uhd: Apply clang-format against all .cpp and .hpp files in host/
Note: template_lvbitx.{cpp,hpp} need to be excluded from the list of
files that clang-format gets applied against.
Diffstat (limited to 'host/lib/convert/convert_pack_sc12.cpp')
| -rw-r--r-- | host/lib/convert/convert_pack_sc12.cpp | 151 | 
1 files changed, 90 insertions, 61 deletions
| diff --git a/host/lib/convert/convert_pack_sc12.cpp b/host/lib/convert/convert_pack_sc12.cpp index 97a4af206..ee28e00cd 100644 --- a/host/lib/convert/convert_pack_sc12.cpp +++ b/host/lib/convert/convert_pack_sc12.cpp @@ -12,9 +12,9 @@ using namespace uhd::convert;  template <typename type, towire32_type towire>  struct convert_star_1_to_sc12_item32_1 : public converter  { -    convert_star_1_to_sc12_item32_1(void):_scalar(0.0) +    convert_star_1_to_sc12_item32_1(void) : _scalar(0.0)      { -        //NOP +        // NOP      }      void set_scalar(const double scalar) @@ -22,74 +22,99 @@ struct convert_star_1_to_sc12_item32_1 : public converter          _scalar = scalar;      } -    void operator()(const input_type &inputs, const output_type &outputs, const size_t nsamps) +    void operator()( +        const input_type& inputs, const output_type& outputs, const size_t nsamps)      { -        const std::complex<type> *input = reinterpret_cast<const std::complex<type> *>(inputs[0]); +        const std::complex<type>* input = +            reinterpret_cast<const std::complex<type>*>(inputs[0]);          /* -         * Effectively outputs will point to a managed_buffer instance. These buffers are 32 bit aligned. -         * For a detailed description see comments in 'convert_unpack_sc12.cpp'. +         * Effectively outputs will point to a managed_buffer instance. These buffers are +         * 32 bit aligned. For a detailed description see comments in +         * 'convert_unpack_sc12.cpp'.           */          const size_t head_samps = size_t(outputs[0]) & 0x3;          int enable;          size_t rewind = 0; -        switch(head_samps) -        { -            case 0: break; -            case 1: rewind = 9; break; -            case 2: rewind = 6; break; -            case 3: rewind = 3; break; +        switch (head_samps) { +            case 0: +                break; +            case 1: +                rewind = 9; +                break; +            case 2: +                rewind = 6; +                break; +            case 3: +                rewind = 3; +                break;          } -        item32_sc12_3x *output = reinterpret_cast<item32_sc12_3x *>(size_t(outputs[0]) - rewind); +        item32_sc12_3x* output = +            reinterpret_cast<item32_sc12_3x*>(size_t(outputs[0]) - rewind); -        //helper variables +        // helper variables          size_t i = 0, o = 0; -        //handle the head case -        switch (head_samps) -        { -        case 0: -            break; //no head -        case 1: -            enable = CONVERT12_LINE2; -            convert_star_4_to_sc12_item32_3<type, towire>(0, 0, 0, input[0], enable, output[o++], _scalar); -            break; -        case 2: -            enable = CONVERT12_LINE2 | CONVERT12_LINE1; -            convert_star_4_to_sc12_item32_3<type, towire>(0, 0, input[0], input[1], enable, output[o++], _scalar); -            break; -        case 3: -            enable = CONVERT12_LINE2 | CONVERT12_LINE1 | CONVERT12_LINE0; -            convert_star_4_to_sc12_item32_3<type, towire>(0, input[0], input[1], input[2], enable, output[o++], _scalar); -            break; +        // handle the head case +        switch (head_samps) { +            case 0: +                break; // no head +            case 1: +                enable = CONVERT12_LINE2; +                convert_star_4_to_sc12_item32_3<type, towire>( +                    0, 0, 0, input[0], enable, output[o++], _scalar); +                break; +            case 2: +                enable = CONVERT12_LINE2 | CONVERT12_LINE1; +                convert_star_4_to_sc12_item32_3<type, towire>( +                    0, 0, input[0], input[1], enable, output[o++], _scalar); +                break; +            case 3: +                enable = CONVERT12_LINE2 | CONVERT12_LINE1 | CONVERT12_LINE0; +                convert_star_4_to_sc12_item32_3<type, towire>( +                    0, input[0], input[1], input[2], enable, output[o++], _scalar); +                break;          }          i += head_samps; -        //convert the body -        while (i+3 < nsamps) -        { -            convert_star_4_to_sc12_item32_3<type, towire>(input[i+0], input[i+1], input[i+2], input[i+3], CONVERT12_LINE_ALL, output[o], _scalar); -            o++; i += 4; +        // convert the body +        while (i + 3 < nsamps) { +            convert_star_4_to_sc12_item32_3<type, towire>(input[i + 0], +                input[i + 1], +                input[i + 2], +                input[i + 3], +                CONVERT12_LINE_ALL, +                output[o], +                _scalar); +            o++; +            i += 4;          } -        //handle the tail case +        // handle the tail case          const size_t tail_samps = nsamps - i; -        switch (tail_samps) -        { -        case 0: -            break; //no tail -        case 1: -            enable = CONVERT12_LINE0; -            convert_star_4_to_sc12_item32_3<type, towire>(input[i+0], 0, 0, 0, enable, output[o], _scalar); -            break; -        case 2: -            enable = CONVERT12_LINE0 | CONVERT12_LINE1; -            convert_star_4_to_sc12_item32_3<type, towire>(input[i+0], input[i+1], 0, 0, enable, output[o], _scalar); -            break; -        case 3: -            enable = CONVERT12_LINE0 | CONVERT12_LINE1 | CONVERT12_LINE2; -            convert_star_4_to_sc12_item32_3<type, towire>(input[i+0], input[i+1], input[i+2], 0, enable, output[o], _scalar); -            break; +        switch (tail_samps) { +            case 0: +                break; // no tail +            case 1: +                enable = CONVERT12_LINE0; +                convert_star_4_to_sc12_item32_3<type, towire>( +                    input[i + 0], 0, 0, 0, enable, output[o], _scalar); +                break; +            case 2: +                enable = CONVERT12_LINE0 | CONVERT12_LINE1; +                convert_star_4_to_sc12_item32_3<type, towire>( +                    input[i + 0], input[i + 1], 0, 0, enable, output[o], _scalar); +                break; +            case 3: +                enable = CONVERT12_LINE0 | CONVERT12_LINE1 | CONVERT12_LINE2; +                convert_star_4_to_sc12_item32_3<type, towire>(input[i + 0], +                    input[i + 1], +                    input[i + 2], +                    0, +                    enable, +                    output[o], +                    _scalar); +                break;          }      } @@ -118,21 +143,25 @@ static converter::sptr make_convert_sc16_1_to_sc12_item32_be_1(void)  UHD_STATIC_BLOCK(register_convert_pack_sc12)  { -    //uhd::convert::register_bytes_per_item("sc12", 3/*bytes*/); //registered in unpack +    // uhd::convert::register_bytes_per_item("sc12", 3/*bytes*/); //registered in unpack      uhd::convert::id_type id; -    id.num_inputs = 1; +    id.num_inputs  = 1;      id.num_outputs = 1; -    id.input_format = "fc32"; +    id.input_format  = "fc32";      id.output_format = "sc12_item32_le"; -    uhd::convert::register_converter(id, &make_convert_fc32_1_to_sc12_item32_le_1, PRIORITY_GENERAL); +    uhd::convert::register_converter( +        id, &make_convert_fc32_1_to_sc12_item32_le_1, PRIORITY_GENERAL);      id.output_format = "sc12_item32_be"; -    uhd::convert::register_converter(id, &make_convert_fc32_1_to_sc12_item32_be_1, PRIORITY_GENERAL); +    uhd::convert::register_converter( +        id, &make_convert_fc32_1_to_sc12_item32_be_1, PRIORITY_GENERAL); -    id.input_format = "sc16"; +    id.input_format  = "sc16";      id.output_format = "sc12_item32_le"; -    uhd::convert::register_converter(id, &make_convert_sc16_1_to_sc12_item32_le_1, PRIORITY_GENERAL); +    uhd::convert::register_converter( +        id, &make_convert_sc16_1_to_sc12_item32_le_1, PRIORITY_GENERAL);      id.output_format = "sc12_item32_be"; -    uhd::convert::register_converter(id, &make_convert_sc16_1_to_sc12_item32_be_1, PRIORITY_GENERAL); +    uhd::convert::register_converter( +        id, &make_convert_sc16_1_to_sc12_item32_be_1, PRIORITY_GENERAL);  } | 
