diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-03-08 10:31:56 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-03-08 10:31:56 -0600 |
| commit | 6ad03bf51766c97781f3be5ff05d69dde7dd4b3b (patch) | |
| tree | 6c5ab55e08d818f935f9db79b266581b7747da0e | |
| parent | freebsd-to-rtems.py Enhancements (diff) | |
| download | rtems-libbsd-6ad03bf51766c97781f3be5ff05d69dde7dd4b3b.tar.bz2 | |
Remove rtems/ from includes of RTEMS specific files
57 files changed, 332 insertions, 332 deletions
@@ -6,7 +6,7 @@ include $(PROJECT_ROOT)/make/leaf.cfg CFLAGS += -ffreestanding CFLAGS += -I . -CFLAGS += -I rtemsbsd +# CFLAGS += -I rtemsbsd CFLAGS += -I rtemsbsd/rtems CFLAGS += -I contrib/altq CFLAGS += -I contrib/pf diff --git a/freebsd/dev/usb/controller/ohci_lpc3250.c b/freebsd/dev/usb/controller/ohci_lpc3250.c index b3341016..8a63fe4a 100644 --- a/freebsd/dev/usb/controller/ohci_lpc3250.c +++ b/freebsd/dev/usb/controller/ohci_lpc3250.c @@ -1,6 +1,6 @@ #include <freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> #include <bsp.h> @@ -8,38 +8,38 @@ #include <bsp/irq.h> -#include <rtems/freebsd/sys/cdefs.h> -#include <rtems/freebsd/sys/stdint.h> -#include <rtems/freebsd/sys/stddef.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/queue.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/kernel.h> -#include <rtems/freebsd/sys/bus.h> -#include <rtems/freebsd/sys/linker_set.h> -#include <rtems/freebsd/sys/module.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/condvar.h> -#include <rtems/freebsd/sys/sysctl.h> -#include <rtems/freebsd/sys/sx.h> -#include <rtems/freebsd/sys/unistd.h> -#include <rtems/freebsd/sys/callout.h> -#include <rtems/freebsd/sys/malloc.h> -#include <rtems/freebsd/sys/priv.h> - -#include <rtems/freebsd/dev/usb/usb.h> -#include <rtems/freebsd/dev/usb/usbdi.h> - -#include <rtems/freebsd/dev/usb/usb_core.h> -#include <rtems/freebsd/dev/usb/usb_busdma.h> -#include <rtems/freebsd/dev/usb/usb_process.h> -#include <rtems/freebsd/dev/usb/usb_util.h> - -#include <rtems/freebsd/dev/usb/usb_controller.h> -#include <rtems/freebsd/dev/usb/usb_bus.h> -#include <rtems/freebsd/dev/usb/controller/ohci.h> +#include <freebsd/sys/cdefs.h> +#include <freebsd/sys/stdint.h> +#include <freebsd/sys/stddef.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/queue.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/kernel.h> +#include <freebsd/sys/bus.h> +#include <freebsd/sys/linker_set.h> +#include <freebsd/sys/module.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/condvar.h> +#include <freebsd/sys/sysctl.h> +#include <freebsd/sys/sx.h> +#include <freebsd/sys/unistd.h> +#include <freebsd/sys/callout.h> +#include <freebsd/sys/malloc.h> +#include <freebsd/sys/priv.h> + +#include <freebsd/dev/usb/usb.h> +#include <freebsd/dev/usb/usbdi.h> + +#include <freebsd/dev/usb/usb_core.h> +#include <freebsd/dev/usb/usb_busdma.h> +#include <freebsd/dev/usb/usb_process.h> +#include <freebsd/dev/usb/usb_util.h> + +#include <freebsd/dev/usb/usb_controller.h> +#include <freebsd/dev/usb/usb_bus.h> +#include <freebsd/dev/usb/controller/ohci.h> typedef struct { diff --git a/rtemsbsd/rtems/freebsd/bsd.h b/rtemsbsd/rtems/freebsd/bsd.h index 6c0d961b..0d361c4c 100644 --- a/rtemsbsd/rtems/freebsd/bsd.h +++ b/rtemsbsd/rtems/freebsd/bsd.h @@ -27,8 +27,8 @@ extern "C" { #endif /* __cplusplus */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/machine/rtems-bsd-select.h> +#include <freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-select.h> rtems_status_code rtems_bsd_initialize(void); diff --git a/rtemsbsd/rtems/freebsd/machine/_align.h b/rtemsbsd/rtems/freebsd/machine/_align.h index d28f51eb..a307acaa 100644 --- a/rtemsbsd/rtems/freebsd/machine/_align.h +++ b/rtemsbsd/rtems/freebsd/machine/_align.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE__ALIGN_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #define _ALIGNBYTES ((uintptr_t) (CPU_ALIGNMENT - 1)) diff --git a/rtemsbsd/rtems/freebsd/machine/_bus.h b/rtemsbsd/rtems/freebsd/machine/_bus.h index b3025ccb..436fb584 100644 --- a/rtemsbsd/rtems/freebsd/machine/_bus.h +++ b/rtemsbsd/rtems/freebsd/machine/_bus.h @@ -1 +1 @@ -#include <rtems/freebsd/machine/bus.h> +#include <freebsd/machine/bus.h> diff --git a/rtemsbsd/rtems/freebsd/machine/_limits.h b/rtemsbsd/rtems/freebsd/machine/_limits.h index 5408c470..46cac302 100644 --- a/rtemsbsd/rtems/freebsd/machine/_limits.h +++ b/rtemsbsd/rtems/freebsd/machine/_limits.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE__LIMITS_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #endif /* _RTEMS_BSD_MACHINE__LIMITS_H_ */ diff --git a/rtemsbsd/rtems/freebsd/machine/_stdint.h b/rtemsbsd/rtems/freebsd/machine/_stdint.h index 0dd26f90..c41425f6 100644 --- a/rtemsbsd/rtems/freebsd/machine/_stdint.h +++ b/rtemsbsd/rtems/freebsd/machine/_stdint.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE__STDINT_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #endif /* _RTEMS_BSD_MACHINE__STDINT_H_ */ diff --git a/rtemsbsd/rtems/freebsd/machine/_types.h b/rtemsbsd/rtems/freebsd/machine/_types.h index cb4f3e84..0a1c80b0 100644 --- a/rtemsbsd/rtems/freebsd/machine/_types.h +++ b/rtemsbsd/rtems/freebsd/machine/_types.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE__TYPES_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #endif /* _RTEMS_BSD_MACHINE__TYPES_H_ */ diff --git a/rtemsbsd/rtems/freebsd/machine/atomic.h b/rtemsbsd/rtems/freebsd/machine/atomic.h index 44c61842..3e63ef2d 100644 --- a/rtemsbsd/rtems/freebsd/machine/atomic.h +++ b/rtemsbsd/rtems/freebsd/machine/atomic.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE_ATOMIC_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #define mb() RTEMS_COMPILER_MEMORY_BARRIER() diff --git a/rtemsbsd/rtems/freebsd/machine/bus.h b/rtemsbsd/rtems/freebsd/machine/bus.h index 3e01ce4a..a2b21954 100644 --- a/rtemsbsd/rtems/freebsd/machine/bus.h +++ b/rtemsbsd/rtems/freebsd/machine/bus.h @@ -119,7 +119,7 @@ #define _RTEMS_BSD_MACHINE_BUS_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif /* @@ -776,6 +776,6 @@ bus_space_copy_region_8(bus_space_tag_t bst __unused, bus_space_handle_t bsh1, #define bus_space_copy_region_stream_8(t, h1, o1, h2, o2, c) \ bus_space_copy_region_8(t, h1, o1, h2, o2, c) -#include <rtems/freebsd/machine/bus_dma.h> +#include <freebsd/machine/bus_dma.h> #endif /* _RTEMS_BSD_MACHINE_BUS_H_ */ diff --git a/rtemsbsd/rtems/freebsd/machine/bus_dma.h b/rtemsbsd/rtems/freebsd/machine/bus_dma.h index b2629b5a..44ed7762 100644 --- a/rtemsbsd/rtems/freebsd/machine/bus_dma.h +++ b/rtemsbsd/rtems/freebsd/machine/bus_dma.h @@ -24,9 +24,9 @@ #define _RTEMS_BSD_MACHINE_BUS_DMA_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif -#include <rtems/freebsd/sys/bus_dma.h> +#include <freebsd/sys/bus_dma.h> #endif /* _RTEMS_BSD_MACHINE_BUS_DMA_H_ */ diff --git a/rtemsbsd/rtems/freebsd/machine/clock.h b/rtemsbsd/rtems/freebsd/machine/clock.h index 4b12f3b7..9f40d413 100644 --- a/rtemsbsd/rtems/freebsd/machine/clock.h +++ b/rtemsbsd/rtems/freebsd/machine/clock.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE_CLOCK_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #ifdef _KERNEL diff --git a/rtemsbsd/rtems/freebsd/machine/cpufunc.h b/rtemsbsd/rtems/freebsd/machine/cpufunc.h index 087a9404..08744991 100644 --- a/rtemsbsd/rtems/freebsd/machine/cpufunc.h +++ b/rtemsbsd/rtems/freebsd/machine/cpufunc.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE_CPUFUNC_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #endif /* _RTEMS_BSD_MACHINE_CPUFUNC_H_ */ diff --git a/rtemsbsd/rtems/freebsd/machine/endian.h b/rtemsbsd/rtems/freebsd/machine/endian.h index 89cc9930..1b8128da 100644 --- a/rtemsbsd/rtems/freebsd/machine/endian.h +++ b/rtemsbsd/rtems/freebsd/machine/endian.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE_ENDIAN_H #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #include <rtems/endian.h> diff --git a/rtemsbsd/rtems/freebsd/machine/mutex.h b/rtemsbsd/rtems/freebsd/machine/mutex.h index 45d2fc47..8ab14405 100644 --- a/rtemsbsd/rtems/freebsd/machine/mutex.h +++ b/rtemsbsd/rtems/freebsd/machine/mutex.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE_MUTEX_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #endif /* _RTEMS_BSD_MACHINE_MUTEX_H_ */ diff --git a/rtemsbsd/rtems/freebsd/machine/param.h b/rtemsbsd/rtems/freebsd/machine/param.h index cf621e6d..c0472daf 100644 --- a/rtemsbsd/rtems/freebsd/machine/param.h +++ b/rtemsbsd/rtems/freebsd/machine/param.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE_PARAM_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #include <machine/param.h> diff --git a/rtemsbsd/rtems/freebsd/machine/pcpu.h b/rtemsbsd/rtems/freebsd/machine/pcpu.h index 42c9de84..caf1385f 100644 --- a/rtemsbsd/rtems/freebsd/machine/pcpu.h +++ b/rtemsbsd/rtems/freebsd/machine/pcpu.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE_PCPU_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #define curthread (( struct thread * )(( RTEMS_API_Control * )_Thread_Executing->API_Extensions[THREAD_API_RTEMS] )->Notepads[RTEMS_NOTEPAD_0] ) diff --git a/rtemsbsd/rtems/freebsd/machine/proc.h b/rtemsbsd/rtems/freebsd/machine/proc.h index d1332ac6..6873e087 100644 --- a/rtemsbsd/rtems/freebsd/machine/proc.h +++ b/rtemsbsd/rtems/freebsd/machine/proc.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE_PROC_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif struct mdthread { diff --git a/rtemsbsd/rtems/freebsd/machine/resource.h b/rtemsbsd/rtems/freebsd/machine/resource.h index 93220dcf..b29a0aca 100644 --- a/rtemsbsd/rtems/freebsd/machine/resource.h +++ b/rtemsbsd/rtems/freebsd/machine/resource.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE_RESOURCE_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #endif /* _RTEMS_BSD_MACHINE_RESOURCE_H_ */ diff --git a/rtemsbsd/rtems/freebsd/machine/rtems-bsd-config.h b/rtemsbsd/rtems/freebsd/machine/rtems-bsd-config.h index 34562b11..b25d7ffe 100644 --- a/rtemsbsd/rtems/freebsd/machine/rtems-bsd-config.h +++ b/rtemsbsd/rtems/freebsd/machine/rtems-bsd-config.h @@ -187,7 +187,7 @@ #ifndef _RTEMS_BSD_BSD_HH_ /* Symbol rename */ -#include <rtems/freebsd/machine/rtems-bsd-symbols.h> +#include <freebsd/machine/rtems-bsd-symbols.h> #define gets _bsd_gets #define realloc _bsd_realloc diff --git a/rtemsbsd/rtems/freebsd/machine/rtems-bsd-sysinit.h b/rtemsbsd/rtems/freebsd/machine/rtems-bsd-sysinit.h index 98de2b80..a8d1fbb9 100644 --- a/rtemsbsd/rtems/freebsd/machine/rtems-bsd-sysinit.h +++ b/rtemsbsd/rtems/freebsd/machine/rtems-bsd-sysinit.h @@ -23,9 +23,9 @@ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_SYSINIT_H_ #define _RTEMS_BSD_MACHINE_RTEMS_BSD_SYSINIT_H_ -#include <rtems/freebsd/sys/cdefs.h> -#include <rtems/freebsd/sys/queue.h> -#include <rtems/freebsd/sys/kernel.h> +#include <freebsd/sys/cdefs.h> +#include <freebsd/sys/queue.h> +#include <freebsd/sys/kernel.h> #define SYSINIT_NEED_FREEBSD_CORE \ SYSINIT_REFERENCE(configure1); \ diff --git a/rtemsbsd/rtems/freebsd/machine/runq.h b/rtemsbsd/rtems/freebsd/machine/runq.h index c03945a2..affc070d 100644 --- a/rtemsbsd/rtems/freebsd/machine/runq.h +++ b/rtemsbsd/rtems/freebsd/machine/runq.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE_RUNQ_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #define RQB_LEN 0 diff --git a/rtemsbsd/rtems/freebsd/machine/signal.h b/rtemsbsd/rtems/freebsd/machine/signal.h index 72aebe22..0e71cabb 100644 --- a/rtemsbsd/rtems/freebsd/machine/signal.h +++ b/rtemsbsd/rtems/freebsd/machine/signal.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE_SIGNAL_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #endif /* _RTEMS_BSD_MACHINE_SIGNAL_H_ */ diff --git a/rtemsbsd/rtems/freebsd/machine/stdarg.h b/rtemsbsd/rtems/freebsd/machine/stdarg.h index 08fc1fb7..7535272e 100644 --- a/rtemsbsd/rtems/freebsd/machine/stdarg.h +++ b/rtemsbsd/rtems/freebsd/machine/stdarg.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE_STDARG_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif #endif /* _RTEMS_BSD_MACHINE_STDARG_H_ */ diff --git a/rtemsbsd/rtems/freebsd/machine/ucontext.h b/rtemsbsd/rtems/freebsd/machine/ucontext.h index 9a46840c..92d2b5d2 100644 --- a/rtemsbsd/rtems/freebsd/machine/ucontext.h +++ b/rtemsbsd/rtems/freebsd/machine/ucontext.h @@ -24,7 +24,7 @@ #define _RTEMS_BSD_MACHINE_UCONTEXT_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ -#error "the header file <rtems/freebsd/machine/rtems-bsd-config.h> must be included first" +#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first" #endif typedef int mcontext_t; diff --git a/rtemsbsd/src/rtems-bsd-assert.c b/rtemsbsd/src/rtems-bsd-assert.c index 6e04db8c..46b1fe3d 100644 --- a/rtemsbsd/src/rtems-bsd-assert.c +++ b/rtemsbsd/src/rtems-bsd-assert.c @@ -20,10 +20,10 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> void rtems_bsd_assert_func(const char *file, int line, const char *func, const char *expr) diff --git a/rtemsbsd/src/rtems-bsd-autoconf.c b/rtemsbsd/src/rtems-bsd-autoconf.c index cdf9fc61..0e37290a 100644 --- a/rtemsbsd/src/rtems-bsd-autoconf.c +++ b/rtemsbsd/src/rtems-bsd-autoconf.c @@ -20,13 +20,13 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/bus.h> -#include <rtems/freebsd/sys/kernel.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/bus.h> +#include <freebsd/sys/kernel.h> static void configure_first(void *dummy) diff --git a/rtemsbsd/src/rtems-bsd-bus-dma.c b/rtemsbsd/src/rtems-bsd-bus-dma.c index 1ed8564e..eae8053a 100644 --- a/rtemsbsd/src/rtems-bsd-bus-dma.c +++ b/rtemsbsd/src/rtems-bsd-bus-dma.c @@ -44,18 +44,18 @@ * SUCH DAMAGE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/machine/rtems-bsd-cache.h> +#include <freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-cache.h> #include <rtems/malloc.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/malloc.h> -#include <rtems/freebsd/machine/atomic.h> -#include <rtems/freebsd/machine/bus.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/malloc.h> +#include <freebsd/machine/atomic.h> +#include <freebsd/machine/bus.h> #ifdef CPU_DATA_CACHE_ALIGNMENT #define CLSZ ((uintptr_t) CPU_DATA_CACHE_ALIGNMENT) diff --git a/rtemsbsd/src/rtems-bsd-callout.c b/rtemsbsd/src/rtems-bsd-callout.c index d427b636..3d612ab6 100644 --- a/rtemsbsd/src/rtems-bsd-callout.c +++ b/rtemsbsd/src/rtems-bsd-callout.c @@ -20,14 +20,14 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> - -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/callout.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> +#include <freebsd/machine/rtems-bsd-config.h> + +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/callout.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> RTEMS_CHAIN_DEFINE_EMPTY(rtems_bsd_callout_chain); diff --git a/rtemsbsd/src/rtems-bsd-cam.c b/rtemsbsd/src/rtems-bsd-cam.c index 36d4d67c..db6deb9b 100644 --- a/rtemsbsd/src/rtems-bsd-cam.c +++ b/rtemsbsd/src/rtems-bsd-cam.c @@ -20,24 +20,24 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> - -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/malloc.h> -#include <rtems/freebsd/sys/kernel.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/condvar.h> - -#include <rtems/freebsd/cam/cam.h> -#include <rtems/freebsd/cam/cam_ccb.h> -#include <rtems/freebsd/cam/cam_sim.h> -#include <rtems/freebsd/cam/cam_xpt.h> -#include <rtems/freebsd/cam/cam_xpt_sim.h> -#include <rtems/freebsd/cam/cam_debug.h> - -#include <rtems/freebsd/cam/scsi/scsi_all.h> +#include <freebsd/machine/rtems-bsd-config.h> + +#include <freebsd/sys/param.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/malloc.h> +#include <freebsd/sys/kernel.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/condvar.h> + +#include <freebsd/cam/cam.h> +#include <freebsd/cam/cam_ccb.h> +#include <freebsd/cam/cam_sim.h> +#include <freebsd/cam/cam_xpt.h> +#include <freebsd/cam/cam_xpt_sim.h> +#include <freebsd/cam/cam_debug.h> + +#include <freebsd/cam/scsi/scsi_all.h> #include <rtems/media.h> #include <rtems/libio.h> diff --git a/rtemsbsd/src/rtems-bsd-condvar.c b/rtemsbsd/src/rtems-bsd-condvar.c index 80b9db73..33951873 100644 --- a/rtemsbsd/src/rtems-bsd-condvar.c +++ b/rtemsbsd/src/rtems-bsd-condvar.c @@ -23,16 +23,16 @@ /* Necessary to obtain some internal functions */ #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> #include <rtems/posix/cond.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/condvar.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/condvar.h> RTEMS_CHAIN_DEFINE_EMPTY(rtems_bsd_condvar_chain); diff --git a/rtemsbsd/src/rtems-bsd-delay.c b/rtemsbsd/src/rtems-bsd-delay.c index b047ab6e..494697d3 100644 --- a/rtemsbsd/src/rtems-bsd-delay.c +++ b/rtemsbsd/src/rtems-bsd-delay.c @@ -20,12 +20,12 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/kernel.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/kernel.h> void DELAY(int usec) diff --git a/rtemsbsd/src/rtems-bsd-generic.c b/rtemsbsd/src/rtems-bsd-generic.c index 3a46da43..bba9fd76 100644 --- a/rtemsbsd/src/rtems-bsd-generic.c +++ b/rtemsbsd/src/rtems-bsd-generic.c @@ -21,20 +21,20 @@ */ #include <sys/types.h> //needed for fd_mask and such -#include <rtems/freebsd/machine/rtems-bsd-config.h> - -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/selinfo.h> -#include <rtems/freebsd/sys/fcntl.h> -#include <rtems/freebsd/sys/socket.h> -#include <rtems/freebsd/sys/socketvar.h> -#include <rtems/freebsd/sys/protosw.h> -#include <rtems/freebsd/sys/select.h> -#include <rtems/freebsd/sys/kernel.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/malloc.h> +#include <freebsd/machine/rtems-bsd-config.h> + +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/selinfo.h> +#include <freebsd/sys/fcntl.h> +#include <freebsd/sys/socket.h> +#include <freebsd/sys/socketvar.h> +#include <freebsd/sys/protosw.h> +#include <freebsd/sys/select.h> +#include <freebsd/sys/kernel.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/malloc.h> MALLOC_DEFINE(M_IOV, "iov", "large iov's"); diff --git a/rtemsbsd/src/rtems-bsd-init-with-irq.c b/rtemsbsd/src/rtems-bsd-init-with-irq.c index c8b3ddc7..2d5da9ae 100644 --- a/rtemsbsd/src/rtems-bsd-init-with-irq.c +++ b/rtemsbsd/src/rtems-bsd-init-with-irq.c @@ -20,11 +20,11 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> #include <rtems/irq-extension.h> -#include <rtems/freebsd/bsd.h> +#include <freebsd/bsd.h> rtems_status_code rtems_bsd_initialize_with_interrupt_server(void) diff --git a/rtemsbsd/src/rtems-bsd-init.c b/rtemsbsd/src/rtems-bsd-init.c index 347d6710..eda98996 100644 --- a/rtemsbsd/src/rtems-bsd-init.c +++ b/rtemsbsd/src/rtems-bsd-init.c @@ -20,17 +20,17 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/kernel.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/proc.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/kernel.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/proc.h> -#include <rtems/freebsd/bsd.h> +#include <freebsd/bsd.h> /* In FreeBSD this is a local function */ void mi_startup(void); diff --git a/rtemsbsd/src/rtems-bsd-jail.c b/rtemsbsd/src/rtems-bsd-jail.c index d04efe5b..bb7fe699 100644 --- a/rtemsbsd/src/rtems-bsd-jail.c +++ b/rtemsbsd/src/rtems-bsd-jail.c @@ -20,38 +20,38 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> -/*#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/malloc.h> -#include <rtems/freebsd/sys/jail.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h>*/ +/*#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/malloc.h> +#include <freebsd/sys/jail.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h>*/ -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/kernel.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/errno.h> -#include <rtems/freebsd/sys/sysproto.h> -#include <rtems/freebsd/sys/malloc.h> -#include <rtems/freebsd/sys/osd.h> -#include <rtems/freebsd/sys/priv.h> -#include <rtems/freebsd/sys/proc.h> -#include <rtems/freebsd/sys/taskqueue.h> -#include <rtems/freebsd/sys/fcntl.h> -#include <rtems/freebsd/sys/jail.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/sx.h> -#include <rtems/freebsd/sys/sysent.h> -#include <rtems/freebsd/sys/namei.h> -#include <rtems/freebsd/sys/mount.h> -#include <rtems/freebsd/sys/queue.h> -#include <rtems/freebsd/sys/socket.h> -#include <rtems/freebsd/sys/syscallsubr.h> -#include <rtems/freebsd/sys/sysctl.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/kernel.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/errno.h> +#include <freebsd/sys/sysproto.h> +#include <freebsd/sys/malloc.h> +#include <freebsd/sys/osd.h> +#include <freebsd/sys/priv.h> +#include <freebsd/sys/proc.h> +#include <freebsd/sys/taskqueue.h> +#include <freebsd/sys/fcntl.h> +#include <freebsd/sys/jail.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/sx.h> +#include <freebsd/sys/sysent.h> +#include <freebsd/sys/namei.h> +#include <freebsd/sys/mount.h> +#include <freebsd/sys/queue.h> +#include <freebsd/sys/socket.h> +#include <freebsd/sys/syscallsubr.h> +#include <freebsd/sys/sysctl.h> #define DEFAULT_HOSTUUID "00000000-0000-0000-0000-000000000000" diff --git a/rtemsbsd/src/rtems-bsd-lock.c b/rtemsbsd/src/rtems-bsd-lock.c index e351debc..c0733b7c 100644 --- a/rtemsbsd/src/rtems-bsd-lock.c +++ b/rtemsbsd/src/rtems-bsd-lock.c @@ -23,17 +23,17 @@ /* Necessary to obtain some internal functions */ #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/ktr.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/sx.h> -#include <rtems/freebsd/sys/rwlock.h> -#include <rtems/freebsd/sys/proc.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/ktr.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/sx.h> +#include <freebsd/sys/rwlock.h> +#include <freebsd/sys/proc.h> struct lock_class *lock_classes[LOCK_CLASS_MAX + 1] = { &lock_class_mtx_spin, diff --git a/rtemsbsd/src/rtems-bsd-malloc.c b/rtemsbsd/src/rtems-bsd-malloc.c index b534b729..12b60830 100644 --- a/rtemsbsd/src/rtems-bsd-malloc.c +++ b/rtemsbsd/src/rtems-bsd-malloc.c @@ -20,13 +20,13 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/malloc.h> -#include <rtems/freebsd/sys/kernel.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/malloc.h> +#include <freebsd/sys/kernel.h> MALLOC_DEFINE(M_DEVBUF, "devbuf", "device driver memory"); diff --git a/rtemsbsd/src/rtems-bsd-mutex.c b/rtemsbsd/src/rtems-bsd-mutex.c index 837232d2..804a765d 100644 --- a/rtemsbsd/src/rtems-bsd-mutex.c +++ b/rtemsbsd/src/rtems-bsd-mutex.c @@ -23,14 +23,14 @@ /* Necessary to obtain some internal functions */ #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ -#include <rtems/freebsd/machine/rtems-bsd-config.h> - -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/proc.h> +#include <freebsd/machine/rtems-bsd-config.h> + +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/proc.h> static void assert_mtx(struct lock_object *lock, int what); static void lock_mtx(struct lock_object *lock, int how); diff --git a/rtemsbsd/src/rtems-bsd-nexus.c b/rtemsbsd/src/rtems-bsd-nexus.c index 480307fc..deba8d46 100644 --- a/rtemsbsd/src/rtems-bsd-nexus.c +++ b/rtemsbsd/src/rtems-bsd-nexus.c @@ -20,15 +20,15 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/machine/rtems-bsd-sysinit.h> +#include <freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-sysinit.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/bus.h> -#include <rtems/freebsd/sys/kernel.h> -#include <rtems/freebsd/sys/module.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/bus.h> +#include <freebsd/sys/kernel.h> +#include <freebsd/sys/module.h> static int nexus_probe(device_t dev) diff --git a/rtemsbsd/src/rtems-bsd-panic.c b/rtemsbsd/src/rtems-bsd-panic.c index 2425abed..042f9f1d 100644 --- a/rtemsbsd/src/rtems-bsd-panic.c +++ b/rtemsbsd/src/rtems-bsd-panic.c @@ -20,15 +20,15 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/kernel.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/proc.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/kernel.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/proc.h> static void suspend_all_threads(void) diff --git a/rtemsbsd/src/rtems-bsd-prot.c b/rtemsbsd/src/rtems-bsd-prot.c index a2631b71..e77f63d6 100644 --- a/rtemsbsd/src/rtems-bsd-prot.c +++ b/rtemsbsd/src/rtems-bsd-prot.c @@ -20,14 +20,14 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> - -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/vm/uma.h> -#include <rtems/freebsd/sys/malloc.h> -#include <rtems/freebsd/sys/ucred.h> -#include <rtems/freebsd/sys/refcount.h> +#include <freebsd/machine/rtems-bsd-config.h> + +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/vm/uma.h> +#include <freebsd/sys/malloc.h> +#include <freebsd/sys/ucred.h> +#include <freebsd/sys/refcount.h> static MALLOC_DEFINE(M_CRED, "cred", "credentials"); diff --git a/rtemsbsd/src/rtems-bsd-resource.c b/rtemsbsd/src/rtems-bsd-resource.c index 3b85d4b7..597d4c3d 100644 --- a/rtemsbsd/src/rtems-bsd-resource.c +++ b/rtemsbsd/src/rtems-bsd-resource.c @@ -20,16 +20,16 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> - -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/malloc.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/proc.h> -#include <rtems/freebsd/sys/resourcevar.h> -#include <rtems/freebsd/sys/rwlock.h> +#include <freebsd/machine/rtems-bsd-config.h> + +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/malloc.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/proc.h> +#include <freebsd/sys/resourcevar.h> +#include <freebsd/sys/rwlock.h> static MALLOC_DEFINE(M_UIDINFO, "uidinfo", "uidinfo structures"); diff --git a/rtemsbsd/src/rtems-bsd-rmlock.c b/rtemsbsd/src/rtems-bsd-rmlock.c index dceb2bd6..0f642d9e 100644 --- a/rtemsbsd/src/rtems-bsd-rmlock.c +++ b/rtemsbsd/src/rtems-bsd-rmlock.c @@ -15,14 +15,14 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> #include <sys/types.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/rmlock.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/rmlock.h> #include <pthread.h> #define RMPF_ONQUEUE 1 diff --git a/rtemsbsd/src/rtems-bsd-rwlock.c b/rtemsbsd/src/rtems-bsd-rwlock.c index de9decd2..62f92846 100644 --- a/rtemsbsd/src/rtems-bsd-rwlock.c +++ b/rtemsbsd/src/rtems-bsd-rwlock.c @@ -23,14 +23,14 @@ /* Necessary to obtain some internal functions */ #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> #include <sys/types.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/rwlock.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/rwlock.h> #include <pthread.h> #ifndef INVARIANTS diff --git a/rtemsbsd/src/rtems-bsd-shell.c b/rtemsbsd/src/rtems-bsd-shell.c index ec704c81..cd075a1a 100644 --- a/rtemsbsd/src/rtems-bsd-shell.c +++ b/rtemsbsd/src/rtems-bsd-shell.c @@ -20,18 +20,18 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> - -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/callout.h> -#include <rtems/freebsd/sys/condvar.h> -#include <rtems/freebsd/sys/proc.h> - -#include <rtems/freebsd/bsd.h> +#include <freebsd/machine/rtems-bsd-config.h> + +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/callout.h> +#include <freebsd/sys/condvar.h> +#include <freebsd/sys/proc.h> + +#include <freebsd/bsd.h> #include <rtems/shell.h> static void diff --git a/rtemsbsd/src/rtems-bsd-signal.c b/rtemsbsd/src/rtems-bsd-signal.c index 02294f96..b8ca429c 100644 --- a/rtemsbsd/src/rtems-bsd-signal.c +++ b/rtemsbsd/src/rtems-bsd-signal.c @@ -20,11 +20,11 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/signalvar.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/signalvar.h> void psignal(struct proc *p, int sig) diff --git a/rtemsbsd/src/rtems-bsd-support.c b/rtemsbsd/src/rtems-bsd-support.c index 461078e9..48be469f 100644 --- a/rtemsbsd/src/rtems-bsd-support.c +++ b/rtemsbsd/src/rtems-bsd-support.c @@ -20,15 +20,15 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> #include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/malloc.h> -#include <rtems/freebsd/sys/uio.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/malloc.h> +#include <freebsd/sys/uio.h> int copyout(const void *kaddr, void *udaddr, size_t len) diff --git a/rtemsbsd/src/rtems-bsd-sx.c b/rtemsbsd/src/rtems-bsd-sx.c index 93232be4..f625841c 100644 --- a/rtemsbsd/src/rtems-bsd-sx.c +++ b/rtemsbsd/src/rtems-bsd-sx.c @@ -23,13 +23,13 @@ /* Necessary to obtain some internal functions */ #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/sx.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/sx.h> #ifndef INVARIANTS #define _sx_assert(sx, what, file, line) diff --git a/rtemsbsd/src/rtems-bsd-synch.c b/rtemsbsd/src/rtems-bsd-synch.c index 2102c1a7..eaf62c63 100644 --- a/rtemsbsd/src/rtems-bsd-synch.c +++ b/rtemsbsd/src/rtems-bsd-synch.c @@ -20,20 +20,20 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> #include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/kernel.h> -#include <rtems/freebsd/sys/ktr.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/proc.h> -#include <rtems/freebsd/machine/pcpu.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/kernel.h> +#include <freebsd/sys/ktr.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/proc.h> +#include <freebsd/machine/pcpu.h> #define STATES_WAITING_FOR_SLEEP 0x40000 diff --git a/rtemsbsd/src/rtems-bsd-syscalls.c b/rtemsbsd/src/rtems-bsd-syscalls.c index daef1d32..6d464401 100644 --- a/rtemsbsd/src/rtems-bsd-syscalls.c +++ b/rtemsbsd/src/rtems-bsd-syscalls.c @@ -19,24 +19,24 @@ * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> - -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/kernel.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/malloc.h> -#include <rtems/freebsd/sys/proc.h> -#include <rtems/freebsd/sys/fcntl.h> -#include <rtems/freebsd/sys/protosw.h> -#include <rtems/freebsd/sys/mbuf.h> -#include <rtems/freebsd/sys/socket.h> -#include <rtems/freebsd/sys/socketvar.h> -#include <rtems/freebsd/sys/uio.h> -#include <rtems/freebsd/machine/pcpu.h> -#include <rtems/freebsd/net/vnet.h> +#include <freebsd/machine/rtems-bsd-config.h> + +#include <freebsd/sys/types.h> +#include <freebsd/sys/param.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/kernel.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/malloc.h> +#include <freebsd/sys/proc.h> +#include <freebsd/sys/fcntl.h> +#include <freebsd/sys/protosw.h> +#include <freebsd/sys/mbuf.h> +#include <freebsd/sys/socket.h> +#include <freebsd/sys/socketvar.h> +#include <freebsd/sys/uio.h> +#include <freebsd/machine/pcpu.h> +#include <freebsd/net/vnet.h> #include <rtems/libio_.h> #include <rtems/seterr.h> diff --git a/rtemsbsd/src/rtems-bsd-sysctl.c b/rtemsbsd/src/rtems-bsd-sysctl.c index dcf963f9..d8df3d1a 100644 --- a/rtemsbsd/src/rtems-bsd-sysctl.c +++ b/rtemsbsd/src/rtems-bsd-sysctl.c @@ -20,10 +20,10 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/sysctl.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/sysctl.h> int sysctl( int *name, diff --git a/rtemsbsd/src/rtems-bsd-sysctlbyname.c b/rtemsbsd/src/rtems-bsd-sysctlbyname.c index b2953cc2..6b7c2018 100644 --- a/rtemsbsd/src/rtems-bsd-sysctlbyname.c +++ b/rtemsbsd/src/rtems-bsd-sysctlbyname.c @@ -18,13 +18,13 @@ * */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/sys/cdefs.h> +#include <freebsd/sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/sysctl.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/sysctl.h> int sysctlbyname(const char *name, void *oldp, size_t *oldlenp, diff --git a/rtemsbsd/src/rtems-bsd-sysctlnametomib.c b/rtemsbsd/src/rtems-bsd-sysctlnametomib.c index 0ce5f088..ecd5cbf1 100644 --- a/rtemsbsd/src/rtems-bsd-sysctlnametomib.c +++ b/rtemsbsd/src/rtems-bsd-sysctlnametomib.c @@ -34,13 +34,13 @@ * SUCH DAMAGE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> +#include <freebsd/machine/rtems-bsd-config.h> -#include <rtems/freebsd/sys/cdefs.h> +#include <freebsd/sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/sysctl.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/sysctl.h> #include <string.h> /* diff --git a/rtemsbsd/src/rtems-bsd-thread.c b/rtemsbsd/src/rtems-bsd-thread.c index 92bf79c0..d1a3cafe 100644 --- a/rtemsbsd/src/rtems-bsd-thread.c +++ b/rtemsbsd/src/rtems-bsd-thread.c @@ -20,14 +20,14 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> - -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/proc.h> -#include <rtems/freebsd/sys/kthread.h> -#include <rtems/freebsd/sys/malloc.h> +#include <freebsd/machine/rtems-bsd-config.h> + +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/proc.h> +#include <freebsd/sys/kthread.h> +#include <freebsd/sys/malloc.h> RTEMS_CHAIN_DEFINE_EMPTY(rtems_bsd_thread_chain); diff --git a/rtemsbsd/src/rtems-bsd-uma.c b/rtemsbsd/src/rtems-bsd-uma.c index c289bf00..26748f98 100644 --- a/rtemsbsd/src/rtems-bsd-uma.c +++ b/rtemsbsd/src/rtems-bsd-uma.c @@ -20,19 +20,19 @@ * http://www.rtems.com/license/LICENSE. */ -#include <rtems/freebsd/machine/rtems-bsd-config.h> - -#include <rtems/freebsd/sys/param.h> -#include <rtems/freebsd/sys/types.h> -#include <rtems/freebsd/sys/systm.h> -#include <rtems/freebsd/sys/malloc.h> -#include <rtems/freebsd/sys/kernel.h> -#include <rtems/freebsd/sys/lock.h> -#include <rtems/freebsd/sys/mutex.h> -#include <rtems/freebsd/sys/ktr.h> -#include <rtems/freebsd/vm/uma.h> -#include <rtems/freebsd/vm/uma_int.h> -#include <rtems/freebsd/vm/uma_dbg.h> +#include <freebsd/machine/rtems-bsd-config.h> + +#include <freebsd/sys/param.h> +#include <freebsd/sys/types.h> +#include <freebsd/sys/systm.h> +#include <freebsd/sys/malloc.h> +#include <freebsd/sys/kernel.h> +#include <freebsd/sys/lock.h> +#include <freebsd/sys/mutex.h> +#include <freebsd/sys/ktr.h> +#include <freebsd/vm/uma.h> +#include <freebsd/vm/uma_int.h> +#include <freebsd/vm/uma_dbg.h> /* * This is the zone and keg from which all zones are spawned. The idea is that diff --git a/testsuite/link01/test.c b/testsuite/link01/test.c index 7d64baa5..da25c10a 100644 --- a/testsuite/link01/test.c +++ b/testsuite/link01/test.c @@ -7,7 +7,7 @@ #include <bsp.h> #include <stdlib.h> #include <stdio.h> -#include <rtems/freebsd/bsd.h> +#include <freebsd/bsd.h> /* needed by rtems-bsd-resource.c */ int maxproc; |