[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-36-g53ec075

[Julien B a. A. <ar...@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  53ec075d32b7664998c4aeb64fa47b225689a8d9 (commit)
       via  fdc715ea884c71d304347600e3415b6f71f05fdf (commit)
       via  cea448a84829b33033b5bef26f15241fcfa95b13 (commit)
      from  258d639395ec119f7a5f08c38dea96118815fe04 (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 53ec075d32b7664998c4aeb64fa47b225689a8d9
Merge: fdc715ea884c71d304347600e3415b6f71f05fdf 258d639395ec119f7a5f08c38dea96118815fe04
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Sep 30 12:48:06 2010 +0200

    Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit fdc715ea884c71d304347600e3415b6f71f05fdf
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Sep 30 12:47:08 2010 +0200

    [AS_DEVICES] increase version number

commit cea448a84829b33033b5bef26f15241fcfa95b13
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Sep 30 12:44:26 2010 +0200

    [AS_DEVICES] helpers: add as_read_int()

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

Summary of changes:
 .../package/armadeus/as_devices/as_devices.mk      |    2 +-
 target/packages/as_devices/c/as_pwm.c              |    8 +++---
 target/packages/as_devices/c/helpers.c             |   27 +++++++++++++++----
 target/packages/as_devices/c/helpers.h             |   20 +++++++++++---
 4 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index 1476a98..152e427 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -6,7 +6,7 @@
 
 PYTHON:=python2.4
 
-AS_DEVICES_VER:=0.14
+AS_DEVICES_VER:=0.15
 AS_DEVICES_SOURCE:=$(TOPDIR)/../target/packages/as_devices
 AS_DEVICES_DIR:=$(BUILD_DIR)/as_devices-$(AS_DEVICES_VER)
 AS_DEVICES_CAT:=zcat
diff --git a/target/packages/as_devices/c/as_pwm.c b/target/packages/as_devices/c/as_pwm.c
index d0bbaa8..f4c8b19 100644
--- a/target/packages/as_devices/c/as_pwm.c
+++ b/target/packages/as_devices/c/as_pwm.c
@@ -91,7 +91,7 @@ int32_t as_pwm_get_frequency(struct as_pwm_device *dev)
     char buffer[SIZE_OF_BUFF];
     int ret;
 
-    ret = as_read_buffer(dev->fileFrequency, buffer);
+    ret = as_read_buffer(dev->fileFrequency, buffer, SIZE_OF_BUFF);
     if (ret < 0) {
         ERROR("Can't read frequency\n");
         return ret;
@@ -114,7 +114,7 @@ int32_t as_pwm_get_period(struct as_pwm_device *dev)
     char buffer[SIZE_OF_BUFF];
     int ret;
 
-    ret = as_read_buffer(dev->filePeriod, buffer);
+    ret = as_read_buffer(dev->filePeriod, buffer, SIZE_OF_BUFF);
     if (ret < 0) {
         ERROR("Can't read period\n");
         return ret;
@@ -137,7 +137,7 @@ int32_t as_pwm_get_duty(struct as_pwm_device *dev)
     char buffer[SIZE_OF_BUFF];
     int ret;
 
-    ret = as_read_buffer(dev->fileDuty, buffer);
+    ret = as_read_buffer(dev->fileDuty, buffer, SIZE_OF_BUFF);
     if (ret < 0) {
         ERROR("Can't read duty\n");
         return ret;
@@ -171,7 +171,7 @@ int32_t as_pwm_get_state(struct as_pwm_device *dev)
     char buffer[SIZE_OF_BUFF];
     int ret;
 
-    ret = as_read_buffer(dev->fileActive, buffer);
+    ret = as_read_buffer(dev->fileActive, buffer, SIZE_OF_BUFF);
     if (ret < 0) {
         ERROR("Can't read state\n");
         return ret;
diff --git a/target/packages/as_devices/c/helpers.c b/target/packages/as_devices/c/helpers.c
index 57d63f6..702a88d 100644
--- a/target/packages/as_devices/c/helpers.c
+++ b/target/packages/as_devices/c/helpers.c
@@ -56,21 +56,36 @@ int as_write_buffer(int fd, int value)
     return buffer_len;
 }
 
-int readBuffer(int fd, char *buf)
+int as_read_buffer(int fd, char *buf, int size)
 {
-    int ret;
+    int ret, err;
 
-    ret = read(fd, buf, SIZE_OF_BUFF);
+    ret = read(fd, buf, size);
     if (ret < 0) {
         ERROR("Can't read file ");
         return ret;
     }
-    ret = lseek(fd, 0, SEEK_SET);
-    if (ret < 0) {
+    err = lseek(fd, 0, SEEK_SET);
+    if (err < 0) {
         ERROR("lseek error ");
-        return ret;
+        return err;
     }
 
     return ret;
 }
 
+int as_read_int(int fd, int *value_res)
+{
+    const int SIZEOFBUFF = 20;
+    ssize_t ret;
+    char buf[SIZEOFBUFF];
+    int value;
+
+    ret = as_read_buffer(fd, buf, SIZEOFBUFF);
+    buf[ret-1] = '\0';
+    value = strtol(buf, NULL, 10);
+    *value_res = value;
+
+    return 0;
+}
+
diff --git a/target/packages/as_devices/c/helpers.h b/target/packages/as_devices/c/helpers.h
index 2c027ae..4ff72e0 100644
--- a/target/packages/as_devices/c/helpers.h
+++ b/target/packages/as_devices/c/helpers.h
@@ -19,11 +19,11 @@
 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <string.h>
+#ifndef __ASHELPERS_H__
+#define __ASHELPERS_H__
+
 #include <stdio.h>
 #include <stdlib.h>
-//#include <fcntl.h>  /* for open()   */
-#include <unistd.h> /* for write()  */
 
 #ifdef DEBUG
 #   define ERROR(fmt, ...) printf(fmt, ##__VA_ARGS__)
@@ -44,8 +44,20 @@ int as_write_buffer(int fd, int value);
  *
  * @param fd: file handler
  * @param buf: char pointer to read buffer
+ * @param size: size of buffer
  *
  * @return number of chars read, negative value on error
  */
-int as_read_buffer(int fd, char *buf);
+int as_read_buffer(int fd, char *buf, int size);
+
+/** @brief read an int value stored as string in a /sys/ or /proc interface
+ *
+ * @param fd: file handler
+ * @param value_res: int pointer to store the value read
+ *
+ * @return negative value on error
+ */
+int as_read_int(int fd, int *value_res);
+
+#endif /* __ASHELPERS_H__ */
 


hooks/post-receive
-- 
armadeus