[Commit-gnuradio] r7626 - gnuradio/trunk/gr-usrp/src

[matt]

Author: matt
Date: 2008-02-10 16:36:53 -0700 (Sun, 10 Feb 2008)
New Revision: 7626

Modified:
   gnuradio/trunk/gr-usrp/src/db_base.py
   gnuradio/trunk/gr-usrp/src/usrp.py
Log:
allow for iq swap on TX side as well


Modified: gnuradio/trunk/gr-usrp/src/db_base.py
===================================================================
--- gnuradio/trunk/gr-usrp/src/db_base.py       2008-02-10 21:23:19 UTC (rev 
7625)
+++ gnuradio/trunk/gr-usrp/src/db_base.py       2008-02-10 23:36:53 UTC (rev 
7626)
@@ -214,7 +214,8 @@
 
     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
 

Modified: gnuradio/trunk/gr-usrp/src/usrp.py
===================================================================
--- gnuradio/trunk/gr-usrp/src/usrp.py  2008-02-10 21:23:19 UTC (rev 7625)
+++ gnuradio/trunk/gr-usrp/src/usrp.py  2008-02-10 23:36:53 UTC (rev 7626)
@@ -367,13 +367,17 @@
     # 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):
     """
     Return the user specified daughterboard subdevice.