[Commit-gnuradio] r8427 - in usrp2/branches/developers/jcorgan/u2/host: gr-usrp2 lib

[jcorgan]

Author: jcorgan
Date: 2008-05-14 19:58:44 -0600 (Wed, 14 May 2008)
New Revision: 8427

Modified:
   usrp2/branches/developers/jcorgan/u2/host/gr-usrp2/usrp2.i
   usrp2/branches/developers/jcorgan/u2/host/gr-usrp2/usrp2_source_base.cc
   usrp2/branches/developers/jcorgan/u2/host/gr-usrp2/usrp2_source_base.h
   usrp2/branches/developers/jcorgan/u2/host/lib/usrp2_basic.cc
   usrp2/branches/developers/jcorgan/u2/host/lib/usrp2_basic.h
Log:
wip

Modified: usrp2/branches/developers/jcorgan/u2/host/gr-usrp2/usrp2.i
===================================================================
--- usrp2/branches/developers/jcorgan/u2/host/gr-usrp2/usrp2.i  2008-05-14 
23:36:34 UTC (rev 8426)
+++ usrp2/branches/developers/jcorgan/u2/host/gr-usrp2/usrp2.i  2008-05-15 
01:58:44 UTC (rev 8427)
@@ -50,6 +50,9 @@
   usrp2_tune_result_sptr set_freq(double frequency);
   bool set_decim(int decimation_factor);
   bool set_scale_iq(int scale_i, int scale_q);
+
+  float adc_rate() const;
+  int decim_rate() const;
 };
 
 // ----------------------------------------------------------------

Modified: 
usrp2/branches/developers/jcorgan/u2/host/gr-usrp2/usrp2_source_base.cc
===================================================================
--- usrp2/branches/developers/jcorgan/u2/host/gr-usrp2/usrp2_source_base.cc     
2008-05-14 23:36:34 UTC (rev 8426)
+++ usrp2/branches/developers/jcorgan/u2/host/gr-usrp2/usrp2_source_base.cc     
2008-05-15 01:58:44 UTC (rev 8427)
@@ -91,6 +91,18 @@
   return d_u2->set_rx_scale_iq(scale_i, scale_q);
 }
 
+float
+usrp2_source_base::adc_rate() const
+{
+  return d_u2->adc_rate();
+}
+
+int 
+usrp2_source_base::decim_rate() const
+{
+  return d_u2->rx_decim_rate();
+}
+
 bool
 usrp2_source_base::start()
 {

Modified: usrp2/branches/developers/jcorgan/u2/host/gr-usrp2/usrp2_source_base.h
===================================================================
--- usrp2/branches/developers/jcorgan/u2/host/gr-usrp2/usrp2_source_base.h      
2008-05-14 23:36:34 UTC (rev 8426)
+++ usrp2/branches/developers/jcorgan/u2/host/gr-usrp2/usrp2_source_base.h      
2008-05-15 01:58:44 UTC (rev 8427)
@@ -49,6 +49,9 @@
   bool set_decim(int decimation_factor);
   bool set_scale_iq(int scale_i, int scale_q);
 
+  float adc_rate() const;
+  int decim_rate() const;
+  
   int work(int noutput_items,
           gr_vector_const_void_star &input_items,
           gr_vector_void_star &output_items);

Modified: usrp2/branches/developers/jcorgan/u2/host/lib/usrp2_basic.cc
===================================================================
--- usrp2/branches/developers/jcorgan/u2/host/lib/usrp2_basic.cc        
2008-05-14 23:36:34 UTC (rev 8426)
+++ usrp2/branches/developers/jcorgan/u2/host/lib/usrp2_basic.cc        
2008-05-15 01:58:44 UTC (rev 8427)
@@ -333,6 +333,7 @@
 
   // FIXME wait for corresponding reply, etc.
 
+  d_rx_decim = decimation_factor;
   return true;
 }
 

Modified: usrp2/branches/developers/jcorgan/u2/host/lib/usrp2_basic.h
===================================================================
--- usrp2/branches/developers/jcorgan/u2/host/lib/usrp2_basic.h 2008-05-14 
23:36:34 UTC (rev 8426)
+++ usrp2/branches/developers/jcorgan/u2/host/lib/usrp2_basic.h 2008-05-15 
01:58:44 UTC (rev 8427)
@@ -47,6 +47,7 @@
   int           d_seqno;
   int           d_next_rid;
   u2_mac_addr_t  d_addr;
+  int            d_rx_decim;
   
   void init_et_hdrs(u2_eth_packet_t *p, const u2_mac_addr_t &dst);
 
@@ -121,6 +122,7 @@
   //! stop streaming Rx samples
   bool stop_rx();
 
+  int rx_decim_rate() const { return d_rx_decim; }
 
   /*
    * Tx configuration and control
@@ -186,7 +188,7 @@
 
 
   //! Return frequency of master oscillator on USRP2.
-  long  fpga_master_clock_freq () const { return 100000000; }  // 100e6
+  long fpga_master_clock_freq () const { return 100000000; }   // 100e6
 
   //! Return A/D sample rate
   long adc_rate() const { return fpga_master_clock_freq(); }