[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-229-gf2f4048

[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  f2f4048bd931f2f28b09a23eb5fa0b2aa733a58a (commit)
       via  3b240cb25e36fc7f208960d5c075655c7cfa9a55 (commit)
      from  e5124b09ce5422e7d4c084d0f1ae137c570c61bd (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 f2f4048bd931f2f28b09a23eb5fa0b2aa733a58a
Merge: 3b240cb25e36fc7f208960d5c075655c7cfa9a55 e5124b09ce5422e7d4c084d0f1ae137c570c61bd
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Mar 9 09:45:25 2010 +0100

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

commit 3b240cb25e36fc7f208960d5c075655c7cfa9a55
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Mar 9 09:43:39 2010 +0100

    [asdevices] Add platform parameter in compilation

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

Summary of changes:
 target/packages/as_devices/Makefile    |    9 ++++++++-
 target/packages/as_devices/c/Makefile  |    9 ++++++++-
 target/packages/as_devices/c/as_gpio.c |    7 +++++++
 target/packages/as_devices/c/as_gpio.h |    2 +-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index b3578d4..fd18837 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -2,7 +2,14 @@
 ARMADEUS_BASE_DIR=../../../
 include $(ARMADEUS_BASE_DIR)/Makefile.in
 
-CFLAGS=-Wall -g -O0
+ifeq ($(ARMADEUS_BOARD_NAME),apf9328)
+CFLAGS=-Wall -g -O0 -DAPF9328
+else
+ifeq ($(ARMADEUS_BOARD_NAME),apf27)
+CFLAGS=-Wall -g -O0 -DAPF27
+endif
+endif
+
 LDFLAGS=
 CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
 CXX:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
diff --git a/target/packages/as_devices/c/Makefile b/target/packages/as_devices/c/Makefile
index 816efe6..6ab4854 100644
--- a/target/packages/as_devices/c/Makefile
+++ b/target/packages/as_devices/c/Makefile
@@ -3,7 +3,14 @@
 ARMADEUS_BASE_DIR=../../../../
 include $(ARMADEUS_BASE_DIR)/Makefile.in
 
-CFLAGS=-Wall -g -O0
+ifeq ($(ARMADEUS_BOARD_NAME),apf9328)
+CFLAGS=-Wall -g -O0 -DAPF9328
+endif
+
+ifeq ($(ARMADEUS_BOARD_NAME),apf27)
+CFLAGS=-Wall -g -O0 -DAPF27
+endif
+
 LDFLAGS=
 CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
 STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index bf8422b..34a7c9a 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -38,6 +38,13 @@
 
 #define GPIO_BASE_PORT ("/dev/gpio/port")
 
+#ifdef APF9328
+#   define NUMBER_OF_PORTS 4
+#elif defined(APF27)
+#   define NUMBER_OF_PORTS 6
+#else
+#error Error no platform defined
+#endif
 
 /*------------------------------------------------------------------------------*/
 
diff --git a/target/packages/as_devices/c/as_gpio.h b/target/packages/as_devices/c/as_gpio.h
index 3ed3b9e..4b98c84 100644
--- a/target/packages/as_devices/c/as_gpio.h
+++ b/target/packages/as_devices/c/as_gpio.h
@@ -28,7 +28,7 @@
 extern "C" {
 #endif // __cplusplus
 
-#define NUMBER_OF_PORTS 6
+//TODO: manage irq
 
 /**
  * Store gpio parameters


hooks/post-receive
-- 
armadeus