diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-09 22:52:54 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-10 09:08:23 +0200 |
| commit | e599318e912d8836c59d8b5202e3e31a6b8dcae9 (patch) | |
| tree | 1172b8b830a1c3236e45c834c2b80e01325ea144 /freebsd/sys/contrib | |
| parent | Move files to match FreeBSD layout (diff) | |
| download | rtems-libbsd-e599318e912d8836c59d8b5202e3e31a6b8dcae9.tar.bz2 | |
Update files to match FreeBSD layout
Add compatibility with Newlib header files. Some FreeBSD header files
are mapped by the translation script:
o rtems/bsd/sys/_types.h
o rtems/bsd/sys/errno.h
o rtems/bsd/sys/lock.h
o rtems/bsd/sys/param.h
o rtems/bsd/sys/resource.h
o rtems/bsd/sys/time.h
o rtems/bsd/sys/timespec.h
o rtems/bsd/sys/types.h
o rtems/bsd/sys/unistd.h
It is now possible to include <sys/socket.h> directly for example.
Generate one Makefile which builds everything including tests.
Diffstat (limited to 'freebsd/sys/contrib')
36 files changed, 644 insertions, 644 deletions
diff --git a/freebsd/sys/contrib/altq/altq/altq.h b/freebsd/sys/contrib/altq/altq/altq.h index 2c9e3536..9319e44c 100644 --- a/freebsd/sys/contrib/altq/altq/altq.h +++ b/freebsd/sys/contrib/altq/altq/altq.h @@ -26,8 +26,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#ifndef _ALTQ_ALTQ_HH_ -#define _ALTQ_ALTQ_HH_ +#ifndef _ALTQ_ALTQ_H_ +#define _ALTQ_ALTQ_H_ #if 0 /* @@ -39,10 +39,10 @@ #endif #ifdef ALTQ3_COMPAT -#include <freebsd/sys/param.h> -#include <freebsd/sys/ioccom.h> -#include <freebsd/sys/queue.h> -#include <freebsd/netinet/in.h> +#include <rtems/bsd/sys/param.h> +#include <sys/ioccom.h> +#include <sys/queue.h> +#include <netinet/in.h> #ifndef IFNAMSIZ #define IFNAMSIZ 16 @@ -198,7 +198,7 @@ struct pktcntr { #endif /* ALTQ3_COMPAT */ #ifdef _KERNEL -#include <freebsd/altq/altq_var.h> +#include <altq/altq_var.h> #endif -#endif /* _ALTQ_ALTQ_HH_ */ +#endif /* _ALTQ_ALTQ_H_ */ diff --git a/freebsd/sys/contrib/altq/altq/altq_cbq.c b/freebsd/sys/contrib/altq/altq/altq_cbq.c index b5f21fb3..7991c0f5 100644 --- a/freebsd/sys/contrib/altq/altq/altq_cbq.c +++ b/freebsd/sys/contrib/altq/altq/altq_cbq.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $ */ @@ -34,37 +34,37 @@ */ #if defined(__FreeBSD__) || defined(__NetBSD__) -#include <freebsd/local/opt_altq.h> +#include <rtems/bsd/local/opt_altq.h> #if (__FreeBSD__ != 2) -#include <freebsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet.h> #ifdef __FreeBSD__ -#include <freebsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_inet6.h> #endif #endif #endif /* __FreeBSD__ || __NetBSD__ */ #ifdef ALTQ_CBQ /* cbq is enabled by ALTQ_CBQ option in opt_altq.h */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/time.h> +#include <rtems/bsd/sys/param.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/socket.h> +#include <sys/systm.h> +#include <sys/proc.h> +#include <rtems/bsd/sys/errno.h> +#include <rtems/bsd/sys/time.h> #ifdef ALTQ3_COMPAT -#include <freebsd/sys/uio.h> -#include <freebsd/sys/kernel.h> +#include <sys/uio.h> +#include <sys/kernel.h> #endif -#include <freebsd/net/if.h> -#include <freebsd/netinet/in.h> +#include <net/if.h> +#include <netinet/in.h> -#include <freebsd/net/pfvar.h> -#include <freebsd/altq/altq.h> -#include <freebsd/altq/altq_cbq.h> +#include <net/pfvar.h> +#include <altq/altq.h> +#include <altq/altq_cbq.h> #ifdef ALTQ3_COMPAT -#include <freebsd/altq/altq_conf.h> +#include <altq/altq_conf.h> #endif #ifdef ALTQ3_COMPAT diff --git a/freebsd/sys/contrib/altq/altq/altq_cbq.h b/freebsd/sys/contrib/altq/altq/altq_cbq.h index 4b90beb4..30a15c73 100644 --- a/freebsd/sys/contrib/altq/altq/altq_cbq.h +++ b/freebsd/sys/contrib/altq/altq/altq_cbq.h @@ -30,13 +30,13 @@ * These notices must be retained in any copies of any part of this software. */ -#ifndef _ALTQ_ALTQ_CBQ_HH_ -#define _ALTQ_ALTQ_CBQ_HH_ +#ifndef _ALTQ_ALTQ_CBQ_H_ +#define _ALTQ_ALTQ_CBQ_H_ -#include <freebsd/altq/altq.h> -#include <freebsd/altq/altq_rmclass.h> -#include <freebsd/altq/altq_red.h> -#include <freebsd/altq/altq_rio.h> +#include <altq/altq.h> +#include <altq/altq_rmclass.h> +#include <altq/altq_red.h> +#include <altq/altq_rio.h> #ifdef __cplusplus extern "C" { @@ -218,4 +218,4 @@ typedef struct cbqstate { } #endif -#endif /* !_ALTQ_ALTQ_CBQ_HH_ */ +#endif /* !_ALTQ_ALTQ_CBQ_H_ */ diff --git a/freebsd/sys/contrib/altq/altq/altq_cdnr.c b/freebsd/sys/contrib/altq/altq/altq_cdnr.c index 66095acc..426e8ddf 100644 --- a/freebsd/sys/contrib/altq/altq/altq_cdnr.c +++ b/freebsd/sys/contrib/altq/altq/altq_cdnr.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $KAME: altq_cdnr.c,v 1.14 2003/09/05 22:40:36 itojun Exp $ */ @@ -30,40 +30,40 @@ */ #if defined(__FreeBSD__) || defined(__NetBSD__) -#include <freebsd/local/opt_altq.h> +#include <rtems/bsd/local/opt_altq.h> #if (__FreeBSD__ != 2) -#include <freebsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet.h> #ifdef __FreeBSD__ -#include <freebsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_inet6.h> #endif #endif #endif /* __FreeBSD__ || __NetBSD__ */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/queue.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/if_types.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> +#include <rtems/bsd/sys/param.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/systm.h> +#include <sys/proc.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/kernel.h> +#include <sys/queue.h> + +#include <net/if.h> +#include <net/if_types.h> +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> #ifdef INET6 -#include <freebsd/netinet/ip6.h> +#include <netinet/ip6.h> #endif -#include <freebsd/altq/altq.h> +#include <altq/altq.h> #ifdef ALTQ3_COMPAT -#include <freebsd/altq/altq_conf.h> +#include <altq/altq_conf.h> #endif -#include <freebsd/altq/altq_cdnr.h> +#include <altq/altq_cdnr.h> #ifdef ALTQ3_COMPAT /* diff --git a/freebsd/sys/contrib/altq/altq/altq_cdnr.h b/freebsd/sys/contrib/altq/altq/altq_cdnr.h index b765833f..d55402f4 100644 --- a/freebsd/sys/contrib/altq/altq/altq_cdnr.h +++ b/freebsd/sys/contrib/altq/altq/altq_cdnr.h @@ -26,10 +26,10 @@ * SUCH DAMAGE. */ -#ifndef _ALTQ_ALTQ_CDNR_HH_ -#define _ALTQ_ALTQ_CDNR_HH_ +#ifndef _ALTQ_ALTQ_CDNR_H_ +#define _ALTQ_ALTQ_CDNR_H_ -#include <freebsd/altq/altq.h> +#include <altq/altq.h> /* * traffic conditioner element types @@ -332,4 +332,4 @@ struct tswtcm { #endif /* _KERNEL */ -#endif /* _ALTQ_ALTQ_CDNR_HH_ */ +#endif /* _ALTQ_ALTQ_CDNR_H_ */ diff --git a/freebsd/sys/contrib/altq/altq/altq_classq.h b/freebsd/sys/contrib/altq/altq/altq_classq.h index c3cfea37..dc5c646f 100644 --- a/freebsd/sys/contrib/altq/altq/altq_classq.h +++ b/freebsd/sys/contrib/altq/altq/altq_classq.h @@ -35,8 +35,8 @@ /* * class queue definitions extracted from rm_class.h. */ -#ifndef _ALTQ_ALTQ_CLASSQ_HH_ -#define _ALTQ_ALTQ_CLASSQ_HH_ +#ifndef _ALTQ_ALTQ_CLASSQ_H_ +#define _ALTQ_ALTQ_CLASSQ_H_ #ifdef __cplusplus extern "C" { @@ -203,4 +203,4 @@ _flushq(class_queue_t *q) } #endif -#endif /* _ALTQ_ALTQ_CLASSQ_HH_ */ +#endif /* _ALTQ_ALTQ_CLASSQ_H_ */ diff --git a/freebsd/sys/contrib/altq/altq/altq_hfsc.c b/freebsd/sys/contrib/altq/altq/altq_hfsc.c index a559f006..c4648af3 100644 --- a/freebsd/sys/contrib/altq/altq/altq_hfsc.c +++ b/freebsd/sys/contrib/altq/altq/altq_hfsc.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $KAME: altq_hfsc.c,v 1.24 2003/12/05 05:40:46 kjc Exp $ */ @@ -45,38 +45,38 @@ */ #if defined(__FreeBSD__) || defined(__NetBSD__) -#include <freebsd/local/opt_altq.h> +#include <rtems/bsd/local/opt_altq.h> #if (__FreeBSD__ != 2) -#include <freebsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet.h> #ifdef __FreeBSD__ -#include <freebsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_inet6.h> #endif #endif #endif /* __FreeBSD__ || __NetBSD__ */ #ifdef ALTQ_HFSC /* hfsc is enabled by ALTQ_HFSC option in opt_altq.h */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/queue.h> +#include <rtems/bsd/sys/param.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/socket.h> +#include <sys/systm.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/queue.h> #if 1 /* ALTQ3_COMPAT */ -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/kernel.h> +#include <sys/sockio.h> +#include <sys/proc.h> +#include <sys/kernel.h> #endif /* ALTQ3_COMPAT */ -#include <freebsd/net/if.h> -#include <freebsd/netinet/in.h> +#include <net/if.h> +#include <netinet/in.h> -#include <freebsd/net/pfvar.h> -#include <freebsd/altq/altq.h> -#include <freebsd/altq/altq_hfsc.h> +#include <net/pfvar.h> +#include <altq/altq.h> +#include <altq/altq_hfsc.h> #ifdef ALTQ3_COMPAT -#include <freebsd/altq/altq_conf.h> +#include <altq/altq_conf.h> #endif /* diff --git a/freebsd/sys/contrib/altq/altq/altq_hfsc.h b/freebsd/sys/contrib/altq/altq/altq_hfsc.h index fc983586..91ba3d18 100644 --- a/freebsd/sys/contrib/altq/altq/altq_hfsc.h +++ b/freebsd/sys/contrib/altq/altq/altq_hfsc.h @@ -29,13 +29,13 @@ * and to grant Carnegie Mellon the rights to redistribute these * changes without encumbrance. */ -#ifndef _ALTQ_ALTQ_HFSC_HH_ -#define _ALTQ_ALTQ_HFSC_HH_ +#ifndef _ALTQ_ALTQ_HFSC_H_ +#define _ALTQ_ALTQ_HFSC_H_ -#include <freebsd/altq/altq.h> -#include <freebsd/altq/altq_classq.h> -#include <freebsd/altq/altq_red.h> -#include <freebsd/altq/altq_rio.h> +#include <altq/altq.h> +#include <altq/altq_classq.h> +#include <altq/altq_red.h> +#include <altq/altq_rio.h> #ifdef __cplusplus extern "C" { @@ -317,4 +317,4 @@ struct hfsc_if { } #endif -#endif /* _ALTQ_ALTQ_HFSC_HH_ */ +#endif /* _ALTQ_ALTQ_HFSC_H_ */ diff --git a/freebsd/sys/contrib/altq/altq/altq_priq.c b/freebsd/sys/contrib/altq/altq/altq_priq.c index d395a833..0bc6f453 100644 --- a/freebsd/sys/contrib/altq/altq/altq_priq.c +++ b/freebsd/sys/contrib/altq/altq/altq_priq.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $KAME: altq_priq.c,v 1.11 2003/09/17 14:23:25 kjc Exp $ */ @@ -32,37 +32,37 @@ */ #if defined(__FreeBSD__) || defined(__NetBSD__) -#include <freebsd/local/opt_altq.h> +#include <rtems/bsd/local/opt_altq.h> #if (__FreeBSD__ != 2) -#include <freebsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet.h> #ifdef __FreeBSD__ -#include <freebsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_inet6.h> #endif #endif #endif /* __FreeBSD__ || __NetBSD__ */ #ifdef ALTQ_PRIQ /* priq is enabled by ALTQ_PRIQ option in opt_altq.h */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/queue.h> - -#include <freebsd/net/if.h> -#include <freebsd/netinet/in.h> - -#include <freebsd/net/pfvar.h> -#include <freebsd/altq/altq.h> +#include <rtems/bsd/sys/param.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/systm.h> +#include <sys/proc.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/kernel.h> +#include <sys/queue.h> + +#include <net/if.h> +#include <netinet/in.h> + +#include <net/pfvar.h> +#include <altq/altq.h> #ifdef ALTQ3_COMPAT -#include <freebsd/altq/altq_conf.h> +#include <altq/altq_conf.h> #endif -#include <freebsd/altq/altq_priq.h> +#include <altq/altq_priq.h> /* * function prototypes diff --git a/freebsd/sys/contrib/altq/altq/altq_priq.h b/freebsd/sys/contrib/altq/altq/altq_priq.h index 7f553b8a..481d31b8 100644 --- a/freebsd/sys/contrib/altq/altq/altq_priq.h +++ b/freebsd/sys/contrib/altq/altq/altq_priq.h @@ -25,13 +25,13 @@ * SUCH DAMAGE. */ -#ifndef _ALTQ_ALTQ_PRIQ_HH_ -#define _ALTQ_ALTQ_PRIQ_HH_ +#ifndef _ALTQ_ALTQ_PRIQ_H_ +#define _ALTQ_ALTQ_PRIQ_H_ -#include <freebsd/altq/altq.h> -#include <freebsd/altq/altq_classq.h> -#include <freebsd/altq/altq_red.h> -#include <freebsd/altq/altq_rio.h> +#include <altq/altq.h> +#include <altq/altq_classq.h> +#include <altq/altq_red.h> +#include <altq/altq_rio.h> #ifdef __cplusplus extern "C" { @@ -167,4 +167,4 @@ struct priq_if { } #endif -#endif /* _ALTQ_ALTQ_PRIQ_HH_ */ +#endif /* _ALTQ_ALTQ_PRIQ_H_ */ diff --git a/freebsd/sys/contrib/altq/altq/altq_red.c b/freebsd/sys/contrib/altq/altq/altq_red.c index 18fa7209..7491c2f0 100644 --- a/freebsd/sys/contrib/altq/altq/altq_red.c +++ b/freebsd/sys/contrib/altq/altq/altq_red.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $KAME: altq_red.c,v 1.18 2003/09/05 22:40:36 itojun Exp $ */ @@ -63,48 +63,48 @@ */ #if defined(__FreeBSD__) || defined(__NetBSD__) -#include <freebsd/local/opt_altq.h> +#include <rtems/bsd/local/opt_altq.h> #if (__FreeBSD__ != 2) -#include <freebsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet.h> #ifdef __FreeBSD__ -#include <freebsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_inet6.h> #endif #endif #endif /* __FreeBSD__ || __NetBSD__ */ #ifdef ALTQ_RED /* red is enabled by ALTQ_RED option in opt_altq.h */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/errno.h> +#include <rtems/bsd/sys/param.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/socket.h> +#include <sys/systm.h> +#include <rtems/bsd/sys/errno.h> #if 1 /* ALTQ3_COMPAT */ -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/kernel.h> +#include <sys/sockio.h> +#include <sys/proc.h> +#include <sys/kernel.h> #ifdef ALTQ_FLOWVALVE -#include <freebsd/sys/queue.h> -#include <freebsd/sys/time.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/time.h> #endif #endif /* ALTQ3_COMPAT */ -#include <freebsd/net/if.h> +#include <net/if.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> #ifdef INET6 -#include <freebsd/netinet/ip6.h> +#include <netinet/ip6.h> #endif -#include <freebsd/net/pfvar.h> -#include <freebsd/altq/altq.h> -#include <freebsd/altq/altq_red.h> +#include <net/pfvar.h> +#include <altq/altq.h> +#include <altq/altq_red.h> #ifdef ALTQ3_COMPAT -#include <freebsd/altq/altq_conf.h> +#include <altq/altq_conf.h> #ifdef ALTQ_FLOWVALVE -#include <freebsd/altq/altq_flowvalve.h> +#include <altq/altq_flowvalve.h> #endif #endif diff --git a/freebsd/sys/contrib/altq/altq/altq_red.h b/freebsd/sys/contrib/altq/altq/altq_red.h index 2d267101..dc8ea0ac 100644 --- a/freebsd/sys/contrib/altq/altq/altq_red.h +++ b/freebsd/sys/contrib/altq/altq/altq_red.h @@ -26,10 +26,10 @@ * SUCH DAMAGE. */ -#ifndef _ALTQ_ALTQ_RED_HH_ -#define _ALTQ_ALTQ_RED_HH_ +#ifndef _ALTQ_ALTQ_RED_H_ +#define _ALTQ_ALTQ_RED_H_ -#include <freebsd/altq/altq_classq.h> +#include <altq/altq_classq.h> #ifdef ALTQ3_COMPAT struct red_interface { @@ -195,4 +195,4 @@ extern int32_t pow_w(struct wtab *, int); #endif /* _KERNEL */ -#endif /* _ALTQ_ALTQ_RED_HH_ */ +#endif /* _ALTQ_ALTQ_RED_H_ */ diff --git a/freebsd/sys/contrib/altq/altq/altq_rio.c b/freebsd/sys/contrib/altq/altq/altq_rio.c index 33a5fce6..a24c9006 100644 --- a/freebsd/sys/contrib/altq/altq/altq_rio.c +++ b/freebsd/sys/contrib/altq/altq/altq_rio.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $KAME: altq_rio.c,v 1.17 2003/07/10 12:07:49 kjc Exp $ */ @@ -62,44 +62,44 @@ */ #if defined(__FreeBSD__) || defined(__NetBSD__) -#include <freebsd/local/opt_altq.h> +#include <rtems/bsd/local/opt_altq.h> #if (__FreeBSD__ != 2) -#include <freebsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet.h> #ifdef __FreeBSD__ -#include <freebsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_inet6.h> #endif #endif #endif /* __FreeBSD__ || __NetBSD__ */ #ifdef ALTQ_RIO /* rio is enabled by ALTQ_RIO option in opt_altq.h */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/errno.h> +#include <rtems/bsd/sys/param.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/socket.h> +#include <sys/systm.h> +#include <rtems/bsd/sys/errno.h> #if 1 /* ALTQ3_COMPAT */ -#include <freebsd/sys/proc.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/kernel.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/kernel.h> #endif -#include <freebsd/net/if.h> +#include <net/if.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> #ifdef INET6 -#include <freebsd/netinet/ip6.h> +#include <netinet/ip6.h> #endif -#include <freebsd/net/pfvar.h> -#include <freebsd/altq/altq.h> -#include <freebsd/altq/altq_cdnr.h> -#include <freebsd/altq/altq_red.h> -#include <freebsd/altq/altq_rio.h> +#include <net/pfvar.h> +#include <altq/altq.h> +#include <altq/altq_cdnr.h> +#include <altq/altq_red.h> +#include <altq/altq_rio.h> #ifdef ALTQ3_COMPAT -#include <freebsd/altq/altq_conf.h> +#include <altq/altq_conf.h> #endif /* diff --git a/freebsd/sys/contrib/altq/altq/altq_rio.h b/freebsd/sys/contrib/altq/altq/altq_rio.h index e32d2ee2..83210f23 100644 --- a/freebsd/sys/contrib/altq/altq/altq_rio.h +++ b/freebsd/sys/contrib/altq/altq/altq_rio.h @@ -26,10 +26,10 @@ * SUCH DAMAGE. */ -#ifndef _ALTQ_ALTQ_RIO_HH_ -#define _ALTQ_ALTQ_RIO_HH_ +#ifndef _ALTQ_ALTQ_RIO_H_ +#define _ALTQ_ALTQ_RIO_H_ -#include <freebsd/altq/altq_classq.h> +#include <altq/altq_classq.h> /* * RIO: RED with IN/OUT bit @@ -141,4 +141,4 @@ extern struct mbuf *rio_getq(rio_t *, class_queue_t *); #endif /* _KERNEL */ -#endif /* _ALTQ_ALTQ_RIO_HH_ */ +#endif /* _ALTQ_ALTQ_RIO_H_ */ diff --git a/freebsd/sys/contrib/altq/altq/altq_rmclass.c b/freebsd/sys/contrib/altq/altq/altq_rmclass.c index 06f61bd3..390d7308 100644 --- a/freebsd/sys/contrib/altq/altq/altq_rmclass.c +++ b/freebsd/sys/contrib/altq/altq/altq_rmclass.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $KAME: altq_rmclass.c,v 1.18 2003/11/06 06:32:53 kjc Exp $ */ @@ -42,39 +42,39 @@ #ident "@(#)rm_class.c 1.48 97/12/05 SMI" #if defined(__FreeBSD__) || defined(__NetBSD__) -#include <freebsd/local/opt_altq.h> +#include <rtems/bsd/local/opt_altq.h> #if (__FreeBSD__ != 2) -#include <freebsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet.h> #ifdef __FreeBSD__ -#include <freebsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_inet6.h> #endif #endif #endif /* __FreeBSD__ || __NetBSD__ */ #ifdef ALTQ_CBQ /* cbq is enabled by ALTQ_CBQ option in opt_altq.h */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/time.h> +#include <rtems/bsd/sys/param.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/socket.h> +#include <sys/systm.h> +#include <rtems/bsd/sys/errno.h> +#include <rtems/bsd/sys/time.h> #ifdef ALTQ3_COMPAT -#include <freebsd/sys/kernel.h> +#include <sys/kernel.h> #endif -#include <freebsd/net/if.h> +#include <net/if.h> #ifdef ALTQ3_COMPAT -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> #endif -#include <freebsd/altq/altq.h> -#include <freebsd/altq/altq_rmclass.h> -#include <freebsd/altq/altq_rmclass_debug.h> -#include <freebsd/altq/altq_red.h> -#include <freebsd/altq/altq_rio.h> +#include <altq/altq.h> +#include <altq/altq_rmclass.h> +#include <altq/altq_rmclass_debug.h> +#include <altq/altq_red.h> +#include <altq/altq_rio.h> /* * Local Macros diff --git a/freebsd/sys/contrib/altq/altq/altq_rmclass.h b/freebsd/sys/contrib/altq/altq/altq_rmclass.h index feb30c1c..cf0ddf48 100644 --- a/freebsd/sys/contrib/altq/altq/altq_rmclass.h +++ b/freebsd/sys/contrib/altq/altq/altq_rmclass.h @@ -33,10 +33,10 @@ * SUCH DAMAGE. */ -#ifndef _ALTQ_ALTQ_RMCLASS_HH_ -#define _ALTQ_ALTQ_RMCLASS_HH_ +#ifndef _ALTQ_ALTQ_RMCLASS_H_ +#define _ALTQ_ALTQ_RMCLASS_H_ -#include <freebsd/altq/altq_classq.h> +#include <altq/altq_classq.h> /* #pragma ident "@(#)rm_class.h 1.20 97/10/23 SMI" */ @@ -263,4 +263,4 @@ extern int rmc_get_weight(struct rm_ifdat *, int); } #endif -#endif /* _ALTQ_ALTQ_RMCLASS_HH_ */ +#endif /* _ALTQ_ALTQ_RMCLASS_H_ */ diff --git a/freebsd/sys/contrib/altq/altq/altq_rmclass_debug.h b/freebsd/sys/contrib/altq/altq/altq_rmclass_debug.h index 6723a4b7..8f471b2f 100644 --- a/freebsd/sys/contrib/altq/altq/altq_rmclass_debug.h +++ b/freebsd/sys/contrib/altq/altq/altq_rmclass_debug.h @@ -30,8 +30,8 @@ * These notices must be retained in any copies of any part of this software. */ -#ifndef _ALTQ_ALTQ_RMCLASS_DEBUG_HH_ -#define _ALTQ_ALTQ_RMCLASS_DEBUG_HH_ +#ifndef _ALTQ_ALTQ_RMCLASS_DEBUG_H_ +#define _ALTQ_ALTQ_RMCLASS_DEBUG_H_ /* #pragma ident "@(#)rm_class_debug.h 1.7 98/05/04 SMI" */ @@ -109,4 +109,4 @@ extern int cbqtrace_count; } #endif -#endif /* _ALTQ_ALTQ_RMCLASS_DEBUG_HH_ */ +#endif /* _ALTQ_ALTQ_RMCLASS_DEBUG_H_ */ diff --git a/freebsd/sys/contrib/altq/altq/altq_subr.c b/freebsd/sys/contrib/altq/altq/altq_subr.c index f4bb6b47..b6e20082 100644 --- a/freebsd/sys/contrib/altq/altq/altq_subr.c +++ b/freebsd/sys/contrib/altq/altq/altq_subr.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $ */ @@ -30,65 +30,65 @@ */ #if defined(__FreeBSD__) || defined(__NetBSD__) -#include <freebsd/local/opt_altq.h> -#include <freebsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_altq.h> +#include <rtems/bsd/local/opt_inet.h> #ifdef __FreeBSD__ -#include <freebsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_inet6.h> #endif #endif /* __FreeBSD__ || __NetBSD__ */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/socketvar.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/syslog.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/queue.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/if_dl.h> -#include <freebsd/net/if_types.h> +#include <rtems/bsd/sys/param.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/systm.h> +#include <sys/proc.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/kernel.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/syslog.h> +#include <sys/sysctl.h> +#include <sys/queue.h> + +#include <net/if.h> +#include <net/if_dl.h> +#include <net/if_types.h> #ifdef __FreeBSD__ -#include <freebsd/net/vnet.h> +#include <net/vnet.h> #endif -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> #ifdef INET6 -#include <freebsd/netinet/ip6.h> +#include <netinet/ip6.h> #endif -#include <freebsd/netinet/tcp.h> -#include <freebsd/netinet/udp.h> +#include <netinet/tcp.h> +#include <netinet/udp.h> -#include <freebsd/net/pfvar.h> -#include <freebsd/altq/altq.h> +#include <net/pfvar.h> +#include <altq/altq.h> #ifdef ALTQ3_COMPAT -#include <freebsd/altq/altq_conf.h> +#include <altq/altq_conf.h> #endif /* machine dependent clock related includes */ #ifdef __FreeBSD__ #if __FreeBSD__ < 3 -#include <freebsd/local/opt_cpu.h> /* for FreeBSD-2.2.8 to get i586_ctr_freq */ +#include <rtems/bsd/local/opt_cpu.h> /* for FreeBSD-2.2.8 to get i586_ctr_freq */ #endif -#include <freebsd/sys/bus.h> -#include <freebsd/sys/cpu.h> -#include <freebsd/sys/eventhandler.h> -#include <freebsd/machine/clock.h> +#include <sys/bus.h> +#include <sys/cpu.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> #endif #if defined(__i386__) -#include <freebsd/machine/cpufunc.h> /* for pentium tsc */ -#include <freebsd/machine/specialreg.h> /* for CPUID_TSC */ +#include <machine/cpufunc.h> /* for pentium tsc */ +#include <machine/specialreg.h> /* for CPUID_TSC */ #ifdef __FreeBSD__ -#include <freebsd/machine/md_var.h> /* for cpu_feature */ +#include <machine/md_var.h> /* for cpu_feature */ #elif defined(__NetBSD__) || defined(__OpenBSD__) -#include <freebsd/machine/cpu.h> /* for cpu_feature */ +#include <machine/cpu.h> /* for cpu_feature */ #endif #endif /* __i386__ */ diff --git a/freebsd/sys/contrib/altq/altq/altq_var.h b/freebsd/sys/contrib/altq/altq/altq_var.h index 9ebfe2ed..6f37f182 100644 --- a/freebsd/sys/contrib/altq/altq/altq_var.h +++ b/freebsd/sys/contrib/altq/altq/altq_var.h @@ -26,14 +26,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#ifndef _ALTQ_ALTQ_VAR_HH_ -#define _ALTQ_ALTQ_VAR_HH_ +#ifndef _ALTQ_ALTQ_VAR_H_ +#define _ALTQ_ALTQ_VAR_H_ #ifdef _KERNEL -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/queue.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/queue.h> #ifdef ALTQ3_CLFIER_COMPAT /* @@ -167,7 +167,7 @@ typedef u_long ioctlcmd_t; /* macro for timeout/untimeout */ #if (__FreeBSD_version > 300000) || defined(__NetBSD__) /* use callout */ -#include <freebsd/sys/callout.h> +#include <sys/callout.h> #if (__FreeBSD_version > 500000) #define CALLOUT_INIT(c) callout_init((c), 0) @@ -180,7 +180,7 @@ typedef u_long ioctlcmd_t; #define CALLOUT_INITIALIZER { { { NULL } }, 0, NULL, NULL, 0 } #endif #elif defined(__OpenBSD__) -#include <freebsd/sys/timeout.h> +#include <sys/timeout.h> /* callout structure as a wrapper of struct timeout */ struct callout { struct timeout c_to; @@ -262,4 +262,4 @@ int hfsc_remove_queue(struct pf_altq *); int hfsc_getqstats(struct pf_altq *, void *, int *); #endif /* _KERNEL */ -#endif /* _ALTQ_ALTQ_VAR_HH_ */ +#endif /* _ALTQ_ALTQ_VAR_H_ */ diff --git a/freebsd/sys/contrib/altq/altq/altqconf.h b/freebsd/sys/contrib/altq/altq/altqconf.h index b4d0f84e..1b4271eb 100644 --- a/freebsd/sys/contrib/altq/altq/altqconf.h +++ b/freebsd/sys/contrib/altq/altq/altqconf.h @@ -4,10 +4,10 @@ #if defined(_KERNEL_OPT) || defined(__OpenBSD__) #if defined(_KERNEL_OPT) -#include <freebsd/local/opt_altq_enabled.h> +#include <rtems/bsd/local/opt_altq_enabled.h> #endif -#include <freebsd/sys/conf.h> +#include <sys/conf.h> #ifdef ALTQ #define NALTQ 1 diff --git a/freebsd/sys/contrib/altq/altq/if_altq.h b/freebsd/sys/contrib/altq/altq/if_altq.h index c2255b8c..50462e9e 100644 --- a/freebsd/sys/contrib/altq/altq/if_altq.h +++ b/freebsd/sys/contrib/altq/altq/if_altq.h @@ -26,17 +26,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#ifndef _ALTQ_IF_ALTQ_HH_ -#define _ALTQ_IF_ALTQ_HH_ +#ifndef _ALTQ_IF_ALTQ_H_ +#define _ALTQ_IF_ALTQ_H_ #if (defined(__FreeBSD__) && __FreeBSD_version >= 500000) -#include <freebsd/sys/lock.h> /* XXX */ -#include <freebsd/sys/mutex.h> /* XXX */ -#include <freebsd/sys/event.h> /* XXX */ +#include <rtems/bsd/sys/lock.h> /* XXX */ +#include <sys/mutex.h> /* XXX */ +#include <sys/event.h> /* XXX */ #endif #ifdef _KERNEL_OPT -#include <freebsd/altq/altqconf.h> +#include <altq/altqconf.h> #endif struct altq_pktattr; struct tb_regulator; struct top_cdnr; @@ -188,4 +188,4 @@ void altq_etherclassify(struct ifaltq *, struct mbuf *, struct altq_pktattr *); #endif #endif /* _KERNEL */ -#endif /* _ALTQ_IF_ALTQ_HH_ */ +#endif /* _ALTQ_IF_ALTQ_H_ */ diff --git a/freebsd/sys/contrib/pf/net/if_pflog.c b/freebsd/sys/contrib/pf/net/if_pflog.c index 8ecc7cee..a05c6435 100644 --- a/freebsd/sys/contrib/pf/net/if_pflog.c +++ b/freebsd/sys/contrib/pf/net/if_pflog.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $OpenBSD: if_pflog.c,v 1.22 2006/12/15 09:31:20 otto Exp $ */ /* @@ -36,12 +36,12 @@ */ #ifdef __FreeBSD__ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> -#include <freebsd/local/opt_bpf.h> -#include <freebsd/local/opt_pf.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_bpf.h> +#include <rtems/bsd/local/opt_pf.h> -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); #ifdef DEV_BPF @@ -57,53 +57,53 @@ __FBSDID("$FreeBSD$"); #endif #else /* ! __FreeBSD__ */ -#include <freebsd/local/bpfilter.h> -#include <freebsd/local/pflog.h> +#include <rtems/bsd/local/bpfilter.h> +#include <rtems/bsd/local/pflog.h> #endif /* __FreeBSD__ */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/socket.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/proc.h> +#include <sys/socket.h> #ifdef __FreeBSD__ -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/limits.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/sockio.h> +#include <sys/kernel.h> +#include <sys/limits.h> +#include <sys/malloc.h> +#include <sys/module.h> +#include <sys/sockio.h> #else -#include <freebsd/sys/ioctl.h> +#include <sys/ioctl.h> #endif -#include <freebsd/net/if.h> +#include <net/if.h> #ifdef __FreeBSD__ -#include <freebsd/net/if_clone.h> +#include <net/if_clone.h> #endif -#include <freebsd/net/if_types.h> -#include <freebsd/net/route.h> -#include <freebsd/net/bpf.h> +#include <net/if_types.h> +#include <net/route.h> +#include <net/bpf.h> #ifdef INET -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_var.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> #endif #ifdef INET6 #ifndef INET -#include <freebsd/netinet/in.h> +#include <netinet/in.h> #endif -#include <freebsd/netinet6/nd6.h> +#include <netinet6/nd6.h> #endif /* INET6 */ -#include <freebsd/net/pfvar.h> -#include <freebsd/net/if_pflog.h> +#include <net/pfvar.h> +#include <net/if_pflog.h> #ifdef INET #ifdef __FreeBSD__ -#include <freebsd/machine/in_cksum.h> +#include <machine/in_cksum.h> #endif #endif diff --git a/freebsd/sys/contrib/pf/net/if_pflog.h b/freebsd/sys/contrib/pf/net/if_pflog.h index 9e9efbef..a3c74d16 100644 --- a/freebsd/sys/contrib/pf/net/if_pflog.h +++ b/freebsd/sys/contrib/pf/net/if_pflog.h @@ -25,8 +25,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _NET_IF_PFLOG_HH_ -#define _NET_IF_PFLOG_HH_ +#ifndef _NET_IF_PFLOG_H_ +#define _NET_IF_PFLOG_H_ #define PFLOGIFS_MAX 16 @@ -100,4 +100,4 @@ extern pflog_packet_t *pflog_packet_ptr; #endif /* NPFLOG > 0 */ #endif /* __FreeBSD__ */ #endif /* _KERNEL */ -#endif /* _NET_IF_PFLOG_HH_ */ +#endif /* _NET_IF_PFLOG_H_ */ diff --git a/freebsd/sys/contrib/pf/net/if_pfsync.c b/freebsd/sys/contrib/pf/net/if_pfsync.c index bc70adfe..c3b830be 100644 --- a/freebsd/sys/contrib/pf/net/if_pfsync.c +++ b/freebsd/sys/contrib/pf/net/if_pfsync.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $OpenBSD: if_pfsync.c,v 1.73 2006/11/16 13:13:38 henning Exp $ */ @@ -29,13 +29,13 @@ */ #ifdef __FreeBSD__ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> -#include <freebsd/local/opt_carp.h> -#include <freebsd/local/opt_bpf.h> -#include <freebsd/local/opt_pf.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_carp.h> +#include <rtems/bsd/local/opt_bpf.h> +#include <rtems/bsd/local/opt_pf.h> -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); #ifdef DEV_BPF @@ -57,66 +57,66 @@ __FBSDID("$FreeBSD$"); #endif #endif /* __FreeBSD__ */ -#include <freebsd/sys/param.h> +#include <rtems/bsd/sys/param.h> #ifdef __FreeBSD__ -#include <freebsd/sys/priv.h> +#include <sys/priv.h> #endif -#include <freebsd/sys/proc.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/time.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/socket.h> +#include <sys/proc.h> +#include <sys/systm.h> +#include <rtems/bsd/sys/time.h> +#include <sys/mbuf.h> +#include <sys/socket.h> #ifdef __FreeBSD__ -#include <freebsd/sys/endian.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/taskqueue.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/sysctl.h> +#include <sys/endian.h> +#include <sys/malloc.h> +#include <sys/module.h> +#include <sys/sockio.h> +#include <sys/taskqueue.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/sysctl.h> #else -#include <freebsd/sys/ioctl.h> -#include <freebsd/sys/timeout.h> +#include <sys/ioctl.h> +#include <sys/timeout.h> #endif -#include <freebsd/sys/kernel.h> +#include <sys/kernel.h> -#include <freebsd/net/if.h> +#include <net/if.h> #ifdef __FreeBSD__ -#include <freebsd/net/if_clone.h> +#include <net/if_clone.h> #endif -#include <freebsd/net/if_types.h> -#include <freebsd/net/route.h> -#include <freebsd/net/bpf.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/if_ether.h> -#include <freebsd/netinet/tcp.h> -#include <freebsd/netinet/tcp_seq.h> +#include <net/if_types.h> +#include <net/route.h> +#include <net/bpf.h> +#include <netinet/in.h> +#include <netinet/if_ether.h> +#include <netinet/tcp.h> +#include <netinet/tcp_seq.h> #ifdef INET -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/in_var.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_var.h> +#include <netinet/in_systm.h> +#include <netinet/in_var.h> +#include <netinet/ip.h> +#include <netinet/ip_var.h> #endif #ifdef INET6 -#include <freebsd/netinet6/nd6.h> +#include <netinet6/nd6.h> #endif /* INET6 */ #ifndef __FreeBSD__ -#include <freebsd/local/carp.h> +#include <rtems/bsd/local/carp.h> #endif #if NCARP > 0 -#include <freebsd/netinet/ip_carp.h> +#include <netinet/ip_carp.h> #endif -#include <freebsd/net/pfvar.h> -#include <freebsd/net/if_pfsync.h> +#include <net/pfvar.h> +#include <net/if_pfsync.h> #ifndef __FreeBSD__ -#include <freebsd/local/bpfilter.h> -#include <freebsd/local/pfsync.h> +#include <rtems/bsd/local/bpfilter.h> +#include <rtems/bsd/local/pfsync.h> #endif #define PFSYNC_MINMTU \ diff --git a/freebsd/sys/contrib/pf/net/if_pfsync.h b/freebsd/sys/contrib/pf/net/if_pfsync.h index e3e6caf9..f306610f 100644 --- a/freebsd/sys/contrib/pf/net/if_pfsync.h +++ b/freebsd/sys/contrib/pf/net/if_pfsync.h @@ -27,8 +27,8 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _NET_IF_PFSYNC_HH_ -#define _NET_IF_PFSYNC_HH_ +#ifndef _NET_IF_PFSYNC_H_ +#define _NET_IF_PFSYNC_H_ #define PFSYNC_ID_LEN sizeof(u_int64_t) @@ -372,4 +372,4 @@ int pfsync_update_tdb(struct tdb *, int); #endif #endif -#endif /* _NET_IF_PFSYNC_HH_ */ +#endif /* _NET_IF_PFSYNC_H_ */ diff --git a/freebsd/sys/contrib/pf/net/pf.c b/freebsd/sys/contrib/pf/net/pf.c index 4ac395f1..bad7a1cd 100644 --- a/freebsd/sys/contrib/pf/net/pf.c +++ b/freebsd/sys/contrib/pf/net/pf.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $OpenBSD: pf.c,v 1.527 2007/02/22 15:23:23 pyr Exp $ */ /* add: $OpenBSD: pf.c,v 1.559 2007/09/18 18:45:59 markus Exp $ */ @@ -39,16 +39,16 @@ */ #ifdef __FreeBSD__ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); #endif #ifdef __FreeBSD__ -#include <freebsd/local/opt_bpf.h> -#include <freebsd/local/opt_pf.h> +#include <rtems/bsd/local/opt_bpf.h> +#include <rtems/bsd/local/opt_pf.h> #ifdef DEV_BPF #define NBPFILTER DEV_BPF @@ -69,84 +69,84 @@ __FBSDID("$FreeBSD$"); #endif #else -#include <freebsd/local/bpfilter.h> -#include <freebsd/local/pflog.h> -#include <freebsd/local/pfsync.h> -#endif - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/filio.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/socketvar.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/time.h> -#ifdef __FreeBSD__ -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/endian.h> +#include <rtems/bsd/local/bpfilter.h> +#include <rtems/bsd/local/pflog.h> +#include <rtems/bsd/local/pfsync.h> +#endif + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/filio.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/kernel.h> +#include <rtems/bsd/sys/time.h> +#ifdef __FreeBSD__ +#include <sys/sysctl.h> +#include <sys/endian.h> #else -#include <freebsd/sys/pool.h> +#include <sys/pool.h> #endif -#include <freebsd/sys/proc.h> +#include <sys/proc.h> #ifdef __FreeBSD__ -#include <freebsd/sys/kthread.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/sx.h> +#include <sys/kthread.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/sx.h> #else -#include <freebsd/sys/rwlock.h> +#include <sys/rwlock.h> #endif -#include <freebsd/net/if.h> -#include <freebsd/net/if_types.h> -#include <freebsd/net/bpf.h> -#include <freebsd/net/route.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/bpf.h> +#include <net/route.h> #ifndef __FreeBSD__ -#include <freebsd/net/radix_mpath.h> -#endif - -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_var.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_var.h> -#include <freebsd/netinet/tcp.h> -#include <freebsd/netinet/tcp_seq.h> -#include <freebsd/netinet/udp.h> -#include <freebsd/netinet/ip_icmp.h> -#include <freebsd/netinet/in_pcb.h> -#include <freebsd/netinet/tcp_timer.h> -#include <freebsd/netinet/tcp_var.h> -#include <freebsd/netinet/udp_var.h> -#include <freebsd/netinet/icmp_var.h> -#include <freebsd/netinet/if_ether.h> +#include <net/radix_mpath.h> +#endif + +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/ip_var.h> +#include <netinet/tcp.h> +#include <netinet/tcp_seq.h> +#include <netinet/udp.h> +#include <netinet/ip_icmp.h> +#include <netinet/in_pcb.h> +#include <netinet/tcp_timer.h> +#include <netinet/tcp_var.h> +#include <netinet/udp_var.h> +#include <netinet/icmp_var.h> +#include <netinet/if_ether.h> #ifndef __FreeBSD__ -#include <freebsd/dev/rndvar.h> +#include <dev/rndvar.h> #endif -#include <freebsd/net/pfvar.h> -#include <freebsd/net/if_pflog.h> +#include <net/pfvar.h> +#include <net/if_pflog.h> #if NPFSYNC > 0 -#include <freebsd/net/if_pfsync.h> +#include <net/if_pfsync.h> #endif /* NPFSYNC > 0 */ #ifdef INET6 -#include <freebsd/netinet/ip6.h> -#include <freebsd/netinet/in_pcb.h> -#include <freebsd/netinet/icmp6.h> -#include <freebsd/netinet6/nd6.h> +#include <netinet/ip6.h> +#include <netinet/in_pcb.h> +#include <netinet/icmp6.h> +#include <netinet6/nd6.h> #ifdef __FreeBSD__ -#include <freebsd/netinet6/ip6_var.h> -#include <freebsd/netinet6/in6_pcb.h> +#include <netinet6/ip6_var.h> +#include <netinet6/in6_pcb.h> #endif #endif /* INET6 */ #ifdef __FreeBSD__ -#include <freebsd/machine/in_cksum.h> -#include <freebsd/sys/limits.h> -#include <freebsd/sys/ucred.h> -#include <freebsd/security/mac/mac_framework.h> +#include <machine/in_cksum.h> +#include <sys/limits.h> +#include <sys/ucred.h> +#include <security/mac/mac_framework.h> extern int ip_optcopy(struct ip *, struct ip *); extern int debug_pfugidhack; diff --git a/freebsd/sys/contrib/pf/net/pf_if.c b/freebsd/sys/contrib/pf/net/pf_if.c index e873a2ef..97c036cb 100644 --- a/freebsd/sys/contrib/pf/net/pf_if.c +++ b/freebsd/sys/contrib/pf/net/pf_if.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $OpenBSD: pf_if.c,v 1.46 2006/12/13 09:01:59 itojun Exp $ */ @@ -35,44 +35,44 @@ */ #if defined(__FreeBSD__) -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); #endif -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> #ifdef __FreeBSD__ -#include <freebsd/sys/malloc.h> +#include <sys/malloc.h> #endif -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/filio.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/socketvar.h> -#include <freebsd/sys/kernel.h> +#include <sys/mbuf.h> +#include <sys/filio.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/kernel.h> #ifndef __FreeBSD__ -#include <freebsd/sys/device.h> +#include <sys/device.h> #endif -#include <freebsd/sys/time.h> +#include <rtems/bsd/sys/time.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_types.h> +#include <net/if.h> +#include <net/if_types.h> #ifdef __FreeBSD__ -#include <freebsd/net/vnet.h> +#include <net/vnet.h> #endif -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_var.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_var.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/ip_var.h> -#include <freebsd/net/pfvar.h> +#include <net/pfvar.h> #ifdef INET6 -#include <freebsd/netinet/ip6.h> +#include <netinet/ip6.h> #endif /* INET6 */ struct pfi_kif *pfi_all = NULL; diff --git a/freebsd/sys/contrib/pf/net/pf_ioctl.c b/freebsd/sys/contrib/pf/net/pf_ioctl.c index de612b4f..766268cf 100644 --- a/freebsd/sys/contrib/pf/net/pf_ioctl.c +++ b/freebsd/sys/contrib/pf/net/pf_ioctl.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $OpenBSD: pf_ioctl.c,v 1.175 2007/02/26 22:47:43 deraadt Exp $ */ @@ -38,13 +38,13 @@ */ #ifdef __FreeBSD__ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> -#include <freebsd/local/opt_bpf.h> -#include <freebsd/local/opt_pf.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_bpf.h> +#include <rtems/bsd/local/opt_pf.h> #ifdef DEV_BPF #define NBPFILTER DEV_BPF @@ -65,79 +65,79 @@ __FBSDID("$FreeBSD$"); #endif #else -#include <freebsd/local/bpfilter.h> -#include <freebsd/local/pflog.h> -#include <freebsd/local/pfsync.h> -#endif - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/filio.h> -#include <freebsd/sys/fcntl.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/socketvar.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/time.h> -#include <freebsd/sys/malloc.h> -#ifdef __FreeBSD__ -#include <freebsd/sys/module.h> -#include <freebsd/sys/conf.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/sysctl.h> +#include <rtems/bsd/local/bpfilter.h> +#include <rtems/bsd/local/pflog.h> +#include <rtems/bsd/local/pfsync.h> +#endif + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/filio.h> +#include <sys/fcntl.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/kernel.h> +#include <rtems/bsd/sys/time.h> +#include <sys/malloc.h> +#ifdef __FreeBSD__ +#include <sys/module.h> +#include <sys/conf.h> +#include <sys/proc.h> +#include <sys/sysctl.h> #else -#include <freebsd/sys/timeout.h> -#include <freebsd/sys/pool.h> +#include <sys/timeout.h> +#include <sys/pool.h> #endif -#include <freebsd/sys/proc.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kthread.h> +#include <sys/proc.h> +#include <sys/malloc.h> +#include <sys/kthread.h> #ifndef __FreeBSD__ -#include <freebsd/sys/rwlock.h> -#include <freebsd/uvm/uvm_extern.h> +#include <sys/rwlock.h> +#include <uvm/uvm_extern.h> #endif -#include <freebsd/net/if.h> -#include <freebsd/net/if_types.h> +#include <net/if.h> +#include <net/if_types.h> #ifdef __FreeBSD__ -#include <freebsd/net/vnet.h> +#include <net/vnet.h> #endif -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_var.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_var.h> -#include <freebsd/netinet/ip_icmp.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/ip_var.h> +#include <netinet/ip_icmp.h> #ifdef __FreeBSD__ -#include <freebsd/sys/md5.h> +#include <sys/md5.h> #else -#include <freebsd/dev/rndvar.h> -#include <freebsd/crypto/md5.h> +#include <dev/rndvar.h> +#include <crypto/md5.h> #endif -#include <freebsd/net/pfvar.h> +#include <net/pfvar.h> #if NPFSYNC > 0 -#include <freebsd/net/if_pfsync.h> +#include <net/if_pfsync.h> #endif /* NPFSYNC > 0 */ -#include <freebsd/net/if_pflog.h> +#include <net/if_pflog.h> #ifdef INET6 -#include <freebsd/netinet/ip6.h> -#include <freebsd/netinet/in_pcb.h> +#include <netinet/ip6.h> +#include <netinet/in_pcb.h> #endif /* INET6 */ #ifdef ALTQ -#include <freebsd/altq/altq.h> +#include <altq/altq.h> #endif #ifdef __FreeBSD__ -#include <freebsd/sys/limits.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/net/pfil.h> +#include <sys/limits.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <net/pfil.h> #endif /* __FreeBSD__ */ #ifdef __FreeBSD__ diff --git a/freebsd/sys/contrib/pf/net/pf_mtag.h b/freebsd/sys/contrib/pf/net/pf_mtag.h index 09aeb25c..a0ebf7ef 100644 --- a/freebsd/sys/contrib/pf/net/pf_mtag.h +++ b/freebsd/sys/contrib/pf/net/pf_mtag.h @@ -29,8 +29,8 @@ * */ -#ifndef _NET_PF_MTAG_HH_ -#define _NET_PF_MTAG_HH_ +#ifndef _NET_PF_MTAG_H_ +#define _NET_PF_MTAG_H_ #ifdef _KERNEL @@ -79,4 +79,4 @@ pf_get_mtag(struct mbuf *m) return ((struct pf_mtag *)(mtag + 1)); } #endif /* _KERNEL */ -#endif /* _NET_PF_MTAG_HH_ */ +#endif /* _NET_PF_MTAG_H_ */ diff --git a/freebsd/sys/contrib/pf/net/pf_norm.c b/freebsd/sys/contrib/pf/net/pf_norm.c index ea68ab50..bf0b6046 100644 --- a/freebsd/sys/contrib/pf/net/pf_norm.c +++ b/freebsd/sys/contrib/pf/net/pf_norm.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $OpenBSD: pf_norm.c,v 1.107 2006/04/16 00:59:52 pascoe Exp $ */ @@ -28,11 +28,11 @@ */ #ifdef __FreeBSD__ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> -#include <freebsd/local/opt_pf.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_pf.h> -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); #ifdef DEV_PFLOG @@ -41,46 +41,46 @@ __FBSDID("$FreeBSD$"); #define NPFLOG 0 #endif #else -#include <freebsd/local/pflog.h> +#include <rtems/bsd/local/pflog.h> #endif -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/filio.h> -#include <freebsd/sys/fcntl.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/time.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/filio.h> +#include <sys/fcntl.h> +#include <sys/socket.h> +#include <sys/kernel.h> +#include <rtems/bsd/sys/time.h> #ifndef __FreeBSD__ -#include <freebsd/sys/pool.h> +#include <sys/pool.h> -#include <freebsd/dev/rndvar.h> +#include <dev/rndvar.h> #endif -#include <freebsd/net/if.h> -#include <freebsd/net/if_types.h> -#include <freebsd/net/bpf.h> -#include <freebsd/net/route.h> -#include <freebsd/net/if_pflog.h> - -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_var.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_var.h> -#include <freebsd/netinet/tcp.h> -#include <freebsd/netinet/tcp_seq.h> -#include <freebsd/netinet/udp.h> -#include <freebsd/netinet/ip_icmp.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/bpf.h> +#include <net/route.h> +#include <net/if_pflog.h> + +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/ip_var.h> +#include <netinet/tcp.h> +#include <netinet/tcp_seq.h> +#include <netinet/udp.h> +#include <netinet/ip_icmp.h> #ifdef INET6 -#include <freebsd/netinet/ip6.h> +#include <netinet/ip6.h> #endif /* INET6 */ -#include <freebsd/net/pfvar.h> +#include <net/pfvar.h> #ifndef __FreeBSD__ -#include <freebsd/inttypes.h> +#include <inttypes.h> struct pf_frent { LIST_ENTRY(pf_frent) fr_next; diff --git a/freebsd/sys/contrib/pf/net/pf_osfp.c b/freebsd/sys/contrib/pf/net/pf_osfp.c index dafeabf1..67486b2d 100644 --- a/freebsd/sys/contrib/pf/net/pf_osfp.c +++ b/freebsd/sys/contrib/pf/net/pf_osfp.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $OpenBSD: pf_osfp.c,v 1.12 2006/12/13 18:14:10 itojun Exp $ */ @@ -20,28 +20,28 @@ */ #ifdef __FreeBSD__ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); #endif -#include <freebsd/sys/param.h> -#include <freebsd/sys/socket.h> +#include <rtems/bsd/sys/param.h> +#include <sys/socket.h> #ifdef _KERNEL -# include <freebsd/sys/systm.h> +# include <sys/systm.h> #endif /* _KERNEL */ -#include <freebsd/sys/mbuf.h> +#include <sys/mbuf.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/tcp.h> +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/tcp.h> -#include <freebsd/net/if.h> -#include <freebsd/net/pfvar.h> +#include <net/if.h> +#include <net/pfvar.h> -#include <freebsd/netinet/ip6.h> +#include <netinet/ip6.h> #ifdef _KERNEL -#include <freebsd/netinet6/in6_var.h> +#include <netinet6/in6_var.h> #endif #ifdef _KERNEL @@ -57,12 +57,12 @@ typedef struct pool pool_t; #else /* Userland equivalents so we can lend code to tcpdump et al. */ -# include <freebsd/arpa/inet.h> -# include <freebsd/errno.h> -# include <freebsd/stdio.h> -# include <freebsd/stdlib.h> -# include <freebsd/string.h> -# include <freebsd/netdb.h> +# include <arpa/inet.h> +# include <errno.h> +# include <stdio.h> +# include <stdlib.h> +# include <string.h> +# include <netdb.h> # define pool_t int # define pool_get(pool, flags) malloc(*(pool)) # define pool_put(pool, item) free(item) @@ -73,7 +73,7 @@ typedef struct pool pool_t; # endif # ifdef PFDEBUG -# include <freebsd/sys/stdarg.h> +# include <sys/stdarg.h> # define DPFPRINTF(format, x...) fprintf(stderr, format , ##x) # else # define DPFPRINTF(format, x...) ((void)0) diff --git a/freebsd/sys/contrib/pf/net/pf_ruleset.c b/freebsd/sys/contrib/pf/net/pf_ruleset.c index 8705d4ca..8e0b65c8 100644 --- a/freebsd/sys/contrib/pf/net/pf_ruleset.c +++ b/freebsd/sys/contrib/pf/net/pf_ruleset.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $OpenBSD: pf_ruleset.c,v 1.1 2006/10/27 13:56:51 mcbride Exp $ */ @@ -38,27 +38,27 @@ */ #ifdef __FreeBSD__ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); #endif -#include <freebsd/sys/param.h> -#include <freebsd/sys/socket.h> +#include <rtems/bsd/sys/param.h> +#include <sys/socket.h> #ifdef _KERNEL -# include <freebsd/sys/systm.h> +# include <sys/systm.h> #endif /* _KERNEL */ -#include <freebsd/sys/mbuf.h> +#include <sys/mbuf.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/tcp.h> +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/tcp.h> -#include <freebsd/net/if.h> -#include <freebsd/net/pfvar.h> +#include <net/if.h> +#include <net/pfvar.h> #ifdef INET6 -#include <freebsd/netinet/ip6.h> +#include <netinet/ip6.h> #endif /* INET6 */ @@ -76,16 +76,16 @@ __FBSDID("$FreeBSD$"); #else /* Userland equivalents so we can lend code to pfctl et al. */ -# include <freebsd/arpa/inet.h> -# include <freebsd/errno.h> -# include <freebsd/stdio.h> -# include <freebsd/stdlib.h> -# include <freebsd/string.h> +# include <arpa/inet.h> +# include <errno.h> +# include <stdio.h> +# include <stdlib.h> +# include <string.h> # define rs_malloc(x) malloc(x) # define rs_free(x) free(x) # ifdef PFDEBUG -# include <freebsd/sys/stdarg.h> +# include <sys/stdarg.h> # define DPFPRINTF(format, x...) fprintf(stderr, format , ##x) # else # define DPFPRINTF(format, x...) ((void)0) diff --git a/freebsd/sys/contrib/pf/net/pf_subr.c b/freebsd/sys/contrib/pf/net/pf_subr.c index 14cf232e..c46d61f2 100644 --- a/freebsd/sys/contrib/pf/net/pf_subr.c +++ b/freebsd/sys/contrib/pf/net/pf_subr.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995 @@ -30,43 +30,43 @@ * */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/libkern.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/md5.h> -#include <freebsd/sys/time.h> -#include <freebsd/sys/random.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/socketvar.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/time.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/libkern.h> +#include <sys/mbuf.h> +#include <sys/md5.h> +#include <rtems/bsd/sys/time.h> +#include <sys/random.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/systm.h> +#include <rtems/bsd/sys/time.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_types.h> -#include <freebsd/net/bpf.h> -#include <freebsd/net/route.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/bpf.h> +#include <net/route.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_var.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_var.h> -#include <freebsd/netinet/tcp.h> -#include <freebsd/netinet/tcp_seq.h> -#include <freebsd/netinet/udp.h> -#include <freebsd/netinet/ip_icmp.h> -#include <freebsd/netinet/in_pcb.h> -#include <freebsd/netinet/tcp_timer.h> -#include <freebsd/netinet/tcp_var.h> -#include <freebsd/netinet/if_ether.h> -#include <freebsd/net/pfvar.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/ip_var.h> +#include <netinet/tcp.h> +#include <netinet/tcp_seq.h> +#include <netinet/udp.h> +#include <netinet/ip_icmp.h> +#include <netinet/in_pcb.h> +#include <netinet/tcp_timer.h> +#include <netinet/tcp_var.h> +#include <netinet/if_ether.h> +#include <net/pfvar.h> /* * Following is where TCP initial sequence number generation occurs. diff --git a/freebsd/sys/contrib/pf/net/pf_table.c b/freebsd/sys/contrib/pf/net/pf_table.c index b07fb7c0..bfe98b11 100644 --- a/freebsd/sys/contrib/pf/net/pf_table.c +++ b/freebsd/sys/contrib/pf/net/pf_table.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $OpenBSD: pf_table.c,v 1.68 2006/05/02 10:08:45 dhartmei Exp $ */ @@ -33,32 +33,32 @@ */ #ifdef __FreeBSD__ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); #endif -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/rwlock.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/socket.h> +#include <sys/mbuf.h> +#include <sys/kernel.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/rwlock.h> #ifdef __FreeBSD__ -#include <freebsd/sys/malloc.h> +#include <sys/malloc.h> #endif -#include <freebsd/net/if.h> -#include <freebsd/net/route.h> -#include <freebsd/netinet/in.h> +#include <net/if.h> +#include <net/route.h> +#include <netinet/in.h> #ifndef __FreeBSD__ -#include <freebsd/netinet/ip_ipsp.h> +#include <netinet/ip_ipsp.h> #endif -#include <freebsd/net/pfvar.h> +#include <net/pfvar.h> #define ACCEPT_FLAGS(oklist) \ do { \ diff --git a/freebsd/sys/contrib/pf/net/pfvar.h b/freebsd/sys/contrib/pf/net/pfvar.h index c6429781..0d711ffc 100644 --- a/freebsd/sys/contrib/pf/net/pfvar.h +++ b/freebsd/sys/contrib/pf/net/pfvar.h @@ -31,35 +31,35 @@ * */ -#ifndef _NET_PFVAR_HH_ -#define _NET_PFVAR_HH_ +#ifndef _NET_PFVAR_H_ +#define _NET_PFVAR_H_ -#include <freebsd/sys/param.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/tree.h> +#include <rtems/bsd/sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <sys/queue.h> +#include <sys/tree.h> #ifdef __FreeBSD__ -#include <freebsd/sys/lock.h> -#include <freebsd/sys/sx.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/sx.h> #else -#include <freebsd/sys/rwlock.h> +#include <sys/rwlock.h> #endif -#include <freebsd/net/radix.h> -#include <freebsd/net/route.h> +#include <net/radix.h> +#include <net/route.h> #ifdef __FreeBSD__ -#include <freebsd/net/if_clone.h> -#include <freebsd/net/pf_mtag.h> -#include <freebsd/vm/uma.h> +#include <net/if_clone.h> +#include <net/pf_mtag.h> +#include <vm/uma.h> #else -#include <freebsd/netinet/ip_ipsp.h> +#include <netinet/ip_ipsp.h> #endif #ifdef __FreeBSD__ -#include <freebsd/netinet/in.h> +#include <netinet/in.h> #endif -#include <freebsd/netinet/tcp_fsm.h> +#include <netinet/tcp_fsm.h> struct ip; struct ip6_hdr; @@ -1863,4 +1863,4 @@ int pf_osfp_match(struct pf_osfp_enlist *, pf_osfp_t); struct pf_os_fingerprint * pf_osfp_validate(void); -#endif /* _NET_PFVAR_HH_ */ +#endif /* _NET_PFVAR_H_ */ diff --git a/freebsd/sys/contrib/pf/netinet/in4_cksum.c b/freebsd/sys/contrib/pf/netinet/in4_cksum.c index 105f26f0..de81173f 100644 --- a/freebsd/sys/contrib/pf/netinet/in4_cksum.c +++ b/freebsd/sys/contrib/pf/netinet/in4_cksum.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $OpenBSD: in4_cksum.c,v 1.7 2003/06/02 23:28:13 millert Exp $ */ @@ -65,16 +65,16 @@ * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_var.h> +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/ip_var.h> -#include <freebsd/machine/in_cksum.h> +#include <machine/in_cksum.h> #define ADDCARRY(x) (x > 65535 ? x -= 65535 : x) #define REDUCE {l_util.l = sum; sum = l_util.s[0] + l_util.s[1]; ADDCARRY(sum);} |