Module: xenomai-2.6
Branch: master
Commit: 3667f7c3f37dc93f05c09d1004fbca794c1677c1
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=3667f7c3f37dc93f05c09d1004fbca794c1677c1
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Sun Apr 14 20:20:23 2013 +0200
skins: move libxenomai headers
from include/asm-generic/bits to include/asm-generic
At this chance, introduce asm-generic/sem_heap.h as a replacement for the
repeated extern declaration of xeno_sem_heap.
---
include/asm-arm/bits/bind.h | 2 +-
include/asm-blackfin/bits/bind.h | 2 +-
include/asm-generic/Makefile.am | 4 ++++
include/asm-generic/Makefile.in | 4 ++++
include/asm-generic/{bits => }/bind.h | 0
include/asm-generic/bits/Makefile.am | 3 ---
include/asm-generic/bits/Makefile.in | 3 ---
include/asm-generic/{bits => }/current.h | 0
include/asm-generic/sem_heap.h | 6 ++++++
include/asm-generic/{bits => }/sigshadow.h | 0
include/asm-nios2/bits/bind.h | 2 +-
include/asm-powerpc/bits/bind.h | 2 +-
include/asm-sh/bits/bind.h | 2 +-
include/asm-x86/bits/bind.h | 2 +-
src/skins/common/assert_context.c | 2 +-
src/skins/common/bind.c | 2 +-
src/skins/common/current.c | 5 ++---
src/skins/common/sem_heap.c | 3 ++-
src/skins/common/sigshadow.c | 2 +-
src/skins/native/init.c | 2 +-
src/skins/native/mutex.c | 4 ++--
src/skins/native/task.c | 4 ++--
src/skins/posix/init.c | 4 ++--
src/skins/posix/mutex.c | 5 ++---
src/skins/posix/printf.c | 2 +-
src/skins/posix/thread.c | 4 ++--
src/skins/psos+/init.c | 2 +-
src/skins/psos+/task.c | 4 ++--
src/skins/rtdm/init.c | 2 +-
src/skins/uitron/init.c | 2 +-
src/skins/uitron/task.c | 4 ++--
src/skins/vrtx/init.c | 2 +-
src/skins/vrtx/task.c | 4 ++--
src/skins/vxworks/init.c | 2 +-
src/skins/vxworks/taskLib.c | 4 ++--
src/testsuite/unit/check-vdso.c | 3 +--
src/testsuite/unit/mutex-torture.c | 2 +-
37 files changed, 54 insertions(+), 48 deletions(-)
diff --git a/include/asm-arm/bits/bind.h b/include/asm-arm/bits/bind.h
index bf9671a..d12f8e2 100644
--- a/include/asm-arm/bits/bind.h
+++ b/include/asm-arm/bits/bind.h
@@ -10,7 +10,7 @@
#include <unistd.h>
#include <limits.h>
-#include <asm-generic/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bind.h>
#include <asm/xenomai/syscall.h>
struct __xn_full_tscinfo __xn_tscinfo = {
diff --git a/include/asm-blackfin/bits/bind.h b/include/asm-blackfin/bits/bind.h
index 5a2603e..dfe50a3 100644
--- a/include/asm-blackfin/bits/bind.h
+++ b/include/asm-blackfin/bits/bind.h
@@ -1,6 +1,6 @@
#ifndef _XENO_ASM_BLACKFIN_BIND_H
#define _XENO_ASM_BLACKFIN_BIND_H
-#include <asm-generic/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bind.h>
#endif /* _XENO_ASM_BLACKFIN_BIND_H */
diff --git a/include/asm-generic/Makefile.am b/include/asm-generic/Makefile.am
index 65c39b3..1cd2024 100644
--- a/include/asm-generic/Makefile.am
+++ b/include/asm-generic/Makefile.am
@@ -2,9 +2,13 @@ includesubdir = $(includedir)/asm-generic
includesub_HEADERS = \
arith.h \
+ bind.h \
+ current.h \
features.h \
hal.h \
pci_ids.h \
+ sem_heap.h \
+ sigshadow.h \
stack.h \
syscall.h \
system.h \
diff --git a/include/asm-generic/Makefile.in b/include/asm-generic/Makefile.in
index d02f926..db5a0b5 100644
--- a/include/asm-generic/Makefile.in
+++ b/include/asm-generic/Makefile.in
@@ -284,9 +284,13 @@ top_srcdir = @top_srcdir@
includesubdir = $(includedir)/asm-generic
includesub_HEADERS = \
arith.h \
+ bind.h \
+ current.h \
features.h \
hal.h \
pci_ids.h \
+ sem_heap.h \
+ sigshadow.h \
stack.h \
syscall.h \
system.h \
diff --git a/include/asm-generic/bits/bind.h b/include/asm-generic/bind.h
similarity index 100%
rename from include/asm-generic/bits/bind.h
rename to include/asm-generic/bind.h
diff --git a/include/asm-generic/bits/Makefile.am
b/include/asm-generic/bits/Makefile.am
index 4e6e4ec..fd7e143 100644
--- a/include/asm-generic/bits/Makefile.am
+++ b/include/asm-generic/bits/Makefile.am
@@ -1,10 +1,7 @@
includesubdir = $(includedir)/asm-generic/bits
includesub_HEADERS = \
- bind.h \
- current.h \
heap.h \
intr.h \
pod.h \
- sigshadow.h \
timeconv.h
diff --git a/include/asm-generic/bits/Makefile.in
b/include/asm-generic/bits/Makefile.in
index 347b181..efd1dee 100644
--- a/include/asm-generic/bits/Makefile.in
+++ b/include/asm-generic/bits/Makefile.in
@@ -245,12 +245,9 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
includesubdir = $(includedir)/asm-generic/bits
includesub_HEADERS = \
- bind.h \
- current.h \
heap.h \
intr.h \
pod.h \
- sigshadow.h \
timeconv.h
all: all-am
diff --git a/include/asm-generic/bits/current.h b/include/asm-generic/current.h
similarity index 100%
rename from include/asm-generic/bits/current.h
rename to include/asm-generic/current.h
diff --git a/include/asm-generic/sem_heap.h b/include/asm-generic/sem_heap.h
new file mode 100644
index 0000000..2cce1f9
--- /dev/null
+++ b/include/asm-generic/sem_heap.h
@@ -0,0 +1,6 @@
+#ifndef SEM_HEAP_H
+#define SEM_HEAP_H
+
+extern unsigned long xeno_sem_heap[2];
+
+#endif /* SEM_HEAP_H */
diff --git a/include/asm-generic/bits/sigshadow.h
b/include/asm-generic/sigshadow.h
similarity index 100%
rename from include/asm-generic/bits/sigshadow.h
rename to include/asm-generic/sigshadow.h
diff --git a/include/asm-nios2/bits/bind.h b/include/asm-nios2/bits/bind.h
index 668d8b8..d2cc1d6 100644
--- a/include/asm-nios2/bits/bind.h
+++ b/include/asm-nios2/bits/bind.h
@@ -10,7 +10,7 @@
#include <unistd.h>
#include <limits.h>
-#include <asm-generic/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bind.h>
volatile void *xeno_nios2_hrclock = NULL;
diff --git a/include/asm-powerpc/bits/bind.h b/include/asm-powerpc/bits/bind.h
index 8d5da4b..dd7f025 100644
--- a/include/asm-powerpc/bits/bind.h
+++ b/include/asm-powerpc/bits/bind.h
@@ -1,6 +1,6 @@
#ifndef _XENO_ASM_POWERPC_BIND_H
#define _XENO_ASM_POWERPC_BIND_H
-#include <asm-generic/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bind.h>
#endif /* _XENO_ASM_POWERPC_BIND_H */
diff --git a/include/asm-sh/bits/bind.h b/include/asm-sh/bits/bind.h
index bd25f80..6081d80 100644
--- a/include/asm-sh/bits/bind.h
+++ b/include/asm-sh/bits/bind.h
@@ -10,7 +10,7 @@
#include <unistd.h>
#include <limits.h>
-#include <asm-generic/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bind.h>
struct xnarch_tsc_area;
diff --git a/include/asm-x86/bits/bind.h b/include/asm-x86/bits/bind.h
index aa4ca8e..87dbdd3 100644
--- a/include/asm-x86/bits/bind.h
+++ b/include/asm-x86/bits/bind.h
@@ -6,7 +6,7 @@
#include <string.h>
#include <unistd.h>
-#include <asm-generic/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bind.h>
#include <asm/xenomai/features.h>
#ifdef __i386__
diff --git a/src/skins/common/assert_context.c
b/src/skins/common/assert_context.c
index d7f74c4..dea5160 100644
--- a/src/skins/common/assert_context.c
+++ b/src/skins/common/assert_context.c
@@ -23,7 +23,7 @@
#include <nucleus/thread.h>
#include <asm-generic/syscall.h>
-#include <asm-generic/bits/current.h>
+#include <asm-generic/current.h>
static void assert_nrt_inner(void)
{
diff --git a/src/skins/common/bind.c b/src/skins/common/bind.c
index 48f8398..c869795 100644
--- a/src/skins/common/bind.c
+++ b/src/skins/common/bind.c
@@ -7,7 +7,7 @@
#include <nucleus/heap.h>
#include <asm/xenomai/syscall.h>
-#include <asm-generic/xenomai/bits/current.h>
+#include <asm-generic/xenomai/current.h>
#include <asm-generic/xenomai/timeconv.h>
#include <asm-generic/xenomai/stack.h>
#include <asm/xenomai/bits/bind.h>
diff --git a/src/skins/common/current.c b/src/skins/common/current.c
index 8684489..69a70cc 100644
--- a/src/skins/common/current.c
+++ b/src/skins/common/current.c
@@ -7,9 +7,8 @@
#include <nucleus/thread.h>
#include <nucleus/vdso.h>
#include <asm/xenomai/syscall.h>
-#include <asm-generic/bits/current.h>
-
-extern unsigned long xeno_sem_heap[2];
+#include <asm-generic/current.h>
+#include <asm-generic/sem_heap.h>
#ifdef HAVE___THREAD
__thread __attribute__ ((tls_model ("initial-exec")))
diff --git a/src/skins/common/sem_heap.c b/src/skins/common/sem_heap.c
index baaa6a6..a50d346 100644
--- a/src/skins/common/sem_heap.c
+++ b/src/skins/common/sem_heap.c
@@ -13,7 +13,8 @@
#include <nucleus/vdso.h>
#include <nucleus/heap.h>
#include <asm/xenomai/syscall.h>
-#include <asm-generic/bits/current.h>
+#include <asm-generic/current.h>
+#include <asm-generic/sem_heap.h>
#include "sem_heap.h"
#define PRIVATE 0
diff --git a/src/skins/common/sigshadow.c b/src/skins/common/sigshadow.c
index 39f7d13..9756d78 100644
--- a/src/skins/common/sigshadow.c
+++ b/src/skins/common/sigshadow.c
@@ -2,7 +2,7 @@
#include <signal.h>
#include <asm/xenomai/syscall.h>
-#include <asm-generic/xenomai/bits/sigshadow.h>
+#include <asm-generic/xenomai/sigshadow.h>
static struct sigaction xeno_saved_sigshadow_action;
diff --git a/src/skins/native/init.c b/src/skins/native/init.c
index 5d433b3..e380ca6 100644
--- a/src/skins/native/init.c
+++ b/src/skins/native/init.c
@@ -24,7 +24,7 @@
#include <pthread.h>
#include <native/syscall.h>
#include <native/task.h>
-#include <asm-generic/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bind.h>
int __native_muxid = -1;
static int fork_handler_registered;
diff --git a/src/skins/native/mutex.c b/src/skins/native/mutex.c
index 2e0cb3d..29057b7 100644
--- a/src/skins/native/mutex.c
+++ b/src/skins/native/mutex.c
@@ -21,10 +21,10 @@
#include <nucleus/thread.h>
#include <native/syscall.h>
#include <native/mutex.h>
-#include <asm-generic/bits/current.h>
+#include <asm-generic/current.h>
+#include <asm-generic/sem_heap.h>
extern int __native_muxid;
-extern unsigned long xeno_sem_heap[2];
int rt_mutex_create(RT_MUTEX *mutex, const char *name)
{
diff --git a/src/skins/native/task.c b/src/skins/native/task.c
index 053048f..a4afcfb 100644
--- a/src/skins/native/task.c
+++ b/src/skins/native/task.c
@@ -27,8 +27,8 @@
#include <pthread.h>
#include <native/syscall.h>
#include <native/task.h>
-#include <asm-generic/bits/sigshadow.h>
-#include <asm-generic/bits/current.h>
+#include <asm-generic/sigshadow.h>
+#include <asm-generic/current.h>
#include <asm-generic/stack.h>
#include "wrappers.h"
diff --git a/src/skins/posix/init.c b/src/skins/posix/init.c
index 83d27a6..710abfb 100644
--- a/src/skins/posix/init.c
+++ b/src/skins/posix/init.c
@@ -26,11 +26,11 @@
#include <posix/posix.h>
#include <posix/syscall.h>
#include <rtdm/syscall.h>
-#include <asm-generic/bits/sigshadow.h>
+#include <asm-generic/sigshadow.h>
#include <posix/mutex.h>
#include <rtdk.h>
-#include <asm-generic/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bind.h>
int __pse51_muxid = -1;
int __pse51_rtdm_muxid = -1;
diff --git a/src/skins/posix/mutex.c b/src/skins/posix/mutex.c
index 6917c86..0cf2d8b 100644
--- a/src/skins/posix/mutex.c
+++ b/src/skins/posix/mutex.c
@@ -23,15 +23,14 @@
#include <posix/mutex.h>
#include <posix/syscall.h>
#include <posix/cb_lock.h>
-#include <asm-generic/bits/current.h>
+#include <asm-generic/current.h>
+#include <asm-generic/sem_heap.h>
extern int __pse51_muxid;
#ifdef CONFIG_XENO_FASTSYNCH
#define PSE51_MUTEX_MAGIC (0x86860303)
-extern unsigned long xeno_sem_heap[2];
-
static xnarch_atomic_t *get_ownerp(struct __shadow_mutex *shadow)
{
if (likely(!shadow->attr.pshared))
diff --git a/src/skins/posix/printf.c b/src/skins/posix/printf.c
index 396a8e0..8948a31 100644
--- a/src/skins/posix/printf.c
+++ b/src/skins/posix/printf.c
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <syslog.h>
#include <rtdk.h>
-#include <asm-generic/bits/current.h>
+#include <asm-generic/current.h>
int __wrap_vfprintf(FILE *stream, const char *fmt, va_list args)
{
diff --git a/src/skins/posix/thread.c b/src/skins/posix/thread.c
index f83e06f..bc6680e 100644
--- a/src/skins/posix/thread.c
+++ b/src/skins/posix/thread.c
@@ -26,8 +26,8 @@
#include <sys/types.h>
#include <semaphore.h>
#include <posix/syscall.h>
-#include <asm-generic/bits/current.h>
-#include <asm-generic/bits/sigshadow.h>
+#include <asm-generic/current.h>
+#include <asm-generic/sigshadow.h>
#include <asm-generic/stack.h>
extern int __pse51_muxid;
diff --git a/src/skins/psos+/init.c b/src/skins/psos+/init.c
index 5098f91..35a3efa 100644
--- a/src/skins/psos+/init.c
+++ b/src/skins/psos+/init.c
@@ -20,7 +20,7 @@
#include <errno.h>
#include <sys/mman.h>
#include <psos+/psos.h>
-#include <asm-generic/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bind.h>
int __psos_muxid = -1;
diff --git a/src/skins/psos+/task.c b/src/skins/psos+/task.c
index 82be6ee..6b1b6ed 100644
--- a/src/skins/psos+/task.c
+++ b/src/skins/psos+/task.c
@@ -27,8 +27,8 @@
#include <string.h>
#include <psos+/psos.h>
#include <psos+/long_names.h>
-#include <asm-generic/bits/sigshadow.h>
-#include <asm-generic/bits/current.h>
+#include <asm-generic/sigshadow.h>
+#include <asm-generic/current.h>
#include <asm-generic/stack.h>
extern int __psos_muxid;
diff --git a/src/skins/rtdm/init.c b/src/skins/rtdm/init.c
index 9672486..393d953 100644
--- a/src/skins/rtdm/init.c
+++ b/src/skins/rtdm/init.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include <rtdm/syscall.h>
-#include <asm-generic/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bind.h>
int __rtdm_muxid = -1;
diff --git a/src/skins/uitron/init.c b/src/skins/uitron/init.c
index 0ffc8bd..dc0dce5 100644
--- a/src/skins/uitron/init.c
+++ b/src/skins/uitron/init.c
@@ -20,7 +20,7 @@
#include <errno.h>
#include <sys/mman.h>
#include <uitron/uitron.h>
-#include <asm-generic/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bind.h>
int __uitron_muxid = -1;
diff --git a/src/skins/uitron/task.c b/src/skins/uitron/task.c
index 5308271..b71dc90 100644
--- a/src/skins/uitron/task.c
+++ b/src/skins/uitron/task.c
@@ -25,8 +25,8 @@
#include <limits.h>
#include <asm/xenomai/system.h>
-#include <asm-generic/bits/sigshadow.h>
-#include <asm-generic/bits/current.h>
+#include <asm-generic/sigshadow.h>
+#include <asm-generic/current.h>
#include <asm-generic/stack.h>
#include <nucleus/sched.h>
#include <uitron/uitron.h>
diff --git a/src/skins/vrtx/init.c b/src/skins/vrtx/init.c
index d3d6cdb..c1f67f4 100644
--- a/src/skins/vrtx/init.c
+++ b/src/skins/vrtx/init.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <pthread.h>
#include <vrtx/vrtx.h>
-#include <asm-generic/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bind.h>
int __vrtx_muxid = -1;
diff --git a/src/skins/vrtx/task.c b/src/skins/vrtx/task.c
index 3956b84..310dedf 100644
--- a/src/skins/vrtx/task.c
+++ b/src/skins/vrtx/task.c
@@ -29,8 +29,8 @@
#include <limits.h>
#include <nucleus/sched.h>
#include <vrtx/vrtx.h>
-#include <asm-generic/bits/sigshadow.h>
-#include <asm-generic/bits/current.h>
+#include <asm-generic/sigshadow.h>
+#include <asm-generic/current.h>
#include <asm-generic/stack.h>
#include "wrappers.h"
diff --git a/src/skins/vxworks/init.c b/src/skins/vxworks/init.c
index b2cdad4..f277736 100644
--- a/src/skins/vxworks/init.c
+++ b/src/skins/vxworks/init.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <pthread.h>
#include <vxworks/vxworks.h>
-#include <asm-generic/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bind.h>
int __vxworks_muxid = -1;
diff --git a/src/skins/vxworks/taskLib.c b/src/skins/vxworks/taskLib.c
index 819e35f..bc4c5c7 100644
--- a/src/skins/vxworks/taskLib.c
+++ b/src/skins/vxworks/taskLib.c
@@ -28,8 +28,8 @@
#include <limits.h>
#include <nucleus/sched.h>
#include <vxworks/vxworks.h>
-#include <asm-generic/bits/sigshadow.h>
-#include <asm-generic/bits/current.h>
+#include <asm-generic/sigshadow.h>
+#include <asm-generic/current.h>
#include <asm-generic/stack.h>
#include "wrappers.h"
diff --git a/src/testsuite/unit/check-vdso.c b/src/testsuite/unit/check-vdso.c
index 17684de..8260bcb 100644
--- a/src/testsuite/unit/check-vdso.c
+++ b/src/testsuite/unit/check-vdso.c
@@ -6,10 +6,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <asm/xenomai/syscall.h>
+#include <asm-generic/sem_heap.h>
#include <nucleus/vdso.h>
-extern unsigned long xeno_sem_heap[2];
-
int main(int argc, char **argv)
{
unsigned long long test_features;
diff --git a/src/testsuite/unit/mutex-torture.c
b/src/testsuite/unit/mutex-torture.c
index 8561a25..cafb31c 100644
--- a/src/testsuite/unit/mutex-torture.c
+++ b/src/testsuite/unit/mutex-torture.c
@@ -29,7 +29,7 @@
#include <native/sem.h>
#include <native/cond.h>
#endif /* __NATIVE_SKIN */
-#include <asm-generic/xenomai/bits/current.h> /* For internal use, do not use
+#include <asm-generic/xenomai/current.h> /* For internal use, do not use
in your code. */
#include <asm-generic/xenomai/stack.h>
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
