[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-301-g62fd960
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2014-06-24 16:08:42
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 62fd960209325beea1ea20300a18a3335c8ab61c (commit)
from 87cfe2e87bdd1bdb61a86170470983eeb5c276de (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 62fd960209325beea1ea20300a18a3335c8ab61c
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 24 18:08:00 2014 +0200
[ASDEVICES] Lindent of Python module C wrappers
-----------------------------------------------------------------------
Summary of changes:
.../packages/as_devices/python/src/Apf27Pwm_wrap.c | 333 ++++++------
.../packages/as_devices/python/src/Apf27Pwm_wrap.h | 46 +-
target/packages/as_devices/python/src/AsAdc_wrap.c | 158 +++---
target/packages/as_devices/python/src/AsAdc_wrap.h | 6 +-
target/packages/as_devices/python/src/AsDac_wrap.c | 163 +++---
target/packages/as_devices/python/src/AsDac_wrap.h | 6 +-
.../packages/as_devices/python/src/AsGpio_wrap.c | 485 ++++++++---------
.../packages/as_devices/python/src/AsGpio_wrap.h | 22 +-
target/packages/as_devices/python/src/AsI2c_wrap.c | 563 ++++++++++----------
target/packages/as_devices/python/src/AsI2c_wrap.h | 23 +-
target/packages/as_devices/python/src/AsSpi_wrap.c | 515 +++++++++----------
target/packages/as_devices/python/src/AsSpi_wrap.h | 22 +-
12 files changed, 1091 insertions(+), 1251 deletions(-)
diff --git a/target/packages/as_devices/python/src/Apf27Pwm_wrap.c b/target/packages/as_devices/python/src/Apf27Pwm_wrap.c
index fbd5cf2..f226cc5 100644
--- a/target/packages/as_devices/python/src/Apf27Pwm_wrap.c
+++ b/target/packages/as_devices/python/src/Apf27Pwm_wrap.c
@@ -5,247 +5,224 @@
* @param aPwmNumber The pwm number used
* @return PyObject
*/
-static PyObject * init(PyObject *self, PyObject *args)
+static PyObject *init(PyObject * self, PyObject * args)
{
- int aPwmNumber;
- int ret=1;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
- return NULL;
-
- ret = as_apf27_pwm_init(aPwmNumber);
- if(ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Initialization error. Is kernel module loaded ?");
- return NULL;
- }
-
- return Py_BuildValue("i",ret);
+ int aPwmNumber;
+ int ret = 1;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
+ return NULL;
+
+ ret = as_apf27_pwm_init(aPwmNumber);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError,
+ "Initialization error. Is kernel module loaded ?");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
/** Set frequency
* @param aPwmNumber the pwm number used
* @param aFrequency frequency to set in Hz
*/
-static PyObject * setFrequency(PyObject *self, PyObject *args)
+static PyObject *setFrequency(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
- int aFrequency;
-
- int ret=0;
-
- /* Get arguments */
- if(!PyArg_ParseTuple(args, "ii", &aPwmNumber, &aFrequency))
- {
- return NULL;
- }
-
- ret = as_apf27_pwm_setFrequency(aPwmNumber, aFrequency);
- if(ret<0)
- {
- PyErr_SetString(PyExc_Exception,"Can't set frequency");
- return NULL;
- }
-
- return Py_BuildValue("i",ret);
+ /* parameters */
+ int aPwmNumber;
+ int aFrequency;
+
+ int ret = 0;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "ii", &aPwmNumber, &aFrequency)) {
+ return NULL;
+ }
+
+ ret = as_apf27_pwm_setFrequency(aPwmNumber, aFrequency);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't set frequency");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
/** Get Frequency
* @param aPwmNumber the pwm number used
*/
-static PyObject * getFrequency(PyObject *self, PyObject *args)
+static PyObject *getFrequency(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
+ /* parameters */
+ int aPwmNumber;
- int ret=1;
+ int ret = 1;
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
- return NULL;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
+ return NULL;
- ret = as_apf27_pwm_getFrequency(aPwmNumber);
- if(ret < 0)
- {
- PyErr_SetString(PyExc_Exception,
- "Can't get frequency");
- return NULL;
- }
+ ret = as_apf27_pwm_getFrequency(aPwmNumber);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't get frequency");
+ return NULL;
+ }
- return Py_BuildValue("i",ret);
+ return Py_BuildValue("i", ret);
}
-static PyObject * setPeriod(PyObject *self, PyObject *args)
+static PyObject *setPeriod(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
- int aPeriod;
-
- int ret=0;
-
- /* Get arguments */
- if(!PyArg_ParseTuple(args, "ii", &aPwmNumber, &aPeriod))
- {
- return NULL;
- }
-
- ret = as_apf27_pwm_setPeriod(aPwmNumber, aPeriod);
- if(ret<0)
- {
- PyErr_SetString(PyExc_Exception,"Can't set period");
- return NULL;
- }
-
- return Py_BuildValue("i",ret);
+ /* parameters */
+ int aPwmNumber;
+ int aPeriod;
+
+ int ret = 0;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "ii", &aPwmNumber, &aPeriod)) {
+ return NULL;
+ }
+
+ ret = as_apf27_pwm_setPeriod(aPwmNumber, aPeriod);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't set period");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * getPeriod(PyObject *self, PyObject *args)
+static PyObject *getPeriod(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
+ /* parameters */
+ int aPwmNumber;
- int ret=1;
+ int ret = 1;
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
- return NULL;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
+ return NULL;
- ret = as_apf27_pwm_getPeriod(aPwmNumber);
- if(ret < 0)
- {
- PyErr_SetString(PyExc_Exception,
- "Can't get period");
- return NULL;
- }
-
- return Py_BuildValue("i",ret);
+ ret = as_apf27_pwm_getPeriod(aPwmNumber);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't get period");
+ return NULL;
+ }
+ return Py_BuildValue("i", ret);
}
-static PyObject * setDuty(PyObject *self, PyObject *args)
+static PyObject *setDuty(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
- int aDuty;
-
- int ret=0;
-
- /* Get arguments */
- if(!PyArg_ParseTuple(args, "ii", &aPwmNumber, &aDuty))
- {
- return NULL;
- }
-
- ret = as_apf27_pwm_setDuty(aPwmNumber, aDuty);
- if(ret<0)
- {
- PyErr_SetString(PyExc_Exception,"Can't set duty");
- return NULL;
- }
-
- return Py_BuildValue("i",ret);
+ /* parameters */
+ int aPwmNumber;
+ int aDuty;
+
+ int ret = 0;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "ii", &aPwmNumber, &aDuty)) {
+ return NULL;
+ }
+
+ ret = as_apf27_pwm_setDuty(aPwmNumber, aDuty);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't set duty");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * getDuty(PyObject *self, PyObject *args)
+static PyObject *getDuty(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
+ /* parameters */
+ int aPwmNumber;
- int ret=1;
+ int ret = 1;
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
- return NULL;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
+ return NULL;
- ret = as_apf27_pwm_getDuty(aPwmNumber);
- if(ret < 0)
- {
- PyErr_SetString(PyExc_Exception,
- "Can't get duty");
- return NULL;
- }
+ ret = as_apf27_pwm_getDuty(aPwmNumber);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't get duty");
+ return NULL;
+ }
- return Py_BuildValue("i",ret);
+ return Py_BuildValue("i", ret);
}
-static PyObject * activate(PyObject *self, PyObject *args)
+static PyObject *activate(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
- int aEnable;
+ /* parameters */
+ int aPwmNumber;
+ int aEnable;
- int ret=1;
+ int ret = 1;
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "ii", &aPwmNumber,&aEnable))
- return NULL;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "ii", &aPwmNumber, &aEnable))
+ return NULL;
- ret = as_apf27_pwm_activate(aPwmNumber,aEnable);
- if(ret < 0)
- {
- PyErr_SetString(PyExc_Exception,
- "Can't activate pwm");
- return NULL;
- }
+ ret = as_apf27_pwm_activate(aPwmNumber, aEnable);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't activate pwm");
+ return NULL;
+ }
- return Py_BuildValue("i",ret);
+ return Py_BuildValue("i", ret);
}
-static PyObject * getState(PyObject *self, PyObject *args)
+static PyObject *getState(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
+ /* parameters */
+ int aPwmNumber;
- int ret=1;
+ int ret = 1;
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
- return NULL;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
+ return NULL;
- ret = as_apf27_pwm_getState(aPwmNumber);
- if(ret < 0)
- {
- PyErr_SetString(PyExc_Exception,
- "Can't get state");
- return NULL;
- }
+ ret = as_apf27_pwm_getState(aPwmNumber);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't get state");
+ return NULL;
+ }
- return Py_BuildValue("i",ret);
+ return Py_BuildValue("i", ret);
}
-static PyObject * pwm_close(PyObject *self, PyObject *args)
+static PyObject *pwm_close(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
+ /* parameters */
+ int aPwmNumber;
- int ret=1;
+ int ret = 1;
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
- return NULL;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
+ return NULL;
- ret = as_apf27_pwm_close(aPwmNumber);
- if(ret < 0)
- {
- PyErr_SetString(PyExc_Exception,
- "Can't close");
- return NULL;
- }
+ ret = as_apf27_pwm_close(aPwmNumber);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't close");
+ return NULL;
+ }
- return Py_BuildValue("i",ret);
+ return Py_BuildValue("i", ret);
}
void initApf27Pwm_wrap()
{
- PyObject *m;
-
- m = Py_InitModule("Apf27Pwm_wrap", Apf27Pwm_wrap_Methods);
- if (m == NULL)
- return;
+ PyObject *m;
+ m = Py_InitModule("Apf27Pwm_wrap", Apf27Pwm_wrap_Methods);
+ if (m == NULL)
+ return;
}
-
diff --git a/target/packages/as_devices/python/src/Apf27Pwm_wrap.h b/target/packages/as_devices/python/src/Apf27Pwm_wrap.h
index 1a9cf83..6aad8ed 100644
--- a/target/packages/as_devices/python/src/Apf27Pwm_wrap.h
+++ b/target/packages/as_devices/python/src/Apf27Pwm_wrap.h
@@ -1,41 +1,39 @@
#include <Python.h>
-
/* init module */
void initApf27Pwm();
/*********************/
/* Functions wrapped */
/*********************/
-static PyObject * init(PyObject *self, PyObject *args);
+static PyObject *init(PyObject * self, PyObject * args);
-static PyObject * setFrequency(PyObject *self, PyObject *args);
-static PyObject * getFrequency(PyObject *self, PyObject *args);
+static PyObject *setFrequency(PyObject * self, PyObject * args);
+static PyObject *getFrequency(PyObject * self, PyObject * args);
-static PyObject * setPeriod(PyObject *self, PyObject *args);
-static PyObject * getPeriod(PyObject *self, PyObject *args);
+static PyObject *setPeriod(PyObject * self, PyObject * args);
+static PyObject *getPeriod(PyObject * self, PyObject * args);
-static PyObject * setDuty(PyObject *self, PyObject *args);
-static PyObject * getDuty(PyObject *self, PyObject *args);
+static PyObject *setDuty(PyObject * self, PyObject * args);
+static PyObject *getDuty(PyObject * self, PyObject * args);
-static PyObject * activate(PyObject *self, PyObject *args);
-static PyObject * getState(PyObject *self, PyObject *args);
+static PyObject *activate(PyObject * self, PyObject * args);
+static PyObject *getState(PyObject * self, PyObject * args);
-static PyObject * pwm_close(PyObject *self, PyObject *args);
+static PyObject *pwm_close(PyObject * self, PyObject * args);
/* Methods definition */
static PyMethodDef Apf27Pwm_wrap_Methods[] = {
- {"init", init , METH_VARARGS, "Initialize pwm"},
- {"setFrequency", setFrequency , METH_VARARGS, "Set frequency in Hz"},
- {"getFrequency", getFrequency , METH_VARARGS, "Get frequency in Hz"},
- {"setPeriod" , setPeriod , METH_VARARGS, "Set period in us"},
- {"getPeriod" , getPeriod , METH_VARARGS, "Get period in us"},
- {"setDuty" , setDuty , METH_VARARGS, "Set duty in 1/1000"},
- {"getDuty" , getDuty , METH_VARARGS, "Get duty in 1/1000"},
- {"activate" , activate , METH_VARARGS, "Activate or desactivate pwm"},
- {"getState" , getState , METH_VARARGS, "Get state of pwm (activated or not"},
- {"pwm_close" , pwm_close , METH_VARARGS, "Close pwm"},
- {NULL, NULL, 0, NULL} /* Sentinel */
+ {"init", init, METH_VARARGS, "Initialize PWM"},
+ {"setFrequency", setFrequency, METH_VARARGS, "Set frequency in Hz"},
+ {"getFrequency", getFrequency, METH_VARARGS, "Get frequency in Hz"},
+ {"setPeriod", setPeriod, METH_VARARGS, "Set period in us"},
+ {"getPeriod", getPeriod, METH_VARARGS, "Get period in us"},
+ {"setDuty", setDuty, METH_VARARGS, "Set duty in 1/1000"},
+ {"getDuty", getDuty, METH_VARARGS, "Get duty in 1/1000"},
+ {"activate", activate, METH_VARARGS, "Activate or desactivate PWM"},
+ {"getState", getState, METH_VARARGS,
+ "Get state of PWM (activated or not)"},
+ {"pwm_close", pwm_close, METH_VARARGS, "Close PWM"},
+ {NULL, NULL, 0, NULL} /* Sentinel */
};
-
-
diff --git a/target/packages/as_devices/python/src/AsAdc_wrap.c b/target/packages/as_devices/python/src/AsAdc_wrap.c
index 6179052..c45ac19 100644
--- a/target/packages/as_devices/python/src/AsAdc_wrap.c
+++ b/target/packages/as_devices/python/src/AsAdc_wrap.c
@@ -18,110 +18,98 @@
** License along with this library; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
#include "AsAdc_wrap.h"
#include "as_adc.h"
-
/* Methods definitions */
static PyMethodDef AsAdc_wrap_methods[] = {
- {"adc_open", adc_open, METH_VARARGS, "Initialize adc"},
- {"getValueInMillivolts", getValueInMillivolts, METH_VARARGS, "Get Channel value in millivolts"},
- {"adc_close", adc_close, METH_VARARGS, "Close adc"},
- {NULL, NULL, 0, NULL} /* Sentinel */
+ {"adc_open", adc_open, METH_VARARGS, "Initialize adc"},
+ {"getValueInMillivolts", getValueInMillivolts, METH_VARARGS,
+ "Get Channel value in millivolts"},
+ {"adc_close", adc_close, METH_VARARGS, "Close adc"},
+ {NULL, NULL, 0, NULL} /* Sentinel */
};
/* Init module */
-void initAsAdc_wrap() /* called on first import */
-{ /* name matter if called dynamically */
- (void) Py_InitModule("AsAdc_wrap", AsAdc_wrap_methods); /* mod name, table ptr */
+void initAsAdc_wrap()
+{ /* called on first import *//* name matter if called dynamically */
+ (void)Py_InitModule("AsAdc_wrap", AsAdc_wrap_methods); /* mod name, table ptr */
}
/** @brief Initialize pin port access
* @return PyObject
*/
-static PyObject * adc_open(PyObject *self, PyObject *args)
+static PyObject *adc_open(PyObject * self, PyObject * args)
{
- /* parameters */
- char *aAdcType;
- int aDeviceNum;
- int aVref;
-
- struct as_adc_device *dev;
- PyObject *ret;
- char buff[300];
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "sii", &aAdcType, &aDeviceNum, &aVref))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
- dev = as_adc_open(aAdcType, aDeviceNum, aVref);
- if (dev == NULL)
- {
- snprintf(buff, 300,
- "Initialization error for ADC type %s bus %d. Is kernel module loaded ?",
- aAdcType, aDeviceNum);
- PyErr_SetString(PyExc_IOError,buff);
- return NULL;
- }
-
- ret = Py_BuildValue("l", (long)dev);
-
- return ret;
+ /* parameters */
+ char *aAdcType;
+ int aDeviceNum;
+ int aVref;
+
+ struct as_adc_device *dev;
+ PyObject *ret;
+ char buff[300];
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "sii", &aAdcType, &aDeviceNum, &aVref)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ dev = as_adc_open(aAdcType, aDeviceNum, aVref);
+ if (dev == NULL) {
+ snprintf(buff, 300,
+ "Initialization error for ADC type %s bus %d. Is kernel module loaded ?",
+ aAdcType, aDeviceNum);
+ PyErr_SetString(PyExc_IOError, buff);
+ return NULL;
+ }
+
+ ret = Py_BuildValue("l", (long)dev);
+
+ return ret;
}
-static PyObject * getValueInMillivolts(PyObject *self, PyObject *args)
+static PyObject *getValueInMillivolts(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_adc_device *aFdev;
- int aChannel;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "li", (long *)&aFdev, &aChannel))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_adc_get_value_in_millivolts(aFdev, aChannel);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin direction");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_adc_device *aFdev;
+ int aChannel;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "li", (long *)&aFdev, &aChannel)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_adc_get_value_in_millivolts(aFdev, aChannel);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin direction");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * adc_close(PyObject *self, PyObject *args)
+static PyObject *adc_close(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_adc_device *aFdev;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aFdev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_adc_close(aFdev);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't close port");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
-}
+ /* parameters */
+ struct as_adc_device *aFdev;
+
+ int ret;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aFdev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ ret = as_adc_close(aFdev);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't close port");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
+}
diff --git a/target/packages/as_devices/python/src/AsAdc_wrap.h b/target/packages/as_devices/python/src/AsAdc_wrap.h
index 7fa0b8f..1f62ad5 100644
--- a/target/packages/as_devices/python/src/AsAdc_wrap.h
+++ b/target/packages/as_devices/python/src/AsAdc_wrap.h
@@ -27,6 +27,6 @@ void initAsAdc_wrap();
/*********************/
/* Functions wrapped */
/*********************/
-static PyObject * adc_open(PyObject *self, PyObject *args);
-static PyObject * getValueInMillivolts(PyObject *self, PyObject *args);
-static PyObject * adc_close(PyObject *self, PyObject *args);
+static PyObject *adc_open(PyObject * self, PyObject * args);
+static PyObject *getValueInMillivolts(PyObject * self, PyObject * args);
+static PyObject *adc_close(PyObject * self, PyObject * args);
diff --git a/target/packages/as_devices/python/src/AsDac_wrap.c b/target/packages/as_devices/python/src/AsDac_wrap.c
index 7f76582..69811e7 100644
--- a/target/packages/as_devices/python/src/AsDac_wrap.c
+++ b/target/packages/as_devices/python/src/AsDac_wrap.c
@@ -18,112 +18,101 @@
** License along with this library; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
#include "AsDac_wrap.h"
#include "as_dac.h"
/* Methods definitions */
static PyMethodDef AsDac_wrap_methods[] = {
- {"dac_open", dac_open, METH_VARARGS, "Initialize dac"},
- {"dac_setValueInMillivolts", dac_setValueInMillivolts, METH_VARARGS, "Set Channel value in millivolts"},
- {"dac_close", dac_close, METH_VARARGS, "Close dac"},
- {NULL, NULL, 0, NULL} /* Sentinel */
+ {"dac_open", dac_open, METH_VARARGS, "Initialize dac"},
+ {"dac_setValueInMillivolts", dac_setValueInMillivolts, METH_VARARGS,
+ "Set Channel value in millivolts"},
+ {"dac_close", dac_close, METH_VARARGS, "Close dac"},
+ {NULL, NULL, 0, NULL} /* Sentinel */
};
/* Init module */
-void initAsDac_wrap() /* called on first import */
-{ /* name matter if called dynamically */
- (void) Py_InitModule("AsDac_wrap", AsDac_wrap_methods); /* mod name, table ptr */
+void initAsDac_wrap()
+{ /* called on first import *//* name matter if called dynamically */
+ (void)Py_InitModule("AsDac_wrap", AsDac_wrap_methods); /* mod name, table ptr */
}
/** @brief Initialize pin port access
* @return PyObject
*/
-static PyObject * dac_open(PyObject *self, PyObject *args)
+static PyObject *dac_open(PyObject * self, PyObject * args)
{
- /* parameters */
- char *aDacType;
- int aBusNumber;
- int aAddress;
- int aVref;
-
- struct as_dac_device *dev;
- PyObject *ret;
- char buff[300];
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "siii", &aDacType,
- &aBusNumber, &aAddress, &aVref))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
- dev = as_dac_open(aDacType, aBusNumber, aAddress, aVref);
- if (dev == NULL)
- {
- snprintf(buff, 300,
- "Initialization error for DAC type %s bus %d. Is kernel module loaded ?",
- aDacType, aBusNumber);
- PyErr_SetString(PyExc_IOError,buff);
- return NULL;
- }
-
- ret = Py_BuildValue("l", (long)dev);
-
- return ret;
+ /* parameters */
+ char *aDacType;
+ int aBusNumber;
+ int aAddress;
+ int aVref;
+
+ struct as_dac_device *dev;
+ PyObject *ret;
+ char buff[300];
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "siii", &aDacType,
+ &aBusNumber, &aAddress, &aVref)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ dev = as_dac_open(aDacType, aBusNumber, aAddress, aVref);
+ if (dev == NULL) {
+ snprintf(buff, 300,
+ "Initialization error for DAC type %s bus %d. Is kernel module loaded ?",
+ aDacType, aBusNumber);
+ PyErr_SetString(PyExc_IOError, buff);
+ return NULL;
+ }
+
+ ret = Py_BuildValue("l", (long)dev);
+
+ return ret;
}
-static PyObject * dac_setValueInMillivolts(PyObject *self, PyObject *args)
+static PyObject *dac_setValueInMillivolts(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_dac_device *aDev;
- int aChannel;
- int aValue;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "lii", (long *)&aDev, &aChannel, &aValue))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_dac_set_value_in_millivolts(aDev, aChannel, aValue);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin direction");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_dac_device *aDev;
+ int aChannel;
+ int aValue;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "lii", (long *)&aDev, &aChannel, &aValue)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_dac_set_value_in_millivolts(aDev, aChannel, aValue);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin direction");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * dac_close(PyObject *self, PyObject *args)
+static PyObject *dac_close(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_dac_device *aDev;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aDev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_dac_close(aDev);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't close port");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
-}
+ /* parameters */
+ struct as_dac_device *aDev;
+
+ int ret;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aDev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ ret = as_dac_close(aDev);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't close port");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
+}
diff --git a/target/packages/as_devices/python/src/AsDac_wrap.h b/target/packages/as_devices/python/src/AsDac_wrap.h
index 6ba91a7..a453902 100644
--- a/target/packages/as_devices/python/src/AsDac_wrap.h
+++ b/target/packages/as_devices/python/src/AsDac_wrap.h
@@ -27,6 +27,6 @@ void initAsDac_wrap();
/*********************/
/* Functions wrapped */
/*********************/
-static PyObject * dac_open(PyObject *self, PyObject *args);
-static PyObject * dac_setValueInMillivolts(PyObject *self, PyObject *args);
-static PyObject * dac_close(PyObject *self, PyObject *args);
+static PyObject *dac_open(PyObject * self, PyObject * args);
+static PyObject *dac_setValueInMillivolts(PyObject * self, PyObject * args);
+static PyObject *dac_close(PyObject * self, PyObject * args);
diff --git a/target/packages/as_devices/python/src/AsGpio_wrap.c b/target/packages/as_devices/python/src/AsGpio_wrap.c
index 29b0da7..0eeb0b8 100644
--- a/target/packages/as_devices/python/src/AsGpio_wrap.c
+++ b/target/packages/as_devices/python/src/AsGpio_wrap.c
@@ -22,64 +22,62 @@
** - Change name of function "blockingGetPinValue" to "WaitEvent" as named
** under C library
*/
+
#include "AsGpio_wrap.h"
#include "as_gpio.h"
-
/* Methods definitions */
static PyMethodDef AsGpio_wrap_methods[] = {
- {"gpio_open", gpio_open, METH_VARARGS, "Initialize gpio"},
- {"setPinDirection", setPinDirection, METH_VARARGS, "Set pin direction"},
- {"getPinDirection", getPinDirection, METH_VARARGS, "Get pin direction"},
- {"setPinValue", setPinValue, METH_VARARGS, "Set pin value"},
- {"getPinValue", getPinValue, METH_VARARGS, "Get pin value"},
- {"blockingGetPinValue", blockingGetPinValue, METH_VARARGS, "Blocking read pin value"},
- {"getIrqMode", getIrqMode, METH_VARARGS, "Get IRQ Mode"},
- {"setIrqMode", setIrqMode, METH_VARARGS, "Set IRQ Mode"},
- {"getPinNumber", getPinNumber, METH_VARARGS, "Get pin number"},
- {"gpio_close", gpio_close, METH_VARARGS, "Close gpio"},
- {NULL, NULL, 0, NULL} /* Sentinel */
+ {"gpio_open", gpio_open, METH_VARARGS, "Initialize gpio"},
+ {"setPinDirection", setPinDirection, METH_VARARGS, "Set pin direction"},
+ {"getPinDirection", getPinDirection, METH_VARARGS, "Get pin direction"},
+ {"setPinValue", setPinValue, METH_VARARGS, "Set pin value"},
+ {"getPinValue", getPinValue, METH_VARARGS, "Get pin value"},
+ {"blockingGetPinValue", blockingGetPinValue, METH_VARARGS,
+ "Blocking read pin value"},
+ {"getIrqMode", getIrqMode, METH_VARARGS, "Get IRQ Mode"},
+ {"setIrqMode", setIrqMode, METH_VARARGS, "Set IRQ Mode"},
+ {"getPinNumber", getPinNumber, METH_VARARGS, "Get pin number"},
+ {"gpio_close", gpio_close, METH_VARARGS, "Close gpio"},
+ {NULL, NULL, 0, NULL} /* Sentinel */
};
/* Init module */
-void initAsGpio_wrap() /* called on first import */
-{ /* name matter if called dynamically */
- (void) Py_InitModule("AsGpio_wrap", AsGpio_wrap_methods); /* mod name, table ptr */
+void initAsGpio_wrap()
+{ /* called on first import *//* name matter if called dynamically */
+ (void)Py_InitModule("AsGpio_wrap", AsGpio_wrap_methods); /* mod name, table ptr */
}
/** @brief Initialize pin port access
* @param aGpioNum pin number on port
* @return PyObject
*/
-static PyObject * gpio_open(PyObject *self, PyObject *args)
+static PyObject *gpio_open(PyObject * self, PyObject * args)
{
- /* parameters */
- int aGpioNum;
-
- struct as_gpio_device *dev;
- PyObject *ret;
- char buff[300];
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aGpioNum))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- dev = as_gpio_open(aGpioNum);
- if (dev == NULL)
- {
- snprintf(buff, 300,
- "Initialization error %d. Is kernel module loaded ?",
- aGpioNum);
- PyErr_SetString(PyExc_IOError,buff);
- return NULL;
- }
-
- ret = Py_BuildValue("l", (long)dev);
-
- return ret;
+ /* parameters */
+ int aGpioNum;
+
+ struct as_gpio_device *dev;
+ PyObject *ret;
+ char buff[300];
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aGpioNum)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ dev = as_gpio_open(aGpioNum);
+ if (dev == NULL) {
+ snprintf(buff, 300,
+ "Initialization error %d. Is kernel module loaded ?",
+ aGpioNum);
+ PyErr_SetString(PyExc_IOError, buff);
+ return NULL;
+ }
+
+ ret = Py_BuildValue("l", (long)dev);
+
+ return ret;
}
/** @brief Set pin direction
@@ -89,59 +87,49 @@ static PyObject * gpio_open(PyObject *self, PyObject *args)
*
* @return error if negative value
*/
-static PyObject * setPinDirection(PyObject *self, PyObject *args)
+static PyObject *setPinDirection(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
- char* aDirection;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "ls",
- (long *)&aFdev,
- &aDirection))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_gpio_set_pin_direction(aFdev, aDirection);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't set pin direction");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+ char *aDirection;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "ls", (long *)&aFdev, &aDirection)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_gpio_set_pin_direction(aFdev, aDirection);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't set pin direction");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * getPinDirection(PyObject *self, PyObject *args)
+static PyObject *getPinDirection(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
-
- const char* dir;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aFdev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- dir = as_gpio_get_pin_direction(aFdev);
- if (strcmp(dir, "??"))
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin direction");
- return NULL;
- }
-
- return Py_BuildValue("s", dir);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+
+ const char *dir;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aFdev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ dir = as_gpio_get_pin_direction(aFdev);
+ if (strcmp(dir, "??")) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin direction");
+ return NULL;
+ }
+
+ return Py_BuildValue("s", dir);
}
/** @brief Set pin value
@@ -151,31 +139,27 @@ static PyObject * getPinDirection(PyObject *self, PyObject *args)
*
* @return error if negative
*/
-static PyObject * setPinValue(PyObject *self, PyObject *args)
+static PyObject *setPinValue(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
- int aValue;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "li", (long *)&aFdev, &aValue))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_gpio_set_pin_value(aFdev, aValue);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't set pin value");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+ int aValue;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "li", (long *)&aFdev, &aValue)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_gpio_set_pin_value(aFdev, aValue);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't set pin value");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
@@ -186,30 +170,26 @@ static PyObject * setPinValue(PyObject *self, PyObject *args)
*
* @return pin value if positive or null, error if negative
*/
-static PyObject * getPinValue(PyObject *self, PyObject *args)
+static PyObject *getPinValue(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aFdev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_gpio_get_pin_value(aFdev);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin value");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aFdev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_gpio_get_pin_value(aFdev);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin value");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
/** @brief Get pin value, blocking until interrupt occur
@@ -220,40 +200,31 @@ static PyObject * getPinValue(PyObject *self, PyObject *args)
*
* @return pin value if positive or null, error if negative
*/
-static PyObject * blockingGetPinValue(PyObject *self, PyObject *args)
+static PyObject *blockingGetPinValue(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
- int aDelay_ms;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "li",
- (long *)&aFdev,
- &aDelay_ms))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
-Py_BEGIN_ALLOW_THREADS
- ret = as_gpio_wait_event(aFdev, aDelay_ms);
-Py_END_ALLOW_THREADS
- if (ret == -ETIMEDOUT)
- {
- PyErr_SetString(PyExc_IOError, "TIMEOUT");
- return NULL;
- }
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin value");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+ int aDelay_ms;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "li", (long *)&aFdev, &aDelay_ms)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ Py_BEGIN_ALLOW_THREADS ret = as_gpio_wait_event(aFdev, aDelay_ms);
+ Py_END_ALLOW_THREADS if (ret == -ETIMEDOUT) {
+ PyErr_SetString(PyExc_IOError, "TIMEOUT");
+ return NULL;
+ }
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin value");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
/** @brief Set pin irq mode
@@ -263,31 +234,27 @@ Py_END_ALLOW_THREADS
*
* @return error if negative
*/
-static PyObject * setIrqMode(PyObject *self, PyObject *args)
+static PyObject *setIrqMode(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
- char *aMode;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "ls", (long *)&aFdev, &aMode))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_gpio_set_irq_mode(aFdev, aMode);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin value");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+ char *aMode;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "ls", (long *)&aFdev, &aMode)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_gpio_set_irq_mode(aFdev, aMode);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin value");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
/** @brief Get pin irq mode value
@@ -296,30 +263,26 @@ static PyObject * setIrqMode(PyObject *self, PyObject *args)
*
* @return pin mode ("falling"/"rising"/"both"/"none")
*/
-static PyObject * getIrqMode(PyObject *self, PyObject *args)
+static PyObject *getIrqMode(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
-
- const char *mode;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aFdev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- mode = as_gpio_get_irq_mode(aFdev);
- if (strcmp(mode, "??"))
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin value");
- return NULL;
- }
-
- return Py_BuildValue("s", mode);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+
+ const char *mode;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aFdev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ mode = as_gpio_get_irq_mode(aFdev);
+ if (strcmp(mode, "??")) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin value");
+ return NULL;
+ }
+
+ return Py_BuildValue("s", mode);
}
/** @brief Get pin number value
@@ -328,30 +291,26 @@ static PyObject * getIrqMode(PyObject *self, PyObject *args)
*
* @return pin number, error if negative
*/
-static PyObject * getPinNumber(PyObject *self, PyObject *args)
+static PyObject *getPinNumber(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aFdev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_gpio_get_pin_num(aFdev);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin value");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aFdev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_gpio_get_pin_num(aFdev);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin value");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
/** @brief Close port access
@@ -360,30 +319,24 @@ static PyObject * getPinNumber(PyObject *self, PyObject *args)
*
* @return pin value if positive or null, error if negative
*/
-static PyObject * gpio_close(PyObject *self, PyObject *args)
+static PyObject *gpio_close(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aFdev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_gpio_close(aFdev);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't close port");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
-}
+ /* parameters */
+ struct as_gpio_device *aFdev;
+
+ int ret;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aFdev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ ret = as_gpio_close(aFdev);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't close port");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
+}
diff --git a/target/packages/as_devices/python/src/AsGpio_wrap.h b/target/packages/as_devices/python/src/AsGpio_wrap.h
index 9437057..0a93390 100644
--- a/target/packages/as_devices/python/src/AsGpio_wrap.h
+++ b/target/packages/as_devices/python/src/AsGpio_wrap.h
@@ -27,17 +27,17 @@ void initAsGpio_wrap();
/*********************/
/* Functions wrapped */
/*********************/
-static PyObject * gpio_open(PyObject *self, PyObject *args);
+static PyObject *gpio_open(PyObject * self, PyObject * args);
-static PyObject * setPinDirection(PyObject *self, PyObject *args);
-static PyObject * getPinDirection(PyObject *self, PyObject *args);
-static PyObject * setPinValue(PyObject *self, PyObject *args);
-static PyObject * getPinValue(PyObject *self, PyObject *args);
+static PyObject *setPinDirection(PyObject * self, PyObject * args);
+static PyObject *getPinDirection(PyObject * self, PyObject * args);
+static PyObject *setPinValue(PyObject * self, PyObject * args);
+static PyObject *getPinValue(PyObject * self, PyObject * args);
-static PyObject * blockingGetPinValue(PyObject *self, PyObject *args);
-static PyObject * getIrqMode(PyObject *self, PyObject *args);
-static PyObject * setIrqMode(PyObject *self, PyObject *args);
-static PyObject * getPinNumber(PyObject *self, PyObject *args);
-static PyObject * getPortLetter(PyObject *self, PyObject *args);
+static PyObject *blockingGetPinValue(PyObject * self, PyObject * args);
+static PyObject *getIrqMode(PyObject * self, PyObject * args);
+static PyObject *setIrqMode(PyObject * self, PyObject * args);
+static PyObject *getPinNumber(PyObject * self, PyObject * args);
+static PyObject *getPortLetter(PyObject * self, PyObject * args);
-static PyObject * gpio_close(PyObject *self, PyObject *args);
+static PyObject *gpio_close(PyObject * self, PyObject * args);
diff --git a/target/packages/as_devices/python/src/AsI2c_wrap.c b/target/packages/as_devices/python/src/AsI2c_wrap.c
index c080d55..97bed5a 100644
--- a/target/packages/as_devices/python/src/AsI2c_wrap.c
+++ b/target/packages/as_devices/python/src/AsI2c_wrap.c
@@ -21,6 +21,7 @@
* TODO:
* - Suppress MAX_DATA_SIZE macro
*/
+
#include "AsI2c_wrap.h"
#include "as_i2c.h"
@@ -28,334 +29,308 @@
/* Methods definitions */
static PyMethodDef AsI2c_wrap_methods[] = {
- {"i2c_open" , i2c_open , METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_close" , i2c_close , METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_set_slave_addr", i2c_set_slave_addr, METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_get_slave_addr", i2c_get_slave_addr, METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_read" , i2c_read , METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_write" , i2c_write , METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_read_reg" , i2c_read_reg , METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_write_reg" , i2c_write_reg , METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_read_reg_byte" , i2c_read_reg_byte , METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_write_reg_byte", i2c_write_reg_byte, METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_read_msg" , i2c_read_msg , METH_VARARGS, "as_i2c function wrapped"},
- {NULL, NULL, 0, NULL} /* Sentinel */
+ {"i2c_open", i2c_open, METH_VARARGS, "as_i2c function wrapped"},
+ {"i2c_close", i2c_close, METH_VARARGS, "as_i2c function wrapped"},
+ {"i2c_set_slave_addr", i2c_set_slave_addr, METH_VARARGS,
+ "as_i2c function wrapped"},
+ {"i2c_get_slave_addr", i2c_get_slave_addr, METH_VARARGS,
+ "as_i2c function wrapped"},
+ {"i2c_read", i2c_read, METH_VARARGS, "as_i2c function wrapped"},
+ {"i2c_write", i2c_write, METH_VARARGS, "as_i2c function wrapped"},
+ {"i2c_read_reg", i2c_read_reg, METH_VARARGS, "as_i2c function wrapped"},
+ {"i2c_write_reg", i2c_write_reg, METH_VARARGS,
+ "as_i2c function wrapped"},
+ {"i2c_read_reg_byte", i2c_read_reg_byte, METH_VARARGS,
+ "as_i2c function wrapped"},
+ {"i2c_write_reg_byte", i2c_write_reg_byte, METH_VARARGS,
+ "as_i2c function wrapped"},
+ {"i2c_read_msg", i2c_read_msg, METH_VARARGS, "as_i2c function wrapped"},
+ {NULL, NULL, 0, NULL} /* Sentinel */
};
-
/* Init module */
-void initAsI2c_wrap() /* called on first import */
-{ /* name matter if called dynamically */
- (void) Py_InitModule("AsI2c_wrap", AsI2c_wrap_methods); /* mod name, table ptr */
+void initAsI2c_wrap()
+{ /* called on first import *//* name matter if called dynamically */
+ (void)Py_InitModule("AsI2c_wrap", AsI2c_wrap_methods); /* mod name, table ptr */
}
-static PyObject * i2c_open(PyObject *self, PyObject *args)
+static PyObject *i2c_open(PyObject * self, PyObject * args)
{
- /* parameters */
- int aBusNumber;
-
- struct as_i2c_device *dev;
- PyObject *ret;
- char buff[300];
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aBusNumber))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
- dev = as_i2c_open(aBusNumber);
- if (dev == NULL)
- {
- snprintf(buff, 300,
- "Initialization error for i2c bus %d.", aBusNumber);
- PyErr_SetString(PyExc_IOError,buff);
- return NULL;
- }
- ret = Py_BuildValue("l", (long)dev);
-
- return ret;
+ /* parameters */
+ int aBusNumber;
+
+ struct as_i2c_device *dev;
+ PyObject *ret;
+ char buff[300];
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aBusNumber)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ dev = as_i2c_open(aBusNumber);
+ if (dev == NULL) {
+ snprintf(buff, 300,
+ "Initialization error for i2c bus %d.", aBusNumber);
+ PyErr_SetString(PyExc_IOError, buff);
+ return NULL;
+ }
+ ret = Py_BuildValue("l", (long)dev);
+
+ return ret;
}
-static PyObject * i2c_close(PyObject *self, PyObject *args)
+static PyObject *i2c_close(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
-
- /* return value */
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aDev)) {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
- ret = as_i2c_close(aDev);
- if (ret < 0) {
- PyErr_SetString(PyExc_IOError, "Can't close i2c");
- return Py_BuildValue("i", -1);
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_i2c_device *aDev;
+
+ /* return value */
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aDev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ ret = as_i2c_close(aDev);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't close i2c");
+ return Py_BuildValue("i", -1);
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * i2c_set_slave_addr(PyObject *self, PyObject *args)
+static PyObject *i2c_set_slave_addr(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- int aSlaveAddr;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aSlaveAddr))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_i2c_set_slave_addr(aDev, aSlaveAddr);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't set slave address");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ int aSlaveAddr;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aSlaveAddr)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_i2c_set_slave_addr(aDev, aSlaveAddr);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't set slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * i2c_get_slave_addr(PyObject *self, PyObject *args)
+static PyObject *i2c_get_slave_addr(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aDev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_i2c_get_slave_addr(aDev);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get slave address");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_i2c_device *aDev;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aDev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_i2c_get_slave_addr(aDev);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * i2c_read(PyObject *self, PyObject *args)
+static PyObject *i2c_read(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- uint8_t aData[MAX_DATA_SIZE];
- int aSize;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aSize))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- if (aSize > MAX_DATA_SIZE) {
- PyErr_SetString(PyExc_IOError,
- "Size too high");
- return NULL;
- }
-
- ret = as_i2c_read(aDev, aData, aSize);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get slave address");
- return NULL;
- }
-
- return Py_BuildValue("s#", (unsigned char *)aData, aSize);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ uint8_t aData[MAX_DATA_SIZE];
+ int aSize;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aSize)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ if (aSize > MAX_DATA_SIZE) {
+ PyErr_SetString(PyExc_IOError, "Size too high");
+ return NULL;
+ }
+
+ ret = as_i2c_read(aDev, aData, aSize);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("s#", (unsigned char *)aData, aSize);
}
-static PyObject * i2c_write(PyObject *self, PyObject *args)
+static PyObject *i2c_write(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- uint8_t *aData;
- int aSize;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "ls#", (long *)&aDev, (unsigned char *)&aData, &aSize)) {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_i2c_write(aDev, aData, aSize);
- if (ret < 0) {
- PyErr_SetString(PyExc_IOError,
- "Can't get slave address");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ uint8_t *aData;
+ int aSize;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple
+ (args, "ls#", (long *)&aDev, (unsigned char *)&aData, &aSize)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_i2c_write(aDev, aData, aSize);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * i2c_read_reg(PyObject *self, PyObject *args)
+static PyObject *i2c_read_reg(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- uint8_t aReg;
- uint8_t aData[MAX_DATA_SIZE];
- int aSize;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "lii", (long *)&aDev, &aReg, &aSize)) {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
- if (aSize > MAX_DATA_SIZE) {
- PyErr_SetString(PyExc_IOError,
- "Size too high");
- return NULL;
- }
-
- ret = as_i2c_read_reg(aDev, aReg, aData, aSize);
- if (ret < 0) {
- PyErr_SetString(PyExc_IOError,
- "Can't get slave address");
- return NULL;
- }
-
- return Py_BuildValue("s#", (unsigned char *)aData, aSize);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ uint8_t aReg;
+ uint8_t aData[MAX_DATA_SIZE];
+ int aSize;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "lii", (long *)&aDev, &aReg, &aSize)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ if (aSize > MAX_DATA_SIZE) {
+ PyErr_SetString(PyExc_IOError, "Size too high");
+ return NULL;
+ }
+
+ ret = as_i2c_read_reg(aDev, aReg, aData, aSize);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("s#", (unsigned char *)aData, aSize);
}
-static PyObject * i2c_write_reg(PyObject *self, PyObject *args)
+static PyObject *i2c_write_reg(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- uint8_t aReg;
- uint8_t *aData;
- int aSize;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "lis#", (long *)&aDev, &aReg, (unsigned char *)&aData, &aSize)) {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_i2c_write_reg(aDev, aReg, aData, aSize);
- if (ret < 0) {
- PyErr_SetString(PyExc_IOError,
- "Can't get slave address");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ uint8_t aReg;
+ uint8_t *aData;
+ int aSize;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple
+ (args, "lis#", (long *)&aDev, &aReg, (unsigned char *)&aData,
+ &aSize)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_i2c_write_reg(aDev, aReg, aData, aSize);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * i2c_read_reg_byte(PyObject *self, PyObject *args)
+static PyObject *i2c_read_reg_byte(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- uint8_t aReg;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aReg)) {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_i2c_read_reg_byte(aDev, aReg);
- if (ret < 0) {
- PyErr_SetString(PyExc_IOError,
- "Can't get slave address");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ uint8_t aReg;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aReg)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_i2c_read_reg_byte(aDev, aReg);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * i2c_read_msg(PyObject *self, PyObject *args)
+static PyObject *i2c_read_msg(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- uint8_t *aWData;
- int aWriteSize;
- uint8_t RData[MAX_DATA_SIZE];
- int aReadSize;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "ls#i", (long *)&aDev,
- (unsigned char *)&aWData, &aWriteSize,
- &aReadSize)) {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
- if (aReadSize > MAX_DATA_SIZE) {
- PyErr_SetString(PyExc_IOError,
- "Read size too high");
- return NULL;
- }
-
- ret = as_i2c_read_msg(aDev, aWData, aWriteSize, RData, aReadSize);
- if (ret < 0) {
- PyErr_SetString(PyExc_IOError,
- "Can't forge read message");
- return NULL;
- }
-
- return Py_BuildValue("s#", (unsigned char *)RData, aReadSize);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ uint8_t *aWData;
+ int aWriteSize;
+ uint8_t RData[MAX_DATA_SIZE];
+ int aReadSize;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "ls#i", (long *)&aDev,
+ (unsigned char *)&aWData, &aWriteSize,
+ &aReadSize)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ if (aReadSize > MAX_DATA_SIZE) {
+ PyErr_SetString(PyExc_IOError, "Read size too high");
+ return NULL;
+ }
+
+ ret = as_i2c_read_msg(aDev, aWData, aWriteSize, RData, aReadSize);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't forge read message");
+ return NULL;
+ }
+
+ return Py_BuildValue("s#", (unsigned char *)RData, aReadSize);
}
-
-static PyObject * i2c_write_reg_byte(PyObject *self, PyObject *args)
+static PyObject *i2c_write_reg_byte(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- uint8_t aReg;
- uint8_t aVal;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "lii", (long *)&aDev, &aReg, &aVal)) {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_i2c_write_reg_byte(aDev, aReg, aVal);
- if (ret < 0) {
- PyErr_SetString(PyExc_IOError,
- "Can't get slave address");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ uint8_t aReg;
+ uint8_t aVal;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "lii", (long *)&aDev, &aReg, &aVal)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_i2c_write_reg_byte(aDev, aReg, aVal);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-
diff --git a/target/packages/as_devices/python/src/AsI2c_wrap.h b/target/packages/as_devices/python/src/AsI2c_wrap.h
index 61b8147..aa2390b 100644
--- a/target/packages/as_devices/python/src/AsI2c_wrap.h
+++ b/target/packages/as_devices/python/src/AsI2c_wrap.h
@@ -19,7 +19,6 @@
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#include <Python.h>
/* Init module */
@@ -28,19 +27,19 @@ void initA...
[truncated message content] |