From f244de9638a482a2f7b6de307661d4c3bbcbf193 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 6 Nov 2013 08:56:38 +0100 Subject: Rename rtems-bsd-config.h Rename rtems-bsd-config.h in rtems-bsd-kernel-space.h. --- rtemsbsd/include/machine/atomic.h | 4 +- rtemsbsd/include/machine/bus.h | 4 +- rtemsbsd/include/machine/bus_dma.h | 4 +- rtemsbsd/include/machine/clock.h | 4 +- rtemsbsd/include/machine/cpu.h | 4 +- rtemsbsd/include/machine/proc.h | 4 +- rtemsbsd/include/machine/rtems-bsd-config.h.in | 83 ---------------------- .../include/machine/rtems-bsd-kernel-space.h.in | 83 ++++++++++++++++++++++ rtemsbsd/include/machine/runq.h | 4 +- rtemsbsd/include/machine/signal.h | 4 +- rtemsbsd/include/machine/stdarg.h | 4 +- rtemsbsd/include/machine/ucontext.h | 4 +- 12 files changed, 103 insertions(+), 103 deletions(-) delete mode 100644 rtemsbsd/include/machine/rtems-bsd-config.h.in create mode 100644 rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in (limited to 'rtemsbsd/include/machine') diff --git a/rtemsbsd/include/machine/atomic.h b/rtemsbsd/include/machine/atomic.h index 3ab06579..20ca8e29 100644 --- a/rtemsbsd/include/machine/atomic.h +++ b/rtemsbsd/include/machine/atomic.h @@ -23,8 +23,8 @@ #ifndef _RTEMS_BSD_MACHINE_ATOMIC_H_ #define _RTEMS_BSD_MACHINE_ATOMIC_H_ -#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file must be included first" +#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ +#error "the header file must be included first" #endif #include diff --git a/rtemsbsd/include/machine/bus.h b/rtemsbsd/include/machine/bus.h index 64616d30..01731701 100644 --- a/rtemsbsd/include/machine/bus.h +++ b/rtemsbsd/include/machine/bus.h @@ -118,8 +118,8 @@ #ifndef _RTEMS_BSD_MACHINE_BUS_H_ #define _RTEMS_BSD_MACHINE_BUS_H_ -#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file must be included first" +#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ +#error "the header file must be included first" #endif /* diff --git a/rtemsbsd/include/machine/bus_dma.h b/rtemsbsd/include/machine/bus_dma.h index d4a1cfb8..c83b1580 100644 --- a/rtemsbsd/include/machine/bus_dma.h +++ b/rtemsbsd/include/machine/bus_dma.h @@ -23,8 +23,8 @@ #ifndef _RTEMS_BSD_MACHINE_BUS_DMA_H_ #define _RTEMS_BSD_MACHINE_BUS_DMA_H_ -#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file must be included first" +#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ +#error "the header file must be included first" #endif #include diff --git a/rtemsbsd/include/machine/clock.h b/rtemsbsd/include/machine/clock.h index 9f40d413..be73d490 100644 --- a/rtemsbsd/include/machine/clock.h +++ b/rtemsbsd/include/machine/clock.h @@ -23,8 +23,8 @@ #ifndef _RTEMS_BSD_MACHINE_CLOCK_H_ #define _RTEMS_BSD_MACHINE_CLOCK_H_ -#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file must be included first" +#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ +#error "the header file must be included first" #endif #ifdef _KERNEL diff --git a/rtemsbsd/include/machine/cpu.h b/rtemsbsd/include/machine/cpu.h index 7ac6e33d..32881325 100644 --- a/rtemsbsd/include/machine/cpu.h +++ b/rtemsbsd/include/machine/cpu.h @@ -18,8 +18,8 @@ #ifndef _RTEMS_BSD_MACHINE_CPU_H_ #define _RTEMS_BSD_MACHINE_CPU_H_ -#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file must be included first" +#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ +#error "the header file must be included first" #endif #define cpu_spinwait() do { } while (0) diff --git a/rtemsbsd/include/machine/proc.h b/rtemsbsd/include/machine/proc.h index 6873e087..6f27bd54 100644 --- a/rtemsbsd/include/machine/proc.h +++ b/rtemsbsd/include/machine/proc.h @@ -23,8 +23,8 @@ #ifndef _RTEMS_BSD_MACHINE_PROC_H_ #define _RTEMS_BSD_MACHINE_PROC_H_ -#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file must be included first" +#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ +#error "the header file must be included first" #endif struct mdthread { diff --git a/rtemsbsd/include/machine/rtems-bsd-config.h.in b/rtemsbsd/include/machine/rtems-bsd-config.h.in deleted file mode 100644 index 066bcdfb..00000000 --- a/rtemsbsd/include/machine/rtems-bsd-config.h.in +++ /dev/null @@ -1,83 +0,0 @@ -/** - * @file - * - * @ingroup rtems_bsd_machine - * - * @brief TODO. - */ - -/* - * Copyright (c) 2009-2013 embedded brains GmbH. All rights reserved. - * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#define _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ - -/* FIXME: Update Newlib */ -#define MSIZE 256 - -/* General define to activate BSD kernel parts */ -#define _KERNEL 1 - -/* Networking */ -#define IPSEC 1 -#define INET 1 -#define INET6 1 -#define TCP_SIGNATURE 1 - -/* Symbol rename */ - -#include - -/* Assert */ - -void rtems_bsd_assert_func(const char *file, int line, const char *func, const char *expr); - -#ifdef RTEMS_BSD_NO_ASSERT -# define BSD_ASSERT(expr) ((void) 0) -#else -# define BSD_ASSERT(expr) ((expr) ? (void) 0 : rtems_bsd_assert_func(__FILE__, __LINE__, __func__, #expr)) -#endif - -/* General definitions */ - -#define M_RTEMS_HEAP 0 - -#define BSD_DEFAULT_FIB 0 - -#define BSD_DEFAULT_PID 0 - -#define BSD_DEFAULT_UID 0 - -#define BSD_DEFAULT_GID 0 - -#define BSD_DEFAULT_PRISON (&prison0) - -#endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ */ diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in b/rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in new file mode 100644 index 00000000..906613f1 --- /dev/null +++ b/rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in @@ -0,0 +1,83 @@ +/** + * @file + * + * @ingroup rtems_bsd_machine + * + * @brief TODO. + */ + +/* + * Copyright (c) 2009-2013 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ +#define _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ + +/* FIXME: Update Newlib */ +#define MSIZE 256 + +/* General define to activate BSD kernel parts */ +#define _KERNEL 1 + +/* Networking */ +#define IPSEC 1 +#define INET 1 +#define INET6 1 +#define TCP_SIGNATURE 1 + +/* Symbol rename */ + +#include + +/* Assert */ + +void rtems_bsd_assert_func(const char *file, int line, const char *func, const char *expr); + +#ifdef RTEMS_BSD_NO_ASSERT +# define BSD_ASSERT(expr) ((void) 0) +#else +# define BSD_ASSERT(expr) ((expr) ? (void) 0 : rtems_bsd_assert_func(__FILE__, __LINE__, __func__, #expr)) +#endif + +/* General definitions */ + +#define M_RTEMS_HEAP 0 + +#define BSD_DEFAULT_FIB 0 + +#define BSD_DEFAULT_PID 0 + +#define BSD_DEFAULT_UID 0 + +#define BSD_DEFAULT_GID 0 + +#define BSD_DEFAULT_PRISON (&prison0) + +#endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ */ diff --git a/rtemsbsd/include/machine/runq.h b/rtemsbsd/include/machine/runq.h index affc070d..98a51a47 100644 --- a/rtemsbsd/include/machine/runq.h +++ b/rtemsbsd/include/machine/runq.h @@ -23,8 +23,8 @@ #ifndef _RTEMS_BSD_MACHINE_RUNQ_H_ #define _RTEMS_BSD_MACHINE_RUNQ_H_ -#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file must be included first" +#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ +#error "the header file must be included first" #endif #define RQB_LEN 0 diff --git a/rtemsbsd/include/machine/signal.h b/rtemsbsd/include/machine/signal.h index 0e71cabb..6d3f3927 100644 --- a/rtemsbsd/include/machine/signal.h +++ b/rtemsbsd/include/machine/signal.h @@ -23,8 +23,8 @@ #ifndef _RTEMS_BSD_MACHINE_SIGNAL_H_ #define _RTEMS_BSD_MACHINE_SIGNAL_H_ -#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file must be included first" +#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ +#error "the header file must be included first" #endif #endif /* _RTEMS_BSD_MACHINE_SIGNAL_H_ */ diff --git a/rtemsbsd/include/machine/stdarg.h b/rtemsbsd/include/machine/stdarg.h index 7535272e..ad7f2eff 100644 --- a/rtemsbsd/include/machine/stdarg.h +++ b/rtemsbsd/include/machine/stdarg.h @@ -23,8 +23,8 @@ #ifndef _RTEMS_BSD_MACHINE_STDARG_H_ #define _RTEMS_BSD_MACHINE_STDARG_H_ -#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file must be included first" +#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ +#error "the header file must be included first" #endif #endif /* _RTEMS_BSD_MACHINE_STDARG_H_ */ diff --git a/rtemsbsd/include/machine/ucontext.h b/rtemsbsd/include/machine/ucontext.h index 92d2b5d2..9845bf3e 100644 --- a/rtemsbsd/include/machine/ucontext.h +++ b/rtemsbsd/include/machine/ucontext.h @@ -23,8 +23,8 @@ #ifndef _RTEMS_BSD_MACHINE_UCONTEXT_H_ #define _RTEMS_BSD_MACHINE_UCONTEXT_H_ -#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file must be included first" +#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ +#error "the header file must be included first" #endif typedef int mcontext_t; -- cgit v1.2.3