[Commit-gnuradio] r9840 - gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src

[jcorgan]

Author: jcorgan
Date: 2008-10-25 14:59:35 -0600 (Sat, 25 Oct 2008)
New Revision: 9840

Modified:
   gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2.i
   gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.cc
   gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.h
   gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.cc
   gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.h
Log:
wip, added adc_rate() and dac_rate()

Modified: gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2.i
===================================================================
--- gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2.i    
2008-10-25 20:49:55 UTC (rev 9839)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2.i    
2008-10-25 20:59:35 UTC (rev 9840)
@@ -64,6 +64,8 @@
   %rename(_real_set_center_freq) set_center_freq;
   bool set_center_freq(double frequency, usrp2::tune_result *r);
   bool set_decim(int decimation_factor);
+  %rename(_real_adc_rate) adc_rate;
+  bool adc_rate(long *rate);
 };
 
 // ----------------------------------------------------------------
@@ -116,6 +118,8 @@
   %rename(_real_set_center_freq) set_center_freq;
   bool set_center_freq(double frequency, usrp2::tune_result *r);
   bool set_interp(int interp_factor);
+  %rename(_real_dac_rate) dac_rate;
+  bool dac_rate(long *rate);
 };
 
 // ----------------------------------------------------------------
@@ -188,6 +192,26 @@
   free_long_ptr(f)
   return result
 
+def __adc_rate(self):
+  rate = make_long_ptr();
+  r = self._real_adc_rate(rate)
+  if r:
+    result = deref_long_ptr(rate)
+  else:
+    result = None
+  free_long_ptr(rate)
+  return result
+
+def __dac_rate(self):
+  rate = make_long_ptr();
+  r = self._real_dac_rate(rate)
+  if r:
+    result = deref_long_ptr(rate)
+  else:
+    result = None
+  free_long_ptr(rate)
+  return result
+
 usrp2_source_32fc_sptr.set_center_freq = __set_center_freq
 usrp2_source_16sc_sptr.set_center_freq = __set_center_freq
 usrp2_sink_32fc_sptr.set_center_freq = __set_center_freq
@@ -198,4 +222,9 @@
 usrp2_sink_32fc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq
 usrp2_sink_16sc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq
 
+usrp2_source_32fc_sptr.adc_rate = __adc_rate
+usrp2_source_16sc_sptr.adc_rate = __adc_rate
+usrp2_sink_32fc_sptr.dac_rate = __dac_rate
+usrp2_sink_16sc_sptr.dac_rate = __dac_rate
+
 %}

Modified: 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.cc 
2008-10-25 20:49:55 UTC (rev 9839)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.cc 
2008-10-25 20:59:35 UTC (rev 9840)
@@ -63,3 +63,9 @@
 {
   return d_u2->set_tx_interp(interp_factor);
 }
+
+bool
+usrp2_sink_base::dac_rate(long *rate)
+{
+  return d_u2->dac_rate(rate);
+}

Modified: 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.h
===================================================================
--- gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.h  
2008-10-25 20:49:55 UTC (rev 9839)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.h  
2008-10-25 20:59:35 UTC (rev 9840)
@@ -54,6 +54,11 @@
    * \brief Set transmit interpolation rate
    */
   bool set_interp(int interp_factor);
+
+  /*!
+   * \brief Get DAC sample rate in Hz 
+   */
+  bool dac_rate(long *rate);
 };
 
 #endif /* INCLUDED_USRP2_SINK_BASE_H */

Modified: 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.cc   
    2008-10-25 20:49:55 UTC (rev 9839)
+++ 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.cc   
    2008-10-25 20:59:35 UTC (rev 9840)
@@ -65,6 +65,12 @@
 }
 
 bool
+usrp2_source_base::adc_rate(long *rate)
+{
+  return d_u2->adc_rate(rate);
+}
+
+bool
 usrp2_source_base::start()
 {
   return d_u2->start_rx_streaming(0); // FIXME: someday sources will have 
channel #s

Modified: 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.h    
    2008-10-25 20:49:55 UTC (rev 9839)
+++ 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.h    
    2008-10-25 20:59:35 UTC (rev 9840)
@@ -56,6 +56,11 @@
   bool set_decim(int decimation_factor);
 
   /*!
+   * \brief Get the ADC sample rate
+   */
+  bool adc_rate(long *rate);
+
+  /*!
    * \brief Called by scheduler when starting flowgraph
    */
   virtual bool start();