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

[trondeau]

Author: trondeau
Date: 2008-09-30 19:47:40 -0600 (Tue, 30 Sep 2008)
New Revision: 9688

Modified:
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink.i
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_base.h
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source.i
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_base.h
Log:
adding wrapper function to call tune from usrp_source and usrp_sink for 
compatability with Python code.

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink.i
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink.i   2008-10-01 
00:46:58 UTC (rev 9687)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink.i   2008-10-01 
01:47:40 UTC (rev 9688)
@@ -94,6 +94,8 @@
   int  _read_9862 (int which_codec, int regno) const;
   bool _write_spi (int optional_header, int enables, int format, std::string 
buf);
   std::string _read_spi (int optional_header, int enables, int format, int 
len);
+
+  tune_result tune(int chan, db_base_sptr db, double target_freq);
 };
 
 

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_base.h
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_base.h      
2008-10-01 00:46:58 UTC (rev 9687)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_base.h      
2008-10-01 01:47:40 UTC (rev 9688)
@@ -80,6 +80,10 @@
   db_base_sptr selected_subdev(const std::vector<int> &subdev_spec);  
   unsigned int determine_tx_mux_value(const std::vector<int> &subdev_spec);
 
+  // Wrapper function to call tune from USRP sink class
+  tune_result tune(int chan, db_base_sptr db, double target_freq)
+  { return db->tune(chan, target_freq); }
+
   int work (int noutput_items,
            gr_vector_const_void_star &input_items,
            gr_vector_void_star &output_items);

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source.i
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source.i 2008-10-01 
00:46:58 UTC (rev 9687)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source.i 2008-10-01 
01:47:40 UTC (rev 9688)
@@ -122,6 +122,7 @@
   bool _write_spi (int optional_header, int enables, int format, std::string 
buf);
   std::string _read_spi (int optional_header, int enables, int format, int 
len);
 
+  tune_result tune(int chan, db_base_sptr db, double target_freq);
 };
 
 

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_base.h
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_base.h    
2008-10-01 00:46:58 UTC (rev 9687)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_base.h    
2008-10-01 01:47:40 UTC (rev 9688)
@@ -96,6 +96,10 @@
   db_base_sptr selected_subdev(const std::vector<int> &subdev_spec);
   unsigned int determine_rx_mux_value(const std::vector<int> &subdev_spec);
 
+  // Wrapper function to call tune from USRP source class
+  tune_result tune(int chan, db_base_sptr db, double target_freq)
+  { return db->tune(chan, target_freq); }
+
   int work (int noutput_items,
            gr_vector_const_void_star &input_items,
            gr_vector_void_star &output_items);