X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=python%2Fftdi1.i;h=f397f84eb89c4d84adea104aa8c03f4f839c883c;hp=1e820dd8762c41cd771f5fb298ab8f124eed3c0f;hb=3eca5150db07262c1c6eb737e12149201f631d47;hpb=c5285326555f088e7626dfa67ea7059e094d6e73

diff --git a/python/ftdi1.i b/python/ftdi1.i
index 1e820dd..f397f84 100644
--- a/python/ftdi1.i
+++ b/python/ftdi1.i
@@ -10,14 +10,27 @@
 %{
 #include "Python.h"
 
-PyObject* convertString( const char *v, Py_ssize_t len )
+inline PyObject* charp2str(const char *v_, long len)
 {
 #if PY_MAJOR_VERSION >= 3
-  return PyBytes_FromStringAndSize(v, len);
+  return PyBytes_FromStringAndSize(v_, len);
 #else
-  return PyString_FromStringAndSize(v, len);
+  return PyString_FromStringAndSize(v_, len);
 #endif
 }
+
+char * str2charp_size(PyObject* pyObj, int * size)
+{
+  char * v_ = 0;
+  Py_ssize_t len = 0;
+#if PY_MAJOR_VERSION >= 3
+  PyBytes_AsStringAndSize(pyObj, &v_, &len);
+#else
+  PyString_AsStringAndSize(pyObj, &v_, &len);
+#endif
+  *size = len;
+  return v_;
+}
 %}
 
 %include <typemaps.i>
@@ -49,27 +62,48 @@ PyObject* convertString( const char *v, Py_ssize_t len )
 "usb_get_strings(context, device) -> (return_code, manufacturer, description, serial)"
 %enddef
 %feature("autodoc", ftdi_usb_get_strings_docstring) ftdi_usb_get_strings;
+%feature("autodoc", ftdi_usb_get_strings_docstring) ftdi_usb_get_strings2;
+%feature("autodoc", ftdi_usb_get_strings_docstring) ftdi_eeprom_get_strings;
 %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 * product, 256 );
 %cstring_bounded_output( char * serial, 256 );
-%typemap(default,noblock=1) int mnf_len, int desc_len, int serial_len { $1 = 256; }
+%typemap(default,noblock=1) int mnf_len, int desc_len, int product_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);
+    int ftdi_usb_get_strings2(struct ftdi_context *ftdi, struct libusb_device *dev,
+                              char * manufacturer, int mnf_len,
+                              char * description, int desc_len,
+                              char * serial, int serial_len);
+    int ftdi_eeprom_get_strings(struct ftdi_context *ftdi,
+                                char *manufacturer, int mnf_len,
+                                char *product, int product_len,
+                                char *serial, int serial_len);
+
 %clear char * manufacturer, char * description, char * serial;
-%clear int mnf_len, int desc_len, int serial_len;
+%clear char * product;
+%clear int mnf_len, int desc_len, int product_len, int serial_len;
 
 %define ftdi_read_data_docstring
 "read_data(context) -> (return_code, buf)"
 %enddef
 %feature("autodoc", ftdi_read_data_docstring) ftdi_read_data;
 %typemap(in,numinputs=1) (unsigned char *buf, int size) %{ $2 = PyInt_AsLong($input);$1 = (unsigned char*)malloc($2*sizeof(char)); %}
-%typemap(argout) (unsigned char *buf, int size) %{ if(result<0) $2=0; $result = SWIG_Python_AppendOutput($result, convertString((char*)$1, $2)); free($1); %}
+%typemap(argout) (unsigned char *buf, int size) %{ if(result<0) $2=0; $result = SWIG_Python_AppendOutput($result, charp2str((char*)$1, $2)); free($1); %}
     int ftdi_read_data(struct ftdi_context *ftdi, unsigned char *buf, int size);
 %clear (unsigned char *buf, int size);
 
+%define ftdi_write_data_docstring
+"write_data(context, data) -> return_code"
+%enddef
+%feature("autodoc", ftdi_write_data_docstring) ftdi_write_data;
+%typemap(in,numinputs=1) (const unsigned char *buf, int size) %{ $1 = (unsigned char*)str2charp_size($input, &$2); %}
+    int ftdi_write_data(struct ftdi_context *ftdi, const unsigned char *buf, int size);
+%clear (const unsigned char *buf, int size);
+
 %apply int *OUTPUT { unsigned int *chunksize };
     int ftdi_read_data_get_chunksize(struct ftdi_context *ftdi, unsigned int *chunksize);
     int ftdi_write_data_get_chunksize(struct ftdi_context *ftdi, unsigned int *chunksize);
@@ -80,12 +114,12 @@ PyObject* convertString( const char *v, Py_ssize_t len )
 %enddef
 %feature("autodoc", ftdi_read_pins_docstring) ftdi_read_pins;
 %typemap(in,numinputs=0) unsigned char *pins ($*ltype temp) %{ $1 = &temp; %}
-%typemap(argout) (unsigned char *pins) %{ $result = SWIG_Python_AppendOutput($result, convertString((char*)$1, 1)); %}
+%typemap(argout) (unsigned char *pins) %{ $result = SWIG_Python_AppendOutput($result, charp2str((char*)$1, 1)); %}
     int ftdi_read_pins(struct ftdi_context *ftdi, unsigned char *pins);
 %clear unsigned char *pins;
 
 %typemap(in,numinputs=0) unsigned char *latency ($*ltype temp) %{ $1 = &temp; %}
-%typemap(argout) (unsigned char *latency) %{ $result = SWIG_Python_AppendOutput($result, convertString((char*)$1, 1)); %}
+%typemap(argout) (unsigned char *latency) %{ $result = SWIG_Python_AppendOutput($result, charp2str((char*)$1, 1)); %}
     int ftdi_get_latency_timer(struct ftdi_context *ftdi, unsigned char *latency);
 %clear unsigned char *latency;
 
@@ -98,7 +132,7 @@ PyObject* convertString( const char *v, Py_ssize_t len )
 %clear int* value;
 
 %typemap(in,numinputs=1) (unsigned char *buf, int size) %{ $2 = PyInt_AsLong($input);$1 = (unsigned char*)malloc($2*sizeof(char)); %}
-%typemap(argout) (unsigned char *buf, int size) %{ if(result<0) $2=0; $result = SWIG_Python_AppendOutput($result, convertString((char*)$1, $2)); free($1); %}
+%typemap(argout) (unsigned char *buf, int size) %{ if(result<0) $2=0; $result = SWIG_Python_AppendOutput($result, charp2str((char*)$1, $2)); free($1); %}
     int ftdi_get_eeprom_buf(struct ftdi_context *ftdi, unsigned char * buf, int size);
 %clear (unsigned char *buf, int size);