Module: xenomai-forge
Branch: next
Commit: 714a65100952ac160f0051d940309241e5458050
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=714a65100952ac160f0051d940309241e5458050
Author: Philippe Gerum <r...@xenomai.org>
Date: Thu Jul 4 11:55:43 2013 +0200
include/cobalt/uapi/sys: move to include/cobalt/kernel/uapi
---
configure | 4 +-
configure.in | 2 +-
include/cobalt/kernel/Makefile.am | 1 +
include/cobalt/kernel/Makefile.in | 206 ++++++++++++++++----
include/cobalt/kernel/clock.h | 2 +-
include/cobalt/kernel/heap.h | 4 +-
include/cobalt/kernel/thread.h | 4 +-
include/cobalt/kernel/trace.h | 2 +-
.../cobalt/{uapi/sys => kernel/uapi}/Makefile.am | 2 +-
.../cobalt/{uapi/sys => kernel/uapi}/Makefile.in | 8 +-
include/cobalt/{uapi/sys => kernel/uapi}/heap.h | 6 +-
include/cobalt/{uapi/sys => kernel/uapi}/synch.h | 8 +-
include/cobalt/{uapi/sys => kernel/uapi}/thread.h | 8 +-
include/cobalt/{uapi/sys => kernel/uapi}/trace.h | 6 +-
include/cobalt/{uapi/sys => kernel/uapi}/types.h | 6 +-
include/cobalt/{uapi/sys => kernel/uapi}/urw.h | 6 +-
include/cobalt/{uapi/sys => kernel/uapi}/vdso.h | 8 +-
include/cobalt/kernel/vdso.h | 2 +-
include/cobalt/ticks.h | 2 +-
include/cobalt/uapi/Makefile.am | 2 +-
include/cobalt/uapi/Makefile.in | 2 +-
include/cobalt/uapi/thread.h | 2 +-
include/copperplate/threadobj.h | 2 +-
include/rtdm/rtipc.h | 2 +-
lib/cobalt/init.c | 2 +-
lib/cobalt/internal.h | 4 +-
lib/cobalt/sem_heap.c | 2 +-
lib/cobalt/trace.c | 2 +-
testsuite/clocktest/clocktest.c | 2 +-
testsuite/regression/posix/leaks.c | 2 +-
testsuite/unit/check-vdso.c | 2 +-
31 files changed, 221 insertions(+), 92 deletions(-)
diff --git a/configure b/configure
index aafdea1..6439f5f 100755
--- a/configure
+++ b/configure
@@ -14101,7 +14101,7 @@ fi
-ac_config_files="$ac_config_files Makefile config/Makefile scripts/Makefile
scripts/xeno-config:scripts/xeno-config-$rtcore_type.in scripts/xeno
lib/Makefile lib/cobalt/Makefile lib/cobalt/sysdeps/Makefile
lib/cobalt/sysdeps/arm/Makefile lib/cobalt/sysdeps/powerpc/Makefile
lib/cobalt/sysdeps/blackfin/Makefile lib/cobalt/sysdeps/x86/Makefile
lib/cobalt/sysdeps/nios2/Makefile lib/cobalt/sysdeps/sh/Makefile
lib/copperplate/Makefile lib/copperplate/regd/Makefile lib/alchemy/Makefile
lib/vxworks/Makefile lib/psos/Makefile lib/analogy/Makefile
lib/include/Makefile testsuite/Makefile testsuite/latency/Makefile
testsuite/cyclic/Makefile testsuite/switchtest/Makefile
testsuite/clocktest/Makefile testsuite/unit/Makefile
testsuite/xeno-test/Makefile testsuite/regression/Makefile
testsuite/regression/posix/Makefile utils/Makefile utils/can/Makefile
utils/analogy/Makefile utils/ps/Makefile utils/slackspot/Makefile
include/Makefile include/nocore/Makefile include/cobalt/uapi/Makefile
include/coba
lt/uapi/sys/Makefile include/cobalt/uapi/rtdm/Makefile
include/cobalt/asm-generic/Makefile include/cobalt/asm-generic/uapi/Makefile
include/cobalt/asm-generic/ipipe/Makefile include/cobalt/asm-blackfin/Makefile
include/cobalt/asm-blackfin/uapi/Makefile include/cobalt/asm-x86/Makefile
include/cobalt/asm-x86/uapi/Makefile include/cobalt/asm-powerpc/Makefile
include/cobalt/asm-powerpc/uapi/Makefile include/cobalt/asm-arm/Makefile
include/cobalt/asm-arm/uapi/Makefile include/cobalt/asm-nios2/Makefile
include/cobalt/asm-nios2/uapi/Makefile include/cobalt/asm-sh/Makefile
include/cobalt/asm-sh/uapi/Makefile include/cobalt/Makefile
include/cobalt/sys/Makefile include/cobalt/kernel/Makefile
include/rtdm/Makefile include/analogy/Makefile include/mercury/Makefile
include/copperplate/Makefile include/alchemy/Makefile include/vxworks/Makefile
include/psos/Makefile"
+ac_config_files="$ac_config_files Makefile config/Makefile scripts/Makefile
scripts/xeno-config:scripts/xeno-config-$rtcore_type.in scripts/xeno
lib/Makefile lib/cobalt/Makefile lib/cobalt/sysdeps/Makefile
lib/cobalt/sysdeps/arm/Makefile lib/cobalt/sysdeps/powerpc/Makefile
lib/cobalt/sysdeps/blackfin/Makefile lib/cobalt/sysdeps/x86/Makefile
lib/cobalt/sysdeps/nios2/Makefile lib/cobalt/sysdeps/sh/Makefile
lib/copperplate/Makefile lib/copperplate/regd/Makefile lib/alchemy/Makefile
lib/vxworks/Makefile lib/psos/Makefile lib/analogy/Makefile
lib/include/Makefile testsuite/Makefile testsuite/latency/Makefile
testsuite/cyclic/Makefile testsuite/switchtest/Makefile
testsuite/clocktest/Makefile testsuite/unit/Makefile
testsuite/xeno-test/Makefile testsuite/regression/Makefile
testsuite/regression/posix/Makefile utils/Makefile utils/can/Makefile
utils/analogy/Makefile utils/ps/Makefile utils/slackspot/Makefile
include/Makefile include/nocore/Makefile include/cobalt/uapi/Makefile
include/coba
lt/uapi/rtdm/Makefile include/cobalt/asm-generic/Makefile
include/cobalt/asm-generic/uapi/Makefile
include/cobalt/asm-generic/ipipe/Makefile include/cobalt/asm-blackfin/Makefile
include/cobalt/asm-blackfin/uapi/Makefile include/cobalt/asm-x86/Makefile
include/cobalt/asm-x86/uapi/Makefile include/cobalt/asm-powerpc/Makefile
include/cobalt/asm-powerpc/uapi/Makefile include/cobalt/asm-arm/Makefile
include/cobalt/asm-arm/uapi/Makefile include/cobalt/asm-nios2/Makefile
include/cobalt/asm-nios2/uapi/Makefile include/cobalt/asm-sh/Makefile
include/cobalt/asm-sh/uapi/Makefile include/cobalt/Makefile
include/cobalt/sys/Makefile include/cobalt/kernel/Makefile
include/cobalt/kernel/uapi/Makefile include/rtdm/Makefile
include/analogy/Makefile include/mercury/Makefile include/copperplate/Makefile
include/alchemy/Makefile include/vxworks/Makefile include/psos/Makefile"
if test \! x$XENO_MAYBE_DOCDIR = x ; then
@@ -15219,7 +15219,6 @@ do
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"include/nocore/Makefile") CONFIG_FILES="$CONFIG_FILES
include/nocore/Makefile" ;;
"include/cobalt/uapi/Makefile") CONFIG_FILES="$CONFIG_FILES
include/cobalt/uapi/Makefile" ;;
- "include/cobalt/uapi/sys/Makefile") CONFIG_FILES="$CONFIG_FILES
include/cobalt/uapi/sys/Makefile" ;;
"include/cobalt/uapi/rtdm/Makefile") CONFIG_FILES="$CONFIG_FILES
include/cobalt/uapi/rtdm/Makefile" ;;
"include/cobalt/asm-generic/Makefile") CONFIG_FILES="$CONFIG_FILES
include/cobalt/asm-generic/Makefile" ;;
"include/cobalt/asm-generic/uapi/Makefile") CONFIG_FILES="$CONFIG_FILES
include/cobalt/asm-generic/uapi/Makefile" ;;
@@ -15239,6 +15238,7 @@ do
"include/cobalt/Makefile") CONFIG_FILES="$CONFIG_FILES
include/cobalt/Makefile" ;;
"include/cobalt/sys/Makefile") CONFIG_FILES="$CONFIG_FILES
include/cobalt/sys/Makefile" ;;
"include/cobalt/kernel/Makefile") CONFIG_FILES="$CONFIG_FILES
include/cobalt/kernel/Makefile" ;;
+ "include/cobalt/kernel/uapi/Makefile") CONFIG_FILES="$CONFIG_FILES
include/cobalt/kernel/uapi/Makefile" ;;
"include/rtdm/Makefile") CONFIG_FILES="$CONFIG_FILES
include/rtdm/Makefile" ;;
"include/analogy/Makefile") CONFIG_FILES="$CONFIG_FILES
include/analogy/Makefile" ;;
"include/mercury/Makefile") CONFIG_FILES="$CONFIG_FILES
include/mercury/Makefile" ;;
diff --git a/configure.in b/configure.in
index ef15dc2..f8de179 100644
--- a/configure.in
+++ b/configure.in
@@ -831,7 +831,6 @@ AC_CONFIG_FILES([ \
include/Makefile \
include/nocore/Makefile \
include/cobalt/uapi/Makefile \
- include/cobalt/uapi/sys/Makefile \
include/cobalt/uapi/rtdm/Makefile \
include/cobalt/asm-generic/Makefile \
include/cobalt/asm-generic/uapi/Makefile \
@@ -851,6 +850,7 @@ AC_CONFIG_FILES([ \
include/cobalt/Makefile \
include/cobalt/sys/Makefile \
include/cobalt/kernel/Makefile \
+ include/cobalt/kernel/uapi/Makefile \
include/rtdm/Makefile \
include/analogy/Makefile \
include/mercury/Makefile \
diff --git a/include/cobalt/kernel/Makefile.am
b/include/cobalt/kernel/Makefile.am
index f49b6f2..dcc4dd4 100644
--- a/include/cobalt/kernel/Makefile.am
+++ b/include/cobalt/kernel/Makefile.am
@@ -33,3 +33,4 @@ noinst_HEADERS = \
vdso.h \
vfile.h
+SUBDIRS = uapi
diff --git a/include/cobalt/kernel/Makefile.in
b/include/cobalt/kernel/Makefile.in
index 1d95b51..402441a 100644
--- a/include/cobalt/kernel/Makefile.in
+++ b/include/cobalt/kernel/Makefile.in
@@ -71,15 +71,53 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
ETAGS = etags
CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
A2X = @A2X@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -278,7 +316,8 @@ noinst_HEADERS = \
vdso.h \
vfile.h
-all: all-am
+SUBDIRS = uapi
+all: all-recursive
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am
$(am__configure_deps)
@@ -318,6 +357,53 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS)
tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS)
ctags); \
+ done
+cscopelist-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS)
cscopelist); \
+ done
+
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -328,10 +414,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
mkid -fID $$unique
tags: TAGS
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -350,7 +449,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
fi; \
fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -367,7 +466,7 @@ GTAGS:
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: $(HEADERS) $(SOURCES) $(LISP)
+cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
list='$(SOURCES) $(HEADERS) $(LISP)'; \
case "$(srcdir)" in \
[\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
@@ -414,19 +513,45 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=:
am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
check-am: all-am
-check: check-am
+check: check-recursive
all-am: Makefile $(HEADERS)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-am
+installcheck: installcheck-recursive
install-strip:
if test -z '$(STRIP)'; then \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
@@ -448,86 +573,89 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-html: html-am
+html: html-recursive
html-am:
-info: info-am
+info: info-recursive
info-am:
install-data-am:
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
install-dvi-am:
install-exec-am:
-install-html: install-html-am
+install-html: install-html-recursive
install-html-am:
-install-info: install-info-am
+install-info: install-info-recursive
install-info-am:
install-man:
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
install-pdf-am:
-install-ps: install-ps-am
+install-ps: install-ps-recursive
install-ps-am:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-pdf: pdf-am
+pdf: pdf-recursive
pdf-am:
-ps: ps-am
+ps: ps-recursive
ps-am:
uninstall-am:
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool cscopelist ctags distclean distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
- uninstall-am
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
+ cscopelist-recursive ctags-recursive install-am install-strip \
+ tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+ cscopelist cscopelist-recursive ctags ctags-recursive \
+ distclean distclean-generic distclean-libtool distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/include/cobalt/kernel/clock.h b/include/cobalt/kernel/clock.h
index f4ad8ad..0a2f37d 100644
--- a/include/cobalt/kernel/clock.h
+++ b/include/cobalt/kernel/clock.h
@@ -28,7 +28,7 @@
#include <cobalt/kernel/list.h>
#include <cobalt/kernel/vfile.h>
-#include <cobalt/uapi/sys/types.h>
+#include <cobalt/kernel/uapi/types.h>
#define XNTBLCK 0x00000001 /* Time base is locked. */
diff --git a/include/cobalt/kernel/heap.h b/include/cobalt/kernel/heap.h
index 67ab718..0d71545 100644
--- a/include/cobalt/kernel/heap.h
+++ b/include/cobalt/kernel/heap.h
@@ -27,8 +27,8 @@
#include <cobalt/kernel/list.h>
#include <cobalt/kernel/trace.h>
#include <cobalt/kernel/misc.h>
-#include <cobalt/uapi/sys/types.h>
-#include <cobalt/uapi/sys/heap.h>
+#include <cobalt/kernel/uapi/types.h>
+#include <cobalt/kernel/uapi/heap.h>
/*
* Minimum page size is 2 ** XNHEAP_MINLOG2 (must be large enough to
diff --git a/include/cobalt/kernel/thread.h b/include/cobalt/kernel/thread.h
index e522599..10eb9b1 100644
--- a/include/cobalt/kernel/thread.h
+++ b/include/cobalt/kernel/thread.h
@@ -28,8 +28,8 @@
#include <cobalt/kernel/registry.h>
#include <cobalt/kernel/schedparam.h>
#include <cobalt/kernel/trace.h>
-#include <cobalt/uapi/sys/thread.h>
-#include <cobalt/uapi/sys/synch.h>
+#include <cobalt/kernel/uapi/thread.h>
+#include <cobalt/kernel/uapi/synch.h>
#include <asm/xenomai/machine.h>
#include <asm/xenomai/thread.h>
diff --git a/include/cobalt/kernel/trace.h b/include/cobalt/kernel/trace.h
index a3d3f5e..4451883 100644
--- a/include/cobalt/kernel/trace.h
+++ b/include/cobalt/kernel/trace.h
@@ -21,7 +21,7 @@
#include <linux/types.h>
#include <linux/ipipe_trace.h>
-#include <cobalt/uapi/sys/trace.h>
+#include <cobalt/kernel/uapi/trace.h>
#ifdef CONFIG_LTT
#include <linux/marker.h>
diff --git a/include/cobalt/uapi/sys/Makefile.am
b/include/cobalt/kernel/uapi/Makefile.am
similarity index 67%
rename from include/cobalt/uapi/sys/Makefile.am
rename to include/cobalt/kernel/uapi/Makefile.am
index c97a97f..f3d6418 100644
--- a/include/cobalt/uapi/sys/Makefile.am
+++ b/include/cobalt/kernel/uapi/Makefile.am
@@ -1,4 +1,4 @@
-includesubdir = $(includedir)/cobalt/uapi/sys
+includesubdir = $(includedir)/cobalt/kernel/uapi
includesub_HEADERS = \
heap.h \
diff --git a/include/cobalt/uapi/sys/Makefile.in
b/include/cobalt/kernel/uapi/Makefile.in
similarity index 98%
rename from include/cobalt/uapi/sys/Makefile.in
rename to include/cobalt/kernel/uapi/Makefile.in
index e04258f..1ec33cf 100644
--- a/include/cobalt/uapi/sys/Makefile.in
+++ b/include/cobalt/kernel/uapi/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = include/cobalt/uapi/sys
+subdir = include/cobalt/kernel/uapi
DIST_COMMON = $(includesub_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -272,7 +272,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/cobalt/uapi/sys
+includesubdir = $(includedir)/cobalt/kernel/uapi
includesub_HEADERS = \
heap.h \
synch.h \
@@ -294,9 +294,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@
$(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
include/cobalt/uapi/sys/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
include/cobalt/kernel/uapi/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign include/cobalt/uapi/sys/Makefile
+ $(AUTOMAKE) --foreign include/cobalt/kernel/uapi/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/include/cobalt/uapi/sys/heap.h b/include/cobalt/kernel/uapi/heap.h
similarity index 91%
rename from include/cobalt/uapi/sys/heap.h
rename to include/cobalt/kernel/uapi/heap.h
index 0448e0f..01c1b9c 100644
--- a/include/cobalt/uapi/sys/heap.h
+++ b/include/cobalt/kernel/uapi/heap.h
@@ -15,8 +15,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#ifndef _COBALT_UAPI_SYS_HEAP_H
-#define _COBALT_UAPI_SYS_HEAP_H
+#ifndef _COBALT_KERNEL_UAPI_HEAP_H
+#define _COBALT_KERNEL_UAPI_HEAP_H
#define XNHEAP_DEV_NAME "/dev/rtheap"
#define XNHEAP_DEV_MINOR 254
@@ -33,4 +33,4 @@ struct xnheap_desc {
unsigned long used;
};
-#endif /* !_COBALT_UAPI_SYS_HEAP_H */
+#endif /* !_COBALT_KERNEL_UAPI_HEAP_H */
diff --git a/include/cobalt/uapi/sys/synch.h
b/include/cobalt/kernel/uapi/synch.h
similarity index 93%
rename from include/cobalt/uapi/sys/synch.h
rename to include/cobalt/kernel/uapi/synch.h
index 491fcc4..1981d4c 100644
--- a/include/cobalt/uapi/sys/synch.h
+++ b/include/cobalt/kernel/uapi/synch.h
@@ -16,10 +16,10 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#ifndef _COBALT_UAPI_SYS_SYNCH_H
-#define _COBALT_UAPI_SYS_SYNCH_H
+#ifndef _COBALT_KERNEL_UAPI_SYNCH_H
+#define _COBALT_KERNEL_UAPI_SYNCH_H
-#include <cobalt/uapi/sys/types.h>
+#include <cobalt/kernel/uapi/types.h>
/* Creation flags */
#define XNSYNCH_FIFO 0x0
@@ -69,4 +69,4 @@ static inline int xnsynch_fast_release(atomic_long_t
*fastlock,
cur_ownerh);
}
-#endif /* !_COBALT_UAPI_SYS_SYNCH_H */
+#endif /* !_COBALT_KERNEL_UAPI_SYNCH_H */
diff --git a/include/cobalt/uapi/sys/thread.h
b/include/cobalt/kernel/uapi/thread.h
similarity index 96%
rename from include/cobalt/uapi/sys/thread.h
rename to include/cobalt/kernel/uapi/thread.h
index 6f9aad8..f4c4c78 100644
--- a/include/cobalt/uapi/sys/thread.h
+++ b/include/cobalt/kernel/uapi/thread.h
@@ -15,10 +15,10 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#ifndef _COBALT_UAPI_SYS_THREAD_H
-#define _COBALT_UAPI_SYS_THREAD_H
+#ifndef _COBALT_KERNEL_UAPI_THREAD_H
+#define _COBALT_KERNEL_UAPI_THREAD_H
-#include <cobalt/uapi/sys/types.h>
+#include <cobalt/kernel/uapi/types.h>
/**
* @ingroup nucleus
@@ -128,4 +128,4 @@ struct xnthread_user_window {
unsigned long grant_value;
};
-#endif /* !_COBALT_UAPI_SYS_THREAD_H */
+#endif /* !_COBALT_KERNEL_UAPI_THREAD_H */
diff --git a/include/cobalt/uapi/sys/trace.h
b/include/cobalt/kernel/uapi/trace.h
similarity index 90%
rename from include/cobalt/uapi/sys/trace.h
rename to include/cobalt/kernel/uapi/trace.h
index b6b994a..1d3a3f3 100644
--- a/include/cobalt/uapi/sys/trace.h
+++ b/include/cobalt/kernel/uapi/trace.h
@@ -15,8 +15,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#ifndef _COBALT_UAPI_SYS_TRACE_H
-#define _COBALT_UAPI_SYS_TRACE_H
+#ifndef _COBALT_KERNEL_UAPI_TRACE_H
+#define _COBALT_KERNEL_UAPI_TRACE_H
#define __xntrace_op_max_begin 0
#define __xntrace_op_max_end 1
@@ -27,4 +27,4 @@
#define __xntrace_op_special 6
#define __xntrace_op_special_u64 7
-#endif /* !_COBALT_UAPI_SYS_TRACE_H */
+#endif /* !_COBALT_KERNEL_UAPI_TRACE_H */
diff --git a/include/cobalt/uapi/sys/types.h
b/include/cobalt/kernel/uapi/types.h
similarity index 91%
rename from include/cobalt/uapi/sys/types.h
rename to include/cobalt/kernel/uapi/types.h
index 87dbb2f..cf5fece 100644
--- a/include/cobalt/uapi/sys/types.h
+++ b/include/cobalt/kernel/uapi/types.h
@@ -15,8 +15,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#ifndef _COBALT_UAPI_SYS_TYPES_H
-#define _COBALT_UAPI_SYS_TYPES_H
+#ifndef _COBALT_KERNEL_UAPI_TYPES_H
+#define _COBALT_KERNEL_UAPI_TYPES_H
typedef unsigned long long xnticks_t;
@@ -38,4 +38,4 @@ typedef unsigned long xnhandle_t;
#define XNOBJECT_NAME_LEN 32
-#endif /* !_COBALT_UAPI_SYS_TYPES_H */
+#endif /* !_COBALT_KERNEL_UAPI_TYPES_H */
diff --git a/include/cobalt/uapi/sys/urw.h b/include/cobalt/kernel/uapi/urw.h
similarity index 96%
rename from include/cobalt/uapi/sys/urw.h
rename to include/cobalt/kernel/uapi/urw.h
index 02d6bcd..01c8849 100644
--- a/include/cobalt/uapi/sys/urw.h
+++ b/include/cobalt/kernel/uapi/urw.h
@@ -15,8 +15,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#ifndef _COBALT_UAPI_SYS_URW_H
-#define _COBALT_UAPI_SYS_URW_H
+#ifndef _COBALT_KERNEL_UAPI_URW_H
+#define _COBALT_KERNEL_UAPI_URW_H
/*
* A restricted version of the kernel seqlocks with a slightly
@@ -104,4 +104,4 @@ static inline void unsynced_rw_init(urw_t *urw)
for (__do_write_start(__urw, __tmp); \
(__tmp)->dirty; __do_write_end(__urw, __tmp))
-#endif /* !_COBALT_UAPI_SYS_URW_H */
+#endif /* !_COBALT_KERNEL_UAPI_URW_H */
diff --git a/include/cobalt/uapi/sys/vdso.h b/include/cobalt/kernel/uapi/vdso.h
similarity index 91%
rename from include/cobalt/uapi/sys/vdso.h
rename to include/cobalt/kernel/uapi/vdso.h
index 1cef138..15f92bd 100644
--- a/include/cobalt/uapi/sys/vdso.h
+++ b/include/cobalt/kernel/uapi/vdso.h
@@ -15,10 +15,10 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#ifndef _COBALT_UAPI_SYS_VDSO_H
-#define _COBALT_UAPI_SYS_VDSO_H
+#ifndef _COBALT_KERNEL_UAPI_VDSO_H
+#define _COBALT_KERNEL_UAPI_VDSO_H
-#include <cobalt/uapi/sys/urw.h>
+#include <cobalt/kernel/uapi/urw.h>
struct xnvdso_hostrt_data {
short live;
@@ -55,4 +55,4 @@ static inline int xnvdso_test_feature(struct xnvdso *vdso,
return (vdso->features & feature) != 0;
}
-#endif /* !_COBALT_UAPI_SYS_VDSO_H */
+#endif /* !_COBALT_KERNEL_UAPI_VDSO_H */
diff --git a/include/cobalt/kernel/vdso.h b/include/cobalt/kernel/vdso.h
index fc00b6f..5cbcd36 100644
--- a/include/cobalt/kernel/vdso.h
+++ b/include/cobalt/kernel/vdso.h
@@ -27,7 +27,7 @@
#include <asm/barrier.h>
#include <asm/atomic.h>
#include <asm/processor.h>
-#include <cobalt/uapi/sys/vdso.h>
+#include <cobalt/kernel/uapi/vdso.h>
/*
* Define the available feature set here. We have a single feature
diff --git a/include/cobalt/ticks.h b/include/cobalt/ticks.h
index a77789d..56c37ce 100644
--- a/include/cobalt/ticks.h
+++ b/include/cobalt/ticks.h
@@ -18,7 +18,7 @@
#ifndef _COBALT_TICKS_H
#define _COBALT_TICKS_H
-#include <cobalt/uapi/sys/types.h>
+#include <cobalt/kernel/uapi/types.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/cobalt/uapi/Makefile.am b/include/cobalt/uapi/Makefile.am
index cf06448..30e4440 100644
--- a/include/cobalt/uapi/Makefile.am
+++ b/include/cobalt/uapi/Makefile.am
@@ -12,4 +12,4 @@ includesub_HEADERS = \
thread.h \
time.h
-SUBDIRS = sys rtdm
+SUBDIRS = rtdm
diff --git a/include/cobalt/uapi/Makefile.in b/include/cobalt/uapi/Makefile.in
index 4b49842..9ea20bf 100644
--- a/include/cobalt/uapi/Makefile.in
+++ b/include/cobalt/uapi/Makefile.in
@@ -323,7 +323,7 @@ includesub_HEADERS = \
thread.h \
time.h
-SUBDIRS = sys rtdm
+SUBDIRS = rtdm
all: all-recursive
.SUFFIXES:
diff --git a/include/cobalt/uapi/thread.h b/include/cobalt/uapi/thread.h
index b3a2455..b6df203 100644
--- a/include/cobalt/uapi/thread.h
+++ b/include/cobalt/uapi/thread.h
@@ -18,7 +18,7 @@
#ifndef _COBALT_UAPI_THREAD_H
#define _COBALT_UAPI_THREAD_H
-#include <cobalt/uapi/sys/thread.h>
+#include <cobalt/kernel/uapi/thread.h>
#define PTHREAD_WARNSW XNTRAPSW
#define PTHREAD_LOCK_SCHED XNLOCK
diff --git a/include/copperplate/threadobj.h b/include/copperplate/threadobj.h
index 3404ccf..dda06b0 100644
--- a/include/copperplate/threadobj.h
+++ b/include/copperplate/threadobj.h
@@ -31,7 +31,7 @@
#ifdef CONFIG_XENO_COBALT
-#include <cobalt/uapi/sys/types.h>
+#include <cobalt/kernel/uapi/types.h>
struct xnthread_user_window;
diff --git a/include/rtdm/rtipc.h b/include/rtdm/rtipc.h
index 77a1475..7764edf 100644
--- a/include/rtdm/rtipc.h
+++ b/include/rtdm/rtipc.h
@@ -401,7 +401,7 @@ int getpeername__AF_RTIPC(int sockfd, struct sockaddr_ipc
*addr, socklen_t *addr
#include <sys/types.h>
#include <sys/socket.h>
#endif /* !__KERNEL__ */
-#include <cobalt/uapi/sys/types.h>
+#include <cobalt/kernel/uapi/types.h>
#include <rtdm/rtdm.h>
/* Address family */
diff --git a/lib/cobalt/init.c b/lib/cobalt/init.c
index f13f7e7..6c1e9ea 100644
--- a/lib/cobalt/init.c
+++ b/lib/cobalt/init.c
@@ -25,7 +25,7 @@
#include <signal.h>
#include <limits.h>
#include <unistd.h>
-#include <cobalt/uapi/sys/heap.h>
+#include <cobalt/kernel/uapi/heap.h>
#include <cobalt/uapi/rtdm/syscall.h>
#include <cobalt/ticks.h>
#include <asm/sysdeps/syscall.h>
diff --git a/lib/cobalt/internal.h b/lib/cobalt/internal.h
index b7534ad..ff36b4b 100644
--- a/lib/cobalt/internal.h
+++ b/lib/cobalt/internal.h
@@ -5,8 +5,8 @@
#include <pthread.h>
#include <errno.h>
#include <nocore/atomic.h>
-#include <cobalt/uapi/sys/synch.h>
-#include <cobalt/uapi/sys/vdso.h>
+#include <cobalt/kernel/uapi/synch.h>
+#include <cobalt/kernel/uapi/vdso.h>
#include <cobalt/uapi/mutex.h>
#include <cobalt/uapi/event.h>
#include <cobalt/uapi/monitor.h>
diff --git a/lib/cobalt/sem_heap.c b/lib/cobalt/sem_heap.c
index 7b869eb..2196c5f 100644
--- a/lib/cobalt/sem_heap.c
+++ b/lib/cobalt/sem_heap.c
@@ -9,7 +9,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <pthread.h>
-#include <cobalt/uapi/sys/heap.h>
+#include <cobalt/kernel/uapi/heap.h>
#include <asm/sysdeps/syscall.h>
#include "current.h"
#include "sem_heap.h"
diff --git a/lib/cobalt/trace.c b/lib/cobalt/trace.c
index 14028aa..b8facbf 100644
--- a/lib/cobalt/trace.c
+++ b/lib/cobalt/trace.c
@@ -15,7 +15,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <cobalt/uapi/sys/trace.h>
+#include <cobalt/kernel/uapi/trace.h>
#include <asm/sysdeps/syscall.h>
int xntrace_max_begin(unsigned long v)
diff --git a/testsuite/clocktest/clocktest.c b/testsuite/clocktest/clocktest.c
index 6bdc968..c000e22 100644
--- a/testsuite/clocktest/clocktest.c
+++ b/testsuite/clocktest/clocktest.c
@@ -30,7 +30,7 @@
#include <sys/mman.h>
#include <sys/time.h>
#include <nocore/atomic.h>
-#include <cobalt/uapi/sys/vdso.h>
+#include <cobalt/kernel/uapi/vdso.h>
#include <xeno_config.h>
diff --git a/testsuite/regression/posix/leaks.c
b/testsuite/regression/posix/leaks.c
index 827f47e..de3baae 100644
--- a/testsuite/regression/posix/leaks.c
+++ b/testsuite/regression/posix/leaks.c
@@ -9,7 +9,7 @@
#include <semaphore.h>
#include <mqueue.h>
#include <signal.h>
-#include <cobalt/uapi/sys/heap.h>
+#include <cobalt/kernel/uapi/heap.h>
#include <asm/sysdeps/syscall.h>
#include "check.h"
diff --git a/testsuite/unit/check-vdso.c b/testsuite/unit/check-vdso.c
index 6b25085..0d3bf63 100644
--- a/testsuite/unit/check-vdso.c
+++ b/testsuite/unit/check-vdso.c
@@ -6,7 +6,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <nocore/atomic.h>
-#include <cobalt/uapi/sys/vdso.h>
+#include <cobalt/kernel/uapi/vdso.h>
extern unsigned long cobalt_sem_heap[2];
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
