[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-229-gb24b862

[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  b24b8626f59ba49613f944e0d2aedc6340fd8484 (commit)
       via  4dc46eaddb04bc8be3e068b4a96f3bcd2a179e22 (commit)
      from  9f9623b77ebea67f44e0d554a19973deb7d539da (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 b24b8626f59ba49613f944e0d2aedc6340fd8484
Merge: 4dc46eaddb04bc8be3e068b4a96f3bcd2a179e22 9f9623b77ebea67f44e0d554a19973deb7d539da
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Jun 23 16:48:38 2011 +0200

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

commit 4dc46eaddb04bc8be3e068b4a96f3bcd2a179e22
Author: Kevin JOLY <jol...@gm...>
Date:   Thu Jun 23 16:45:52 2011 +0200

    Update return values of as_gpio_wait_event()
    
    Signed-off-by: Kevin JOLY <jol...@gm...>

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

Summary of changes:
 target/packages/as_devices/c/as_gpio.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index 7d1ed64..9bf2b02 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -210,11 +210,13 @@ int32_t as_gpio_wait_event(struct as_gpio_device *gpio_dev, int delay_ms)
 	poll_set[0].revents = 0;
 	ret = poll(poll_set, 1, delay_ms);
 	if (ret > 0) {
-		printf("event received\n");
-		read(gpio_fd, tmp, sizeof(tmp));
+		return read(gpio_fd, tmp, sizeof(tmp));
+	} else if (ret < 0) {
+		ERROR("poll()");
+		return ret;
 	}
 
-	return 0;
+	return -ETIMEDOUT;
 }
 
 /*------------------------------------------------------------------------------*/


hooks/post-receive
-- 
armadeus