[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-224-g8ca4a12
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-224-g8ca4a12
|
From: Fabien M <fa...@us...> - 2011-06-23 09:55:10
|
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 8ca4a12b22aa9960765d2dd6fb62ec8cea95f698 (commit)
via f5b259d55302769f96e69fd6d0c3ed4c8276d2e2 (commit)
via f22d01dad2f629853b7dfedbe58a59b3ce25b7bb (commit)
from e2223d6de323d3a1a278b040c54cebb490c083ea (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 8ca4a12b22aa9960765d2dd6fb62ec8cea95f698
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 23 11:53:13 2011 +0200
[buildroot][package][straton_ios] adding support for apf51
commit f5b259d55302769f96e69fd6d0c3ed4c8276d2e2
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 23 11:04:19 2011 +0200
[buildroot][package][as_devices] new version number -> 0.16
commit f22d01dad2f629853b7dfedbe58a59b3ce25b7bb
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 23 11:03:17 2011 +0200
[buildroot][package][straton_ios] as_gpio_open has changed
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/as_devices/as_devices.mk | 2 +-
.../package/armadeus/straton_ios/straton_ios.mk | 4 ++--
target/packages/straton_ios/Makefile | 3 ++-
.../straton_ios/{straton_ios.c => apf27_ios.c} | 10 +++++-----
.../straton_ios/{straton_ios.h => apf27_ios.h} | 0
.../straton_ios/{straton_ios.c => apf51_ios.c} | 10 +++++-----
.../straton_ios/{straton_ios.h => apf51_ios.h} | 0
7 files changed, 15 insertions(+), 14 deletions(-)
copy target/packages/straton_ios/{straton_ios.c => apf27_ios.c} (91%)
copy target/packages/straton_ios/{straton_ios.h => apf27_ios.h} (100%)
rename target/packages/straton_ios/{straton_ios.c => apf51_ios.c} (91%)
rename target/packages/straton_ios/{straton_ios.h => apf51_ios.h} (100%)
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index c1d6faa..08c4c6d 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.15
+AS_DEVICES_VER:=0.16
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/buildroot/package/armadeus/straton_ios/straton_ios.mk b/buildroot/package/armadeus/straton_ios/straton_ios.mk
index f08a5dd..703d3cc 100644
--- a/buildroot/package/armadeus/straton_ios/straton_ios.mk
+++ b/buildroot/package/armadeus/straton_ios/straton_ios.mk
@@ -13,13 +13,13 @@ STRATON_IOS_SITE=$(TOPDIR)/../target/packages/straton_ios
define STRATON_IOS_BUILD_CMDS
$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" STAGING_DIR="$(STAGING_DIR)" \
- BOARD_NAME=$(BOARD_NAME) -C $(@D)
+ BOARD_NAME=$(BR2_BOARD_NAME) -C $(@D)
endef
define STRATON_IOS_INSTALL_STAGING_CMDS
$(INSTALL) -m 0755 $(STRATON_IOS_DIR)/$(STRATON_IOS_BINARY)* $(STAGING_DIR)/usr/lib/
mkdir -p $(STAGING_DIR)/usr/include/straton_ios/
- $(INSTALL) -m 644 $(STRATON_IOS_DIR)/straton_ios.h $(STAGING_DIR)/usr/include/straton_ios/
+ $(INSTALL) -m 644 $(STRATON_IOS_DIR)/$(BR2_BOARD_NAME)_ios.h $(STAGING_DIR)/usr/include/straton_ios/straton_ios.h
endef
define STRATON_IOS_INSTALL_TARGET_CMDS
diff --git a/target/packages/straton_ios/Makefile b/target/packages/straton_ios/Makefile
index 59e3293..ec06682 100644
--- a/target/packages/straton_ios/Makefile
+++ b/target/packages/straton_ios/Makefile
@@ -1,4 +1,5 @@
-OBJ = straton_ios.o
+
+OBJ= $(strip $(BOARD_NAME))_ios.o
LIBRARY=straton_ios
diff --git a/target/packages/straton_ios/straton_ios.c b/target/packages/straton_ios/apf27_ios.c
similarity index 91%
copy from target/packages/straton_ios/straton_ios.c
copy to target/packages/straton_ios/apf27_ios.c
index 7bbc339..b172a86 100755
--- a/target/packages/straton_ios/straton_ios.c
+++ b/target/packages/straton_ios/apf27_ios.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include "straton_ios.h"
+#include "apf27_ios.h"
#include <as_gpio.h>
static struct as_gpio_device *led;
@@ -21,16 +21,16 @@ long button_getvalue(void){
/* straton api */
int straton_ios_init(void) {
- /* init BUTTON */
- button = as_gpio_open('F', 13);
+ /* init BUTTON (portF13)*/
+ button = as_gpio_open(173);
if (button == NULL) {
printf("IO error: Can't initialize button\n");
goto error;
}
as_gpio_set_pin_direction(button, "in");
- /* init LED */
- led = as_gpio_open('F', 14);
+ /* init LED (portF14)*/
+ led = as_gpio_open(174);
if (led == NULL) {
printf("IO error: Can't initialize led\n");
goto close_button_error;
diff --git a/target/packages/straton_ios/straton_ios.h b/target/packages/straton_ios/apf27_ios.h
similarity index 100%
copy from target/packages/straton_ios/straton_ios.h
copy to target/packages/straton_ios/apf27_ios.h
diff --git a/target/packages/straton_ios/straton_ios.c b/target/packages/straton_ios/apf51_ios.c
similarity index 91%
rename from target/packages/straton_ios/straton_ios.c
rename to target/packages/straton_ios/apf51_ios.c
index 7bbc339..660281a 100755
--- a/target/packages/straton_ios/straton_ios.c
+++ b/target/packages/straton_ios/apf51_ios.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include "straton_ios.h"
+#include "apf27_ios.h"
#include <as_gpio.h>
static struct as_gpio_device *led;
@@ -21,16 +21,16 @@ long button_getvalue(void){
/* straton api */
int straton_ios_init(void) {
- /* init BUTTON */
- button = as_gpio_open('F', 13);
+ /* init BUTTON (GPIO1_3)*/
+ button = as_gpio_open(3);
if (button == NULL) {
printf("IO error: Can't initialize button\n");
goto error;
}
as_gpio_set_pin_direction(button, "in");
- /* init LED */
- led = as_gpio_open('F', 14);
+ /* init LED (GPIO1_2)*/
+ led = as_gpio_open(2);
if (led == NULL) {
printf("IO error: Can't initialize led\n");
goto close_button_error;
diff --git a/target/packages/straton_ios/straton_ios.h b/target/packages/straton_ios/apf51_ios.h
similarity index 100%
rename from target/packages/straton_ios/straton_ios.h
rename to target/packages/straton_ios/apf51_ios.h
hooks/post-receive
--
armadeus
|
