[Commit-gnuradio] r10114 - gnuradio/branches/features/cppdb-test/grc/src/grc_gnuradio/usrp

[jblum]

Author: jblum
Date: 2008-12-11 12:01:38 -0700 (Thu, 11 Dec 2008)
New Revision: 10114

Modified:
   
gnuradio/branches/features/cppdb-test/grc/src/grc_gnuradio/usrp/simple_usrp.py
Log:
_which to which()

Modified: 
gnuradio/branches/features/cppdb-test/grc/src/grc_gnuradio/usrp/simple_usrp.py
===================================================================
--- 
gnuradio/branches/features/cppdb-test/grc/src/grc_gnuradio/usrp/simple_usrp.py  
    2008-12-08 15:21:48 UTC (rev 10113)
+++ 
gnuradio/branches/features/cppdb-test/grc/src/grc_gnuradio/usrp/simple_usrp.py  
    2008-12-11 19:01:38 UTC (rev 10114)
@@ -79,7 +79,7 @@
        """
        subdev = usrp.selected_subdev(u, subdev_spec)#get the subdev
        subdev.set_gain(gain)
-       _set_frequency(u, subdev._which, subdev, frequency, verbose=True)
+       _set_frequency(u, subdev.which(), subdev, frequency, verbose=True)
        if auto_tr is not None: subdev.set_auto_tr(auto_tr)
        if tx_enb is not None: subdev.set_enable(tx_enb)
        return subdev
@@ -211,7 +211,7 @@
                if mux is None: mux = usrp.determine_tx_mux_value(u, 
subdev_spec)
                u.set_mux(mux)
                subdev = _setup_tx_subdev(u, subdev_spec, gain, frequency, 
auto_tr, tx_enb)
-               _simple_usrp.__init__(self, u, subdev, subdev._which)
+               _simple_usrp.__init__(self, u, subdev, subdev.which())
                #connect
                self.connect(self, u)
 
@@ -366,7 +366,7 @@
                u.set_mux(mux)
                subdev_a = _setup_tx_subdev(u, (0, 0), gain_a, frequency_a, 
auto_tr, tx_enb_a)
                subdev_b = _setup_tx_subdev(u, (1, 0), gain_b, frequency_b, 
auto_tr, tx_enb_b)
-               _dual_usrp.__init__(self, u, subdev_a, subdev_b, 
subdev_a._which, subdev_b._which)
+               _dual_usrp.__init__(self, u, subdev_a, subdev_b, 
subdev_a.which(), subdev_b.which())
                #connect
                inter = gr.interleave(constructor_to_size[self.constructor])
                self.connect(inter, u)