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

[jcorgan]

Author: jcorgan
Date: 2008-10-25 17:00:16 -0600 (Sat, 25 Oct 2008)
New Revision: 9851

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, adds daughterboard_id accessor.

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 22:39:22 UTC (rev 9850)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2.i    
2008-10-25 23:00:16 UTC (rev 9851)
@@ -73,6 +73,8 @@
   double gain_db_per_step();
   double freq_min();
   double freq_max();
+  %rename(_real_daughterboard_id) daughterboard_id;
+  bool daughterboard_id(int *dbid);
 };
 
 // ----------------------------------------------------------------
@@ -134,6 +136,8 @@
   double gain_db_per_step();
   double freq_min();
   double freq_max();
+  %rename(_real_daughterboard_id) daughterboard_id;
+  bool daughterboard_id(int *dbid);
 };
 
 // ----------------------------------------------------------------
@@ -179,11 +183,17 @@
   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); }
+  int *make_int_ptr() { return (int *)malloc(sizeof(int)); }
+  int deref_int_ptr(int *l) { return *l; }
+  void free_int_ptr(int *l) { free(l); }
 %}
 
 long *make_long_ptr();
 long deref_long_ptr(long *l);
 void free_long_ptr(long *l);
+int *make_int_ptr();
+int deref_int_ptr(int *l);
+void free_int_ptr(int *l);
 
 // create a more pythonic interface
 %pythoncode %{
@@ -238,6 +248,16 @@
   return [self.freq_min(),
           self.freq_max()]
 
+def __daughterboard_id(self):
+  dbid = make_int_ptr();
+  r = self._real_daughterboard_id(dbid)
+  if r:
+    result = deref_int_ptr(dbid)
+  else:
+    result = None
+  free_int_ptr(dbid)
+  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
@@ -263,4 +283,9 @@
 usrp2_sink_32fc_sptr.freq_range = __freq_range
 usrp2_sink_16sc_sptr.freq_range = __freq_range
 
+usrp2_source_32fc_sptr.daughterboard_id = __daughterboard_id
+usrp2_source_16sc_sptr.daughterboard_id = __daughterboard_id
+usrp2_sink_32fc_sptr.daughterboard_id = __daughterboard_id
+usrp2_sink_16sc_sptr.daughterboard_id = __daughterboard_id
+
 %}

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 22:39:22 UTC (rev 9850)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.cc 
2008-10-25 23:00:16 UTC (rev 9851)
@@ -111,3 +111,9 @@
 {
   return d_u2->tx_freq_max();
 }
+
+bool
+usrp2_sink_base::daughterboard_id(int *dbid)
+{
+  return d_u2->tx_daughterboard_id(dbid);
+}

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 22:39:22 UTC (rev 9850)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.h  
2008-10-25 23:00:16 UTC (rev 9851)
@@ -94,6 +94,16 @@
    * \brief Returns maximum Tx center frequency
    */
   double freq_max();
+
+  /*!
+   * \brief Get Tx daughterboard ID
+   *
+   * \param[out] dbid returns the daughterboard id.
+   *
+   * daughterboard id >= 0 if successful, -1 if no daugherboard installed,
+   * -2 if invalid EEPROM on daughterboard.
+   */
+  bool daughterboard_id(int *dbid);
 };
 
 #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 22:39:22 UTC (rev 9850)
+++ 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.cc   
    2008-10-25 23:00:16 UTC (rev 9851)
@@ -113,6 +113,12 @@
 }
 
 bool
+usrp2_source_base::daughterboard_id(int *dbid)
+{
+  return d_u2->rx_daughterboard_id(dbid);
+}
+
+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 22:39:22 UTC (rev 9850)
+++ 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.h    
    2008-10-25 23:00:16 UTC (rev 9851)
@@ -94,6 +94,16 @@
    * \brief Returns maximum Rx center frequency
    */
   double freq_max();
+  
+  /*!
+   * \brief Get Rx daughterboard ID
+   *
+   * \param[out] dbid returns the daughterboard id.
+   *
+   * daughterboard id >= 0 if successful, -1 if no daugherboard installed,
+   * -2 if invalid EEPROM on daughterboard.
+   */
+  bool daughterboard_id(int *dbid);
 
   /*!
    * \brief Called by scheduler when starting flowgraph