[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-444-gdafd031

[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  dafd031e95b5772fbf5c0297a43b8b555e4778d1 (commit)
       via  fb94fbec8bdbb1c7d852f7d96cd2572f46c8b7ce (commit)
      from  c4a69b796052698fadd47c745640de426d9052f9 (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 dafd031e95b5772fbf5c0297a43b8b555e4778d1
Merge: fb94fbec8bdbb1c7d852f7d96cd2572f46c8b7ce c4a69b796052698fadd47c745640de426d9052f9
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jun 16 11:18:58 2010 +0200

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

commit fb94fbec8bdbb1c7d852f7d96cd2572f46c8b7ce
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jun 16 11:18:43 2010 +0200

    [as_devices] suppress -DAPFXX compilation option

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

Summary of changes:
 target/packages/as_devices/c/Makefile  |    9 +--------
 target/packages/as_devices/c/as_gpio.c |   15 ---------------
 2 files changed, 1 insertions(+), 23 deletions(-)

diff --git a/target/packages/as_devices/c/Makefile b/target/packages/as_devices/c/Makefile
index 0c25aa3..1fc7a5c 100644
--- a/target/packages/as_devices/c/Makefile
+++ b/target/packages/as_devices/c/Makefile
@@ -11,14 +11,7 @@ endif
 LDFLAGS=
 CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
 STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
-
-ifeq ($(ARMADEUS_BOARD_NAME),apf9328)
-CFLAGS+= -DAPF9328
-endif
-
-ifeq ($(ARMADEUS_BOARD_NAME),apf27)
-CFLAGS+= -DAPF27
-endif
+CFLAGS+=
 
 OBJ=as_pwm.o
 OBJ+= as_i2c.o
diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index b614b09..bab67c0 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -54,14 +54,6 @@
 
 #define BUFF_SIZE (300)
 
-#ifdef APF9328
-#   define NUMBER_OF_PORTS 4
-#elif defined(APF27)
-#   define NUMBER_OF_PORTS 6
-#else
-#error Error no platform defined
-#endif
-
 //#define DEBUG
 #ifdef DEBUG
 #   define ERROR(fmt, ...) printf(fmt, ##__VA_ARGS__)
@@ -79,12 +71,6 @@ struct as_gpio_device *as_gpio_open(char aPortChar, int aPinNum)
     int file;
     int value;
 
-    if (((aPortChar-'A') > (NUMBER_OF_PORTS-1)) || ((aPortChar-'A') < 0))
-    {
-        ERROR("No port named %c\n",aPortChar);
-        goto letter_error;
-    }
-
     /* make gpio port string path */
     ret = snprintf(gpio_file_path,50, "%s%c%d",
                    GPIO_BASE_PIN, aPortChar, aPinNum);
@@ -127,7 +113,6 @@ malloc_error:
     close(file);
 open_file_error:
 path_error:
-letter_error:
     return NULL;
 }
 


hooks/post-receive
-- 
armadeus