diff options
| author | Josh Blum <josh@joshknows.com> | 2011-10-06 18:41:59 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-11-03 20:37:11 -0700 |
| commit | 4c4f0810ef06be18e989b6933ff236ff97c13dd0 (patch) | |
| tree | ce506b4f259d31d966b847dde9adddf07f09f753 /host/lib/usrp/usrp1/usrp1_calc_mux.hpp | |
| parent | de17ef4614c3c14212f239e3c735bfde3f47a68f (diff) | |
| download | uhd-4c4f0810ef06be18e989b6933ff236ff97c13dd0.tar.gz uhd-4c4f0810ef06be18e989b6933ff236ff97c13dd0.tar.bz2 uhd-4c4f0810ef06be18e989b6933ff236ff97c13dd0.zip | |
usrp1: type conversions and 8-bit work
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_calc_mux.hpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_calc_mux.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_calc_mux.hpp b/host/lib/usrp/usrp1/usrp1_calc_mux.hpp index 31c190db0..d86a7a809 100644 --- a/host/lib/usrp/usrp1/usrp1_calc_mux.hpp +++ b/host/lib/usrp/usrp1/usrp1_calc_mux.hpp @@ -37,7 +37,7 @@ typedef std::pair<std::string, std::string> mapping_pair_t; * to account for the reversal in the type conversion routines. **********************************************************************/ static int calc_rx_mux_pair(int adc_for_i, int adc_for_q){ - return (adc_for_i << 2) | (adc_for_q << 0); //shift reversal here + return (adc_for_i << 0) | (adc_for_q << 2); } /*! @@ -98,7 +98,7 @@ static boost::uint32_t calc_rx_mux(const std::vector<mapping_pair_t> &mapping){ * to account for the reversal in the type conversion routines. **********************************************************************/ static int calc_tx_mux_pair(int chn_for_i, int chn_for_q){ - return (chn_for_i << 4) | (chn_for_q << 0); //shift reversal here + return (chn_for_i << 0) | (chn_for_q << 4); } /*! |