diff options
| author | Josh Blum <josh@joshknows.com> | 2010-06-09 00:54:35 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-06-09 00:54:35 +0000 |
| commit | 8985d5c400a5f64dd95c0f0dcf9f793b32bd2d9c (patch) | |
| tree | c038d960822b5ca153f4bbf6a4bad075467a2a1f /host/lib/usrp | |
| parent | cd84a19214ea03a3615b5ac7997f33fcfc9870ae (diff) | |
| parent | 8c7b73ee536357d2f7efc4558b531575fa28ca31 (diff) | |
| download | uhd-8985d5c400a5f64dd95c0f0dcf9f793b32bd2d9c.tar.gz uhd-8985d5c400a5f64dd95c0f0dcf9f793b32bd2d9c.tar.bz2 uhd-8985d5c400a5f64dd95c0f0dcf9f793b32bd2d9c.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/dsp_utils.hpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/host/lib/usrp/dsp_utils.hpp b/host/lib/usrp/dsp_utils.hpp index 8a6afb292..cfe5375f8 100644 --- a/host/lib/usrp/dsp_utils.hpp +++ b/host/lib/usrp/dsp_utils.hpp @@ -81,15 +81,14 @@ namespace dsp_type1{ /*! * Calculate the IQ scale factor word from I and Q components. - * \param i the I component - * \param q the Q component + * \param i the I component of the scalar + * \param q the Q component of the scalar * \return the 32-bit scale factor control word */ static inline boost::uint32_t calc_iq_scale_word( - boost::int16_t i, - boost::int16_t q + boost::int16_t i, boost::int16_t q ){ - return (boost::uint16_t(i) << 16) | (boost::uint16_t(q) << 0); + return (boost::uint32_t(i) << 16) | (boost::uint32_t(q) << 0); } /*! |