Merge branch 'maint'

[debian/gnuradio] / gr-usrp2 / src / usrp2.i

diff --git a/gr-usrp2/src/usrp2.i b/gr-usrp2/src/usrp2.i
index 28944e67618ff5a866adde51aa3828738265fb5d..2a79fad44b8f5831a4dee3e96b97b2740254000b 100644 (file)
--- a/gr-usrp2/src/usrp2.i
+++ b/gr-usrp2/src/usrp2.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,14 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-%feature("autodoc", "1");              // generate python docstrings
-
-%include "exception.i"
-%import "gnuradio.i"                   // the common stuff
-%import <stdint.i>     
+%include "gnuradio.i"  // the common stuff
+%import <stdint.i>
 
 %{
-#include <gnuradio_swig_bug_workaround.h>
 #include "usrp2_source_16sc.h"
 #include "usrp2_source_32fc.h"
 #include "usrp2_sink_16sc.h"
@@ -35,6 +31,8 @@
 %}
 
 %include <usrp2/tune_result.h>
+%include <usrp2/mimo_config.h>
+%include <usrp2/metadata.h>
 
 %template(uint32_t_vector) std::vector<uint32_t>;
 
@@ -49,9 +47,12 @@ public:
   ~usrp2_base();
 
   std::string mac_addr() const;
+  std::string interface_name() const;
   %rename(_real_fpga_master_clock_freq) fpga_master_clock_freq;
   bool fpga_master_clock_freq(long *freq);
+  bool config_mimo(int flags);
   bool sync_to_pps();
+  bool sync_every_pps(bool enable);
   std::vector<uint32_t> peek32(uint32_t addr, uint32_t words);
   bool poke32(uint32_t addr, const std::vector<uint32_t> &data);
 };
@@ -66,8 +67,10 @@ protected:
 public:
   ~usrp2_source_base();
 
+  bool set_antenna(int ant);
   bool set_gain(double gain);
   %rename(_real_set_center_freq) set_center_freq;
+  bool set_lo_offset(double frequency);
   bool set_center_freq(double frequency, usrp2::tune_result *r);
   bool set_decim(int decimation_factor);
   bool set_scale_iq(int scale_i, int scale_q);
@@ -83,6 +86,12 @@ public:
   bool daughterboard_id(int *dbid);
   unsigned int overruns();
   unsigned int missing();
+  bool set_gpio_ddr(uint16_t value, uint16_t mask);
+  bool set_gpio_sels(std::string sels);
+  bool write_gpio(uint16_t value, uint16_t mask);
+  %rename(_real_read_gpio) read_gpio;
+  bool read_gpio(uint16_t *value);
+  bool enable_gpio_streaming(int enable);
 };
 
 // ----------------------------------------------------------------
@@ -131,8 +140,10 @@ protected:
 public:
   ~usrp2_sink_base();
 
+  bool set_antenna(int ant);
   bool set_gain(double gain);
   %rename(_real_set_center_freq) set_center_freq;
+  bool set_lo_offset(double frequency);
   bool set_center_freq(double frequency, usrp2::tune_result *r);
   bool set_interp(int interp_factor);
   bool set_scale_iq(int scale_i, int scale_q);
@@ -148,6 +159,12 @@ public:
   double freq_max();
   %rename(_real_daughterboard_id) daughterboard_id;
   bool daughterboard_id(int *dbid);
+  bool set_gpio_ddr(uint16_t value, uint16_t mask);
+  bool set_gpio_sels(std::string sels);
+  bool write_gpio(uint16_t value, uint16_t mask);
+  %rename(_real_read_gpio) read_gpio;
+  bool read_gpio(uint16_t *value);
+  bool start_streaming_at(usrp2::fpga_timestamp time);
 };
 
 // ----------------------------------------------------------------
@@ -190,12 +207,15 @@ public:
 
 // some utility functions to allow Python to deal with pointers
 %{
-  long *make_long_ptr() { return (long *)malloc(sizeof(long)); }
+  long *make_long_ptr() { return new 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)); }
+  void free_long_ptr(long *l) { delete l; }
+  int *make_int_ptr() { return new int; }
   int deref_int_ptr(int *l) { return *l; }
-  void free_int_ptr(int *l) { free(l); }
+  void free_int_ptr(int *l) { delete l; }
+  uint16_t *make_uint16_ptr() { return new uint16_t; }
+  int deref_uint16_ptr(uint16_t *l) { return *l; }
+  void free_uint16_ptr(uint16_t *l) { delete l; }
 %}
 
 long *make_long_ptr();
@@ -204,6 +224,9 @@ void free_long_ptr(long *l);
 int *make_int_ptr();
 int deref_int_ptr(int *l);
 void free_int_ptr(int *l);
+uint16_t *make_uint16_ptr();
+int deref_uint16_ptr(uint16_t *l);
+void free_uint16_ptr(uint16_t *l);
 
 // create a more pythonic interface
 %pythoncode %{
@@ -274,6 +297,17 @@ def __default_tx_scale_iq(self, interp):
   self._real_default_tx_scale_iq(interp, scale_i, scale_q)
   return (deref_int_ptr(scale_i), deref_int_ptr(scale_q))
 
+def __read_gpio(self):
+  value = make_uint16_ptr()
+  r = self._real_read_gpio(value)
+  if r:
+    result = deref_uint16_ptr(value)
+  else:
+    result = None
+  free_uint16_ptr(value)
+  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
@@ -307,4 +341,9 @@ usrp2_sink_16sc_sptr.daughterboard_id = __daughterboard_id
 usrp2_sink_32fc_sptr.default_scale_iq = __default_tx_scale_iq
 usrp2_sink_16sc_sptr.default_scale_iq = __default_tx_scale_iq
 
+usrp2_source_32fc_sptr.read_gpio = __read_gpio
+usrp2_source_16sc_sptr.read_gpio = __read_gpio
+usrp2_sink_32fc_sptr.read_gpio = __read_gpio
+usrp2_sink_16sc_sptr.read_gpio = __read_gpio
+
 %}