[Commit-gnuradio] r10043 - in gnuradio/branches/features/cppdb: gr-usrp/src gr-utils/src/python

[jcorgan]

Author: jcorgan
Date: 2008-11-24 10:48:21 -0700 (Mon, 24 Nov 2008)
New Revision: 10043

Modified:
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp_base.i
   gnuradio/branches/features/cppdb/gr-utils/src/python/usrp_oscope.py
Log:
Minor fixes to check-in r10042

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp_base.i
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp_base.i    2008-11-24 
17:39:25 UTC (rev 10042)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp_base.i    2008-11-24 
17:48:21 UTC (rev 10043)
@@ -35,7 +35,7 @@
 public:
   std::vector<std::vector<db_base_sptr> > db();
   std::vector<db_base_sptr> db(int which_side);
-  db_base_sptr db(int which_side, int chan);
+  db_base_sptr db(int which_side, int which_dev);
   %rename (_real_selected_subdev) selected_subdev;
   db_base_sptr selected_subdev(usrp_subdev_spec ss);
   long  fpga_master_clock_freq() const;

Modified: gnuradio/branches/features/cppdb/gr-utils/src/python/usrp_oscope.py
===================================================================
--- gnuradio/branches/features/cppdb/gr-utils/src/python/usrp_oscope.py 
2008-11-24 17:39:25 UTC (rev 10042)
+++ gnuradio/branches/features/cppdb/gr-utils/src/python/usrp_oscope.py 
2008-11-24 17:48:21 UTC (rev 10043)
@@ -40,10 +40,9 @@
     If there's a daughterboard on B, select B.
     Otherwise, select A.
     """
-    db = u.db()
-    if db(0, 0).dbid() >= 0:       # dbid is < 0 if there's no d'board or a 
problem
+    if u.db(0, 0).dbid() >= 0:       # dbid is < 0 if there's no d'board or a 
problem
         return (0, 0)
-    if db(0, 0).dbid() >= 0:
+    if u.db(0, 0).dbid() >= 0:
         return (1, 0)
     return (0, 0)