Commit 1a376147 authored by Philippe Gerum's avatar Philippe Gerum

Make xenomai/ prefix useless in include directives

git-svn-id: svn+ssh://svn.gna.org/svn/xenomai/trunk@525 c6d672ea-8702-0410-b560-f74c916a59fe
parent cf4075c7
......@@ -21607,12 +21607,6 @@ XENO_USER_APP_LDFLAGS=$XENO_USER_LDFLAGS
base=include
ac_config_links="$ac_config_links src/include/xenomai:$base"
base=rtdm
ac_config_links="$ac_config_links src/include/$base:include/$base"
base=asm-$XENO_TARGET_ARCH
ac_config_links="$ac_config_links src/include/asm/xenomai:include/$base"
......@@ -22294,8 +22288,6 @@ do
"doc/docbook/custom-stylesheets/xsl/html/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/docbook/custom-stylesheets/xsl/html/Makefile" ;;
"doc/docbook/custom-stylesheets/xsl/html/chunk.xsl" ) CONFIG_FILES="$CONFIG_FILES doc/docbook/custom-stylesheets/xsl/html/chunk.xsl" ;;
"doc/docbook/xenomai/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/docbook/xenomai/Makefile" ;;
"src/include/xenomai" ) CONFIG_LINKS="$CONFIG_LINKS src/include/xenomai:$base" ;;
"src/include/$base" ) CONFIG_LINKS="$CONFIG_LINKS src/include/$base:include/$base" ;;
"src/include/asm/xenomai" ) CONFIG_LINKS="$CONFIG_LINKS src/include/asm/xenomai:include/$base" ;;
"src/include/$base/xenomai" ) CONFIG_LINKS="$CONFIG_LINKS src/include/$base/xenomai:include/$base" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
......
......@@ -526,10 +526,6 @@ AC_SUBST(XENO_USER_LDFLAGS)
AC_SUBST(XENO_USER_APP_CFLAGS)
AC_SUBST(XENO_USER_APP_LDFLAGS)
base=include
AC_CONFIG_LINKS([src/include/xenomai:$base])
base=rtdm
AC_CONFIG_LINKS([src/include/$base:include/$base])
base=asm-$XENO_TARGET_ARCH
AC_CONFIG_LINKS([src/include/asm/xenomai:include/$base])
base=asm-generic
......
......@@ -628,7 +628,7 @@ static inline void xnarch_exit (void)
#else /* !__KERNEL__ */
#include <xenomai/nucleus/system.h>
#include <nucleus/system.h>
#include <bits/local_lim.h>
#endif /* __KERNEL__ */
......
......@@ -578,7 +578,7 @@ static inline void xnarch_exit (void)
#else /* !__KERNEL__ */
#include <xenomai/nucleus/system.h>
#include <nucleus/system.h>
#include <bits/local_lim.h>
#endif /* __KERNEL__ */
......
......@@ -37,7 +37,7 @@
#include <linux/config.h>
#include <asm/xenomai/hal.h>
#include <asm/xenomai/atomic.h>
#include <xenomai/nucleus/shadow.h>
#include <nucleus/shadow.h>
#define module_param_value(parm) (parm)
......
......@@ -769,7 +769,7 @@ static inline void xnarch_exit (void)
#else /* !__KERNEL__ */
#include <xenomai/nucleus/system.h>
#include <nucleus/system.h>
#include <bits/local_lim.h>
#endif /* __KERNEL__ */
......
......@@ -795,7 +795,7 @@ static inline void xnarch_exit (void)
#else /* !__KERNEL__ */
#include <xenomai/nucleus/system.h>
#include <nucleus/system.h>
#include <bits/local_lim.h>
#endif /* __KERNEL__ */
......
......@@ -709,7 +709,7 @@ static inline void xnarch_exit (void)
#else /* !__KERNEL__ */
#include <xenomai/nucleus/system.h>
#include <nucleus/system.h>
#include <bits/local_lim.h>
#endif /* __KERNEL__ */
......
......@@ -34,7 +34,7 @@
#include <pthread.h>
#include <asm/xenomai/atomic.h>
#include <asm/xenomai/syscall.h>
#include <xenomai/asm-uvm/uvm.h>
#include <asm-uvm/uvm.h>
/* Module arg macros */
#define vartype(var) var ## _ ## tYpE
......
......@@ -22,9 +22,9 @@
#ifndef _XENO_ALARM_H
#define _XENO_ALARM_H
#include <xenomai/nucleus/timer.h>
#include <xenomai/nucleus/synch.h>
#include <xenomai/native/types.h>
#include <nucleus/timer.h>
#include <nucleus/synch.h>
#include <native/types.h>
typedef struct rt_alarm_info {
......
......@@ -22,8 +22,8 @@
#ifndef _XENO_COND_H
#define _XENO_COND_H
#include <xenomai/nucleus/synch.h>
#include <xenomai/native/mutex.h>
#include <nucleus/synch.h>
#include <native/mutex.h>
typedef struct rt_cond_info {
......
......@@ -22,8 +22,8 @@
#ifndef _XENO_EVENT_H
#define _XENO_EVENT_H
#include <xenomai/nucleus/synch.h>
#include <xenomai/native/types.h>
#include <nucleus/synch.h>
#include <native/types.h>
/* Creation flags. */
#define EV_PRIO XNSYNCH_PRIO /* Pend by task priority order. */
......
......@@ -22,9 +22,9 @@
#ifndef _XENO_HEAP_H
#define _XENO_HEAP_H
#include <xenomai/nucleus/synch.h>
#include <xenomai/nucleus/heap.h>
#include <xenomai/native/types.h>
#include <nucleus/synch.h>
#include <nucleus/heap.h>
#include <native/types.h>
/* Creation flags. */
#define H_PRIO XNSYNCH_PRIO /* Pend by task priority order. */
......
......@@ -22,9 +22,9 @@
#ifndef _XENO_INTR_H
#define _XENO_INTR_H
#include <xenomai/nucleus/synch.h>
#include <xenomai/nucleus/intr.h>
#include <xenomai/native/types.h>
#include <nucleus/synch.h>
#include <nucleus/intr.h>
#include <native/types.h>
/* Creation flag. */
#define I_AUTOENA XN_ISR_ENABLE /* Auto-enable interrupt channel
......
......@@ -22,7 +22,7 @@
#ifndef _XENO_MISC_H
#define _XENO_MISC_H
#include <xenomai/native/types.h>
#include <native/types.h>
#if !defined(__KERNEL__) && !defined(__XENO_SIM__)
......
......@@ -22,8 +22,8 @@
#ifndef _XENO_MUTEX_H
#define _XENO_MUTEX_H
#include <xenomai/nucleus/synch.h>
#include <xenomai/native/types.h>
#include <nucleus/synch.h>
#include <native/types.h>
struct rt_task;
......
......@@ -22,9 +22,9 @@
#ifndef _XENO_PIPE_H
#define _XENO_PIPE_H
#include <xenomai/nucleus/pipe.h>
#include <xenomai/nucleus/heap.h>
#include <xenomai/native/types.h>
#include <nucleus/pipe.h>
#include <nucleus/heap.h>
#include <native/types.h>
/* Operation flags. */
#define P_NORMAL XNPIPE_NORMAL
......
......@@ -22,9 +22,9 @@
#ifndef _XENO_QUEUE_H
#define _XENO_QUEUE_H
#include <xenomai/nucleus/synch.h>
#include <xenomai/nucleus/heap.h>
#include <xenomai/native/types.h>
#include <nucleus/synch.h>
#include <nucleus/heap.h>
#include <native/types.h>
/* Creation flags. */
#define Q_PRIO XNSYNCH_PRIO /* Pend by task priority order. */
......
......@@ -22,7 +22,7 @@
#ifndef _XENO_REGISTRY_H
#define _XENO_REGISTRY_H
#include <xenomai/native/types.h>
#include <native/types.h>
#define RT_REGISTRY_SELF RT_HANDLE_INVALID
......@@ -32,8 +32,8 @@
#if defined(__KERNEL__) || defined(__XENO_SIM__)
#include <xenomai/nucleus/synch.h>
#include <xenomai/nucleus/thread.h>
#include <nucleus/synch.h>
#include <nucleus/thread.h>
struct rt_object_procnode;
......
......@@ -22,8 +22,8 @@
#ifndef _XENO_SEM_H
#define _XENO_SEM_H
#include <xenomai/nucleus/synch.h>
#include <xenomai/native/types.h>
#include <nucleus/synch.h>
#include <native/types.h>
/* Creation flags. */
#define S_PRIO XNSYNCH_PRIO /* Pend by task priority order. */
......
......@@ -22,10 +22,10 @@
#ifndef _XENO_TASK_H
#define _XENO_TASK_H
#include <xenomai/nucleus/core.h>
#include <xenomai/nucleus/thread.h>
#include <xenomai/nucleus/synch.h>
#include <xenomai/native/timer.h>
#include <nucleus/core.h>
#include <nucleus/thread.h>
#include <nucleus/synch.h>
#include <native/timer.h>
/* Creation flags. */
#define T_FPU XNFPU
......
......@@ -22,8 +22,8 @@
#ifndef _XENO_TIMER_H
#define _XENO_TIMER_H
#include <xenomai/nucleus/timer.h>
#include <xenomai/native/types.h>
#include <nucleus/timer.h>
#include <native/types.h>
#define TM_UNSET XN_NO_TICK
#define TM_ONESHOT XN_APERIODIC_TICK
......@@ -56,9 +56,9 @@ RTIME rt_timer_tsc(void);
void rt_timer_spin(RTIME ns);
int __deprecated__ rt_timer_start(RTIME nstick);
int __deprecated_call__ rt_timer_start(RTIME nstick);
void __deprecated__ rt_timer_stop(void);
void __deprecated_call__ rt_timer_stop(void);
#ifdef __cplusplus
}
......
......@@ -24,7 +24,7 @@
#define XENO_SKIN_MAGIC 0x52544149
#include <xenomai/nucleus/types.h>
#include <nucleus/types.h>
#define TM_INFINITE XN_INFINITE
#define TM_NONBLOCK XN_NONBLOCK
......
......@@ -20,7 +20,7 @@
#ifndef _XENO_NUCLEUS_HEAP_H
#define _XENO_NUCLEUS_HEAP_H
#include <xenomai/nucleus/queue.h>
#include <nucleus/queue.h>
/*
* CONSTRAINTS:
......
......@@ -20,7 +20,7 @@
#ifndef _XENO_NUCLEUS_INTR_H
#define _XENO_NUCLEUS_INTR_H
#include <xenomai/nucleus/types.h>
#include <nucleus/types.h>
#define XN_ISR_HANDLED 0x0
#define XN_ISR_CHAINED 0x1
......
......@@ -21,7 +21,7 @@
#ifndef _XENO_NUCLEUS_LTT_H
#define _XENO_NUCLEUS_LTT_H
#include <xenomai/nucleus/types.h>
#include <nucleus/types.h>
#ifdef CONFIG_LTT
......
......@@ -20,7 +20,7 @@
#ifndef _XENO_NUCLEUS_MODULE_H
#define _XENO_NUCLEUS_MODULE_H
#include <xenomai/nucleus/queue.h>
#include <nucleus/queue.h>
#define XNMOD_GHOLDER_REALLOC 128 /* Realloc count */
#define XNMOD_GHOLDER_THRESHOLD 64 /* Safety threshold */
......
......@@ -34,9 +34,9 @@
#ifdef __KERNEL__
#include <xenomai/nucleus/queue.h>
#include <xenomai/nucleus/synch.h>
#include <xenomai/nucleus/thread.h>
#include <nucleus/queue.h>
#include <nucleus/synch.h>
#include <nucleus/thread.h>
#include <linux/types.h>
#include <linux/poll.h>
......
......@@ -31,8 +31,8 @@
/*! \addtogroup pod
*@{*/
#include <xenomai/nucleus/thread.h>
#include <xenomai/nucleus/intr.h>
#include <nucleus/thread.h>
#include <nucleus/intr.h>
/* Creation flags */
#define XNDREORD 0x00000001 /* Don't reorder pend queues upon prio change */
......
......@@ -20,7 +20,7 @@
#ifndef _XENO_NUCLEUS_QUEUE_H
#define _XENO_NUCLEUS_QUEUE_H
#include <xenomai/nucleus/types.h>
#include <nucleus/types.h>
/* Basic element holder */
......
......@@ -20,7 +20,7 @@
#ifndef _XENO_NUCLEUS_SYNCH_H
#define _XENO_NUCLEUS_SYNCH_H
#include <xenomai/nucleus/queue.h>
#include <nucleus/queue.h>
/* Creation flags */
#define XNSYNCH_FIFO 0x0
......
......@@ -31,7 +31,7 @@ static inline unsigned long ffnz (unsigned long ul) {
#include <asm-uvm/system.h>
#else /* !__XENO_UVM__ */
#include <asm/xenomai/atomic.h>
#include <xenomai/nucleus/core.h>
#include <nucleus/core.h>
#endif /* __XENO_UVM__ */
#endif /* !_XENO_NUCLEUS_SYSTEM_H */
......@@ -20,7 +20,7 @@
#ifndef _XENO_NUCLEUS_THREAD_H
#define _XENO_NUCLEUS_THREAD_H
#include <xenomai/nucleus/timer.h>
#include <nucleus/timer.h>
/* Status flags */
#define XNSUSP 0x00000001 /* Suspended */
......
......@@ -20,7 +20,7 @@
#ifndef _XENO_NUCLEUS_TIMER_H
#define _XENO_NUCLEUS_TIMER_H
#include <xenomai/nucleus/queue.h>
#include <nucleus/queue.h>
#if defined(__KERNEL__) || defined(__XENO_UVM__) || defined(__XENO_SIM__)
......
......@@ -38,7 +38,7 @@
#endif /* __KERNEL__ */
#include <asm/xenomai/system.h>
#include <xenomai/nucleus/compiler.h>
#include <nucleus/compiler.h>
typedef unsigned long xnsigmask_t;
......
......@@ -20,11 +20,11 @@
#ifndef _XENO_NUCLEUS_XENOMAI_H
#define _XENO_NUCLEUS_XENOMAI_H
#include <xenomai/nucleus/pod.h>
#include <xenomai/nucleus/synch.h>
#include <xenomai/nucleus/heap.h>
#include <xenomai/nucleus/intr.h>
#include <xenomai/nucleus/module.h>
#include <xenomai/nucleus/version.h>
#include <nucleus/pod.h>
#include <nucleus/synch.h>
#include <nucleus/heap.h>
#include <nucleus/intr.h>
#include <nucleus/module.h>
#include <nucleus/version.h>
#endif /* !_XENO_NUCLEUS_XENOMAI_H */
......@@ -21,7 +21,7 @@
#if defined(__KERNEL__) || defined(__XENO_SIM__)
#include <xenomai/nucleus/xenomai.h>
#include <nucleus/xenomai.h>
#ifdef __KERNEL__
#include <linux/types.h>
......
......@@ -20,8 +20,8 @@
#ifndef _psos_asr_h
#define _psos_asr_h
#include "xenomai/psos+/defs.h"
#include "xenomai/psos+/psos.h"
#include "psos+/defs.h"
#include "psos+/psos.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -20,7 +20,7 @@
#ifndef _psos_defs_h
#define _psos_defs_h
#include "xenomai/nucleus/xenomai.h"
#include "nucleus/xenomai.h"
#define psos_h2obj_active(h,m,t) \
((h) && ((t *)(h))->magic == (m) ? ((t *)(h)) : NULL)
......
......@@ -20,8 +20,8 @@
#ifndef _psos_event_h
#define _psos_event_h
#include "xenomai/psos+/defs.h"
#include "xenomai/psos+/psos.h"
#include "psos+/defs.h"
#include "psos+/psos.h"
typedef struct psosevent {
......
......@@ -25,7 +25,7 @@
#ifndef _XENO_SKIN_PSOS_H
#define _XENO_SKIN_PSOS_H
#include <xenomai/nucleus/xenomai.h>
#include <nucleus/xenomai.h>
#define PSOS_SKIN_VERSION_CODE 0x00000004
#define PSOS_SKIN_MAGIC 0x50534F53
......
......@@ -20,8 +20,8 @@
#ifndef _psos_pt_h
#define _psos_pt_h
#include "xenomai/psos+/defs.h"
#include "xenomai/psos+/psos.h"
#include "psos+/defs.h"
#include "psos+/psos.h"
#define PSOS_PT_MAGIC 0x81810404
......
......@@ -20,8 +20,8 @@
#ifndef _psos_queue_h
#define _psos_queue_h
#include "xenomai/psos+/defs.h"
#include "xenomai/psos+/psos.h"
#include "psos+/defs.h"
#include "psos+/psos.h"
#define PSOS_QUEUE_MAGIC 0x81810303
......
......@@ -20,8 +20,8 @@
#ifndef _psos_rn_h
#define _psos_rn_h
#include "xenomai/psos+/defs.h"
#include "xenomai/psos+/psos.h"
#include "psos+/defs.h"
#include "psos+/psos.h"
#define PSOS_RN_MAGIC 0x81810505
......
......@@ -20,8 +20,8 @@
#ifndef _psos_sem_h
#define _psos_sem_h
#include "xenomai/psos+/defs.h"
#include "xenomai/psos+/psos.h"
#include "psos+/defs.h"
#include "psos+/psos.h"
#define PSOS_SEM_MAGIC 0x81810202
......
......@@ -20,7 +20,7 @@
#ifndef _psos_task_h
#define _psos_task_h
#include "xenomai/psos+/event.h"
#include "psos+/event.h"
#define PSOSTASK_NOTEPAD_REGS 16
......
......@@ -20,8 +20,8 @@
#ifndef _psos_tm_h
#define _psos_tm_h
#include "xenomai/psos+/defs.h"
#include "xenomai/psos+/psos.h"
#include "psos+/defs.h"
#include "psos+/psos.h"
#define PSOS_TM_MAGIC 0x81810505
......
......@@ -21,8 +21,8 @@
#ifndef _RTAI_FIFO_H
#define _RTAI_FIFO_H
#include <xenomai/nucleus/pipe.h>
#include <xenomai/rtai/types.h>
#include <nucleus/pipe.h>
#include <rtai/types.h>
#if defined(__KERNEL__) || defined(__XENO_SIM__)
......
......@@ -21,7 +21,7 @@
#ifndef _RTAI_INTR_H
#define _RTAI_INTR_H
#include <xenomai/rtai/types.h>
#include <rtai/types.h>
#ifdef __cplusplus
extern "C" {
......
......@@ -20,7 +20,7 @@
#ifndef _RTAI_XENO_MEM_MGR_H
#define _RTAI_XENO_MEM_MGR_H
#include <xenomai/nucleus/heap.h>
#include <nucleus/heap.h>
#define rt_alloc(size) xnheap_alloc(&kheap,size)
......
......@@ -21,6 +21,6 @@
#ifndef _RTAI_XENO_FIFOS_H
#define _RTAI_XENO_FIFOS_H
#include <xenomai/rtai/fifo.h>
#include <rtai/fifo.h>
#endif /* !_RTAI_XENO_FIFOS_H */
......@@ -21,6 +21,6 @@
#ifndef _RTAI_XENO_HAL_H
#define _RTAI_XENO_HAL_H
#include <xenomai/rtai/intr.h>
#include <rtai/intr.h>
#endif /* !_RTAI_XENO_HAL_H */
......@@ -19,7 +19,7 @@
#ifndef _RTAI_XENO_NAM2NUM_H
#define _RTAI_XENO_NAM2NUM_H
#include <xenomai/rtai/rtai_types.h>
#include <rtai/rtai_types.h>
static inline unsigned long nam2num (const char *name)
{
......
......@@ -21,8 +21,8 @@
#ifndef _RTAI_XENO_SCHED_H
#define _RTAI_XENO_SCHED_H
#include <xenomai/rtai/rtai_hal.h>
#include <xenomai/rtai/task.h>
#include <xenomai/rtai/timer.h>
#include <rtai/rtai_hal.h>
#include <rtai/task.h>
#include <rtai/timer.h>
#endif /* !_RTAI_XENO_SCHED_H */
......@@ -21,6 +21,6 @@
#ifndef _RTAI_XENO_SEM_H
#define _RTAI_XENO_SEM_H
#include <xenomai/rtai/sem.h>
#include <rtai/sem.h>
#endif /* !_RTAI_XENO_SEM_H */
......@@ -21,6 +21,6 @@
#ifndef _RTAI_XENO_SHM_H
#define _RTAI_XENO_SHM_H
#include <xenomai/rtai/shm.h>
#include <rtai/shm.h>