Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

spi: Make Spi write() work from SWIG with typemaps

Browse Source 
This change also changes the C++ API write(char) call to writeByte(uint8_t) and
the write() call now takes a uint8_t* instead of a char*. This should not alter
any code significantly and does not affect the C API.

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2015-01-14 11:41:43 +00:00
parent 17ee0c9669
commit b7a0856f51
6 changed files with 160 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/python/python-mraa.i
View File

@@ -16,13 +16,36 @@
}
}
// Spi write()
%typemap(in) (uint8_t *txBuf, int length) {
if (PyByteArray_Check($input)) {
// whilst this may seem 'hopeful' it turns out this is safe
$1 = (uint8_t*) PyByteArray_AsString($input);
$2 = PyByteArray_Size($input);
}
}
namespace mraa {
class I2c;
%typemap(out) uint8_t*
{
// need to loop over length
$result = PyByteArray_FromStringAndSize((char*) $1, arg2);
}
class Spi;
%typemap(out) uint8_t*
{
// need to loop over length
$result = PyByteArray_FromStringAndSize((char*) $1, arg3);
}
}
%newobject I2c::read(uint8_t *data, int length);
%newobject Spi::write(uint8_t *data, int length);
%newobject Spi::transfer(uint8_t *txBuf, uint8_t *rxBuf, int length);
// I2c::read()
%typemap(in) (uint8_t *data, int length) {
if (!PyInt_Check($input)) {
@@ -49,5 +72,31 @@
free($1);
}
// Spi::transfer()
%typemap(in) (uint8_t* txBuf, uint8_t* rxBuf, int length) {
if (!PyInt_Check($input)) {
PyErr_SetString(PyExc_ValueError, "Expecting an integer");
return NULL;
}
$3 = PyInt_AsLong($input);
if ($3 < 0) {
PyErr_SetString(PyExc_ValueError, "Positive integer expected");
return NULL;
}
$2 = (uint8_t*) malloc($3 * sizeof(uint8_t));
}
%typemap(argout) (uint8_t* txBuf, uint8_t* rxBuf, int length) {
Py_XDECREF($result); /* Blow away any previous result */
if (result != MRAA_SUCCESS) { /* Check for I/O error */
free($2);
PyErr_SetFromErrno(PyExc_IOError);
return NULL;
}
$result = PyByteArray_FromStringAndSize((char*) $2, $3);
free($2);
}
%include ../mraa.i