[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-436-g2251637

[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  22516371a42b1d4458ab1b8b841ef36d7521c4fe (commit)
      from  7b2ee7e1d7d82fbf499b91227540fea4fbe06f7d (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 22516371a42b1d4458ab1b8b841ef36d7521c4fe
Author: Fabien Marteau <fab...@ar...>
Date:   Mon Jun 14 16:22:54 2010 +0200

    [as_devices] ioctl changed

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

Summary of changes:
 target/packages/as_devices/c/as_gpio.c |   30 ++++++++++++++----------------
 target/packages/as_devices/c/as_gpio.h |    2 --
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index 261a9a7..b614b09 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -30,27 +30,25 @@
 #include <sys/ioctl.h>
 #include <linux/ppdev.h>
 
+/* IOCTL */
+/* direction: 1 output, 0 input */
+#define GPIORDDIRECTION	_IOR(PP_IOCTL, 0xF0, int)
+#define GPIOWRDIRECTION	_IOW(PP_IOCTL, 0xF1, int)
 
-#define GPIORDDIRECTION    _IOR(PP_IOCTL, 0xF0, int)
-#define GPIOWRDIRECTION    _IOW(PP_IOCTL, 0xF1, int)
-#define GPIORDDATA         _IOR(PP_IOCTL, 0xF2, int)
-#define GPIOWRDATA         _IOW(PP_IOCTL, 0xF3, int)
-#define GPIORDMODE         _IOR(PP_IOCTL, 0xF4, int)
-#define GPIOWRMODE         _IOW(PP_IOCTL, 0xF5, int)
+#define GPIORDDATA	_IOR(PP_IOCTL, 0xF2, int)
+#define GPIOWRDATA	_IOW(PP_IOCTL, 0xF3, int)
 
-#define GPIORDPULLUP       _IOR(PP_IOCTL, 0xF6, int)
-#define GPIOWRPULLUP       _IOW(PP_IOCTL, 0xF7, int)
+/* mode: 1 GPIO, 0 device function */
+#define GPIORDMODE	_IOR(PP_IOCTL, 0xF4, int)
+#define GPIOWRMODE	_IOW(PP_IOCTL, 0xF5, int)
 
-#define GPIORDIRQMODE_H    _IOR(PP_IOCTL, 0xF8, int)
-#define GPIORDIRQMODE_L    _IOR(PP_IOCTL, 0xF9, int)
-#define GPIOWRIRQMODE_H    _IOW(PP_IOCTL, 0xFA, int)
-#define GPIOWRIRQMODE_L    _IOW(PP_IOCTL, 0xFB, int)
+#define GPIORDPULLUP	_IOR(PP_IOCTL, 0xF6, int)
+#define GPIOWRPULLUP	_IOW(PP_IOCTL, 0xF7, int)
 
-#define GPIORDISR          _IOR(PP_IOCTL, 0xFC, int)
-#define GPIOWRISR          _IOW(PP_IOCTL, 0xFD, int)
+/* IRQ type: 0 none, 1 rising, 2 falling, 3 both */
+#define GPIORDIRQMODE	_IOR(PP_IOCTL, 0xF8, int)
+#define GPIOWRIRQMODE	_IOW(PP_IOCTL, 0xF9, int)
 
-#define GPIORDIRQMODE	_IOR(PP_IOCTL, 0xFE, int)
-#define GPIOWRIRQMODE	_IOW(PP_IOCTL, 0xFF, int)
 
 #define GPIO_BASE_PIN  ("/dev/gpio/P")
 
diff --git a/target/packages/as_devices/c/as_gpio.h b/target/packages/as_devices/c/as_gpio.h
index a6ce554..dd2d504 100644
--- a/target/packages/as_devices/c/as_gpio.h
+++ b/target/packages/as_devices/c/as_gpio.h
@@ -35,8 +35,6 @@ extern "C" {
 
 #define PORT_SIZE (32)
 
-//TODO: Change structure to use pin instead of port.
-
 /**
  * Store gpio parameters
  */


hooks/post-receive
-- 
armadeus