Module: xenomai-forge
Branch: master
Commit: a36f25171b91c0f29c75d17b73550c4b44dc7a67
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=a36f25171b91c0f29c75d17b73550c4b44dc7a67

Author: Philippe Gerum <r...@xenomai.org>
Date:   Sun Jan  1 17:08:12 2012 +0100

cobalt: remove xenomai.h

---

 configure                          |   20 ++++++++++----------
 include/cobalt/errno.h             |   13 +++----------
 include/cobalt/fcntl.h             |    1 -
 include/cobalt/mqueue.h            |    1 -
 include/cobalt/nucleus/Makefile.am |    1 -
 include/cobalt/nucleus/Makefile.in |    1 -
 include/cobalt/nucleus/xenomai.h   |   30 ------------------------------
 include/cobalt/pthread.h           |    1 -
 include/cobalt/sched.h             |    2 +-
 include/cobalt/semaphore.h         |    1 -
 include/cobalt/signal.h            |    1 -
 include/cobalt/sys/mman.h          |    1 -
 include/cobalt/time.h              |    1 -
 include/cobalt/unistd.h            |    1 -
 include/rtdm/rtdm_driver.h         |    3 ++-
 kernel/cobalt/internal.h           |    3 ++-
 16 files changed, 18 insertions(+), 63 deletions(-)

diff --git a/configure b/configure
index 126b897..f47d961 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for Xenomai 2.6.0.
+# Generated by GNU Autoconf 2.67 for Xenomai 2.99.0.
 #
 # Report bugs to <xenomai-h...@gna.org>.
 #
@@ -562,8 +562,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Xenomai'
 PACKAGE_TARNAME='xenomai'
-PACKAGE_VERSION='2.6.0'
-PACKAGE_STRING='Xenomai 2.6.0'
+PACKAGE_VERSION='2.99.0'
+PACKAGE_STRING='Xenomai 2.99.0'
 PACKAGE_BUGREPORT='xenomai-h...@gna.org'
 PACKAGE_URL=''
 
