summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2014-06-12 11:31:38 -0700
committermichael-west <michael.west@ettus.com>2014-06-12 11:31:38 -0700
commitc884c555be0d85c659e2ece2f44440b2f679d2ca (patch)
treefe9208fbca10aeb0de8d429f3b2fbd66290f3e6f /host/lib/usrp
parent05559d64b9c061c0da11cacec46f11fe03d852cb (diff)
downloaduhd-c884c555be0d85c659e2ece2f44440b2f679d2ca.tar.gz
uhd-c884c555be0d85c659e2ece2f44440b2f679d2ca.tar.bz2
uhd-c884c555be0d85c659e2ece2f44440b2f679d2ca.zip
- Changed XOR to OR for REG_DSP_RX_MUX flags.
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/cores/rx_dsp_core_3000.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/cores/rx_dsp_core_3000.cpp b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
index a39b4a05e..584dd6a94 100644
--- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp
+++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
@@ -80,9 +80,9 @@ public:
("Q", FLAG_DSP_RX_MUX_SWAP_IQ | FLAG_DSP_RX_MUX_REAL_MODE)
;
_iface->poke32(REG_DSP_RX_MUX, mode_to_mux[mode]
- ^ (fe_swapped ? FLAG_DSP_RX_MUX_SWAP_IQ : 0)
- ^ (invert_i ? FLAG_DSP_RX_MUX_INVERT_I : 0)
- ^ (invert_q ? FLAG_DSP_RX_MUX_INVERT_Q : 0));
+ | (fe_swapped ? FLAG_DSP_RX_MUX_SWAP_IQ : 0)
+ | (invert_i ? FLAG_DSP_RX_MUX_INVERT_I : 0)
+ | (invert_q ? FLAG_DSP_RX_MUX_INVERT_Q : 0));
}
void set_tick_rate(const double rate){