[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-336-ge607f92

[Fabien M <fa...@us...>]

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  e607f92fb9cdc1eb3a7ab615062bd4f33bc4e147 (commit)
       via  223e01c006ce6417e02dd777409b5103a7d2da6f (commit)
      from  e93ef0a43eec633fcb03a4c345457f89eca6cf9d (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 e607f92fb9cdc1eb3a7ab615062bd4f33bc4e147
Author: Fabien Marteau <fab...@ar...>
Date:   Tue May 4 16:04:02 2010 +0200

    [AsDevices] Adding irq and pullup function prototype for Python wrapper

commit 223e01c006ce6417e02dd777409b5103a7d2da6f
Author: Fabien Marteau <fab...@ar...>
Date:   Tue May 4 15:55:42 2010 +0200

    indentation

-----------------------------------------------------------------------

Summary of changes:
 target/packages/as_devices/c/as_gpio.c             |   23 ++++---
 .../packages/as_devices/python/src/AsGpio_wrap.c   |   65 ++++++++++++++++++++
 .../packages/as_devices/python/src/AsGpio_wrap.h   |    6 ++
 3 files changed, 85 insertions(+), 9 deletions(-)

diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index a2f7916..938529e 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -200,15 +200,20 @@ int32_t as_gpio_blocking_get_pin_value(struct as_gpio_device *aDev,
     int ret;
     char value;
 
-    if ( aPinNum >= PORT_SIZE ) return -1;     /* aPinNum wrong */
-    if ( aPinNum < 0 ) return -1;
+    if (aPinNum >= PORT_SIZE )
+        return -1;     /* aPinNum wrong */
+    if (aPinNum < 0 )
+        return -1;
 
-    if ( aDev->fpin[aPinNum] == -1) return -1; /* irq must be configured before */
+    if (aDev->fpin[aPinNum] == -1)
+        return -1; /* irq must be configured before */
 
     ret = read(aDev->fpin[aPinNum], &value, 1);
-    if ( ret < 0) return ret;
+    if (ret < 0)
+        return ret;
 
-    if (value != 0) return 1;
+    if (value != 0)
+        return 1;
     else return 0;
 
 }
@@ -350,22 +355,22 @@ int32_t as_gpio_set_irq_mode(struct as_gpio_device *aDev,
 
 
     /* close fpin file */
-    if ( (aMode == GPIO_IRQ_MODE_NOINT) && (aDev->fpin[aPinNum] != -1))
+    if ((aMode == GPIO_IRQ_MODE_NOINT) && (aDev->fpin[aPinNum] != -1))
     {
         close(aDev->fpin[aPinNum]);
         aDev->fpin[aPinNum] = -1;
     }
 
     /* open fpin file */
-    if ( (aMode != GPIO_IRQ_MODE_NOINT) && (aDev->fpin[aPinNum] == -1))
+    if ((aMode != GPIO_IRQ_MODE_NOINT) && (aDev->fpin[aPinNum] == -1))
     {
         ret = snprintf(buffer, BUFF_SIZE, "%s%c%d",
                             GPIO_BASE_PIN, aDev->port_letter, aPinNum);
-        if ( ret < 0)
+        if (ret < 0)
             return ret;
 
         ret = open(buffer, O_RDONLY);
-        if( ret < 0)
+        if (ret < 0)
             return ret;
 
         aDev->fpin[aPinNum] = ret;
diff --git a/target/packages/as_devices/python/src/AsGpio_wrap.c b/target/packages/as_devices/python/src/AsGpio_wrap.c
index b807ebc..5e652b5 100644
--- a/target/packages/as_devices/python/src/AsGpio_wrap.c
+++ b/target/packages/as_devices/python/src/AsGpio_wrap.c
@@ -27,6 +27,11 @@ static PyMethodDef AsGpio_wrap_methods[] = {
     {"setPinDirection", setPinDirection, METH_VARARGS, "Set pin direction"},
     {"setPinValue", setPinValue, METH_VARARGS, "Set pin value"},
     {"getPinValue", getPinValue, METH_VARARGS, "Get pin value"},
+    {"blockingGetPinValue", blockingGetPinValue, METH_VARARGS, "Blocking read pin value"},
+    {"setPullupValue", setPullupValue, METH_VARARGS, "Set pull up value"},
+    {"getPullupValue", getPullupValue, METH_VARARGS, "Get pull up value"},
+    {"getIrqMode", getIrqMode, METH_VARARGS, "Get IRQ Mode"},
+    {"setIrqMode", setIrqMode, METH_VARARGS, "Set IRQ Mode"},
     {"gpio_close", gpio_close, METH_VARARGS, "Close gpio"},
     {NULL, NULL, 0, NULL} /* Sentinel */
 };
@@ -230,6 +235,66 @@ static PyObject * getPinValue(PyObject *self, PyObject *args)
     return Py_BuildValue("i", ret);
 }
 
+/** @brief TODO 
+ *
+ * @param TODO 
+ * @param TODO 
+ *
+ * @return TODO 
+ */
+static PyObject * blockingGetPinValue(PyObject *self, PyObject *args)
+{
+   /* TODO */
+}
+
+/** @brief TODO 
+ *
+ * @param TODO 
+ * @param TODO 
+ *
+ * @return TODO 
+ */
+static PyObject * getPullupValue(PyObject *self, PyObject *args)
+{
+   /* TODO */
+}
+
+/** @brief TODO 
+ *
+ * @param TODO 
+ * @param TODO 
+ *
+ * @return TODO 
+ */
+static PyObject * setPullupValue(PyObject *self, PyObject *args)
+{
+   /* TODO */
+}
+
+/** @brief TODO 
+ *
+ * @param TODO 
+ * @param TODO 
+ *
+ * @return TODO 
+ */
+static PyObject * getIrqMode(PyObject *self, PyObject *args)
+{
+   /* TODO */
+}
+
+/** @brief TODO 
+ *
+ * @param TODO 
+ * @param TODO 
+ *
+ * @return TODO 
+ */
+static PyObject * setIrqMode(PyObject *self, PyObject *args)
+{
+   /* TODO */
+}
+
 /** @brief Close port access
  *
  * @param ((ci)) -> (aPort_letter, aFdev) as_gpio_device structure_list
diff --git a/target/packages/as_devices/python/src/AsGpio_wrap.h b/target/packages/as_devices/python/src/AsGpio_wrap.h
index bf52ba6..10a910f 100644
--- a/target/packages/as_devices/python/src/AsGpio_wrap.h
+++ b/target/packages/as_devices/python/src/AsGpio_wrap.h
@@ -33,5 +33,11 @@ static PyObject * setPinDirection(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 * getPullupValue(PyObject *self, PyObject *args);
+static PyObject * setPullupValue(PyObject *self, PyObject *args);
+static PyObject * getIrqMode(PyObject *self, PyObject *args);
+static PyObject * setIrqMode(PyObject *self, PyObject *args);
+
 static PyObject * gpio_close(PyObject *self, PyObject *args);
 


hooks/post-receive
-- 
armadeus