@@ -1377,7 +1377,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Xenomai 2.6.0 to adapt to many kinds of systems.
+\`configure' configures Xenomai 2.99.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1448,7 +1448,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Xenomai 2.6.0:";;
+     short | recursive ) echo "Configuration of Xenomai 2.99.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1584,7 +1584,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Xenomai configure 2.6.0
+Xenomai configure 2.99.0
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1953,7 +1953,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Xenomai $as_me 2.6.0, which was
+It was created by Xenomai $as_me 2.99.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -4660,7 +4660,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xenomai'
- VERSION='2.6.0'
+ VERSION='2.99.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14327,7 +14327,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Xenomai $as_me 2.6.0, which was
+This file was extended by Xenomai $as_me 2.99.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14397,7 +14397,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Xenomai config.status 2.6.0
+Xenomai config.status 2.99.0
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/include/cobalt/errno.h b/include/cobalt/errno.h
index 92c6c3d..2ad0fda 100644
--- a/include/cobalt/errno.h
+++ b/include/cobalt/errno.h
@@ -21,25 +21,18 @@
 
 #ifdef __KERNEL__
 
-#include <nucleus/xenomai.h>
 #include <linux/errno.h>
 #include <linux/unistd.h>         /* conflicting declaration of errno. */
 
+struct xnthread;
+
 /* errno values pasted from Linux asm/errno.h and bits/errno.h (ENOTSUP). */
 #define ENOTSUP         EOPNOTSUPP
 #define        ETIMEDOUT       110     /* Connection timed out */
 
 #define errno (*xnthread_get_errno_location(xnpod_current_thread()))
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int *xnthread_get_errno_location(xnthread_t *thread);
-
-#ifdef __cplusplus
-}
-#endif
+int *xnthread_get_errno_location(struct xnthread *thread);
 
 #else /* !__KERNEL__ */
 
diff --git a/include/cobalt/fcntl.h b/include/cobalt/fcntl.h
index ac13cf3..61c1194 100644
--- a/include/cobalt/fcntl.h
+++ b/include/cobalt/fcntl.h
@@ -21,7 +21,6 @@
 
 #ifdef __KERNEL__
 
-#include <nucleus/xenomai.h>
 #include <linux/fcntl.h>
 
 #ifdef __cplusplus
diff --git a/include/cobalt/mqueue.h b/include/cobalt/mqueue.h
index 09e4883..fd21558 100644
--- a/include/cobalt/mqueue.h
+++ b/include/cobalt/mqueue.h
@@ -21,7 +21,6 @@
 
 #ifdef __KERNEL__
 
-#include <nucleus/xenomai.h>
 #include <linux/types.h>
 #include <linux/signal.h>
 #include <linux/fcntl.h>
diff --git a/include/cobalt/nucleus/Makefile.am 
b/include/cobalt/nucleus/Makefile.am
index 9c2342f..6d2fb92 100644
--- a/include/cobalt/nucleus/Makefile.am
+++ b/include/cobalt/nucleus/Makefile.am
@@ -36,5 +36,4 @@ includesub_HEADERS = \
        vdso.h \
        seqlock.h \
        version.h \
-       xenomai.h \
        vfile.h
diff --git a/include/cobalt/nucleus/Makefile.in 
b/include/cobalt/nucleus/Makefile.in
index 3677fe3..70eaff2 100644
--- a/include/cobalt/nucleus/Makefile.in
+++ b/include/cobalt/nucleus/Makefile.in
@@ -277,7 +277,6 @@ includesub_HEADERS = \
        vdso.h \
        seqlock.h \
        version.h \
-       xenomai.h \
        vfile.h
 
 all: all-am
diff --git a/include/cobalt/nucleus/xenomai.h b/include/cobalt/nucleus/xenomai.h
deleted file mode 100644
index 3e7ef6e..0000000
--- a/include/cobalt/nucleus/xenomai.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2001,2002,2003 Philippe Gerum <r...@xenomai.org>.
- *
- * Xenomai is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * Xenomai is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Xenomai; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _XENO_NUCLEUS_XENOMAI_H
-#define _XENO_NUCLEUS_XENOMAI_H
-
-#include <nucleus/pod.h>
-#include <nucleus/synch.h>
-#include <nucleus/heap.h>
-#include <nucleus/intr.h>
-#include <nucleus/clock.h>
-#include <nucleus/version.h>
-
-#endif /* !_XENO_NUCLEUS_XENOMAI_H */
diff --git a/include/cobalt/pthread.h b/include/cobalt/pthread.h
index d59c74b..6531980 100644
--- a/include/cobalt/pthread.h
+++ b/include/cobalt/pthread.h
@@ -21,7 +21,6 @@
 
 #ifdef __KERNEL__
 
-#include <nucleus/xenomai.h>
 #include <linux/types.h>
 #include <sched.h>
 
diff --git a/include/cobalt/sched.h b/include/cobalt/sched.h
index 5519e3f..e21f8d9 100644
--- a/include/cobalt/sched.h
+++ b/include/cobalt/sched.h
@@ -21,7 +21,7 @@
 
 #ifdef __KERNEL__
 
-#include <nucleus/xenomai.h>
+#include <nucleus/sched.h>
 #include <linux/sched.h>
 
 #define SCHED_OTHER 0
diff --git a/include/cobalt/semaphore.h b/include/cobalt/semaphore.h
index 4458392..f4423f0 100644
--- a/include/cobalt/semaphore.h
+++ b/include/cobalt/semaphore.h
@@ -21,7 +21,6 @@
 
 #ifdef __KERNEL__
 
-#include <nucleus/xenomai.h>
 #include <linux/kernel.h>
 #include <linux/fcntl.h>
 
diff --git a/include/cobalt/signal.h b/include/cobalt/signal.h
index 48d43a9..6b20370 100644
--- a/include/cobalt/signal.h
+++ b/include/cobalt/signal.h
@@ -21,7 +21,6 @@
 
 #ifdef __KERNEL__
 
-#include <nucleus/xenomai.h>
 #include <linux/signal.h>
 
 /* These are not defined in kernel-space headers. */
diff --git a/include/cobalt/sys/mman.h b/include/cobalt/sys/mman.h
index b8b1348..96543f6 100644
--- a/include/cobalt/sys/mman.h
+++ b/include/cobalt/sys/mman.h
@@ -21,7 +21,6 @@
 
 #ifdef __KERNEL__
 
-#include <nucleus/xenomai.h>
 #include <asm/mman.h>
 
 #define MAP_FAILED ((void *) -1)
diff --git a/include/cobalt/time.h b/include/cobalt/time.h
index 2f71e94..30d477d 100644
--- a/include/cobalt/time.h
+++ b/include/cobalt/time.h
@@ -21,7 +21,6 @@
 
 #ifdef __KERNEL__
 
-#include <nucleus/xenomai.h>
 #include <linux/time.h>
 
 #define DELAYTIMER_MAX UINT_MAX
diff --git a/include/cobalt/unistd.h b/include/cobalt/unistd.h
index cc71522..80152ed 100644
--- a/include/cobalt/unistd.h
+++ b/include/cobalt/unistd.h
@@ -21,7 +21,6 @@
 
 #ifdef __KERNEL__
 
-#include <nucleus/xenomai.h>
 #include <linux/types.h>
 
 #ifdef __cplusplus
diff --git a/include/rtdm/rtdm_driver.h b/include/rtdm/rtdm_driver.h
index fa0076d..2eee4ce 100644
--- a/include/rtdm/rtdm_driver.h
+++ b/include/rtdm/rtdm_driver.h
@@ -34,13 +34,14 @@
 #include <asm/atomic.h>
 #include <linux/list.h>
 
-#include <nucleus/xenomai.h>
 #include <nucleus/heap.h>
 #include <nucleus/pod.h>
+#include <nucleus/intr.h>
 #include <nucleus/synch.h>
 #include <nucleus/select.h>
 #include <nucleus/vfile.h>
 #include <nucleus/clock.h>
+#include <nucleus/version.h>
 #include <rtdm/rtdm.h>
 
 /* debug support */
diff --git a/kernel/cobalt/internal.h b/kernel/cobalt/internal.h
index 89cff70..65d54d7 100644
--- a/kernel/cobalt/internal.h
+++ b/kernel/cobalt/internal.h
@@ -19,7 +19,8 @@
 #ifndef _POSIX_INTERNAL_H
 #define _POSIX_INTERNAL_H
 
-#include <nucleus/xenomai.h>
+#include <nucleus/pod.h>
+#include <nucleus/heap.h>
 #include <nucleus/ppd.h>
 #include <nucleus/select.h>
 #include <cobalt/posix.h>


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git

Reply via email to