diff options
| author | Josh Blum <josh@joshknows.com> | 2011-11-07 18:47:29 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-11-07 18:47:29 -0800 |
| commit | e219ad10a6e86cd4edc748f2218e01a9890e108c (patch) | |
| tree | 372f2e426781de9885889bec6aa98697006268ec /host/lib/usrp/usrp1/usrp1_calc_mux.hpp | |
| parent | 8ff8f206d317e8d9c026fef9228a80edc241f9d4 (diff) | |
| parent | 11f1390bbde65c60f45962acb128cac1ce21e474 (diff) | |
| download | uhd-e219ad10a6e86cd4edc748f2218e01a9890e108c.tar.gz uhd-e219ad10a6e86cd4edc748f2218e01a9890e108c.tar.bz2 uhd-e219ad10a6e86cd4edc748f2218e01a9890e108c.zip | |
Merge branch 'uhd_next'
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); } /*! |