diff options
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/convert/convert_common.hpp | 25 | ||||
| -rw-r--r-- | host/lib/convert/gen_convert_general.py | 2 | ||||
| -rw-r--r-- | host/lib/convert/gen_convert_pred.py | 16 | ||||
| -rw-r--r-- | host/lib/types/types.cpp | 1 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/codec_impl.cpp | 6 |
5 files changed, 44 insertions, 6 deletions
diff --git a/host/lib/convert/convert_common.hpp b/host/lib/convert/convert_common.hpp index 1a653a56f..c6ba1fcf9 100644 --- a/host/lib/convert/convert_common.hpp +++ b/host/lib/convert/convert_common.hpp @@ -41,8 +41,10 @@ /*********************************************************************** * Typedefs **********************************************************************/ +typedef std::complex<double> fc64_t; typedef std::complex<float> fc32_t; typedef std::complex<boost::int16_t> sc16_t; +typedef std::complex<boost::int8_t> sc8_t; typedef boost::uint32_t item32_t; /*********************************************************************** @@ -87,4 +89,27 @@ static UHD_INLINE fc32_t item32_to_fc32(item32_t item){ ); } +/*********************************************************************** + * Convert complex double buffer to items32 (no swap) + **********************************************************************/ +static const double shorts_per_double = double(32767); + +static UHD_INLINE item32_t fc64_to_item32(fc64_t num){ + boost::uint16_t real = boost::int16_t(num.real()*shorts_per_double); + boost::uint16_t imag = boost::int16_t(num.imag()*shorts_per_double); + return (item32_t(real) << 16) | (item32_t(imag) << 0); +} + +/*********************************************************************** + * Convert items32 buffer to complex double + **********************************************************************/ +static const double doubles_per_short = double(1.0/shorts_per_double); + +static UHD_INLINE fc64_t item32_to_fc64(item32_t item){ + return fc64_t( + float(boost::int16_t(item >> 16)*doubles_per_short), + float(boost::int16_t(item >> 0)*doubles_per_short) + ); +} + #endif /* INCLUDED_LIBUHD_CONVERT_COMMON_HPP */ diff --git a/host/lib/convert/gen_convert_general.py b/host/lib/convert/gen_convert_general.py index 47c4cd7d0..f03448047 100644 --- a/host/lib/convert/gen_convert_general.py +++ b/host/lib/convert/gen_convert_general.py @@ -85,7 +85,7 @@ if __name__ == '__main__': output = parse_tmpl(TMPL_HEADER, file=file) for width in 1, 2, 3, 4: for swap, swap_fcn in (('nswap', ''), ('bswap', 'uhd::byteswap')): - for cpu_type in 'fc32', 'sc16': + for cpu_type in 'fc64', 'fc32', 'sc16': output += parse_tmpl( TMPL_CONV_TO_FROM_ITEM32_1 if width == 1 else TMPL_CONV_TO_FROM_ITEM32_X, width=width, swap=swap, swap_fcn=swap_fcn, cpu_type=cpu_type diff --git a/host/lib/convert/gen_convert_pred.py b/host/lib/convert/gen_convert_pred.py index 1d573bf1a..fea7db4cc 100644 --- a/host/lib/convert/gen_convert_pred.py +++ b/host/lib/convert/gen_convert_pred.py @@ -69,8 +69,10 @@ pred_type make_pred(const std::string &markup, dir_type &dir){ dir = DIR_OTW_TO_CPU; } - if (cpu_type == "fc32") pred |= $ph.fc32_p; + if (cpu_type == "fc64") pred |= $ph.fc64_p; + else if (cpu_type == "fc32") pred |= $ph.fc32_p; else if (cpu_type == "sc16") pred |= $ph.sc16_p; + else if (cpu_type == "sc8") pred |= $ph.sc8_p; else throw pred_error("unhandled io type " + cpu_type); if (otw_type == "item32") pred |= $ph.item32_p; @@ -127,6 +129,8 @@ UHD_INLINE pred_type make_pred( switch(io_type.tid){ case io_type_t::COMPLEX_FLOAT32: pred |= $ph.fc32_p; break; case io_type_t::COMPLEX_INT16: pred |= $ph.sc16_p; break; + //case io_type_t::COMPLEX_INT8: pred |= $ph.sc8_p; break; + case io_type_t::COMPLEX_FLOAT64: pred |= $ph.fc64_p; break; default: throw pred_error("unhandled io type id"); } @@ -150,12 +154,14 @@ class ph: bswap_p = 0b00001 nswap_p = 0b00000 item32_p = 0b00000 + sc8_p = 0b00000 sc16_p = 0b00010 - fc32_p = 0b00000 + fc32_p = 0b00100 + fc64_p = 0b00110 chan1_p = 0b00000 - chan2_p = 0b00100 - chan3_p = 0b01000 - chan4_p = 0b01100 + chan2_p = 0b01000 + chan3_p = 0b10000 + chan4_p = 0b11000 if __name__ == '__main__': import sys, os diff --git a/host/lib/types/types.cpp b/host/lib/types/types.cpp index 34d5947eb..c1be2ff6d 100644 --- a/host/lib/types/types.cpp +++ b/host/lib/types/types.cpp @@ -68,6 +68,7 @@ otw_type_t::otw_type_t(void): **********************************************************************/ static size_t tid_to_size(io_type_t::tid_t tid){ switch(tid){ + case io_type_t::COMPLEX_FLOAT64: return sizeof(std::complex<double>); case io_type_t::COMPLEX_FLOAT32: return sizeof(std::complex<float>); case io_type_t::COMPLEX_INT16: return sizeof(std::complex<boost::int16_t>); case io_type_t::COMPLEX_INT8: return sizeof(std::complex<boost::int8_t>); diff --git a/host/lib/usrp/usrp2/codec_impl.cpp b/host/lib/usrp/usrp2/codec_impl.cpp index d7078d985..09bec6db2 100644 --- a/host/lib/usrp/usrp2/codec_impl.cpp +++ b/host/lib/usrp/usrp2/codec_impl.cpp @@ -47,6 +47,12 @@ void usrp2_mboard_impl::codec_init(void){ boost::bind(&usrp2_mboard_impl::tx_codec_get, this, _1, _2), boost::bind(&usrp2_mboard_impl::tx_codec_set, this, _1, _2) ); + + //initialize gain names. keeps get_rx_gain() from getting a gain + //that hasn't been set yet. + BOOST_FOREACH(std::string key, codec_rx_gain_ranges.keys()) { + _codec_rx_gains[key] = codec_rx_gain_ranges[key].start(); + } } /*********************************************************************** |