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/convert/gen_convert_general.py | |
| 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/convert/gen_convert_general.py')
| -rw-r--r-- | host/lib/convert/gen_convert_general.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/host/lib/convert/gen_convert_general.py b/host/lib/convert/gen_convert_general.py index 5c62d51df..6e38d9c81 100644 --- a/host/lib/convert/gen_convert_general.py +++ b/host/lib/convert/gen_convert_general.py @@ -149,18 +149,18 @@ DECLARE_CONVERTER(${cpu_type}, ${width}, sc16_item16_usrp1, 1, PRIORITY_GENERAL) % for w in range(width): const ${cpu_type}_t *input${w} = reinterpret_cast<const ${cpu_type}_t *>(inputs[${w}]); % endfor - boost::uint16_t *output = reinterpret_cast<boost::uint16_t *>(outputs[0]); + uint16_t *output = reinterpret_cast<uint16_t *>(outputs[0]); for (size_t i = 0, j = 0; i < nsamps; i++){ % for w in range(width): - output[j++] = ${to_wire}(boost::uint16_t(boost::int16_t(input${w}[i].real()${do_scale}))); - output[j++] = ${to_wire}(boost::uint16_t(boost::int16_t(input${w}[i].imag()${do_scale}))); + output[j++] = ${to_wire}(uint16_t(int16_t(input${w}[i].real()${do_scale}))); + output[j++] = ${to_wire}(uint16_t(int16_t(input${w}[i].imag()${do_scale}))); % endfor } } DECLARE_CONVERTER(sc16_item16_usrp1, 1, ${cpu_type}, ${width}, PRIORITY_GENERAL){ - const boost::uint16_t *input = reinterpret_cast<const boost::uint16_t *>(inputs[0]); + const uint16_t *input = reinterpret_cast<const uint16_t *>(inputs[0]); % for w in range(width): ${cpu_type}_t *output${w} = reinterpret_cast<${cpu_type}_t *>(outputs[${w}]); % endfor @@ -168,8 +168,8 @@ DECLARE_CONVERTER(sc16_item16_usrp1, 1, ${cpu_type}, ${width}, PRIORITY_GENERAL) for (size_t i = 0, j = 0; i < nsamps; i++){ % for w in range(width): output${w}[i] = ${cpu_type}_t( - boost::int16_t(${to_host}(input[j+0]))${do_scale}, - boost::int16_t(${to_host}(input[j+1]))${do_scale} + int16_t(${to_host}(input[j+0]))${do_scale}, + int16_t(${to_host}(input[j+1]))${do_scale} ); j += 2; % endfor @@ -177,7 +177,7 @@ DECLARE_CONVERTER(sc16_item16_usrp1, 1, ${cpu_type}, ${width}, PRIORITY_GENERAL) } DECLARE_CONVERTER(sc8_item16_usrp1, 1, ${cpu_type}, ${width}, PRIORITY_GENERAL){ - const boost::uint16_t *input = reinterpret_cast<const boost::uint16_t *>(inputs[0]); + const uint16_t *input = reinterpret_cast<const uint16_t *>(inputs[0]); % for w in range(width): ${cpu_type}_t *output${w} = reinterpret_cast<${cpu_type}_t *>(outputs[${w}]); % endfor @@ -185,10 +185,10 @@ DECLARE_CONVERTER(sc8_item16_usrp1, 1, ${cpu_type}, ${width}, PRIORITY_GENERAL){ for (size_t i = 0, j = 0; i < nsamps; i++){ % for w in range(width): { - const boost::uint16_t num = ${to_host}(input[j++]); + const uint16_t num = ${to_host}(input[j++]); output${w}[i] = ${cpu_type}_t( - boost::int8_t(num)${do_scale}, - boost::int8_t(num >> 8)${do_scale} + int8_t(num)${do_scale}, + int8_t(num >> 8)${do_scale} ); } % endfor |