[Commit-gnuradio] r10046 - gnuradio/branches/features/cppdb/gr-usrp/src

[jcorgan]

Author: jcorgan
Date: 2008-11-24 13:46:18 -0700 (Mon, 24 Nov 2008)
New Revision: 10046

Modified:
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp.i
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp_sink_base.cc
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp_sink_base.h
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp_sink_base.i
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp_source_base.cc
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp_source_base.h
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp_source_base.i
Log:
Get API name right

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp.i
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp.i 2008-11-24 20:18:30 UTC 
(rev 10045)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp.i 2008-11-24 20:46:18 UTC 
(rev 10046)
@@ -66,13 +66,13 @@
     return (ss.side, ss.subdev)
 
 # Allow subdev_spec to be tuple
-def __pick_tx_subdev(self):
-    ss = self._real_pick_tx_subdev()
+def __pick_tx_subdevice(self):
+    ss = self._real_pick_tx_subdevice()
     return (ss.side, ss.subdev)
 
 # Allow subdev_spec to be tuple
-def __pick_rx_subdev(self):
-    ss = self._real_pick_rx_subdev()
+def __pick_rx_subdevice(self):
+    ss = self._real_pick_rx_subdevice()
     return (ss.side, ss.subdev)
 
 # Make return tune_result or None on failure
@@ -101,12 +101,12 @@
     return u.pick_subdev(candidates);
 
 # Allow to be called as free function
-def pick_tx_subdev(u):
-    return u.pick_tx_subdev();
+def pick_tx_subdevice(u):
+    return u.pick_tx_subdevice();
 
 # Allow to be called as free function
-def pick_rx_subdev(u):
-    return u.pick_rx_subdev();
+def pick_rx_subdevice(u):
+    return u.pick_rx_subdevice();
 
 # Jam into Python objects
 usrp_sink_c_sptr.determine_tx_mux_value   = __determine_tx_mux_value
@@ -130,9 +130,9 @@
 usrp_source_c_sptr.pick_subdev            = __pick_subdev
 usrp_source_s_sptr.pick_subdev            = __pick_subdev
 
-usrp_sink_c_sptr.pick_tx_subdev           = __pick_tx_subdev
-usrp_sink_s_sptr.pick_tx_subdev           = __pick_tx_subdev
-usrp_source_c_sptr.pick_rx_subdev         = __pick_rx_subdev
-usrp_source_s_sptr.pick_rx_subdev         = __pick_rx_subdev
+usrp_sink_c_sptr.pick_tx_subdevice        = __pick_tx_subdevice
+usrp_sink_s_sptr.pick_tx_subdevice        = __pick_tx_subdevice
+usrp_source_c_sptr.pick_rx_subdevice      = __pick_rx_subdevice
+usrp_source_s_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 
 %}

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp_sink_base.cc
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp_sink_base.cc      
2008-11-24 20:18:30 UTC (rev 10045)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp_sink_base.cc      
2008-11-24 20:46:18 UTC (rev 10046)
@@ -226,7 +226,7 @@
 }
 
 usrp_subdev_spec
-usrp_sink_base::pick_tx_subdev()
+usrp_sink_base::pick_tx_subdevice()
 {
   int dbids[] = {
     USRP_DBID_FLEX_400_TX,

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp_sink_base.h
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp_sink_base.h       
2008-11-24 20:18:30 UTC (rev 10045)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp_sink_base.h       
2008-11-24 20:46:18 UTC (rev 10046)
@@ -145,7 +145,7 @@
   /*!
    * \brief Select suitable Tx daughterboard
    */
-  usrp_subdev_spec pick_tx_subdev();
+  usrp_subdev_spec pick_tx_subdevice();
 };
 
 #endif /* INCLUDED_USRP_SINK_BASE_H */

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp_sink_base.i
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp_sink_base.i       
2008-11-24 20:18:30 UTC (rev 10045)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp_sink_base.i       
2008-11-24 20:46:18 UTC (rev 10046)
@@ -49,6 +49,6 @@
   int nducs();
   %rename(_real_tune) tune;
   bool tune(int chan, db_base_sptr db, double target_freq, usrp_tune_result 
*result);
-  %rename(_real_pick_tx_subdev) pick_tx_subdev();
-  usrp_subdev_spec pick_tx_subdev();
+  %rename(_real_pick_tx_subdevice) pick_tx_subdevice();
+  usrp_subdev_spec pick_tx_subdevice();
 };

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp_source_base.cc
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp_source_base.cc    
2008-11-24 20:18:30 UTC (rev 10045)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp_source_base.cc    
2008-11-24 20:46:18 UTC (rev 10046)
@@ -276,7 +276,7 @@
 }
 
 usrp_subdev_spec
-usrp_source_base::pick_rx_subdev()
+usrp_source_base::pick_rx_subdevice()
 {
   int dbids[] = {
     USRP_DBID_FLEX_400_RX,

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp_source_base.h
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp_source_base.h     
2008-11-24 20:18:30 UTC (rev 10045)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp_source_base.h     
2008-11-24 20:46:18 UTC (rev 10046)
@@ -213,7 +213,7 @@
   /*!
    * \brief Select suitable Rx daughterboard
    */
-  usrp_subdev_spec pick_rx_subdev();
+  usrp_subdev_spec pick_rx_subdevice();
 };
 
 #endif /* INCLUDED_USRP_SOURCE_BASE_H */

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp_source_base.i
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp_source_base.i     
2008-11-24 20:18:30 UTC (rev 10045)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp_source_base.i     
2008-11-24 20:46:18 UTC (rev 10046)
@@ -58,6 +58,6 @@
   static bool format_bypass_halfband(unsigned int format);
   %rename(_real_tune) tune;
   bool tune(int chan, db_base_sptr db, double target_freq, usrp_tune_result 
*result);
-  %rename(_real_pick_rx_subdev) pick_rx_subdev();
-  usrp_subdev_spec pick_rx_subdev();
+  %rename(_real_pick_rx_subdevice) pick_rx_subdevice();
+  usrp_subdev_spec pick_rx_subdevice();
 };