[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2430-gdf0c944
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2430-gdf0c944
|
From: Gwenhael <gwe...@us...> - 2011-07-29 14:06:24
|
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 df0c944149e7b12460d172b4b59613a5cf305c6a (commit)
via 5adc155f56b59b709af4a8564b55e4f7adfd6b93 (commit)
from ef7bb8030f0429ad1a26c8bbfb03d67781207958 (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 df0c944149e7b12460d172b4b59613a5cf305c6a
Merge: 5adc155f56b59b709af4a8564b55e4f7adfd6b93 ef7bb8030f0429ad1a26c8bbfb03d67781207958
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Fri Jul 29 15:55:55 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 5adc155f56b59b709af4a8564b55e4f7adfd6b93
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Fri Jul 29 15:51:26 2011 +0200
[DEMO][REAL_TIME] Update all examples and Makefile according to the new Xenomai version
-----------------------------------------------------------------------
Summary of changes:
target/demos/real_time/Makefile.in | 13 ++++++++++---
target/demos/real_time/common.h | 7 ++++++-
target/demos/real_time/common_kernel.h | 13 ++++++++++---
.../xenomai/kernel/interrupt_xeno_kernel.c | 2 +-
.../xenomai/user_space/interrupt_xeno_userspace.c | 5 +++++
.../kernel/rt_timer/pulse_xeno_kernel_rt_timer.c | 1 -
.../pulse_sleep/pulse_xeno_userspace_sleep.c | 5 +++++
7 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/target/demos/real_time/Makefile.in b/target/demos/real_time/Makefile.in
index c4cf0de..7f67bb7 100644
--- a/target/demos/real_time/Makefile.in
+++ b/target/demos/real_time/Makefile.in
@@ -21,8 +21,13 @@ CFLAGS=-g -W -Wall -D_GNU_SOURCE -D_REENTRANT
LDFLAGS=-lpthread
ifeq ($(XENOMAI),y)
XENO=$(ARMADEUS_ROOTFS_DIR)/usr/xenomai
-CFLAGS+=-I$(XENO)/include -I$(XENO)/include/native -I$(XENO)/include/rtdm
-LDFLAGS+=-L$(XENO)/lib -Xlinker -rpath $(XENO)/lib -Xlinker $(XENO)/lib/libnative.a $(XENO)/lib/librtdm.a -lnative -lrtdm
+CFLAGS+=-I$(XENO)/include -I$(XENO)/include/native -I$(XENO)/include/rtdm -D__XENO__
+LDFLAGS+=-lnative -L$(XENO)/lib -lxenomai
+LDFLAGS+=-Xlinker -rpath -Xlinker $(XENO)/lib
+LDFLAGS+=-Xlinker $(XENO)/lib/libnative.a
+LDFLAGS+=-Xlinker $(XENO)/lib/libxenomai.a
+LDFLAGS+=-Xlinker $(XENO)/lib/librtdm.a -lrtdm
+
endif
$(EXEC) : $(OBJ)
@@ -54,9 +59,11 @@ obj-m := $(OBJ)
CLEAN_MOD= modules.order *.ko *.mod.c *.mod.o *.symvers $(CLEANMOD)
CLEAN_MOD+= .tmp_versions Module.markers
+export DEV_TOOLS =/home/toolchains/armadeus/armadeus_xeno/buildroot/output/build/staging_dir/usr/bin
+export PATH:=$(PATH):$(DEV_TOOLS)
$(EXEC): $(MODULES).c
- $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules ARCH=arm CROSS_COMPILE=arm-unknown-linux-uclibcgnueabi-
install: $(EXEC)
cp $(EXEC) $(DEST_DIR)/$(EXEC)
diff --git a/target/demos/real_time/common.h b/target/demos/real_time/common.h
index dc537f9..af2b39c 100644
--- a/target/demos/real_time/common.h
+++ b/target/demos/real_time/common.h
@@ -2,12 +2,17 @@
#define COMMON_H
/* Common defines used in userspace applications */
+#ifdef CONFIG_ARCH_MX2
+#define INTERRUPT_OUTPUT_DEV "/dev/gpio/PB16"
+#define INTERRUPT_INPUT_DEV "/dev/gpio/PB15"
+#define PULSE_OUTPUT_DEV "/dev/gpio/PB16"
+#else
#define INTERRUPT_OUTPUT_DEV "/dev/gpio/PA9"
#define INTERRUPT_INPUT_DEV "/dev/gpio/PA6"
#define PULSE_OUTPUT_DEV "/dev/gpio/PA4"
-
+#endif
#define TIMESLEEP 10000
#define TASK_PRIO 99 /* Highest RT priority */
#define TASK_MODE 0 /* No flags */
diff --git a/target/demos/real_time/common_kernel.h b/target/demos/real_time/common_kernel.h
index b3fa34b..0847ba7 100644
--- a/target/demos/real_time/common_kernel.h
+++ b/target/demos/real_time/common_kernel.h
@@ -11,11 +11,18 @@
#include "common.h"
-#define INTERRUPT_OUTPUT_GPIO (GPIO_PORTA | 9)
+#ifdef CONFIG_ARCH_MX2
+// CSI PIXCLK
+#define PULSE_OUTPUT_GPIO (GPIO_PORTB | 16)
+#define INTERRUPT_OUTPUT_GPIO (GPIO_PORTB | 16)
+#define INTERRUPT_INPUT_NB IRQ_GPIOB(15)
+#define INTERRUPT_INPUT_GPIO (GPIO_PORTB | 15)
+#else
+#define PULSE_OUTPUT_GPIO (GPIO_PORTA | 4)
+#define INTERRUPT_OUTPUT_GPIO (GPIO_PORTA | 9)
#define INTERRUPT_INPUT_GPIO (GPIO_PORTA | 6)
#define INTERRUPT_INPUT_NB IRQ_GPIOA(6)
-
-#define PULSE_OUTPUT_GPIO (GPIO_PORTA | 4)
+#endif
#endif /* COMMON_KERNEL_H */
diff --git a/target/demos/real_time/interrupt/xenomai/kernel/interrupt_xeno_kernel.c b/target/demos/real_time/interrupt/xenomai/kernel/interrupt_xeno_kernel.c
index 368d6ae..bf05fff 100644
--- a/target/demos/real_time/interrupt/xenomai/kernel/interrupt_xeno_kernel.c
+++ b/target/demos/real_time/interrupt/xenomai/kernel/interrupt_xeno_kernel.c
@@ -57,7 +57,7 @@ static int __init irq_init(void)
}
err = rt_intr_enable(&intr_desc);
if (err == 0)
- printk("rt_intr_create : ok\n";
+ printk("rt_intr_create : ok\n");
return err;
}
diff --git a/target/demos/real_time/interrupt/xenomai/user_space/interrupt_xeno_userspace.c b/target/demos/real_time/interrupt/xenomai/user_space/interrupt_xeno_userspace.c
index 670e328..bf5798a 100644
--- a/target/demos/real_time/interrupt/xenomai/user_space/interrupt_xeno_userspace.c
+++ b/target/demos/real_time/interrupt/xenomai/user_space/interrupt_xeno_userspace.c
@@ -25,6 +25,11 @@
#include <native/task.h>
#include <native/intr.h>
#include "../../../common.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
RT_INTR intr_desc;
diff --git a/target/demos/real_time/pulse/xenomai/kernel/rt_timer/pulse_xeno_kernel_rt_timer.c b/target/demos/real_time/pulse/xenomai/kernel/rt_timer/pulse_xeno_kernel_rt_timer.c
index ea91d19..37e096a 100644
--- a/target/demos/real_time/pulse/xenomai/kernel/rt_timer/pulse_xeno_kernel_rt_timer.c
+++ b/target/demos/real_time/pulse/xenomai/kernel/rt_timer/pulse_xeno_kernel_rt_timer.c
@@ -83,7 +83,6 @@ static void __exit blink_exit(void)
end = 1;
printk(KERN_INFO "blink_exit\n");
rt_task_delete(&blink_task);
- rt_timer_stop();
gpio_free(PULSE_OUTPUT_GPIO);
}
diff --git a/target/demos/real_time/pulse/xenomai/user_space/pulse_sleep/pulse_xeno_userspace_sleep.c b/target/demos/real_time/pulse/xenomai/user_space/pulse_sleep/pulse_xeno_userspace_sleep.c
index 67acb84..3bb6e64 100644
--- a/target/demos/real_time/pulse/xenomai/user_space/pulse_sleep/pulse_xeno_userspace_sleep.c
+++ b/target/demos/real_time/pulse/xenomai/user_space/pulse_sleep/pulse_xeno_userspace_sleep.c
@@ -27,6 +27,11 @@
#include <native/timer.h>
#include <rtdm/rtdm.h>
#include "../../../../common.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
RT_TASK blink_task;
int write_fd = -1;
hooks/post-receive
--
armadeus
|
