Python wrapper update

[libftdi] / bindings / ftdi.i

diff --git a/bindings/ftdi.i b/bindings/ftdi.i
index edad474..54a45e6 100644 (file)
--- a/bindings/ftdi.i
+++ b/bindings/ftdi.i
@@ -2,9 +2,8 @@
 
 %module(docstring="Python interface to libftdi") ftdi
 
-%include "typemaps.i"
-%include "cpointer.i"
-%include "cstring.i"
+%include <typemaps.i>
+%include <cstring.i>
 
 %typemap(in) unsigned char* = char*;
 
@@ -16,19 +15,28 @@
 
 %rename("%(strip:[ftdi_])s") "";
 
-%apply char *OUTPUT { char * manufacturer };
-%apply char *OUTPUT { char * description };
-%apply char *OUTPUT { char * serial };
+%newobject ftdi_new;
+%typemap(newfree) struct ftdi_context *ftdi "ftdi_free($1);";
+%delobject ftdi_free;
+
+%typemap(in,numinputs=0) SWIGTYPE** OUTPUT ($*ltype temp) %{ $1 = &temp; %}
+%typemap(argout) SWIGTYPE** OUTPUT %{ $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj((void*)*$1,$*descriptor,0)); %}
+%apply SWIGTYPE** OUTPUT { struct ftdi_device_list **devlist };
+    int ftdi_usb_find_all(struct ftdi_context *ftdi, struct ftdi_device_list **devlist,
+                          int vendor, int product);
+%clear struct ftdi_device_list **devlist;
+
+%apply char *OUTPUT { char * manufacturer, char * description, char * serial };
 %cstring_bounded_output( char * manufacturer, 256 );
 %cstring_bounded_output( char * description, 256 );
 %cstring_bounded_output( char * serial, 256 );
+%typemap(default,noblock=1) int mnf_len, int desc_len, int serial_len { $1 = 256; }
     int ftdi_usb_get_strings(struct ftdi_context *ftdi, struct libusb_device *dev,
                              char * manufacturer, int mnf_len,
                              char * description, int desc_len,
                              char * serial, int serial_len);
-%clear char * manufacturer;
-%clear char * description;
-%clear char * serial;
+%clear char * manufacturer, char * description, char * serial;
+%clear int mnf_len, int desc_len, int serial_len;
 
 %apply char *OUTPUT { unsigned char *buf };
     int ftdi_read_data(struct ftdi_context *ftdi, unsigned char *buf, int size);
@@ -55,6 +63,15 @@
     int ftdi_get_eeprom_value(struct ftdi_context *ftdi, enum ftdi_eeprom_value value_name, int* value);
 %clear int* value;
 
+%apply char *OUTPUT { unsigned char *buf };
+%typemap(in,numinputs=0) unsigned char *buf(char temp[FTDI_MAX_EEPROM_SIZE]) %{ $1 = ($1_ltype) temp; %}
+%typemap(freearg,match="in") unsigned char *buf "";
+%typemap(argout,fragment="SWIG_FromCharPtrAndSize") unsigned char *buf %{ $result = SWIG_Python_AppendOutput($result, SWIG_FromCharPtrAndSize((char*)$1,FTDI_MAX_EEPROM_SIZE)); %}
+%typemap(default,noblock=1) int size { $1 = 128; }
+    int ftdi_get_eeprom_buf(struct ftdi_context *ftdi, unsigned char * buf, int size);
+%clear unsigned char *buf;
+%clear int size;
+
 %apply short *OUTPUT { unsigned short *eeprom_val };
     int ftdi_read_eeprom_location (struct ftdi_context *ftdi, int eeprom_addr, unsigned short *eeprom_val);
 %clear unsigned short *eeprom_val;
@@ -72,5 +89,3 @@
 %{
 #include <ftdi_i.h>
 %}
-
-%pointer_functions(struct ftdi_device_list *, device_listpp)