summaryrefslogtreecommitdiff
path: root/gr-usrp/src
diff options
context:
space:
mode:
Diffstat (limited to 'gr-usrp/src')
-rw-r--r--gr-usrp/src/db_base.py3
-rw-r--r--gr-usrp/src/usrp.py8
2 files changed, 8 insertions, 3 deletions
diff --git a/gr-usrp/src/db_base.py b/gr-usrp/src/db_base.py
index 787d4c3c3..947f81559 100644
--- a/gr-usrp/src/db_base.py
+++ b/gr-usrp/src/db_base.py
@@ -214,7 +214,8 @@ class db_base(object):
def i_and_q_swapped(self):
"""
- Return True if this is a quadrature device and ADC 0 is Q.
+ Return True if this is a quadrature device and (for RX) ADC 0 is Q
+ or (for TX) DAC 0 is Q
"""
return False
diff --git a/gr-usrp/src/usrp.py b/gr-usrp/src/usrp.py
index f149a3ff8..d5eb1d5a2 100644
--- a/gr-usrp/src/usrp.py
+++ b/gr-usrp/src/usrp.py
@@ -367,11 +367,15 @@ def determine_tx_mux_value(u, subdev_spec):
# determine the value manually.
side = subdev_spec[0] # side A = 0, side B = 1
-
if not(side in (0, 1)):
raise ValueError, "Invalid subdev_spec: %r:" % (subdev_spec,)
- return gru.hexint([0x0098, 0x9800][side])
+ db = u.db[side]
+
+ if(db[0].i_and_q_swapped()):
+ return gru.hexint([0x0089, 0x8900][side])
+ else:
+ return gru.hexint([0x0098, 0x9800][side])
def selected_subdev(u, subdev_spec):