[Commit-gnuradio] r9838 - in gnuradio/branches/developers/jcorgan/u2-wip: gr-usrp2/src usrp2/host/include/usrp2

[jcorgan]

Author: jcorgan
Date: 2008-10-25 14:13:54 -0600 (Sat, 25 Oct 2008)
New Revision: 9838

Modified:
   gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2.i
   gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_base.cc
   gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_base.h
   gnuradio/branches/developers/jcorgan/u2-wip/usrp2/host/include/usrp2/usrp2.h
Log:
wip, added fpga_master_clock_freq()

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 19:20:16 UTC (rev 9837)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2.i    
2008-10-25 20:13:54 UTC (rev 9838)
@@ -46,6 +46,8 @@
   ~usrp2_base();
 
   std::string mac_addr() const;
+  %rename(_real_fpga_master_clock_freq) fpga_master_clock_freq;
+  bool fpga_master_clock_freq(long *freq);
 };
 
 // ----------------------------------------------------------------
@@ -154,6 +156,17 @@
 
 // ----------------------------------------------------------------
 
+// some utility functions to allow Python to deal with pointers
+%{
+  long *make_long_ptr() { return (long *)malloc(sizeof(long)); }
+  long deref_long_ptr(long *l) { return *l; }
+  void free_long_ptr(long *l) { free(l); }
+%}
+
+long *make_long_ptr();
+long deref_long_ptr(long *l);
+void free_long_ptr(long *l);
+
 // create a more pythonic interface
 %pythoncode %{
 
@@ -165,8 +178,24 @@
   else:
     return None
 
+def __fpga_master_clock_freq(self):
+  f = make_long_ptr();
+  r = self._real_fpga_master_clock_freq(f)
+  if r:
+    result = deref_long_ptr(f)
+  else:
+    result = None
+  free_long_ptr(f)
+  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
 usrp2_sink_16sc_sptr.set_center_freq = __set_center_freq
+
+usrp2_source_32fc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq
+usrp2_source_16sc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq
+usrp2_sink_32fc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq
+usrp2_sink_16sc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq
+
 %}

Modified: gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_base.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_base.cc      
2008-10-25 19:20:16 UTC (rev 9837)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_base.cc      
2008-10-25 20:13:54 UTC (rev 9838)
@@ -56,6 +56,12 @@
 }
 
 bool
+usrp2_base::fpga_master_clock_freq(long *freq) const
+{
+  return d_u2->fpga_master_clock_freq(freq);
+}
+
+bool
 usrp2_base::start()
 {
   // Default implementation is NOP

Modified: gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_base.h
===================================================================
--- gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_base.h       
2008-10-25 19:20:16 UTC (rev 9837)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_base.h       
2008-10-25 20:13:54 UTC (rev 9838)
@@ -54,6 +54,11 @@
   std::string mac_addr() const;
   
   /*!
+   * \brief Get USRP2 master clock rate
+   */
+  bool fpga_master_clock_freq(long *freq) const;
+
+  /*!
    * \brief Called by scheduler when starting flowgraph
    */
   virtual bool start();

Modified: 
gnuradio/branches/developers/jcorgan/u2-wip/usrp2/host/include/usrp2/usrp2.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/u2-wip/usrp2/host/include/usrp2/usrp2.h    
    2008-10-25 19:20:16 UTC (rev 9837)
+++ 
gnuradio/branches/developers/jcorgan/u2-wip/usrp2/host/include/usrp2/usrp2.h    
    2008-10-25 20:13:54 UTC (rev 9838)
@@ -23,7 +23,6 @@
 #include <boost/utility.hpp>
 #include <vector>
 #include <complex>
-//#include <iosfwd>
 #include <usrp2/rx_sample_handler.h>
 #include <usrp2/tune_result.h>