diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-05-23 13:18:31 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-06-08 13:19:54 +0200 |
| commit | 02373194fe0be1ef82db419bedbf9d6ffd31dc93 (patch) | |
| tree | f151591d23221ec221c57496d07f7fba8dff137a | |
| parent | Update scripts to include support for input devices - USB Keyboard, USB mouse... (diff) | |
| download | rtems-libbsd-02373194fe0be1ef82db419bedbf9d6ffd31dc93.tar.bz2 | |
Update due to Newlib 2017-06-07 changes
The following files are now provided by Newlib:
* arpa/inet.h
* net/if.h
* netinet/in.h
* netinet/tcp.h
* sys/socket.h
* sys/uio.h
* sys/un.h
The <sys/param.h> and <sys/cpuset.h> are now compatible enough to be
used directly.
Update #2833.
748 files changed, 817 insertions, 5152 deletions
@@ -231,9 +231,6 @@ def mapCPUDependentPath(path): def fixIncludes(data): data = re.sub('#include <sys/lock.h>', '#include <rtems/bsd/sys/lock.h>', data) - data = re.sub('#include <sys/cpuset.h>', '#include <rtems/bsd/sys/cpuset.h>', data) - data = re.sub('#include <sys/errno.h>', '#include <rtems/bsd/sys/errno.h>', data) - data = re.sub('#include <sys/param.h>', '#include <rtems/bsd/sys/param.h>', data) data = re.sub('#include <sys/resource.h>', '#include <rtems/bsd/sys/resource.h>', data) data = re.sub('#include <sys/unistd.h>', '#include <rtems/bsd/sys/unistd.h>', data) return data diff --git a/freebsd/bin/hostname/hostname.c b/freebsd/bin/hostname/hostname.c index 87646a86..964eb52b 100644 --- a/freebsd/bin/hostname/hostname.c +++ b/freebsd/bin/hostname/hostname.c @@ -60,7 +60,7 @@ static char sccsid[] = "@(#)hostname.c 8.1 (Berkeley) 5/31/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <err.h> #include <stdio.h> diff --git a/freebsd/contrib/libpcap/gencode.c b/freebsd/contrib/libpcap/gencode.c index 3d09d50a..2541ea17 100644 --- a/freebsd/contrib/libpcap/gencode.c +++ b/freebsd/contrib/libpcap/gencode.c @@ -57,7 +57,7 @@ static const char rcsid[] _U_ = #ifndef WIN32 #ifdef __NetBSD__ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #endif #include <netinet/in.h> diff --git a/freebsd/contrib/libpcap/inet.c b/freebsd/contrib/libpcap/inet.c index 08867903..92ae3ab8 100644 --- a/freebsd/contrib/libpcap/inet.c +++ b/freebsd/contrib/libpcap/inet.c @@ -47,7 +47,7 @@ static const char rcsid[] _U_ = #include <pcap-stdinc.h> #else /* WIN32 */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #ifndef MSDOS #include <sys/file.h> #endif diff --git a/freebsd/contrib/libpcap/nametoaddr.c b/freebsd/contrib/libpcap/nametoaddr.c index 17516e7f..b0940374 100644 --- a/freebsd/contrib/libpcap/nametoaddr.c +++ b/freebsd/contrib/libpcap/nametoaddr.c @@ -45,7 +45,7 @@ static const char rcsid[] _U_ = #else /* WIN32 */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> /* concession to AIX */ #include <sys/socket.h> #include <sys/time.h> diff --git a/freebsd/contrib/libpcap/pcap-bpf.c b/freebsd/contrib/libpcap/pcap-bpf.c index 463946b6..8375308f 100644 --- a/freebsd/contrib/libpcap/pcap-bpf.c +++ b/freebsd/contrib/libpcap/pcap-bpf.c @@ -31,7 +31,7 @@ static const char rcsid[] _U_ = #include "config.h" #endif -#include <rtems/bsd/sys/param.h> /* optionally get BSD define */ +#include <sys/param.h> /* optionally get BSD define */ #ifdef HAVE_ZEROCOPY_BPF #include <sys/mman.h> #endif diff --git a/freebsd/contrib/libpcap/pcap-int.h b/freebsd/contrib/libpcap/pcap-int.h index 059b597c..b3ce82d6 100644 --- a/freebsd/contrib/libpcap/pcap-int.h +++ b/freebsd/contrib/libpcap/pcap-int.h @@ -219,7 +219,7 @@ struct pcap_opt { * line up on a nice boundary. */ #ifdef __NetBSD__ -#include <rtems/bsd/sys/param.h> /* needed to declare __NetBSD_Version__ */ +#include <sys/param.h> /* needed to declare __NetBSD_Version__ */ #endif #if defined(ultrix) || defined(__osf__) || (defined(__NetBSD__) && __NetBSD_Version__ > 106000000) diff --git a/freebsd/contrib/libxo/libxo/xo_encoder.c b/freebsd/contrib/libxo/libxo/xo_encoder.c index 8c3d9dbb..84a705e0 100644 --- a/freebsd/contrib/libxo/libxo/xo_encoder.c +++ b/freebsd/contrib/libxo/libxo/xo_encoder.c @@ -22,7 +22,7 @@ #include <unistd.h> #include <string.h> #include <sys/queue.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <dlfcn.h> #include "xo_config.h" diff --git a/freebsd/contrib/tcpdump/tcpdump-stdinc.h b/freebsd/contrib/tcpdump/tcpdump-stdinc.h index b241301e..d350d1be 100644 --- a/freebsd/contrib/tcpdump/tcpdump-stdinc.h +++ b/freebsd/contrib/tcpdump/tcpdump-stdinc.h @@ -117,7 +117,7 @@ typedef char* caddr_t; #ifdef HAVE_SYS_BITYPES_H #include <sys/bitypes.h> #endif -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> /* concession to AIX */ #include <sys/time.h> #include <sys/socket.h> diff --git a/freebsd/include/arpa/nameser.h b/freebsd/include/arpa/nameser.h index a1f87c6f..ef47b204 100644 --- a/freebsd/include/arpa/nameser.h +++ b/freebsd/include/arpa/nameser.h @@ -56,7 +56,7 @@ #define BIND_4_COMPAT -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/cdefs.h> diff --git a/freebsd/include/resolv.h b/freebsd/include/resolv.h index 412e4a91..e3d4fd12 100644 --- a/freebsd/include/resolv.h +++ b/freebsd/include/resolv.h @@ -53,7 +53,7 @@ #ifndef _RESOLV_H_ #define _RESOLV_H_ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/cdefs.h> #include <sys/socket.h> diff --git a/freebsd/lib/lib80211/lib80211_ioctl.c b/freebsd/lib/lib80211/lib80211_ioctl.c index eedb67ef..afcfa794 100644 --- a/freebsd/lib/lib80211/lib80211_ioctl.c +++ b/freebsd/lib/lib80211/lib80211_ioctl.c @@ -59,7 +59,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/sysctl.h> diff --git a/freebsd/lib/lib80211/lib80211_regdomain.c b/freebsd/lib/lib80211/lib80211_regdomain.c index 517690be..11c6e849 100644 --- a/freebsd/lib/lib80211/lib80211_regdomain.c +++ b/freebsd/lib/lib80211/lib80211_regdomain.c @@ -38,8 +38,8 @@ static const char rcsid[] = "$FreeBSD$"; #define sbuf_new _bsd_sbuf_new #endif /* __rtems__ */ #include <sys/types.h> -#include <rtems/bsd/sys/errno.h> -#include <rtems/bsd/sys/param.h> +#include <sys/errno.h> +#include <sys/param.h> #include <sys/mman.h> #include <sys/sbuf.h> #include <sys/stat.h> diff --git a/freebsd/lib/libc/db/btree/bt_close.c b/freebsd/lib/libc/db/btree/bt_close.c index 506fdcf1..a56a8595 100644 --- a/freebsd/lib/libc/db/btree/bt_close.c +++ b/freebsd/lib/libc/db/btree/bt_close.c @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)bt_close.c 8.7 (Berkeley) 8/17/94"; __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <errno.h> #include <stdio.h> diff --git a/freebsd/lib/libc/db/btree/bt_conv.c b/freebsd/lib/libc/db/btree/bt_conv.c index 117bd1fe..4acb9d47 100644 --- a/freebsd/lib/libc/db/btree/bt_conv.c +++ b/freebsd/lib/libc/db/btree/bt_conv.c @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_conv.c 8.5 (Berkeley) 8/17/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <stdio.h> diff --git a/freebsd/lib/libc/db/btree/bt_debug.c b/freebsd/lib/libc/db/btree/bt_debug.c index 15e738cc..992ed358 100644 --- a/freebsd/lib/libc/db/btree/bt_debug.c +++ b/freebsd/lib/libc/db/btree/bt_debug.c @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_debug.c 8.5 (Berkeley) 8/17/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <stdio.h> #include <stdlib.h> diff --git a/freebsd/lib/libc/db/btree/bt_open.c b/freebsd/lib/libc/db/btree/bt_open.c index 4003449a..02da0f77 100644 --- a/freebsd/lib/libc/db/btree/bt_open.c +++ b/freebsd/lib/libc/db/btree/bt_open.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); */ #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/stat.h> #include <errno.h> diff --git a/freebsd/lib/libc/db/btree/bt_overflow.c b/freebsd/lib/libc/db/btree/bt_overflow.c index f6a469c8..109db15e 100644 --- a/freebsd/lib/libc/db/btree/bt_overflow.c +++ b/freebsd/lib/libc/db/btree/bt_overflow.c @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_overflow.c 8.5 (Berkeley) 7/16/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <stdio.h> #include <stdlib.h> diff --git a/freebsd/lib/libc/db/btree/bt_split.c b/freebsd/lib/libc/db/btree/bt_split.c index 4d1a28d0..ce47a6e3 100644 --- a/freebsd/lib/libc/db/btree/bt_split.c +++ b/freebsd/lib/libc/db/btree/bt_split.c @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_split.c 8.10 (Berkeley) 1/9/95"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <limits.h> #include <stdio.h> diff --git a/freebsd/lib/libc/db/btree/bt_utils.c b/freebsd/lib/libc/db/btree/bt_utils.c index a98d2cb7..9aee0051 100644 --- a/freebsd/lib/libc/db/btree/bt_utils.c +++ b/freebsd/lib/libc/db/btree/bt_utils.c @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_utils.c 8.8 (Berkeley) 7/20/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <stdio.h> #include <stdlib.h> diff --git a/freebsd/lib/libc/db/mpool/mpool.c b/freebsd/lib/libc/db/mpool/mpool.c index fbf6878f..bcb00dad 100644 --- a/freebsd/lib/libc/db/mpool/mpool.c +++ b/freebsd/lib/libc/db/mpool/mpool.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mpool.c 8.7 (Berkeley) 11/2/95"; __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/stat.h> diff --git a/freebsd/lib/libc/db/recno/rec_utils.c b/freebsd/lib/libc/db/recno/rec_utils.c index 2a3596ae..2af19d0c 100644 --- a/freebsd/lib/libc/db/recno/rec_utils.c +++ b/freebsd/lib/libc/db/recno/rec_utils.c @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rec_utils.c 8.6 (Berkeley) 7/16/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <stdio.h> #include <stdlib.h> diff --git a/freebsd/lib/libc/gen/getdomainname.c b/freebsd/lib/libc/gen/getdomainname.c index dd514d99..142e79c6 100644 --- a/freebsd/lib/libc/gen/getdomainname.c +++ b/freebsd/lib/libc/gen/getdomainname.c @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)gethostname.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sysctl.h> #include <unistd.h> diff --git a/freebsd/lib/libc/gen/gethostname.c b/freebsd/lib/libc/gen/gethostname.c index 5a7658ff..26c97ec1 100644 --- a/freebsd/lib/libc/gen/gethostname.c +++ b/freebsd/lib/libc/gen/gethostname.c @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)gethostname.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sysctl.h> #include <errno.h> diff --git a/freebsd/lib/libc/gen/sethostname.c b/freebsd/lib/libc/gen/sethostname.c index baa03e89..9e81311d 100644 --- a/freebsd/lib/libc/gen/sethostname.c +++ b/freebsd/lib/libc/gen/sethostname.c @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)sethostname.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sysctl.h> #include <unistd.h> diff --git a/freebsd/lib/libc/inet/inet_addr.c b/freebsd/lib/libc/inet/inet_addr.c index a41b777b..04361b95 100644 --- a/freebsd/lib/libc/inet/inet_addr.c +++ b/freebsd/lib/libc/inet/inet_addr.c @@ -75,7 +75,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/inet/inet_lnaof.c b/freebsd/lib/libc/inet/inet_lnaof.c index 153bbc74..683eb1a9 100644 --- a/freebsd/lib/libc/inet/inet_lnaof.c +++ b/freebsd/lib/libc/inet/inet_lnaof.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/inet/inet_makeaddr.c b/freebsd/lib/libc/inet/inet_makeaddr.c index 7befa357..47407516 100644 --- a/freebsd/lib/libc/inet/inet_makeaddr.c +++ b/freebsd/lib/libc/inet/inet_makeaddr.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/inet/inet_netof.c b/freebsd/lib/libc/inet/inet_netof.c index 9fa9a354..7770c2dd 100644 --- a/freebsd/lib/libc/inet/inet_netof.c +++ b/freebsd/lib/libc/inet/inet_netof.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/inet/inet_ntop.c b/freebsd/lib/libc/inet/inet_ntop.c index a3f49d2f..0387a14f 100644 --- a/freebsd/lib/libc/inet/inet_ntop.c +++ b/freebsd/lib/libc/inet/inet_ntop.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd/lib/libc/inet/inet_pton.c b/freebsd/lib/libc/inet/inet_pton.c index 605076e5..3272a027 100644 --- a/freebsd/lib/libc/inet/inet_pton.c +++ b/freebsd/lib/libc/inet/inet_pton.c @@ -24,7 +24,7 @@ static const char rcsid[] = "$Id: inet_pton.c,v 1.5 2005/07/28 06:51:47 marka Ex __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/inet/nsap_addr.c b/freebsd/lib/libc/inet/nsap_addr.c index e46d8848..e1fa05be 100644 --- a/freebsd/lib/libc/inet/nsap_addr.c +++ b/freebsd/lib/libc/inet/nsap_addr.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd/lib/libc/isc/eventlib_p.h b/freebsd/lib/libc/isc/eventlib_p.h index 495e8d1e..07db816f 100644 --- a/freebsd/lib/libc/isc/eventlib_p.h +++ b/freebsd/lib/libc/isc/eventlib_p.h @@ -26,7 +26,7 @@ #ifndef _EVENTLIB_P_H #define _EVENTLIB_P_H -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <sys/un.h> diff --git a/freebsd/lib/libc/net/base64.c b/freebsd/lib/libc/net/base64.c index 86366ec2..d21d9301 100644 --- a/freebsd/lib/libc/net/base64.c +++ b/freebsd/lib/libc/net/base64.c @@ -45,7 +45,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd/lib/libc/net/ether_addr.c b/freebsd/lib/libc/net/ether_addr.c index ad2449c6..bceefaec 100644 --- a/freebsd/lib/libc/net/ether_addr.c +++ b/freebsd/lib/libc/net/ether_addr.c @@ -42,7 +42,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <net/ethernet.h> diff --git a/freebsd/lib/libc/net/getaddrinfo.c b/freebsd/lib/libc/net/getaddrinfo.c index 0c87988a..630bb291 100644 --- a/freebsd/lib/libc/net/getaddrinfo.c +++ b/freebsd/lib/libc/net/getaddrinfo.c @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <net/if.h> #include <netinet/in.h> diff --git a/freebsd/lib/libc/net/gethostbydns.c b/freebsd/lib/libc/net/gethostbydns.c index 40671c45..bb63e8bd 100644 --- a/freebsd/lib/libc/net/gethostbydns.c +++ b/freebsd/lib/libc/net/gethostbydns.c @@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vi #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/gethostbyht.c b/freebsd/lib/libc/net/gethostbyht.c index a5c0fc0a..648a3e71 100644 --- a/freebsd/lib/libc/net/gethostbyht.c +++ b/freebsd/lib/libc/net/gethostbyht.c @@ -55,7 +55,7 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/gethostbynis.c b/freebsd/lib/libc/net/gethostbynis.c index 19d3f92a..833017ab 100644 --- a/freebsd/lib/libc/net/gethostbynis.c +++ b/freebsd/lib/libc/net/gethostbynis.c @@ -28,7 +28,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/gethostnamadr.c b/freebsd/lib/libc/net/gethostnamadr.c index e5d41ac0..837b5ec2 100644 --- a/freebsd/lib/libc/net/gethostnamadr.c +++ b/freebsd/lib/libc/net/gethostnamadr.c @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" #include "reentrant.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/getifaddrs.c b/freebsd/lib/libc/net/getifaddrs.c index ee5ecd76..7e111a68 100644 --- a/freebsd/lib/libc/net/getifaddrs.c +++ b/freebsd/lib/libc/net/getifaddrs.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <net/if.h> #ifdef NET_RT_IFLIST -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <net/route.h> #include <sys/sysctl.h> #include <net/if_dl.h> diff --git a/freebsd/lib/libc/net/getifmaddrs.c b/freebsd/lib/libc/net/getifmaddrs.c index 72d07733..41d61091 100644 --- a/freebsd/lib/libc/net/getifmaddrs.c +++ b/freebsd/lib/libc/net/getifmaddrs.c @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sysctl.h> #include <sys/ioctl.h> #include <sys/socket.h> diff --git a/freebsd/lib/libc/net/getnetbydns.c b/freebsd/lib/libc/net/getnetbydns.c index 226956d1..6338d36e 100644 --- a/freebsd/lib/libc/net/getnetbydns.c +++ b/freebsd/lib/libc/net/getnetbydns.c @@ -62,7 +62,7 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/getnetbynis.c b/freebsd/lib/libc/net/getnetbynis.c index 7b561abc..b47d3808 100644 --- a/freebsd/lib/libc/net/getnetbynis.c +++ b/freebsd/lib/libc/net/getnetbynis.c @@ -28,7 +28,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/getnetnamadr.c b/freebsd/lib/libc/net/getnetnamadr.c index 79cd5f62..ca08a191 100644 --- a/freebsd/lib/libc/net/getnetnamadr.c +++ b/freebsd/lib/libc/net/getnetnamadr.c @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" #include "reentrant.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/getprotoent.c b/freebsd/lib/libc/net/getprotoent.c index a45f74f0..f81746f2 100644 --- a/freebsd/lib/libc/net/getprotoent.c +++ b/freebsd/lib/libc/net/getprotoent.c @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getprotoent.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <errno.h> #include <limits.h> diff --git a/freebsd/lib/libc/net/getservent.c b/freebsd/lib/libc/net/getservent.c index ccdad343..424adb2e 100644 --- a/freebsd/lib/libc/net/getservent.c +++ b/freebsd/lib/libc/net/getservent.c @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getservent.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <arpa/inet.h> #include <db.h> diff --git a/freebsd/lib/libc/net/ip6opt.c b/freebsd/lib/libc/net/ip6opt.c index 2fbd6cc6..920c203a 100644 --- a/freebsd/lib/libc/net/ip6opt.c +++ b/freebsd/lib/libc/net/ip6opt.c @@ -34,7 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd/lib/libc/net/map_v4v6.c b/freebsd/lib/libc/net/map_v4v6.c index a2f0a1dd..60334b05 100644 --- a/freebsd/lib/libc/net/map_v4v6.c +++ b/freebsd/lib/libc/net/map_v4v6.c @@ -57,7 +57,7 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/name6.c b/freebsd/lib/libc/net/name6.c index 8b8ac79c..da65015b 100644 --- a/freebsd/lib/libc/net/name6.c +++ b/freebsd/lib/libc/net/name6.c @@ -89,7 +89,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/time.h> #include <sys/queue.h> diff --git a/freebsd/lib/libc/net/nsdispatch.c b/freebsd/lib/libc/net/nsdispatch.c index 2e241740..f097375d 100644 --- a/freebsd/lib/libc/net/nsdispatch.c +++ b/freebsd/lib/libc/net/nsdispatch.c @@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/stat.h> #include <dlfcn.h> diff --git a/freebsd/lib/libc/net/rcmd.c b/freebsd/lib/libc/net/rcmd.c index 12811b17..aff5584c 100644 --- a/freebsd/lib/libc/net/rcmd.c +++ b/freebsd/lib/libc/net/rcmd.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94"; __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/stat.h> diff --git a/freebsd/lib/libc/net/rthdr.c b/freebsd/lib/libc/net/rthdr.c index dd7c9a9a..89d1c2eb 100644 --- a/freebsd/lib/libc/net/rthdr.c +++ b/freebsd/lib/libc/net/rthdr.c @@ -34,7 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd/lib/libc/resolv/herror.c b/freebsd/lib/libc/resolv/herror.c index 68bafc84..b7abf3bc 100644 --- a/freebsd/lib/libc/resolv/herror.c +++ b/freebsd/lib/libc/resolv/herror.c @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/uio.h> #include <netinet/in.h> diff --git a/freebsd/lib/libc/resolv/res_comp.c b/freebsd/lib/libc/resolv/res_comp.c index a0ce084e..a62551ca 100644 --- a/freebsd/lib/libc/resolv/res_comp.c +++ b/freebsd/lib/libc/resolv/res_comp.c @@ -74,7 +74,7 @@ static const char rcsid[] = "$Id: res_comp.c,v 1.5 2005/07/28 06:51:50 marka Exp __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <netinet/in.h> #include <arpa/nameser.h> #include <ctype.h> diff --git a/freebsd/lib/libc/resolv/res_data.c b/freebsd/lib/libc/resolv/res_data.c index e89390f8..d17412de 100644 --- a/freebsd/lib/libc/resolv/res_data.c +++ b/freebsd/lib/libc/resolv/res_data.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/time.h> diff --git a/freebsd/lib/libc/resolv/res_debug.c b/freebsd/lib/libc/resolv/res_debug.c index 4a7e8eee..ff6e61f4 100644 --- a/freebsd/lib/libc/resolv/res_debug.c +++ b/freebsd/lib/libc/resolv/res_debug.c @@ -100,7 +100,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd/lib/libc/resolv/res_findzonecut.c b/freebsd/lib/libc/resolv/res_findzonecut.c index 360bd498..acb3186f 100644 --- a/freebsd/lib/libc/resolv/res_findzonecut.c +++ b/freebsd/lib/libc/resolv/res_findzonecut.c @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/time.h> diff --git a/freebsd/lib/libc/resolv/res_init.c b/freebsd/lib/libc/resolv/res_init.c index 0591d3c1..521839f8 100644 --- a/freebsd/lib/libc/resolv/res_init.c +++ b/freebsd/lib/libc/resolv/res_init.c @@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/time.h> diff --git a/freebsd/lib/libc/resolv/res_mkquery.c b/freebsd/lib/libc/resolv/res_mkquery.c index 352275f0..9e6c4d7a 100644 --- a/freebsd/lib/libc/resolv/res_mkquery.c +++ b/freebsd/lib/libc/resolv/res_mkquery.c @@ -74,7 +74,7 @@ static const char rcsid[] = "$Id: res_mkquery.c,v 1.10 2008/12/11 09:59:00 marka __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <netinet/in.h> #include <arpa/nameser.h> #include <netdb.h> diff --git a/freebsd/lib/libc/resolv/res_mkupdate.c b/freebsd/lib/libc/resolv/res_mkupdate.c index 6b0c484f..c737bc87 100644 --- a/freebsd/lib/libc/resolv/res_mkupdate.c +++ b/freebsd/lib/libc/resolv/res_mkupdate.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <netinet/in.h> #include <arpa/nameser.h> diff --git a/freebsd/lib/libc/resolv/res_query.c b/freebsd/lib/libc/resolv/res_query.c index 71883c75..9c351050 100644 --- a/freebsd/lib/libc/resolv/res_query.c +++ b/freebsd/lib/libc/resolv/res_query.c @@ -74,7 +74,7 @@ static const char rcsid[] = "$Id: res_query.c,v 1.11 2008/11/14 02:36:51 marka E __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <netinet/in.h> #include <arpa/inet.h> #include <arpa/nameser.h> diff --git a/freebsd/lib/libc/resolv/res_send.c b/freebsd/lib/libc/resolv/res_send.c index 564e3716..064c8c48 100644 --- a/freebsd/lib/libc/resolv/res_send.c +++ b/freebsd/lib/libc/resolv/res_send.c @@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$"); #endif #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> #include <sys/uio.h> diff --git a/freebsd/lib/libc/resolv/res_update.c b/freebsd/lib/libc/resolv/res_update.c index d29c47f1..d4df045c 100644 --- a/freebsd/lib/libc/resolv/res_update.c +++ b/freebsd/lib/libc/resolv/res_update.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/time.h> diff --git a/freebsd/lib/libc/rpc/auth_time.c b/freebsd/lib/libc/rpc/auth_time.c index a685ebb5..90e5b15e 100644 --- a/freebsd/lib/libc/rpc/auth_time.c +++ b/freebsd/lib/libc/rpc/auth_time.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <unistd.h> #include <netdb.h> #include <sys/signal.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/rpc/auth_unix.c b/freebsd/lib/libc/rpc/auth_unix.c index b27236ad..6936327a 100644 --- a/freebsd/lib/libc/rpc/auth_unix.c +++ b/freebsd/lib/libc/rpc/auth_unix.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" #include "reentrant.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <assert.h> #include <err.h> diff --git a/freebsd/lib/libc/rpc/clnt_simple.c b/freebsd/lib/libc/rpc/clnt_simple.c index 491172cf..8ae6e266 100644 --- a/freebsd/lib/libc/rpc/clnt_simple.c +++ b/freebsd/lib/libc/rpc/clnt_simple.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" #include "reentrant.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <stdio.h> #include <errno.h> #include <rpc/rpc.h> diff --git a/freebsd/lib/libc/rpc/getrpcent.c b/freebsd/lib/libc/rpc/getrpcent.c index bed8074c..97cccf8d 100644 --- a/freebsd/lib/libc/rpc/getrpcent.c +++ b/freebsd/lib/libc/rpc/getrpcent.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); * Copyright (c) 1984 by Sun Microsystems, Inc. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <arpa/inet.h> #include <assert.h> diff --git a/freebsd/lib/libc/rpc/netname.c b/freebsd/lib/libc/rpc/netname.c index 25439fda..2590325a 100644 --- a/freebsd/lib/libc/rpc/netname.c +++ b/freebsd/lib/libc/rpc/netname.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); */ #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rpc/rpc.h> #include <rpc/rpc_com.h> #ifdef YP diff --git a/freebsd/lib/libc/rpc/netnamer.c b/freebsd/lib/libc/rpc/netnamer.c index be154eb0..910323ed 100644 --- a/freebsd/lib/libc/rpc/netnamer.c +++ b/freebsd/lib/libc/rpc/netnamer.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); * architecture. */ #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rpc/rpc.h> #include <rpc/rpc_com.h> #ifdef YP diff --git a/freebsd/lib/libc/rpc/rpc_generic.c b/freebsd/lib/libc/rpc/rpc_generic.c index 8471fd7c..bb8c606b 100644 --- a/freebsd/lib/libc/rpc/rpc_generic.c +++ b/freebsd/lib/libc/rpc/rpc_generic.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" #include "reentrant.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/time.h> #include <sys/un.h> diff --git a/freebsd/lib/libc/rpc/rpc_prot.c b/freebsd/lib/libc/rpc/rpc_prot.c index d943ceaf..e182c7e9 100644 --- a/freebsd/lib/libc/rpc/rpc_prot.c +++ b/freebsd/lib/libc/rpc/rpc_prot.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); */ #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <assert.h> diff --git a/freebsd/lib/libc/rpc/svc_auth_des.c b/freebsd/lib/libc/rpc/svc_auth_des.c index 55f3d3ee..c1665ba6 100644 --- a/freebsd/lib/libc/rpc/svc_auth_des.c +++ b/freebsd/lib/libc/rpc/svc_auth_des.c @@ -54,7 +54,7 @@ #include <stdio.h> #include <unistd.h> #include <rpc/des_crypt.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <netinet/in.h> #include <rpc/types.h> #include <rpc/xdr.h> diff --git a/freebsd/lib/libc/rpc/svc_vc.c b/freebsd/lib/libc/rpc/svc_vc.c index 5b4c7bd3..d00a1fbf 100644 --- a/freebsd/lib/libc/rpc/svc_vc.c +++ b/freebsd/lib/libc/rpc/svc_vc.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" #include "reentrant.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/poll.h> #include <sys/socket.h> #include <sys/un.h> diff --git a/freebsd/lib/libc/xdr/xdr_float.c b/freebsd/lib/libc/xdr/xdr_float.c index 3c99f192..29cfcac0 100644 --- a/freebsd/lib/libc/xdr/xdr_float.c +++ b/freebsd/lib/libc/xdr/xdr_float.c @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); */ #include "namespace.h" -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <stdio.h> diff --git a/freebsd/lib/libipsec/ipsec_dump_policy.c b/freebsd/lib/libipsec/ipsec_dump_policy.c index 301ed764..d1844bf4 100644 --- a/freebsd/lib/libipsec/ipsec_dump_policy.c +++ b/freebsd/lib/libipsec/ipsec_dump_policy.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netipsec/key_var.h> diff --git a/freebsd/lib/libipsec/ipsec_get_policylen.c b/freebsd/lib/libipsec/ipsec_get_policylen.c index b9d5a101..43950ee2 100644 --- a/freebsd/lib/libipsec/ipsec_get_policylen.c +++ b/freebsd/lib/libipsec/ipsec_get_policylen.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <netipsec/ipsec.h> diff --git a/freebsd/lib/libipsec/ipsec_strerror.c b/freebsd/lib/libipsec/ipsec_strerror.c index 9b4bc4a6..a9eeb511 100644 --- a/freebsd/lib/libipsec/ipsec_strerror.c +++ b/freebsd/lib/libipsec/ipsec_strerror.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <string.h> #include <netipsec/ipsec.h> diff --git a/freebsd/lib/libipsec/pfkey.c b/freebsd/lib/libipsec/pfkey.c index 6df0aa00..87ef4113 100644 --- a/freebsd/lib/libipsec/pfkey.c +++ b/freebsd/lib/libipsec/pfkey.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <net/pfkeyv2.h> #include <netipsec/key_var.h> diff --git a/freebsd/lib/libipsec/pfkey_dump.c b/freebsd/lib/libipsec/pfkey_dump.c index 0bc89f9b..e8d4b9b8 100644 --- a/freebsd/lib/libipsec/pfkey_dump.c +++ b/freebsd/lib/libipsec/pfkey_dump.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <net/if.h> #include <net/pfkeyv2.h> diff --git a/freebsd/lib/libmemstat/memstat.c b/freebsd/lib/libmemstat/memstat.c index e7e7d53f..995984e5 100644 --- a/freebsd/lib/libmemstat/memstat.c +++ b/freebsd/lib/libmemstat/memstat.c @@ -28,7 +28,7 @@ * $FreeBSD$ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sysctl.h> #include <err.h> diff --git a/freebsd/lib/libmemstat/memstat_malloc.c b/freebsd/lib/libmemstat/memstat_malloc.c index 58e91e8d..6dc274e0 100644 --- a/freebsd/lib/libmemstat/memstat_malloc.c +++ b/freebsd/lib/libmemstat/memstat_malloc.c @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/malloc.h> #include <sys/sysctl.h> diff --git a/freebsd/lib/libmemstat/memstat_uma.c b/freebsd/lib/libmemstat/memstat_uma.c index 299386c8..431aa046 100644 --- a/freebsd/lib/libmemstat/memstat_uma.c +++ b/freebsd/lib/libmemstat/memstat_uma.c @@ -28,8 +28,8 @@ * $FreeBSD$ */ -#include <rtems/bsd/sys/param.h> -#include <rtems/bsd/sys/cpuset.h> +#include <sys/param.h> +#include <sys/cpuset.h> #include <sys/sysctl.h> #include <vm/uma.h> diff --git a/freebsd/lib/libutil/trimdomain.c b/freebsd/lib/libutil/trimdomain.c index d99e84c7..848dd760 100644 --- a/freebsd/lib/libutil/trimdomain.c +++ b/freebsd/lib/libutil/trimdomain.c @@ -31,7 +31,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <libutil.h> #include <string.h> diff --git a/freebsd/sbin/dhclient/dhcpd.h b/freebsd/sbin/dhclient/dhcpd.h index f2bc7738..9210cd42 100644 --- a/freebsd/sbin/dhclient/dhcpd.h +++ b/freebsd/sbin/dhclient/dhcpd.h @@ -41,7 +41,7 @@ * $FreeBSD$ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/sockio.h> diff --git a/freebsd/sbin/ifconfig/af_inet.c b/freebsd/sbin/ifconfig/af_inet.c index 6b12cc22..ad825c9d 100644 --- a/freebsd/sbin/ifconfig/af_inet.c +++ b/freebsd/sbin/ifconfig/af_inet.c @@ -41,7 +41,7 @@ static const char rcsid[] = #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <net/if.h> diff --git a/freebsd/sbin/ifconfig/af_inet6.c b/freebsd/sbin/ifconfig/af_inet6.c index f8f3b8ec..2dc372a6 100644 --- a/freebsd/sbin/ifconfig/af_inet6.c +++ b/freebsd/sbin/ifconfig/af_inet6.c @@ -41,7 +41,7 @@ static const char rcsid[] = #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <net/if.h> diff --git a/freebsd/sbin/ifconfig/af_nd6.c b/freebsd/sbin/ifconfig/af_nd6.c index ac302c65..f7d221b9 100644 --- a/freebsd/sbin/ifconfig/af_nd6.c +++ b/freebsd/sbin/ifconfig/af_nd6.c @@ -37,7 +37,7 @@ static const char rcsid[] = #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/sysctl.h> diff --git a/freebsd/sbin/ifconfig/ifbridge.c b/freebsd/sbin/ifconfig/ifbridge.c index 9e116912..7eeeb853 100644 --- a/freebsd/sbin/ifconfig/ifbridge.c +++ b/freebsd/sbin/ifconfig/ifbridge.c @@ -47,7 +47,7 @@ static const char rcsid[] = #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/sockio.h> diff --git a/freebsd/sbin/ifconfig/ifcarp.c b/freebsd/sbin/ifconfig/ifcarp.c index 61e3fa36..851ece06 100644 --- a/freebsd/sbin/ifconfig/ifcarp.c +++ b/freebsd/sbin/ifconfig/ifcarp.c @@ -36,7 +36,7 @@ #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/sockio.h> diff --git a/freebsd/sbin/ifconfig/ifclone.c b/freebsd/sbin/ifconfig/ifclone.c index c31da169..d885f62a 100644 --- a/freebsd/sbin/ifconfig/ifclone.c +++ b/freebsd/sbin/ifconfig/ifclone.c @@ -41,7 +41,7 @@ static const char rcsid[] = #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/queue.h> #include <sys/socket.h> diff --git a/freebsd/sbin/ifconfig/ifconfig.c b/freebsd/sbin/ifconfig/ifconfig.c index 521c37b8..956a9dfe 100644 --- a/freebsd/sbin/ifconfig/ifconfig.c +++ b/freebsd/sbin/ifconfig/ifconfig.c @@ -55,7 +55,7 @@ static const char rcsid[] = #include <machine/rtems-bsd-program.h> #include <machine/rtems-bsd-commands.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/module.h> #include <sys/linker.h> diff --git a/freebsd/sbin/ifconfig/ifgif.c b/freebsd/sbin/ifconfig/ifgif.c index c13a0506..2d29a8f0 100644 --- a/freebsd/sbin/ifconfig/ifgif.c +++ b/freebsd/sbin/ifconfig/ifgif.c @@ -37,7 +37,7 @@ static const char rcsid[] = #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/sockio.h> diff --git a/freebsd/sbin/ifconfig/ifgre.c b/freebsd/sbin/ifconfig/ifgre.c index 6f72a89e..1f954101 100644 --- a/freebsd/sbin/ifconfig/ifgre.c +++ b/freebsd/sbin/ifconfig/ifgre.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/sockio.h> diff --git a/freebsd/sbin/ifconfig/ifgroup.c b/freebsd/sbin/ifconfig/ifgroup.c index 0e19d4ae..d02903d2 100644 --- a/freebsd/sbin/ifconfig/ifgroup.c +++ b/freebsd/sbin/ifconfig/ifgroup.c @@ -37,7 +37,7 @@ static const char rcsid[] = #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <net/if.h> diff --git a/freebsd/sbin/ifconfig/ifieee80211.c b/freebsd/sbin/ifconfig/ifieee80211.c index fd3e539b..18484368 100644 --- a/freebsd/sbin/ifconfig/ifieee80211.c +++ b/freebsd/sbin/ifconfig/ifieee80211.c @@ -66,7 +66,7 @@ #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/sysctl.h> diff --git a/freebsd/sbin/ifconfig/iflagg.c b/freebsd/sbin/ifconfig/iflagg.c index 78f81fdb..d8a897d4 100644 --- a/freebsd/sbin/ifconfig/iflagg.c +++ b/freebsd/sbin/ifconfig/iflagg.c @@ -15,7 +15,7 @@ static const char rcsid[] = #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/sockio.h> diff --git a/freebsd/sbin/ifconfig/ifmac.c b/freebsd/sbin/ifconfig/ifmac.c index b9aa5eed..65493600 100644 --- a/freebsd/sbin/ifconfig/ifmac.c +++ b/freebsd/sbin/ifconfig/ifmac.c @@ -43,7 +43,7 @@ #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/mac.h> #include <sys/socket.h> diff --git a/freebsd/sbin/ifconfig/ifmedia.c b/freebsd/sbin/ifconfig/ifmedia.c index 890ca8e3..64bf544b 100644 --- a/freebsd/sbin/ifconfig/ifmedia.c +++ b/freebsd/sbin/ifconfig/ifmedia.c @@ -71,7 +71,7 @@ #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/sysctl.h> diff --git a/freebsd/sbin/ifconfig/ifpfsync.c b/freebsd/sbin/ifconfig/ifpfsync.c index 162219c8..1c4afc13 100644 --- a/freebsd/sbin/ifconfig/ifpfsync.c +++ b/freebsd/sbin/ifconfig/ifpfsync.c @@ -35,7 +35,7 @@ #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> diff --git a/freebsd/sbin/ifconfig/ifvlan.c b/freebsd/sbin/ifconfig/ifvlan.c index 14350baf..dd1d15fe 100644 --- a/freebsd/sbin/ifconfig/ifvlan.c +++ b/freebsd/sbin/ifconfig/ifvlan.c @@ -43,7 +43,7 @@ #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/sockio.h> diff --git a/freebsd/sbin/ifconfig/sfp.c b/freebsd/sbin/ifconfig/sfp.c index 55fb7c7e..b061927e 100644 --- a/freebsd/sbin/ifconfig/sfp.c +++ b/freebsd/sbin/ifconfig/sfp.c @@ -38,7 +38,7 @@ static const char rcsid[] = #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> diff --git a/freebsd/sbin/pfctl/pfctl_parser.c b/freebsd/sbin/pfctl/pfctl_parser.c index 917980ae..5206c769 100644 --- a/freebsd/sbin/pfctl/pfctl_parser.c +++ b/freebsd/sbin/pfctl/pfctl_parser.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/ioctl.h> #include <sys/socket.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/proc.h> #include <net/if.h> #include <netinet/in.h> diff --git a/freebsd/sbin/ping/ping.c b/freebsd/sbin/ping/ping.c index 304f308d..96bd410f 100644 --- a/freebsd/sbin/ping/ping.c +++ b/freebsd/sbin/ping/ping.c @@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$"); #include <machine/rtems-bsd-program.h> #include <machine/rtems-bsd-commands.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> /* NB: we rely on this for <sys/types.h> */ +#include <sys/param.h> /* NB: we rely on this for <sys/types.h> */ #include <sys/capsicum.h> #include <sys/socket.h> #include <sys/sysctl.h> diff --git a/freebsd/sbin/ping6/ping6.c b/freebsd/sbin/ping6/ping6.c index 382336a2..9faf09e2 100644 --- a/freebsd/sbin/ping6/ping6.c +++ b/freebsd/sbin/ping6/ping6.c @@ -113,7 +113,7 @@ __FBSDID("$FreeBSD$"); #include <machine/rtems-bsd-program.h> #include <machine/rtems-bsd-commands.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/uio.h> #include <sys/socket.h> #include <sys/time.h> diff --git a/freebsd/sbin/route/route.c b/freebsd/sbin/route/route.c index 07a400fb..dfa7c21c 100644 --- a/freebsd/sbin/route/route.c +++ b/freebsd/sbin/route/route.c @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #include <machine/rtems-bsd-program.h> #include <machine/rtems-bsd-commands.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/file.h> #include <sys/socket.h> #include <sys/ioctl.h> diff --git a/freebsd/sbin/sysctl/sysctl.c b/freebsd/sbin/sysctl/sysctl.c index 2836da5d..8de24190 100644 --- a/freebsd/sbin/sysctl/sysctl.c +++ b/freebsd/sbin/sysctl/sysctl.c @@ -53,7 +53,7 @@ static const char rcsid[] = #include <machine/rtems-bsd-program.h> #include <machine/rtems-bsd-commands.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/time.h> #include <rtems/bsd/sys/resource.h> #include <sys/stat.h> diff --git a/freebsd/sys/arm/arm/in_cksum.c b/freebsd/sys/arm/arm/in_cksum.c index 7c680bbe..22e19d83 100644 --- a/freebsd/sys/arm/arm/in_cksum.c +++ b/freebsd/sys/arm/arm/in_cksum.c @@ -40,7 +40,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/arm/lpc/if_lpe.c b/freebsd/sys/arm/lpc/if_lpe.c index 69e24ae9..9c847283 100755 --- a/freebsd/sys/arm/lpc/if_lpe.c +++ b/freebsd/sys/arm/lpc/if_lpe.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/endian.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/freebsd/sys/arm/lpc/lpc_pwr.c b/freebsd/sys/arm/lpc/lpc_pwr.c index 231024d4..70ffe902 100755 --- a/freebsd/sys/arm/lpc/lpc_pwr.c +++ b/freebsd/sys/arm/lpc/lpc_pwr.c @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/kernel.h> diff --git a/freebsd/sys/arm/xilinx/zy7_slcr.c b/freebsd/sys/arm/xilinx/zy7_slcr.c index e7b8ce77..7398af7a 100644 --- a/freebsd/sys/arm/xilinx/zy7_slcr.c +++ b/freebsd/sys/arm/xilinx/zy7_slcr.c @@ -39,7 +39,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #ifdef __rtems__ #include <sys/bus.h> diff --git a/freebsd/sys/avr/avr/in_cksum.c b/freebsd/sys/avr/avr/in_cksum.c index 7c680bbe..22e19d83 100644 --- a/freebsd/sys/avr/avr/in_cksum.c +++ b/freebsd/sys/avr/avr/in_cksum.c @@ -40,7 +40,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/bfin/bfin/in_cksum.c b/freebsd/sys/bfin/bfin/in_cksum.c index 7c680bbe..22e19d83 100644 --- a/freebsd/sys/bfin/bfin/in_cksum.c +++ b/freebsd/sys/bfin/bfin/in_cksum.c @@ -40,7 +40,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/bsm/audit.h b/freebsd/sys/bsm/audit.h index aa776057..af9622af 100644 --- a/freebsd/sys/bsm/audit.h +++ b/freebsd/sys/bsm/audit.h @@ -38,7 +38,7 @@ #ifndef _BSM_AUDIT_H #define _BSM_AUDIT_H -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #define AUDIT_RECORD_MAGIC 0x828a0f1b diff --git a/freebsd/sys/cam/cam.c b/freebsd/sys/cam/cam.c index 71523db2..b6bc10d3 100644 --- a/freebsd/sys/cam/cam.c +++ b/freebsd/sys/cam/cam.c @@ -31,7 +31,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #ifdef _KERNEL #include <sys/systm.h> #include <sys/kernel.h> diff --git a/freebsd/sys/cam/cam_sim.h b/freebsd/sys/cam/cam_sim.h index 7309e97c..4c4c8c58 100644 --- a/freebsd/sys/cam/cam_sim.h +++ b/freebsd/sys/cam/cam_sim.h @@ -33,7 +33,7 @@ #ifdef _KERNEL #ifdef __rtems__ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/proc.h> #include <sys/condvar.h> #endif /* __rtems__ */ diff --git a/freebsd/sys/cam/scsi/scsi_all.c b/freebsd/sys/cam/scsi/scsi_all.c index 4b767bc2..5f9450c2 100644 --- a/freebsd/sys/cam/scsi/scsi_all.c +++ b/freebsd/sys/cam/scsi/scsi_all.c @@ -32,7 +32,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/stdint.h> diff --git a/freebsd/sys/crypto/des/des_ecb.c b/freebsd/sys/crypto/des/des_ecb.c index 82dc18b0..4c383f1d 100644 --- a/freebsd/sys/crypto/des/des_ecb.c +++ b/freebsd/sys/crypto/des/des_ecb.c @@ -53,7 +53,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <crypto/des/des_locl.h> #include <crypto/des/spr.h> diff --git a/freebsd/sys/crypto/des/des_setkey.c b/freebsd/sys/crypto/des/des_setkey.c index 6d6c2da2..01adb7d1 100644 --- a/freebsd/sys/crypto/des/des_setkey.c +++ b/freebsd/sys/crypto/des/des_setkey.c @@ -61,7 +61,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <crypto/des/des_locl.h> #include <crypto/des/podd.h> diff --git a/freebsd/sys/crypto/rc4/rc4.c b/freebsd/sys/crypto/rc4/rc4.c index db89e781..2bdc3ce3 100644 --- a/freebsd/sys/crypto/rc4/rc4.c +++ b/freebsd/sys/crypto/rc4/rc4.c @@ -39,7 +39,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/types.h> diff --git a/freebsd/sys/crypto/rijndael/rijndael-api-fst.c b/freebsd/sys/crypto/rijndael/rijndael-api-fst.c index 2f7ba27b..1ae535a5 100644 --- a/freebsd/sys/crypto/rijndael/rijndael-api-fst.c +++ b/freebsd/sys/crypto/rijndael/rijndael-api-fst.c @@ -20,7 +20,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #ifdef _KERNEL #include <sys/systm.h> #else diff --git a/freebsd/sys/crypto/siphash/siphash.c b/freebsd/sys/crypto/siphash/siphash.c index aaf69a01..59a00282 100644 --- a/freebsd/sys/crypto/siphash/siphash.c +++ b/freebsd/sys/crypto/siphash/siphash.c @@ -46,7 +46,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> #include <sys/libkern.h> diff --git a/freebsd/sys/dev/bce/if_bce.c b/freebsd/sys/dev/bce/if_bce.c index 079e903d..2b4a09b6 100644 --- a/freebsd/sys/dev/bce/if_bce.c +++ b/freebsd/sys/dev/bce/if_bce.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_bce.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/endian.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/freebsd/sys/dev/bfe/if_bfe.c b/freebsd/sys/dev/bfe/if_bfe.c index a76bc7ee..c0bd4b26 100644 --- a/freebsd/sys/dev/bfe/if_bfe.c +++ b/freebsd/sys/dev/bfe/if_bfe.c @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/endian.h> diff --git a/freebsd/sys/dev/bge/if_bge.c b/freebsd/sys/dev/bge/if_bge.c index aadf5a99..fad66e1e 100644 --- a/freebsd/sys/dev/bge/if_bge.c +++ b/freebsd/sys/dev/bge/if_bge.c @@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_device_polling.h> #endif -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/endian.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/freebsd/sys/dev/cadence/if_cgem.c b/freebsd/sys/dev/cadence/if_cgem.c index 3098ee5d..4f4114cf 100644 --- a/freebsd/sys/dev/cadence/if_cgem.c +++ b/freebsd/sys/dev/cadence/if_cgem.c @@ -38,7 +38,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/kernel.h> diff --git a/freebsd/sys/dev/dc/dcphy.c b/freebsd/sys/dev/dc/dcphy.c index 76170aa0..d702f6f3 100644 --- a/freebsd/sys/dev/dc/dcphy.c +++ b/freebsd/sys/dev/dc/dcphy.c @@ -44,11 +44,11 @@ __FBSDID("$FreeBSD$"); * which is harder to do. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/socket.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <rtems/bsd/sys/lock.h> #include <sys/module.h> #include <sys/mutex.h> diff --git a/freebsd/sys/dev/dc/if_dc.c b/freebsd/sys/dev/dc/if_dc.c index 5b0aaffd..a0efd5ba 100644 --- a/freebsd/sys/dev/dc/if_dc.c +++ b/freebsd/sys/dev/dc/if_dc.c @@ -98,7 +98,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_device_polling.h> #endif -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/endian.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/freebsd/sys/dev/dc/pnphy.c b/freebsd/sys/dev/dc/pnphy.c index 5f1c52f2..488b64d9 100644 --- a/freebsd/sys/dev/dc/pnphy.c +++ b/freebsd/sys/dev/dc/pnphy.c @@ -42,11 +42,11 @@ __FBSDID("$FreeBSD$"); * NWAY to work right is amazingly difficult. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/socket.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <rtems/bsd/sys/lock.h> #include <sys/module.h> #include <sys/mutex.h> diff --git a/freebsd/sys/dev/dwc/if_dwc.c b/freebsd/sys/dev/dwc/if_dwc.c index d62dc8d9..94b1a9d2 100644 --- a/freebsd/sys/dev/dwc/if_dwc.c +++ b/freebsd/sys/dev/dwc/if_dwc.c @@ -41,7 +41,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/gpio.h> diff --git a/freebsd/sys/dev/e1000/e1000_osdep.h b/freebsd/sys/dev/e1000/e1000_osdep.h index 4ef3ce76..62203ae1 100644 --- a/freebsd/sys/dev/e1000/e1000_osdep.h +++ b/freebsd/sys/dev/e1000/e1000_osdep.h @@ -37,7 +37,7 @@ #define _FREEBSD_OS_H_ #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> diff --git a/freebsd/sys/dev/e1000/if_em.h b/freebsd/sys/dev/e1000/if_em.h index eb353700..cfd1388d 100644 --- a/freebsd/sys/dev/e1000/if_em.h +++ b/freebsd/sys/dev/e1000/if_em.h @@ -33,7 +33,7 @@ #include <rtems/bsd/local/opt_device_polling.h> #endif -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #ifdef DDB #include <sys/types.h> diff --git a/freebsd/sys/dev/evdev/cdev.c b/freebsd/sys/dev/evdev/cdev.c index b9cc4cd5..b08a2440 100644 --- a/freebsd/sys/dev/evdev/cdev.c +++ b/freebsd/sys/dev/evdev/cdev.c @@ -34,7 +34,7 @@ #include <sys/types.h> #include <sys/bitstring.h> #include <sys/systm.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/conf.h> #include <sys/uio.h> diff --git a/freebsd/sys/dev/evdev/evdev.c b/freebsd/sys/dev/evdev/evdev.c index 323e2d28..185e48f7 100644 --- a/freebsd/sys/dev/evdev/evdev.c +++ b/freebsd/sys/dev/evdev/evdev.c @@ -33,7 +33,7 @@ #include <sys/types.h> #include <sys/systm.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/conf.h> diff --git a/freebsd/sys/dev/evdev/evdev_mt.c b/freebsd/sys/dev/evdev/evdev_mt.c index 9eb8a54e..3207cd87 100644 --- a/freebsd/sys/dev/evdev/evdev_mt.c +++ b/freebsd/sys/dev/evdev/evdev_mt.c @@ -28,7 +28,7 @@ * $FreeBSD$ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/malloc.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> diff --git a/freebsd/sys/dev/evdev/evdev_utils.c b/freebsd/sys/dev/evdev/evdev_utils.c index 787cc2d3..49e03b6a 100644 --- a/freebsd/sys/dev/evdev/evdev_utils.c +++ b/freebsd/sys/dev/evdev/evdev_utils.c @@ -31,7 +31,7 @@ #include <sys/types.h> #include <sys/systm.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/bus.h> #include <sys/kernel.h> #include <sys/conf.h> diff --git a/freebsd/sys/dev/evdev/uinput.c b/freebsd/sys/dev/evdev/uinput.c index c66afe63..1c585e35 100644 --- a/freebsd/sys/dev/evdev/uinput.c +++ b/freebsd/sys/dev/evdev/uinput.c @@ -33,7 +33,7 @@ #include <sys/types.h> #include <sys/systm.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/fcntl.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/freebsd/sys/dev/fdt/fdt_common.c b/freebsd/sys/dev/fdt/fdt_common.c index efbef9de..f1f51081 100644 --- a/freebsd/sys/dev/fdt/fdt_common.c +++ b/freebsd/sys/dev/fdt/fdt_common.c @@ -34,7 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/freebsd/sys/dev/fdt/simplebus.c b/freebsd/sys/dev/fdt/simplebus.c index fb099965..9c85f751 100644 --- a/freebsd/sys/dev/fdt/simplebus.c +++ b/freebsd/sys/dev/fdt/simplebus.c @@ -28,7 +28,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/module.h> #include <sys/bus.h> diff --git a/freebsd/sys/dev/fxp/if_fxp.c b/freebsd/sys/dev/fxp/if_fxp.c index b3d4fa15..850a9afb 100644 --- a/freebsd/sys/dev/fxp/if_fxp.c +++ b/freebsd/sys/dev/fxp/if_fxp.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_device_polling.h> #endif -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/endian.h> diff --git a/freebsd/sys/dev/kbd/kbd.c b/freebsd/sys/dev/kbd/kbd.c index 3505b29d..3187e8bf 100644 --- a/freebsd/sys/dev/kbd/kbd.c +++ b/freebsd/sys/dev/kbd/kbd.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_kbd.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/dev/led/led.c b/freebsd/sys/dev/led/led.c index 87cf9993..cb811ce9 100644 --- a/freebsd/sys/dev/led/led.c +++ b/freebsd/sys/dev/led/led.c @@ -13,7 +13,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/conf.h> #include <sys/kernel.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/mii/brgphy.c b/freebsd/sys/dev/mii/brgphy.c index e07cd968..d476960f 100644 --- a/freebsd/sys/dev/mii/brgphy.c +++ b/freebsd/sys/dev/mii/brgphy.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); * Driver for the Broadcom BCM54xx/57xx 1000baseTX PHY. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/freebsd/sys/dev/mii/e1000phy.c b/freebsd/sys/dev/mii/e1000phy.c index 10d6fc68..ee62b6c6 100644 --- a/freebsd/sys/dev/mii/e1000phy.c +++ b/freebsd/sys/dev/mii/e1000phy.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); * Jung-uk Kim <jkim@niksun.com> */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/freebsd/sys/dev/mii/icsphy.c b/freebsd/sys/dev/mii/icsphy.c index a51b899f..e313afe1 100755 --- a/freebsd/sys/dev/mii/icsphy.c +++ b/freebsd/sys/dev/mii/icsphy.c @@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$"); * datasheet from www.icst.com */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/freebsd/sys/dev/mii/micphy.c b/freebsd/sys/dev/mii/micphy.c index acaa8b73..a8d90198 100644 --- a/freebsd/sys/dev/mii/micphy.c +++ b/freebsd/sys/dev/mii/micphy.c @@ -37,11 +37,11 @@ __FBSDID("$FreeBSD$"); * Micrel KSZ9021 Gigabit Ethernet Transceiver */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/socket.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/module.h> #include <sys/bus.h> #include <sys/malloc.h> diff --git a/freebsd/sys/dev/mii/mii.c b/freebsd/sys/dev/mii/mii.c index 1f0ead72..b7464bb6 100644 --- a/freebsd/sys/dev/mii/mii.c +++ b/freebsd/sys/dev/mii/mii.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); * plus some NetBSD extensions. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/socket.h> #include <sys/malloc.h> diff --git a/freebsd/sys/dev/mii/mii_bitbang.c b/freebsd/sys/dev/mii/mii_bitbang.c index af495ad4..784aa4d8 100644 --- a/freebsd/sys/dev/mii/mii_bitbang.c +++ b/freebsd/sys/dev/mii/mii_bitbang.c @@ -39,7 +39,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/module.h> diff --git a/freebsd/sys/dev/mii/mii_physubr.c b/freebsd/sys/dev/mii/mii_physubr.c index e03d153a..864f9968 100644 --- a/freebsd/sys/dev/mii/mii_physubr.c +++ b/freebsd/sys/dev/mii/mii_physubr.c @@ -39,11 +39,11 @@ __FBSDID("$FreeBSD$"); * Subroutines common to all PHYs. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/socket.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/module.h> #include <sys/bus.h> diff --git a/freebsd/sys/dev/mii/rgephy.c b/freebsd/sys/dev/mii/rgephy.c index 963197a1..de8a2975 100644 --- a/freebsd/sys/dev/mii/rgephy.c +++ b/freebsd/sys/dev/mii/rgephy.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); * Driver for the RealTek 8169S/8110S/8211B/8211C internal 10/100/1000 PHY. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/freebsd/sys/dev/mii/ukphy.c b/freebsd/sys/dev/mii/ukphy.c index 57958cac..c9c59b06 100644 --- a/freebsd/sys/dev/mii/ukphy.c +++ b/freebsd/sys/dev/mii/ukphy.c @@ -63,11 +63,11 @@ __FBSDID("$FreeBSD$"); * driver for generic unknown PHYs */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/socket.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/module.h> #include <sys/bus.h> diff --git a/freebsd/sys/dev/mii/ukphy_subr.c b/freebsd/sys/dev/mii/ukphy_subr.c index b53ee861..06e1cc5f 100644 --- a/freebsd/sys/dev/mii/ukphy_subr.c +++ b/freebsd/sys/dev/mii/ukphy_subr.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); * Subroutines shared by the ukphy driver and other PHY drivers. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/socket.h> #include <sys/module.h> diff --git a/freebsd/sys/dev/mmc/mmc.c b/freebsd/sys/dev/mmc/mmc.c index ab494804..d49316eb 100644 --- a/freebsd/sys/dev/mmc/mmc.c +++ b/freebsd/sys/dev/mmc/mmc.c @@ -56,7 +56,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/dev/mmc/mmc_subr.c b/freebsd/sys/dev/mmc/mmc_subr.c index 294fd9c0..08296d7b 100644 --- a/freebsd/sys/dev/mmc/mmc_subr.c +++ b/freebsd/sys/dev/mmc/mmc_subr.c @@ -55,7 +55,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/dev/mmc/mmcsd.c b/freebsd/sys/dev/mmc/mmcsd.c index c1cfbe8b..b364edf0 100644 --- a/freebsd/sys/dev/mmc/mmcsd.c +++ b/freebsd/sys/dev/mmc/mmcsd.c @@ -56,7 +56,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bio.h> #include <sys/bus.h> diff --git a/freebsd/sys/dev/nvme/nvme.h b/freebsd/sys/dev/nvme/nvme.h index 1bad4392..ff64cb00 100644 --- a/freebsd/sys/dev/nvme/nvme.h +++ b/freebsd/sys/dev/nvme/nvme.h @@ -33,7 +33,7 @@ #include <sys/types.h> #endif -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #define NVME_PASSTHROUGH_CMD _IOWR('n', 0, struct nvme_pt_command) #define NVME_RESET_CONTROLLER _IO('n', 1) diff --git a/freebsd/sys/dev/ofw/ofw_bus_subr.c b/freebsd/sys/dev/ofw/ofw_bus_subr.c index a067b949..cc30578d 100644 --- a/freebsd/sys/dev/ofw/ofw_bus_subr.c +++ b/freebsd/sys/dev/ofw/ofw_bus_subr.c @@ -33,10 +33,10 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_platform.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/libkern.h> #include <machine/resource.h> diff --git a/freebsd/sys/dev/ofw/ofw_fdt.c b/freebsd/sys/dev/ofw/ofw_fdt.c index 20e07e90..766be90f 100644 --- a/freebsd/sys/dev/ofw/ofw_fdt.c +++ b/freebsd/sys/dev/ofw/ofw_fdt.c @@ -32,7 +32,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/ofw/ofw_subr.c b/freebsd/sys/dev/ofw/ofw_subr.c index 391d25c4..e2528691 100644 --- a/freebsd/sys/dev/ofw/ofw_subr.c +++ b/freebsd/sys/dev/ofw/ofw_subr.c @@ -33,7 +33,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/bus.h> #include <sys/libkern.h> #include <sys/reboot.h> diff --git a/freebsd/sys/dev/ofw/ofwbus.c b/freebsd/sys/dev/ofw/ofwbus.c index 58ec2841..7afcef77 100644 --- a/freebsd/sys/dev/ofw/ofwbus.c +++ b/freebsd/sys/dev/ofw/ofwbus.c @@ -37,7 +37,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/kernel.h> diff --git a/freebsd/sys/dev/ofw/openfirm.c b/freebsd/sys/dev/ofw/openfirm.c index 3e86d8db..9bf91f0a 100644 --- a/freebsd/sys/dev/ofw/openfirm.c +++ b/freebsd/sys/dev/ofw/openfirm.c @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_platform.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> diff --git a/freebsd/sys/dev/pci/pci.c b/freebsd/sys/dev/pci/pci.c index 3209f893..be4c626f 100644 --- a/freebsd/sys/dev/pci/pci.c +++ b/freebsd/sys/dev/pci/pci.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_bus.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/module.h> diff --git a/freebsd/sys/dev/pci/pci_pci.c b/freebsd/sys/dev/pci/pci_pci.c index d468ca2e..c6d07157 100644 --- a/freebsd/sys/dev/pci/pci_pci.c +++ b/freebsd/sys/dev/pci/pci_pci.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_pci.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/bus.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/dev/pci/pci_user.c b/freebsd/sys/dev/pci/pci_user.c index 5f2b934f..edad1847 100644 --- a/freebsd/sys/dev/pci/pci_user.c +++ b/freebsd/sys/dev/pci/pci_user.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_bus.h> /* XXX trim includes */ #include <rtems/bsd/local/opt_compat.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/module.h> diff --git a/freebsd/sys/dev/re/if_re.c b/freebsd/sys/dev/re/if_re.c index 7e0e87f8..2504624f 100644 --- a/freebsd/sys/dev/re/if_re.c +++ b/freebsd/sys/dev/re/if_re.c @@ -114,7 +114,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_device_polling.h> #endif -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/endian.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/freebsd/sys/dev/rtwn/if_rtwn.c b/freebsd/sys/dev/rtwn/if_rtwn.c index 050d9960..326e2a48 100644 --- a/freebsd/sys/dev/rtwn/if_rtwn.c +++ b/freebsd/sys/dev/rtwn/if_rtwn.c @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sockio.h> #include <sys/sysctl.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/dev/rtwn/if_rtwn_beacon.c b/freebsd/sys/dev/rtwn/if_rtwn_beacon.c index a6a49f76..e5380154 100644 --- a/freebsd/sys/dev/rtwn/if_rtwn_beacon.c +++ b/freebsd/sys/dev/rtwn/if_rtwn_beacon.c @@ -21,7 +21,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/if_rtwn_calib.c b/freebsd/sys/dev/rtwn/if_rtwn_calib.c index 8943b557..8b90aacb 100644 --- a/freebsd/sys/dev/rtwn/if_rtwn_calib.c +++ b/freebsd/sys/dev/rtwn/if_rtwn_calib.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/if_rtwn_cam.c b/freebsd/sys/dev/rtwn/if_rtwn_cam.c index 2539bc70..36658420 100644 --- a/freebsd/sys/dev/rtwn/if_rtwn_cam.c +++ b/freebsd/sys/dev/rtwn/if_rtwn_cam.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/if_rtwn_efuse.c b/freebsd/sys/dev/rtwn/if_rtwn_efuse.c index bdf28a5d..58d28562 100644 --- a/freebsd/sys/dev/rtwn/if_rtwn_efuse.c +++ b/freebsd/sys/dev/rtwn/if_rtwn_efuse.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/if_rtwn_fw.c b/freebsd/sys/dev/rtwn/if_rtwn_fw.c index a4c9506e..10ba0de5 100644 --- a/freebsd/sys/dev/rtwn/if_rtwn_fw.c +++ b/freebsd/sys/dev/rtwn/if_rtwn_fw.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/if_rtwn_rx.c b/freebsd/sys/dev/rtwn/if_rtwn_rx.c index 31ab7e69..3beb07d1 100644 --- a/freebsd/sys/dev/rtwn/if_rtwn_rx.c +++ b/freebsd/sys/dev/rtwn/if_rtwn_rx.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/if_rtwn_task.c b/freebsd/sys/dev/rtwn/if_rtwn_task.c index e8bbd5d0..57b38663 100644 --- a/freebsd/sys/dev/rtwn/if_rtwn_task.c +++ b/freebsd/sys/dev/rtwn/if_rtwn_task.c @@ -24,7 +24,7 @@ __FBSDID("$FreeBSD$"); #ifdef __rtems__ #define __LINUX_ERRNO_EXTENSIONS__ #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/if_rtwn_tx.c b/freebsd/sys/dev/rtwn/if_rtwn_tx.c index c48e2e0e..4b7d049e 100644 --- a/freebsd/sys/dev/rtwn/if_rtwn_tx.c +++ b/freebsd/sys/dev/rtwn/if_rtwn_tx.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/pci/rtwn_pci_attach.c b/freebsd/sys/dev/rtwn/pci/rtwn_pci_attach.c index 9813cb32..8abf1313 100644 --- a/freebsd/sys/dev/rtwn/pci/rtwn_pci_attach.c +++ b/freebsd/sys/dev/rtwn/pci/rtwn_pci_attach.c @@ -23,7 +23,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sysctl.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> diff --git a/freebsd/sys/dev/rtwn/pci/rtwn_pci_reg.c b/freebsd/sys/dev/rtwn/pci/rtwn_pci_reg.c index 3801f811..b3434cad 100644 --- a/freebsd/sys/dev/rtwn/pci/rtwn_pci_reg.c +++ b/freebsd/sys/dev/rtwn/pci/rtwn_pci_reg.c @@ -23,7 +23,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/pci/rtwn_pci_rx.c b/freebsd/sys/dev/rtwn/pci/rtwn_pci_rx.c index 292fb07f..533bf239 100644 --- a/freebsd/sys/dev/rtwn/pci/rtwn_pci_rx.c +++ b/freebsd/sys/dev/rtwn/pci/rtwn_pci_rx.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/pci/rtwn_pci_tx.c b/freebsd/sys/dev/rtwn/pci/rtwn_pci_tx.c index a2f4221c..943be372 100644 --- a/freebsd/sys/dev/rtwn/pci/rtwn_pci_tx.c +++ b/freebsd/sys/dev/rtwn/pci/rtwn_pci_tx.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_beacon.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_beacon.c index 752b29dd..05149560 100644 --- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_beacon.c +++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_beacon.c @@ -21,7 +21,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_calib.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_calib.c index c996749a..9922592f 100644 --- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_calib.c +++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_calib.c @@ -21,7 +21,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_chan.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_chan.c index 405edb2b..f878469f 100644 --- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_chan.c +++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_chan.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_fw.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_fw.c index fb7743ed..45e51591 100644 --- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_fw.c +++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_fw.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_init.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_init.c index 62e5463b..579684aa 100644 --- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_init.c +++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_init.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_led.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_led.c index 02ec644a..1dd73080 100644 --- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_led.c +++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_led.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_rf.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_rf.c index 18991ba8..0cf77791 100644 --- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_rf.c +++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_rf.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_rom.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_rom.c index 9fc7c4c4..88808cdc 100644 --- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_rom.c +++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_rom.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_rx.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_rx.c index acffb40e..ad4efeb4 100644 --- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_rx.c +++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_rx.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_tx.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_tx.c index 4f70e61c..f993ac98 100644 --- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_tx.c +++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_tx.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c b/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c index f834fb38..612e2a8e 100644 --- a/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c +++ b/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c b/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c index 3f9ae320..899e5bda 100644 --- a/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c +++ b/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_rx.c b/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_rx.c index 3c2671c7..a5a34f01 100644 --- a/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_rx.c +++ b/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_rx.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c index 225c69f5..cd442f0f 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c index e1b4f507..645eaa3d 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c index c4905429..9f277161 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c index e7ec8bfd..fb60a476 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_led.c b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_led.c index 28273a38..91fab7de 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_led.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_led.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c index d496e7b8..3df12114 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c index 31d621bd..af5ce97d 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_attach.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_attach.c index cfb76acc..3a7f428e 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_attach.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_attach.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_beacon.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_beacon.c index fc106a47..2992d634 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_beacon.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_beacon.c @@ -21,7 +21,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_calib.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_calib.c index e7706b8d..9f6bc071 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_calib.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_calib.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_chan.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_chan.c index a4ba2766..0dc365b8 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_chan.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_chan.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_fw.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_fw.c index 91bcfc0e..868a86a2 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_fw.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_fw.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_init.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_init.c index 4ec44045..973a9410 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_init.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_init.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_rf.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_rf.c index 22507e6c..4a4df3ad 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_rf.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_rf.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_rom.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_rom.c index 1c1595fc..c444a44d 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_rom.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_rom.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_rx.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_rx.c index 70dff0f6..db66f1cb 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_rx.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_rx.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_tx.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_tx.c index 0e3c408d..179770b3 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_tx.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_tx.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c index aa6f7067..5e29c0a0 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c index 44b3a509..d4e79e03 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c index 4db6b167..3c76ce2e 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c index ec55da6d..0e31a1f9 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c index 0954316d..d84176af 100644 --- a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c +++ b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c @@ -21,7 +21,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_beacon.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_beacon.c index 67714442..63abbc03 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_beacon.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_beacon.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_calib.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_calib.c index 73f1df0f..ceccc492 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_calib.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_calib.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_caps.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_caps.c index fc022e91..43d99af4 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_caps.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_caps.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sockio.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_chan.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_chan.c index 11db1a5d..20550923 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_chan.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_chan.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_fw.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_fw.c index f3bbc099..0ee4a3a6 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_fw.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_fw.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_init.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_init.c index 4835966e..1182287a 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_init.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_init.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_led.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_led.c index e38dbd44..d92a34c7 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_led.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_led.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_rf.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_rf.c index 29922ba2..bcf70017 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_rf.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_rf.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_rom.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_rom.c index a6a0b8c1..72fc4945 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_rom.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_rom.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_rx.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_rx.c index b9c3bbf8..dc426ef8 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_rx.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_rx.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_tx.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_tx.c index 40d54634..53e3de94 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_tx.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_tx.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c index 97d966f0..7f3ff96b 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_init.c b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_init.c index f55ecb81..710e7dcc 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_init.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_init.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_rx.c b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_rx.c index 9015631a..adc8f516 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_rx.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_rx.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_tx.c b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_tx.c index 20f13f93..18a7cb39 100644 --- a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_tx.c +++ b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_tx.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_beacon.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_beacon.c index e60b777c..3cdf59b5 100644 --- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_beacon.c +++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_beacon.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_calib.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_calib.c index d4679bc0..c2bb1e9f 100644 --- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_calib.c +++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_calib.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_chan.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_chan.c index 9277b6af..91e72f75 100644 --- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_chan.c +++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_chan.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_fw.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_fw.c index dad74ed1..5964d460 100644 --- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_fw.c +++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_fw.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_init.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_init.c index e2c3972f..351961c5 100644 --- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_init.c +++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_init.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_led.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_led.c index 83d67c67..120843dd 100644 --- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_led.c +++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_led.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_rom.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_rom.c index be64a064..67e421d3 100644 --- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_rom.c +++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_rom.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_rx.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_rx.c index 498d2423..73f8d011 100644 --- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_rx.c +++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_rx.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c b/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c index 145aca21..47fd071d 100644 --- a/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c +++ b/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_dfs.c b/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_dfs.c index 796ce6e0..c686d822 100644 --- a/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_dfs.c +++ b/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_dfs.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_init.c b/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_init.c index 484d2dad..447771fc 100644 --- a/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_init.c +++ b/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_init.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/usb/rtwn_usb_attach.c b/freebsd/sys/dev/rtwn/usb/rtwn_usb_attach.c index f378ca3c..eca38813 100644 --- a/freebsd/sys/dev/rtwn/usb/rtwn_usb_attach.c +++ b/freebsd/sys/dev/rtwn/usb/rtwn_usb_attach.c @@ -23,7 +23,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sysctl.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> diff --git a/freebsd/sys/dev/rtwn/usb/rtwn_usb_ep.c b/freebsd/sys/dev/rtwn/usb/rtwn_usb_ep.c index b75aa3b9..cd577431 100644 --- a/freebsd/sys/dev/rtwn/usb/rtwn_usb_ep.c +++ b/freebsd/sys/dev/rtwn/usb/rtwn_usb_ep.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/condvar.h> diff --git a/freebsd/sys/dev/rtwn/usb/rtwn_usb_reg.c b/freebsd/sys/dev/rtwn/usb/rtwn_usb_reg.c index 1461205b..82180f83 100644 --- a/freebsd/sys/dev/rtwn/usb/rtwn_usb_reg.c +++ b/freebsd/sys/dev/rtwn/usb/rtwn_usb_reg.c @@ -23,7 +23,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/usb/rtwn_usb_rx.c b/freebsd/sys/dev/rtwn/usb/rtwn_usb_rx.c index 4afa71af..4c3414ed 100644 --- a/freebsd/sys/dev/rtwn/usb/rtwn_usb_rx.c +++ b/freebsd/sys/dev/rtwn/usb/rtwn_usb_rx.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/rtwn/usb/rtwn_usb_tx.c b/freebsd/sys/dev/rtwn/usb/rtwn_usb_tx.c index 9ae41d28..c5bd56d4 100644 --- a/freebsd/sys/dev/rtwn/usb/rtwn_usb_tx.c +++ b/freebsd/sys/dev/rtwn/usb/rtwn_usb_tx.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/dev/smc/if_smc.c b/freebsd/sys/dev/smc/if_smc.c index 37f89a51..a018e09e 100644 --- a/freebsd/sys/dev/smc/if_smc.c +++ b/freebsd/sys/dev/smc/if_smc.c @@ -35,9 +35,9 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_device_polling.h> #endif -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/kernel.h> #include <sys/sockio.h> #include <sys/malloc.h> diff --git a/freebsd/sys/dev/tsec/if_tsec.c b/freebsd/sys/dev/tsec/if_tsec.c index 25802db0..d76c8f10 100644 --- a/freebsd/sys/dev/tsec/if_tsec.c +++ b/freebsd/sys/dev/tsec/if_tsec.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_device_polling.h> #endif -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/bus_dma.h> diff --git a/freebsd/sys/dev/tsec/if_tsec_fdt.c b/freebsd/sys/dev/tsec/if_tsec_fdt.c index 1ae47b9c..bf650575 100644 --- a/freebsd/sys/dev/tsec/if_tsec_fdt.c +++ b/freebsd/sys/dev/tsec/if_tsec_fdt.c @@ -34,7 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/endian.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/dev/usb/controller/dwc_otg.c b/freebsd/sys/dev/usb/controller/dwc_otg.c index 3450f6de..00181102 100644 --- a/freebsd/sys/dev/usb/controller/dwc_otg.c +++ b/freebsd/sys/dev/usb/controller/dwc_otg.c @@ -50,7 +50,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/controller/ehci.c b/freebsd/sys/dev/usb/controller/ehci.c index 827399cb..1d728287 100644 --- a/freebsd/sys/dev/usb/controller/ehci.c +++ b/freebsd/sys/dev/usb/controller/ehci.c @@ -51,7 +51,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/controller/ohci.c b/freebsd/sys/dev/usb/controller/ohci.c index 4c77fdea..c89628ee 100644 --- a/freebsd/sys/dev/usb/controller/ohci.c +++ b/freebsd/sys/dev/usb/controller/ohci.c @@ -40,7 +40,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/controller/usb_controller.c b/freebsd/sys/dev/usb/controller/usb_controller.c index 45b33118..dbc3aec8 100644 --- a/freebsd/sys/dev/usb/controller/usb_controller.c +++ b/freebsd/sys/dev/usb/controller/usb_controller.c @@ -33,7 +33,7 @@ #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/input/atp.c b/freebsd/sys/dev/usb/input/atp.c index 461d4fff..2e9407ee 100644 --- a/freebsd/sys/dev/usb/input/atp.c +++ b/freebsd/sys/dev/usb/input/atp.c @@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/freebsd/sys/dev/usb/input/uep.c b/freebsd/sys/dev/usb/input/uep.c index 93441974..e466361e 100644 --- a/freebsd/sys/dev/usb/input/uep.c +++ b/freebsd/sys/dev/usb/input/uep.c @@ -32,7 +32,7 @@ * http://www.eeti.com.tw/pdf/Software%20Programming%20Guide_v2.0.pdf */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/bus.h> #include <sys/callout.h> #include <sys/conf.h> diff --git a/freebsd/sys/dev/usb/input/uhid.c b/freebsd/sys/dev/usb/input/uhid.c index d3812d0b..b6f21642 100644 --- a/freebsd/sys/dev/usb/input/uhid.c +++ b/freebsd/sys/dev/usb/input/uhid.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/input/ukbd.c b/freebsd/sys/dev/usb/input/ukbd.c index e463f5ee..dc0a1ef2 100644 --- a/freebsd/sys/dev/usb/input/ukbd.c +++ b/freebsd/sys/dev/usb/input/ukbd.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/input/ums.c b/freebsd/sys/dev/usb/input/ums.c index 1af6d63e..a60dbdda 100644 --- a/freebsd/sys/dev/usb/input/ums.c +++ b/freebsd/sys/dev/usb/input/ums.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/input/wsp.c b/freebsd/sys/dev/usb/input/wsp.c index cff29723..1e3d8f89 100644 --- a/freebsd/sys/dev/usb/input/wsp.c +++ b/freebsd/sys/dev/usb/input/wsp.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/dev/usb/net/if_aue.c b/freebsd/sys/dev/usb/net/if_aue.c index b79959f9..bc5e1003 100644 --- a/freebsd/sys/dev/usb/net/if_aue.c +++ b/freebsd/sys/dev/usb/net/if_aue.c @@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/net/if_axe.c b/freebsd/sys/dev/usb/net/if_axe.c index 35b9ca2e..d071d67c 100644 --- a/freebsd/sys/dev/usb/net/if_axe.c +++ b/freebsd/sys/dev/usb/net/if_axe.c @@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$"); * http://www.asix.com.tw/FrootAttach/datasheet/AX88772_datasheet_Rev10.pdf */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/condvar.h> diff --git a/freebsd/sys/dev/usb/net/if_axge.c b/freebsd/sys/dev/usb/net/if_axge.c index fd50dcdf..c4310c94 100644 --- a/freebsd/sys/dev/usb/net/if_axge.c +++ b/freebsd/sys/dev/usb/net/if_axge.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); * ASIX Electronics AX88178A/AX88179 USB 2.0/3.0 gigabit ethernet driver. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/condvar.h> diff --git a/freebsd/sys/dev/usb/net/if_cdce.c b/freebsd/sys/dev/usb/net/if_cdce.c index ecab60ea..b42e6a31 100644 --- a/freebsd/sys/dev/usb/net/if_cdce.c +++ b/freebsd/sys/dev/usb/net/if_cdce.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/net/if_cue.c b/freebsd/sys/dev/usb/net/if_cue.c index 7110f78e..a5a3e950 100644 --- a/freebsd/sys/dev/usb/net/if_cue.c +++ b/freebsd/sys/dev/usb/net/if_cue.c @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/net/if_ipheth.c b/freebsd/sys/dev/usb/net/if_ipheth.c index 025d5208..513499b5 100644 --- a/freebsd/sys/dev/usb/net/if_ipheth.c +++ b/freebsd/sys/dev/usb/net/if_ipheth.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/net/if_kue.c b/freebsd/sys/dev/usb/net/if_kue.c index 02d3322c..e1282f37 100644 --- a/freebsd/sys/dev/usb/net/if_kue.c +++ b/freebsd/sys/dev/usb/net/if_kue.c @@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/net/if_mos.c b/freebsd/sys/dev/usb/net/if_mos.c index 4c997fa4..9cc23f67 100644 --- a/freebsd/sys/dev/usb/net/if_mos.c +++ b/freebsd/sys/dev/usb/net/if_mos.c @@ -100,7 +100,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/net/if_rue.c b/freebsd/sys/dev/usb/net/if_rue.c index d64e1e0a..669c5ac8 100644 --- a/freebsd/sys/dev/usb/net/if_rue.c +++ b/freebsd/sys/dev/usb/net/if_rue.c @@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/net/if_smsc.c b/freebsd/sys/dev/usb/net/if_smsc.c index 5176fda9..c63b5322 100644 --- a/freebsd/sys/dev/usb/net/if_smsc.c +++ b/freebsd/sys/dev/usb/net/if_smsc.c @@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$"); */ #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/net/if_udav.c b/freebsd/sys/dev/usb/net/if_udav.c index f4fcc4a5..1b1e3cbe 100644 --- a/freebsd/sys/dev/usb/net/if_udav.c +++ b/freebsd/sys/dev/usb/net/if_udav.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/net/if_ure.c b/freebsd/sys/dev/usb/net/if_ure.c index d5778ce4..649d496c 100644 --- a/freebsd/sys/dev/usb/net/if_ure.c +++ b/freebsd/sys/dev/usb/net/if_ure.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/condvar.h> diff --git a/freebsd/sys/dev/usb/net/ruephy.c b/freebsd/sys/dev/usb/net/ruephy.c index d6db6a04..af01d23b 100644 --- a/freebsd/sys/dev/usb/net/ruephy.c +++ b/freebsd/sys/dev/usb/net/ruephy.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); * driver for RealTek RTL8150 internal PHY */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/dev/usb/net/usb_ethernet.c b/freebsd/sys/dev/usb/net/usb_ethernet.c index 7b9bfa19..fa594d6c 100644 --- a/freebsd/sys/dev/usb/net/usb_ethernet.c +++ b/freebsd/sys/dev/usb/net/usb_ethernet.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/condvar.h> diff --git a/freebsd/sys/dev/usb/net/usb_ethernet.h b/freebsd/sys/dev/usb/net/usb_ethernet.h index 09a48e27..d22e5d9b 100644 --- a/freebsd/sys/dev/usb/net/usb_ethernet.h +++ b/freebsd/sys/dev/usb/net/usb_ethernet.h @@ -31,7 +31,7 @@ #include <rtems/bsd/local/opt_inet.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/freebsd/sys/dev/usb/quirk/usb_quirk.c b/freebsd/sys/dev/usb/quirk/usb_quirk.c index 794bb0b0..993068c6 100644 --- a/freebsd/sys/dev/usb/quirk/usb_quirk.c +++ b/freebsd/sys/dev/usb/quirk/usb_quirk.c @@ -30,7 +30,7 @@ #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/u3g.c b/freebsd/sys/dev/usb/serial/u3g.c index 2f3289f0..520a414e 100644 --- a/freebsd/sys/dev/usb/serial/u3g.c +++ b/freebsd/sys/dev/usb/serial/u3g.c @@ -35,7 +35,7 @@ #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/uark.c b/freebsd/sys/dev/usb/serial/uark.c index c04516ac..4eb6ddf6 100644 --- a/freebsd/sys/dev/usb/serial/uark.c +++ b/freebsd/sys/dev/usb/serial/uark.c @@ -28,7 +28,7 @@ #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/ubsa.c b/freebsd/sys/dev/usb/serial/ubsa.c index a83163a2..5c8643f2 100644 --- a/freebsd/sys/dev/usb/serial/ubsa.c +++ b/freebsd/sys/dev/usb/serial/ubsa.c @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/ubser.c b/freebsd/sys/dev/usb/serial/ubser.c index fbac4c76..00787abb 100644 --- a/freebsd/sys/dev/usb/serial/ubser.c +++ b/freebsd/sys/dev/usb/serial/ubser.c @@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/uchcom.c b/freebsd/sys/dev/usb/serial/uchcom.c index 6daef909..338dc9bb 100644 --- a/freebsd/sys/dev/usb/serial/uchcom.c +++ b/freebsd/sys/dev/usb/serial/uchcom.c @@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/ucycom.c b/freebsd/sys/dev/usb/serial/ucycom.c index 09f90ab3..b214609f 100644 --- a/freebsd/sys/dev/usb/serial/ucycom.c +++ b/freebsd/sys/dev/usb/serial/ucycom.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/ufoma.c b/freebsd/sys/dev/usb/serial/ufoma.c index 6a481add..b48f062c 100644 --- a/freebsd/sys/dev/usb/serial/ufoma.c +++ b/freebsd/sys/dev/usb/serial/ufoma.c @@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/uftdi.c b/freebsd/sys/dev/usb/serial/uftdi.c index 3445b4c7..0e3f29eb 100644 --- a/freebsd/sys/dev/usb/serial/uftdi.c +++ b/freebsd/sys/dev/usb/serial/uftdi.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/ugensa.c b/freebsd/sys/dev/usb/serial/ugensa.c index 3e6680dc..2eb62fb0 100644 --- a/freebsd/sys/dev/usb/serial/ugensa.c +++ b/freebsd/sys/dev/usb/serial/ugensa.c @@ -39,7 +39,7 @@ #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/uipaq.c b/freebsd/sys/dev/usb/serial/uipaq.c index e4eb0dab..77fea226 100644 --- a/freebsd/sys/dev/usb/serial/uipaq.c +++ b/freebsd/sys/dev/usb/serial/uipaq.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/ulpt.c b/freebsd/sys/dev/usb/serial/ulpt.c index 77600bf7..c0780c40 100644 --- a/freebsd/sys/dev/usb/serial/ulpt.c +++ b/freebsd/sys/dev/usb/serial/ulpt.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/umcs.c b/freebsd/sys/dev/usb/serial/umcs.c index 97712ed6..fac1b6e4 100644 --- a/freebsd/sys/dev/usb/serial/umcs.c +++ b/freebsd/sys/dev/usb/serial/umcs.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/umct.c b/freebsd/sys/dev/usb/serial/umct.c index 6b41fa94..2dd1d257 100644 --- a/freebsd/sys/dev/usb/serial/umct.c +++ b/freebsd/sys/dev/usb/serial/umct.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/umodem.c b/freebsd/sys/dev/usb/serial/umodem.c index f0d14914..0d1966ac 100644 --- a/freebsd/sys/dev/usb/serial/umodem.c +++ b/freebsd/sys/dev/usb/serial/umodem.c @@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/umoscom.c b/freebsd/sys/dev/usb/serial/umoscom.c index 87a47c15..edfab5c9 100644 --- a/freebsd/sys/dev/usb/serial/umoscom.c +++ b/freebsd/sys/dev/usb/serial/umoscom.c @@ -21,7 +21,7 @@ #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/uplcom.c b/freebsd/sys/dev/usb/serial/uplcom.c index 31b58670..0247422b 100644 --- a/freebsd/sys/dev/usb/serial/uplcom.c +++ b/freebsd/sys/dev/usb/serial/uplcom.c @@ -81,7 +81,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/usb_serial.c b/freebsd/sys/dev/usb/serial/usb_serial.c index f494b10c..dc3cf40d 100644 --- a/freebsd/sys/dev/usb/serial/usb_serial.c +++ b/freebsd/sys/dev/usb/serial/usb_serial.c @@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/uslcom.c b/freebsd/sys/dev/usb/serial/uslcom.c index 03cc96bc..865a2393 100644 --- a/freebsd/sys/dev/usb/serial/uslcom.c +++ b/freebsd/sys/dev/usb/serial/uslcom.c @@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/uvisor.c b/freebsd/sys/dev/usb/serial/uvisor.c index e26c596e..7941cf76 100644 --- a/freebsd/sys/dev/usb/serial/uvisor.c +++ b/freebsd/sys/dev/usb/serial/uvisor.c @@ -51,7 +51,7 @@ #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/serial/uvscom.c b/freebsd/sys/dev/usb/serial/uvscom.c index deb80011..8065d3bc 100644 --- a/freebsd/sys/dev/usb/serial/uvscom.c +++ b/freebsd/sys/dev/usb/serial/uvscom.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/storage/umass.c b/freebsd/sys/dev/usb/storage/umass.c index e8ee210a..d699c63b 100644 --- a/freebsd/sys/dev/usb/storage/umass.c +++ b/freebsd/sys/dev/usb/storage/umass.c @@ -106,7 +106,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_busdma.c b/freebsd/sys/dev/usb/usb_busdma.c index 16fc7f7b..3d6b90c5 100644 --- a/freebsd/sys/dev/usb/usb_busdma.c +++ b/freebsd/sys/dev/usb/usb_busdma.c @@ -31,7 +31,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_core.c b/freebsd/sys/dev/usb/usb_core.c index a74bdcaa..5a20d53f 100644 --- a/freebsd/sys/dev/usb/usb_core.c +++ b/freebsd/sys/dev/usb/usb_core.c @@ -37,7 +37,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_debug.c b/freebsd/sys/dev/usb/usb_debug.c index f9e08af9..e951a34b 100644 --- a/freebsd/sys/dev/usb/usb_debug.c +++ b/freebsd/sys/dev/usb/usb_debug.c @@ -31,7 +31,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_dev.c b/freebsd/sys/dev/usb/usb_dev.c index da96a991..99940759 100644 --- a/freebsd/sys/dev/usb/usb_dev.c +++ b/freebsd/sys/dev/usb/usb_dev.c @@ -34,7 +34,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_device.c b/freebsd/sys/dev/usb/usb_device.c index 06e70503..6a5cd629 100644 --- a/freebsd/sys/dev/usb/usb_device.c +++ b/freebsd/sys/dev/usb/usb_device.c @@ -31,7 +31,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_dynamic.c b/freebsd/sys/dev/usb/usb_dynamic.c index 993344d3..2a62a7f2 100644 --- a/freebsd/sys/dev/usb/usb_dynamic.c +++ b/freebsd/sys/dev/usb/usb_dynamic.c @@ -31,7 +31,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_error.c b/freebsd/sys/dev/usb/usb_error.c index 345d9e8e..fe971271 100644 --- a/freebsd/sys/dev/usb/usb_error.c +++ b/freebsd/sys/dev/usb/usb_error.c @@ -31,7 +31,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_generic.c b/freebsd/sys/dev/usb/usb_generic.c index c0873a6a..c32481fd 100644 --- a/freebsd/sys/dev/usb/usb_generic.c +++ b/freebsd/sys/dev/usb/usb_generic.c @@ -31,7 +31,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_handle_request.c b/freebsd/sys/dev/usb/usb_handle_request.c index 308df345..92a9455d 100644 --- a/freebsd/sys/dev/usb/usb_handle_request.c +++ b/freebsd/sys/dev/usb/usb_handle_request.c @@ -31,7 +31,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_hid.c b/freebsd/sys/dev/usb/usb_hid.c index 9d9c9988..089db280 100644 --- a/freebsd/sys/dev/usb/usb_hid.c +++ b/freebsd/sys/dev/usb/usb_hid.c @@ -37,7 +37,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_hub.c b/freebsd/sys/dev/usb/usb_hub.c index b3ee8ab7..0ca9f055 100644 --- a/freebsd/sys/dev/usb/usb_hub.c +++ b/freebsd/sys/dev/usb/usb_hub.c @@ -37,7 +37,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_lookup.c b/freebsd/sys/dev/usb/usb_lookup.c index 5dea5188..13e0b8b2 100644 --- a/freebsd/sys/dev/usb/usb_lookup.c +++ b/freebsd/sys/dev/usb/usb_lookup.c @@ -31,7 +31,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_mbuf.c b/freebsd/sys/dev/usb/usb_mbuf.c index dc78a10f..168f6122 100644 --- a/freebsd/sys/dev/usb/usb_mbuf.c +++ b/freebsd/sys/dev/usb/usb_mbuf.c @@ -31,7 +31,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_msctest.c b/freebsd/sys/dev/usb/usb_msctest.c index 58849f13..d5d23c16 100644 --- a/freebsd/sys/dev/usb/usb_msctest.c +++ b/freebsd/sys/dev/usb/usb_msctest.c @@ -39,7 +39,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_parse.c b/freebsd/sys/dev/usb/usb_parse.c index 196a02a5..e88389fc 100644 --- a/freebsd/sys/dev/usb/usb_parse.c +++ b/freebsd/sys/dev/usb/usb_parse.c @@ -31,7 +31,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_process.c b/freebsd/sys/dev/usb/usb_process.c index 060cc18a..1c435f1c 100644 --- a/freebsd/sys/dev/usb/usb_process.c +++ b/freebsd/sys/dev/usb/usb_process.c @@ -31,7 +31,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_request.c b/freebsd/sys/dev/usb/usb_request.c index 2d7634a2..9ad89263 100644 --- a/freebsd/sys/dev/usb/usb_request.c +++ b/freebsd/sys/dev/usb/usb_request.c @@ -33,7 +33,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_transfer.c b/freebsd/sys/dev/usb/usb_transfer.c index 9cd40349..2d642918 100644 --- a/freebsd/sys/dev/usb/usb_transfer.c +++ b/freebsd/sys/dev/usb/usb_transfer.c @@ -31,7 +31,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/usb_util.c b/freebsd/sys/dev/usb/usb_util.c index 377c2341..92ebb372 100644 --- a/freebsd/sys/dev/usb/usb_util.c +++ b/freebsd/sys/dev/usb/usb_util.c @@ -31,7 +31,7 @@ #else #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/dev/usb/wlan/if_rsu.c b/freebsd/sys/dev/usb/wlan/if_rsu.c index 21d67465..659e178a 100644 --- a/freebsd/sys/dev/usb/wlan/if_rsu.c +++ b/freebsd/sys/dev/usb/wlan/if_rsu.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #ifdef __rtems__ #define __LINUX_ERRNO_EXTENSIONS__ #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/endian.h> #include <sys/sockio.h> #include <sys/malloc.h> diff --git a/freebsd/sys/dev/usb/wlan/if_rum.c b/freebsd/sys/dev/usb/wlan/if_rum.c index 897f9c00..24d736f8 100644 --- a/freebsd/sys/dev/usb/wlan/if_rum.c +++ b/freebsd/sys/dev/usb/wlan/if_rum.c @@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$"); * http://www.ralinktech.com.tw/ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sockio.h> #include <sys/sysctl.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/dev/usb/wlan/if_run.c b/freebsd/sys/dev/usb/wlan/if_run.c index 5af8e859..30338924 100644 --- a/freebsd/sys/dev/usb/wlan/if_run.c +++ b/freebsd/sys/dev/usb/wlan/if_run.c @@ -27,7 +27,7 @@ __FBSDID("$FreeBSD$"); * http://www.ralinktech.com/ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sockio.h> #include <sys/sysctl.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/dev/usb/wlan/if_uath.c b/freebsd/sys/dev/usb/wlan/if_uath.c index c0c339e0..62045870 100644 --- a/freebsd/sys/dev/usb/wlan/if_uath.c +++ b/freebsd/sys/dev/usb/wlan/if_uath.c @@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$"); * for these devices does not work in this way and so does not work * with this driver. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sockio.h> #include <sys/sysctl.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/dev/usb/wlan/if_upgt.c b/freebsd/sys/dev/usb/wlan/if_upgt.c index 50acf468..8f19f63b 100644 --- a/freebsd/sys/dev/usb/wlan/if_upgt.c +++ b/freebsd/sys/dev/usb/wlan/if_upgt.c @@ -19,7 +19,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/endian.h> diff --git a/freebsd/sys/dev/usb/wlan/if_ural.c b/freebsd/sys/dev/usb/wlan/if_ural.c index 0e380ec0..3595160e 100644 --- a/freebsd/sys/dev/usb/wlan/if_ural.c +++ b/freebsd/sys/dev/usb/wlan/if_ural.c @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); * http://www.ralinktech.com/ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sockio.h> #include <sys/sysctl.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/dev/usb/wlan/if_urtw.c b/freebsd/sys/dev/usb/wlan/if_urtw.c index 74fcee28..14865bcf 100644 --- a/freebsd/sys/dev/usb/wlan/if_urtw.c +++ b/freebsd/sys/dev/usb/wlan/if_urtw.c @@ -18,7 +18,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sockio.h> #include <sys/sysctl.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/dev/usb/wlan/if_zyd.c b/freebsd/sys/dev/usb/wlan/if_zyd.c index 1208d185..4827552a 100644 --- a/freebsd/sys/dev/usb/wlan/if_zyd.c +++ b/freebsd/sys/dev/usb/wlan/if_zyd.c @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); * ZyDAS ZD1211/ZD1211B USB WLAN driver. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/sockio.h> #include <sys/sysctl.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/fs/devfs/devfs_vnops.c b/freebsd/sys/fs/devfs/devfs_vnops.c index 31231fdd..defa10b9 100644 --- a/freebsd/sys/fs/devfs/devfs_vnops.c +++ b/freebsd/sys/fs/devfs/devfs_vnops.c @@ -41,7 +41,7 @@ * mkdir: want it ? */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> #include <sys/dirent.h> diff --git a/freebsd/sys/h8300/h8300/in_cksum.c b/freebsd/sys/h8300/h8300/in_cksum.c index 7c680bbe..22e19d83 100644 --- a/freebsd/sys/h8300/h8300/in_cksum.c +++ b/freebsd/sys/h8300/h8300/in_cksum.c @@ -40,7 +40,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/i386/i386/in_cksum.c b/freebsd/sys/i386/i386/in_cksum.c index d16f6c21..34a7228f 100644 --- a/freebsd/sys/i386/i386/in_cksum.c +++ b/freebsd/sys/i386/i386/in_cksum.c @@ -35,7 +35,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/i386/i386/legacy.c b/freebsd/sys/i386/i386/legacy.c index b3298d9a..50fa9aa2 100644 --- a/freebsd/sys/i386/i386/legacy.c +++ b/freebsd/sys/i386/i386/legacy.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); * support ACPI or when ACPI support is not present in the kernel. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/cpu.h> diff --git a/freebsd/sys/kern/init_main.c b/freebsd/sys/kern/init_main.c index 910c1820..d1ca1f8d 100644 --- a/freebsd/sys/kern/init_main.c +++ b/freebsd/sys/kern/init_main.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_init_path.h> #include <rtems/bsd/local/opt_verbose_sysinit.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/exec.h> #include <sys/file.h> @@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/sys/unistd.h> #include <sys/malloc.h> #include <sys/conf.h> -#include <rtems/bsd/sys/cpuset.h> +#include <sys/cpuset.h> #include <machine/cpu.h> diff --git a/freebsd/sys/kern/kern_condvar.c b/freebsd/sys/kern/kern_condvar.c index 2843e273..2ce55374 100644 --- a/freebsd/sys/kern/kern_condvar.c +++ b/freebsd/sys/kern/kern_condvar.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ktrace.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/limits.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/kern/kern_conf.c b/freebsd/sys/kern/kern_conf.c index f008fc0c..ce099541 100644 --- a/freebsd/sys/kern/kern_conf.c +++ b/freebsd/sys/kern/kern_conf.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> #include <sys/bus.h> diff --git a/freebsd/sys/kern/kern_event.c b/freebsd/sys/kern/kern_event.c index a01e9b4b..880c079d 100644 --- a/freebsd/sys/kern/kern_event.c +++ b/freebsd/sys/kern/kern_event.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ktrace.h> #include <rtems/bsd/local/opt_kqueue.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/capsicum.h> #include <sys/kernel.h> diff --git a/freebsd/sys/kern/kern_hhook.c b/freebsd/sys/kern/kern_hhook.c index 2efdc533..af2dcf61 100644 --- a/freebsd/sys/kern/kern_hhook.c +++ b/freebsd/sys/kern/kern_hhook.c @@ -39,7 +39,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/hhook.h> #include <sys/khelp.h> diff --git a/freebsd/sys/kern/kern_intr.c b/freebsd/sys/kern/kern_intr.c index 4f6f6414..b1547da7 100644 --- a/freebsd/sys/kern/kern_intr.c +++ b/freebsd/sys/kern/kern_intr.c @@ -32,10 +32,10 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ddb.h> #include <rtems/bsd/local/opt_kstack_usage_prof.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/bus.h> #include <sys/conf.h> -#include <rtems/bsd/sys/cpuset.h> +#include <sys/cpuset.h> #include <sys/rtprio.h> #include <sys/systm.h> #include <sys/interrupt.h> diff --git a/freebsd/sys/kern/kern_khelp.c b/freebsd/sys/kern/kern_khelp.c index e1192ae8..490d11b6 100644 --- a/freebsd/sys/kern/kern_khelp.c +++ b/freebsd/sys/kern/kern_khelp.c @@ -39,7 +39,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/hhook.h> #include <sys/khelp.h> diff --git a/freebsd/sys/kern/kern_linker.c b/freebsd/sys/kern/kern_linker.c index 5a69490d..c592c15b 100644 --- a/freebsd/sys/kern/kern_linker.c +++ b/freebsd/sys/kern/kern_linker.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_kld.h> #include <rtems/bsd/local/opt_hwpmc_hooks.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/freebsd/sys/kern/kern_mbuf.c b/freebsd/sys/kern/kern_mbuf.c index 6229b836..c198e930 100644 --- a/freebsd/sys/kern/kern_mbuf.c +++ b/freebsd/sys/kern/kern_mbuf.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_param.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/malloc.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/freebsd/sys/kern/kern_mib.c b/freebsd/sys/kern/kern_mib.c index b3ab9e9f..436860a4 100644 --- a/freebsd/sys/kern/kern_mib.c +++ b/freebsd/sys/kern/kern_mib.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_posix.h> #include <rtems/bsd/local/opt_config.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/jail.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/kern/kern_module.c b/freebsd/sys/kern/kern_module.c index fb910e3c..0b239f03 100644 --- a/freebsd/sys/kern/kern_module.c +++ b/freebsd/sys/kern/kern_module.c @@ -31,7 +31,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> #include <sys/eventhandler.h> diff --git a/freebsd/sys/kern/kern_mtxpool.c b/freebsd/sys/kern/kern_mtxpool.c index e778ec31..70ebe84d 100644 --- a/freebsd/sys/kern/kern_mtxpool.c +++ b/freebsd/sys/kern/kern_mtxpool.c @@ -48,7 +48,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/proc.h> #include <sys/kernel.h> #include <sys/ktr.h> diff --git a/freebsd/sys/kern/kern_osd.c b/freebsd/sys/kern/kern_osd.c index 71dd6289..cd4d322e 100644 --- a/freebsd/sys/kern/kern_osd.c +++ b/freebsd/sys/kern/kern_osd.c @@ -29,11 +29,11 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> #include <sys/sysctl.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/jail.h> #include <sys/malloc.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/kern/kern_synch.c b/freebsd/sys/kern/kern_synch.c index 91b3c72b..8bb5607c 100644 --- a/freebsd/sys/kern/kern_synch.c +++ b/freebsd/sys/kern/kern_synch.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ktrace.h> #include <rtems/bsd/local/opt_sched.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/condvar.h> #include <sys/kdb.h> diff --git a/freebsd/sys/kern/kern_sysctl.c b/freebsd/sys/kern/kern_sysctl.c index 0f003907..6767e48d 100644 --- a/freebsd/sys/kern/kern_sysctl.c +++ b/freebsd/sys/kern/kern_sysctl.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_compat.h> #include <rtems/bsd/local/opt_ktrace.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/fail.h> #include <sys/systm.h> #include <sys/capsicum.h> diff --git a/freebsd/sys/kern/kern_time.c b/freebsd/sys/kern/kern_time.c index 2fc7092f..6683173b 100644 --- a/freebsd/sys/kern/kern_time.c +++ b/freebsd/sys/kern/kern_time.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ktrace.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/limits.h> #include <sys/clock.h> diff --git a/freebsd/sys/kern/kern_timeout.c b/freebsd/sys/kern/kern_timeout.c index 17d23ba6..1c76ec2f 100644 --- a/freebsd/sys/kern/kern_timeout.c +++ b/freebsd/sys/kern/kern_timeout.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #endif #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/callout.h> diff --git a/freebsd/sys/kern/kern_uuid.c b/freebsd/sys/kern/kern_uuid.c index ebcdfab8..704125e0 100644 --- a/freebsd/sys/kern/kern_uuid.c +++ b/freebsd/sys/kern/kern_uuid.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/endian.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/kern/subr_bufring.c b/freebsd/sys/kern/subr_bufring.c index f40f0d76..00b3a10a 100644 --- a/freebsd/sys/kern/subr_bufring.c +++ b/freebsd/sys/kern/subr_bufring.c @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/kern/subr_bus.c b/freebsd/sys/kern/subr_bus.c index cf94de2f..4a4ceef9 100644 --- a/freebsd/sys/kern/subr_bus.c +++ b/freebsd/sys/kern/subr_bus.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_bus.h> #include <rtems/bsd/local/opt_ddb.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/conf.h> #include <sys/filio.h> #include <rtems/bsd/sys/lock.h> @@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$"); #include <sys/uio.h> #include <sys/bus.h> #include <sys/interrupt.h> -#include <rtems/bsd/sys/cpuset.h> +#include <sys/cpuset.h> #include <net/vnet.h> diff --git a/freebsd/sys/kern/subr_counter.c b/freebsd/sys/kern/subr_counter.c index c34f1cac..1131fd21 100644 --- a/freebsd/sys/kern/subr_counter.c +++ b/freebsd/sys/kern/subr_counter.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/kern/subr_eventhandler.c b/freebsd/sys/kern/subr_eventhandler.c index dd20f529..609e7e80 100644 --- a/freebsd/sys/kern/subr_eventhandler.c +++ b/freebsd/sys/kern/subr_eventhandler.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> diff --git a/freebsd/sys/kern/subr_firmware.c b/freebsd/sys/kern/subr_firmware.c index 0c549bd3..060b64d0 100644 --- a/freebsd/sys/kern/subr_firmware.c +++ b/freebsd/sys/kern/subr_firmware.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/queue.h> @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/linker.h> #include <sys/firmware.h> #include <sys/priv.h> diff --git a/freebsd/sys/kern/subr_hash.c b/freebsd/sys/kern/subr_hash.c index 425fd34d..193ad1be 100644 --- a/freebsd/sys/kern/subr_hash.c +++ b/freebsd/sys/kern/subr_hash.c @@ -39,7 +39,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/freebsd/sys/kern/subr_hints.c b/freebsd/sys/kern/subr_hints.c index 4c1a6008..052eda65 100644 --- a/freebsd/sys/kern/subr_hints.c +++ b/freebsd/sys/kern/subr_hints.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> diff --git a/freebsd/sys/kern/subr_kobj.c b/freebsd/sys/kern/subr_kobj.c index 91a25cf4..fe0b3892 100644 --- a/freebsd/sys/kern/subr_kobj.c +++ b/freebsd/sys/kern/subr_kobj.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/kobj.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/kern/subr_lock.c b/freebsd/sys/kern/subr_lock.c index 7c62bca0..9046f550 100644 --- a/freebsd/sys/kern/subr_lock.c +++ b/freebsd/sys/kern/subr_lock.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ddb.h> #include <rtems/bsd/local/opt_mprof.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/ktr.h> diff --git a/freebsd/sys/kern/subr_module.c b/freebsd/sys/kern/subr_module.c index 531600c4..09cc3560 100644 --- a/freebsd/sys/kern/subr_module.c +++ b/freebsd/sys/kern/subr_module.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/linker.h> diff --git a/freebsd/sys/kern/subr_pcpu.c b/freebsd/sys/kern/subr_pcpu.c index 5c244b42..f83f0777 100644 --- a/freebsd/sys/kern/subr_pcpu.c +++ b/freebsd/sys/kern/subr_pcpu.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ddb.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/sysctl.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/kern/subr_prf.c b/freebsd/sys/kern/subr_prf.c index ffc8165f..3c87da5f 100644 --- a/freebsd/sys/kern/subr_prf.c +++ b/freebsd/sys/kern/subr_prf.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_printf.h> #endif /* _KERNEL */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #ifdef _KERNEL #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/kern/subr_rman.c b/freebsd/sys/kern/subr_rman.c index 115d5d8d..e4e74287 100644 --- a/freebsd/sys/kern/subr_rman.c +++ b/freebsd/sys/kern/subr_rman.c @@ -62,7 +62,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/limits.h> diff --git a/freebsd/sys/kern/subr_sbuf.c b/freebsd/sys/kern/subr_sbuf.c index 73a9b383..680613b1 100644 --- a/freebsd/sys/kern/subr_sbuf.c +++ b/freebsd/sys/kern/subr_sbuf.c @@ -31,11 +31,11 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #ifdef _KERNEL #include <sys/ctype.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/kernel.h> #include <sys/limits.h> #include <sys/malloc.h> diff --git a/freebsd/sys/kern/subr_sleepqueue.c b/freebsd/sys/kern/subr_sleepqueue.c index f90c7102..215a0fef 100644 --- a/freebsd/sys/kern/subr_sleepqueue.c +++ b/freebsd/sys/kern/subr_sleepqueue.c @@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_sched.h> #include <rtems/bsd/local/opt_stack.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> #include <sys/kernel.h> diff --git a/freebsd/sys/kern/subr_taskqueue.c b/freebsd/sys/kern/subr_taskqueue.c index c394869f..e543d90f 100644 --- a/freebsd/sys/kern/subr_taskqueue.c +++ b/freebsd/sys/kern/subr_taskqueue.c @@ -29,10 +29,10 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> -#include <rtems/bsd/sys/cpuset.h> +#include <sys/cpuset.h> #include <sys/interrupt.h> #include <sys/kernel.h> #include <sys/kthread.h> diff --git a/freebsd/sys/kern/subr_uio.c b/freebsd/sys/kern/subr_uio.c index 3a34e521..617dfa98 100644 --- a/freebsd/sys/kern/subr_uio.c +++ b/freebsd/sys/kern/subr_uio.c @@ -44,7 +44,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/limits.h> diff --git a/freebsd/sys/kern/subr_unit.c b/freebsd/sys/kern/subr_unit.c index cdbe5343..1541754c 100644 --- a/freebsd/sys/kern/subr_unit.c +++ b/freebsd/sys/kern/subr_unit.c @@ -69,7 +69,7 @@ * N is the number of the highest unit allocated. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/_unrhdr.h> diff --git a/freebsd/sys/kern/sys_generic.c b/freebsd/sys/kern/sys_generic.c index c3bf19f5..818fb476 100644 --- a/freebsd/sys/kern/sys_generic.c +++ b/freebsd/sys/kern/sys_generic.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_compat.h> #include <rtems/bsd/local/opt_ktrace.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/sysproto.h> #include <sys/capsicum.h> diff --git a/freebsd/sys/kern/sys_pipe.c b/freebsd/sys/kern/sys_pipe.c index 7ff0c815..c96caa12 100755 --- a/freebsd/sys/kern/sys_pipe.c +++ b/freebsd/sys/kern/sys_pipe.c @@ -96,7 +96,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> #include <sys/fcntl.h> diff --git a/freebsd/sys/kern/sys_socket.c b/freebsd/sys/kern/sys_socket.c index 19567b5f..59457769 100644 --- a/freebsd/sys/kern/sys_socket.c +++ b/freebsd/sys/kern/sys_socket.c @@ -34,7 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/aio.h> #include <sys/domain.h> diff --git a/freebsd/sys/kern/tty.c b/freebsd/sys/kern/tty.c index 5972e32a..6e4246b6 100644 --- a/freebsd/sys/kern/tty.c +++ b/freebsd/sys/kern/tty.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_capsicum.h> #include <rtems/bsd/local/opt_compat.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/capsicum.h> #include <sys/conf.h> #include <sys/cons.h> diff --git a/freebsd/sys/kern/tty_inq.c b/freebsd/sys/kern/tty_inq.c index 0093cb31..48318e80 100644 --- a/freebsd/sys/kern/tty_inq.c +++ b/freebsd/sys/kern/tty_inq.c @@ -32,7 +32,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/queue.h> diff --git a/freebsd/sys/kern/tty_outq.c b/freebsd/sys/kern/tty_outq.c index b6bc96d5..32a36a10 100644 --- a/freebsd/sys/kern/tty_outq.c +++ b/freebsd/sys/kern/tty_outq.c @@ -32,7 +32,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/queue.h> diff --git a/freebsd/sys/kern/tty_ttydisc.c b/freebsd/sys/kern/tty_ttydisc.c index 2cdc332a..5ecb15ea 100644 --- a/freebsd/sys/kern/tty_ttydisc.c +++ b/freebsd/sys/kern/tty_ttydisc.c @@ -32,7 +32,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/fcntl.h> #include <sys/filio.h> #include <sys/kernel.h> diff --git a/freebsd/sys/kern/uipc_accf.c b/freebsd/sys/kern/uipc_accf.c index 7d6bde25..a691ebe5 100644 --- a/freebsd/sys/kern/uipc_accf.c +++ b/freebsd/sys/kern/uipc_accf.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #define ACCEPT_FILTER_MOD #include <rtems/bsd/local/opt_param.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/domain.h> #include <sys/kernel.h> diff --git a/freebsd/sys/kern/uipc_domain.c b/freebsd/sys/kern/uipc_domain.c index ab301eb5..03b3b490 100644 --- a/freebsd/sys/kern/uipc_domain.c +++ b/freebsd/sys/kern/uipc_domain.c @@ -34,7 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/protosw.h> #include <sys/domain.h> diff --git a/freebsd/sys/kern/uipc_mbuf.c b/freebsd/sys/kern/uipc_mbuf.c index 74f4f0b4..4deab1ae 100644 --- a/freebsd/sys/kern/uipc_mbuf.c +++ b/freebsd/sys/kern/uipc_mbuf.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_mbuf_stress_test.h> #include <rtems/bsd/local/opt_mbuf_profiling.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/limits.h> diff --git a/freebsd/sys/kern/uipc_mbuf2.c b/freebsd/sys/kern/uipc_mbuf2.c index dd73910d..a7c5dac3 100644 --- a/freebsd/sys/kern/uipc_mbuf2.c +++ b/freebsd/sys/kern/uipc_mbuf2.c @@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$"); /*#define PULLDOWN_DEBUG*/ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/kern/uipc_mbufhash.c b/freebsd/sys/kern/uipc_mbufhash.c index 804510e0..5bb6ac18 100644 --- a/freebsd/sys/kern/uipc_mbufhash.c +++ b/freebsd/sys/kern/uipc_mbufhash.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/fnv_hash.h> diff --git a/freebsd/sys/kern/uipc_sockbuf.c b/freebsd/sys/kern/uipc_sockbuf.c index b2a6460a..830712ac 100644 --- a/freebsd/sys/kern/uipc_sockbuf.c +++ b/freebsd/sys/kern/uipc_sockbuf.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_param.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/aio.h> /* for aio_swake proto */ #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/kern/uipc_socket.c b/freebsd/sys/kern/uipc_socket.c index 59a52115..3bc9a1af 100644 --- a/freebsd/sys/kern/uipc_socket.c +++ b/freebsd/sys/kern/uipc_socket.c @@ -109,7 +109,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_compat.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/fcntl.h> #include <sys/limits.h> diff --git a/freebsd/sys/kern/uipc_syscalls.c b/freebsd/sys/kern/uipc_syscalls.c index 41701401..2748df43 100644 --- a/freebsd/sys/kern/uipc_syscalls.c +++ b/freebsd/sys/kern/uipc_syscalls.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_compat.h> #include <rtems/bsd/local/opt_ktrace.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/capsicum.h> #include <sys/kernel.h> diff --git a/freebsd/sys/kern/uipc_usrreq.c b/freebsd/sys/kern/uipc_usrreq.c index b3b55402..c3094a5a 100644 --- a/freebsd/sys/kern/uipc_usrreq.c +++ b/freebsd/sys/kern/uipc_usrreq.c @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ddb.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/capsicum.h> #include <sys/domain.h> #include <sys/fcntl.h> diff --git a/freebsd/sys/libkern/bcd.c b/freebsd/sys/libkern/bcd.c index 38e7d0c1..d0f2fed7 100644 --- a/freebsd/sys/libkern/bcd.c +++ b/freebsd/sys/libkern/bcd.c @@ -8,7 +8,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/libkern.h> u_char const bcd2bin_data[] = { diff --git a/freebsd/sys/libkern/inet_ntoa.c b/freebsd/sys/libkern/inet_ntoa.c index 1aa48077..4dff5a63 100644 --- a/freebsd/sys/libkern/inet_ntoa.c +++ b/freebsd/sys/libkern/inet_ntoa.c @@ -32,7 +32,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <netinet/in.h> diff --git a/freebsd/sys/lm32/lm32/in_cksum.c b/freebsd/sys/lm32/lm32/in_cksum.c index 7c680bbe..22e19d83 100644 --- a/freebsd/sys/lm32/lm32/in_cksum.c +++ b/freebsd/sys/lm32/lm32/in_cksum.c @@ -40,7 +40,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/m32c/m32c/in_cksum.c b/freebsd/sys/m32c/m32c/in_cksum.c index 7c680bbe..22e19d83 100644 --- a/freebsd/sys/m32c/m32c/in_cksum.c +++ b/freebsd/sys/m32c/m32c/in_cksum.c @@ -40,7 +40,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/m32r/m32r/in_cksum.c b/freebsd/sys/m32r/m32r/in_cksum.c index 7c680bbe..22e19d83 100644 --- a/freebsd/sys/m32r/m32r/in_cksum.c +++ b/freebsd/sys/m32r/m32r/in_cksum.c @@ -40,7 +40,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/m68k/m68k/in_cksum.c b/freebsd/sys/m68k/m68k/in_cksum.c index 7c680bbe..22e19d83 100644 --- a/freebsd/sys/m68k/m68k/in_cksum.c +++ b/freebsd/sys/m68k/m68k/in_cksum.c @@ -40,7 +40,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/mips/mips/in_cksum.c b/freebsd/sys/mips/mips/in_cksum.c index 7c680bbe..22e19d83 100644 --- a/freebsd/sys/mips/mips/in_cksum.c +++ b/freebsd/sys/mips/mips/in_cksum.c @@ -40,7 +40,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/net/altq/altq.h b/freebsd/sys/net/altq/altq.h index 5d7eab8a..9cb97bc2 100644 --- a/freebsd/sys/net/altq/altq.h +++ b/freebsd/sys/net/altq/altq.h @@ -39,7 +39,7 @@ #endif #ifdef ALTQ3_COMPAT -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ioccom.h> #include <sys/queue.h> #include <netinet/in.h> diff --git a/freebsd/sys/net/altq/altq_cbq.c b/freebsd/sys/net/altq/altq_cbq.c index b8593fd6..1631d145 100644 --- a/freebsd/sys/net/altq/altq_cbq.c +++ b/freebsd/sys/net/altq/altq_cbq.c @@ -38,13 +38,13 @@ #include <rtems/bsd/local/opt_inet6.h> #ifdef ALTQ_CBQ /* cbq is enabled by ALTQ_CBQ option in opt_altq.h */ -#include <rtems/bsd/sys/param.h> +#include <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 <sys/errno.h> #include <sys/time.h> #ifdef ALTQ3_COMPAT #include <sys/uio.h> diff --git a/freebsd/sys/net/altq/altq_cdnr.c b/freebsd/sys/net/altq/altq_cdnr.c index f456ce83..0f4eeec1 100644 --- a/freebsd/sys/net/altq/altq_cdnr.c +++ b/freebsd/sys/net/altq/altq_cdnr.c @@ -33,14 +33,14 @@ #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <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/errno.h> #include <sys/kernel.h> #include <sys/queue.h> diff --git a/freebsd/sys/net/altq/altq_codel.c b/freebsd/sys/net/altq/altq_codel.c index 438120f5..37a44216 100644 --- a/freebsd/sys/net/altq/altq_codel.c +++ b/freebsd/sys/net/altq/altq_codel.c @@ -47,7 +47,7 @@ #ifdef ALTQ_CODEL /* CoDel is enabled by ALTQ_CODEL option in opt_altq.h */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/freebsd/sys/net/altq/altq_fairq.c b/freebsd/sys/net/altq/altq_fairq.c index efb58d3f..9979a1fa 100644 --- a/freebsd/sys/net/altq/altq_fairq.c +++ b/freebsd/sys/net/altq/altq_fairq.c @@ -93,14 +93,14 @@ #ifdef ALTQ_FAIRQ /* fairq is enabled in the kernel conf */ -#include <rtems/bsd/sys/param.h> +#include <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/errno.h> #include <sys/kernel.h> #include <sys/queue.h> diff --git a/freebsd/sys/net/altq/altq_hfsc.c b/freebsd/sys/net/altq/altq_hfsc.c index f7a18296..d31d55c3 100644 --- a/freebsd/sys/net/altq/altq_hfsc.c +++ b/freebsd/sys/net/altq/altq_hfsc.c @@ -50,12 +50,12 @@ #ifdef ALTQ_HFSC /* hfsc is enabled by ALTQ_HFSC option in opt_altq.h */ -#include <rtems/bsd/sys/param.h> +#include <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/errno.h> #include <sys/queue.h> #if 1 /* ALTQ3_COMPAT */ #include <sys/sockio.h> diff --git a/freebsd/sys/net/altq/altq_priq.c b/freebsd/sys/net/altq/altq_priq.c index d257ae3c..46a014ad 100644 --- a/freebsd/sys/net/altq/altq_priq.c +++ b/freebsd/sys/net/altq/altq_priq.c @@ -38,14 +38,14 @@ #ifdef ALTQ_PRIQ /* priq is enabled by ALTQ_PRIQ option in opt_altq.h */ -#include <rtems/bsd/sys/param.h> +#include <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/errno.h> #include <sys/kernel.h> #include <sys/queue.h> diff --git a/freebsd/sys/net/altq/altq_red.c b/freebsd/sys/net/altq/altq_red.c index f83b7b50..3ac0e0ec 100644 --- a/freebsd/sys/net/altq/altq_red.c +++ b/freebsd/sys/net/altq/altq_red.c @@ -67,12 +67,12 @@ #include <rtems/bsd/local/opt_inet6.h> #ifdef ALTQ_RED /* red is enabled by ALTQ_RED option in opt_altq.h */ -#include <rtems/bsd/sys/param.h> +#include <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/errno.h> #if 1 /* ALTQ3_COMPAT */ #include <sys/sockio.h> #include <sys/proc.h> diff --git a/freebsd/sys/net/altq/altq_rio.c b/freebsd/sys/net/altq/altq_rio.c index bad0257c..4e8a1158 100644 --- a/freebsd/sys/net/altq/altq_rio.c +++ b/freebsd/sys/net/altq/altq_rio.c @@ -66,12 +66,12 @@ #include <rtems/bsd/local/opt_inet6.h> #ifdef ALTQ_RIO /* rio is enabled by ALTQ_RIO option in opt_altq.h */ -#include <rtems/bsd/sys/param.h> +#include <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/errno.h> #if 1 /* ALTQ3_COMPAT */ #include <sys/proc.h> #include <sys/sockio.h> diff --git a/freebsd/sys/net/altq/altq_rmclass.c b/freebsd/sys/net/altq/altq_rmclass.c index 160884e2..9ba3eb25 100644 --- a/freebsd/sys/net/altq/altq_rmclass.c +++ b/freebsd/sys/net/altq/altq_rmclass.c @@ -44,12 +44,12 @@ #include <rtems/bsd/local/opt_inet6.h> #ifdef ALTQ_CBQ /* cbq is enabled by ALTQ_CBQ option in opt_altq.h */ -#include <rtems/bsd/sys/param.h> +#include <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/errno.h> #include <sys/time.h> #ifdef ALTQ3_COMPAT #include <sys/kernel.h> diff --git a/freebsd/sys/net/altq/altq_subr.c b/freebsd/sys/net/altq/altq_subr.c index a9a68b37..6a385560 100644 --- a/freebsd/sys/net/altq/altq_subr.c +++ b/freebsd/sys/net/altq/altq_subr.c @@ -33,7 +33,7 @@ #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/systm.h> @@ -41,7 +41,7 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/kernel.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/syslog.h> #include <sys/sysctl.h> #include <sys/queue.h> diff --git a/freebsd/sys/net/altq/altq_var.h b/freebsd/sys/net/altq/altq_var.h index 2ddcb211..1909599d 100644 --- a/freebsd/sys/net/altq/altq_var.h +++ b/freebsd/sys/net/altq/altq_var.h @@ -31,7 +31,7 @@ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/queue.h> diff --git a/freebsd/sys/net/bpf.c b/freebsd/sys/net/bpf.c index 41e22db7..5b744f79 100644 --- a/freebsd/sys/net/bpf.c +++ b/freebsd/sys/net/bpf.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_netgraph.h> #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/rwlock.h> #include <sys/systm.h> diff --git a/freebsd/sys/net/bpf_buffer.c b/freebsd/sys/net/bpf_buffer.c index 0bfb9c06..88af8425 100644 --- a/freebsd/sys/net/bpf_buffer.c +++ b/freebsd/sys/net/bpf_buffer.c @@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_bpf.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/freebsd/sys/net/bpf_filter.c b/freebsd/sys/net/bpf_filter.c index 9e5fbb0f..6eec4b9c 100644 --- a/freebsd/sys/net/bpf_filter.c +++ b/freebsd/sys/net/bpf_filter.c @@ -39,7 +39,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #if !defined(_KERNEL) #include <strings.h> diff --git a/freebsd/sys/net/bpf_jitter.c b/freebsd/sys/net/bpf_jitter.c index 10850b97..a597f626 100644 --- a/freebsd/sys/net/bpf_jitter.c +++ b/freebsd/sys/net/bpf_jitter.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #ifdef _KERNEL #include <rtems/bsd/local/opt_bpf.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/mbuf.h> @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #else #include <stdlib.h> #include <sys/mman.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #endif diff --git a/freebsd/sys/net/bridgestp.c b/freebsd/sys/net/bridgestp.c index 5fea7ae7..a0e5ccad 100644 --- a/freebsd/sys/net/bridgestp.c +++ b/freebsd/sys/net/bridgestp.c @@ -39,7 +39,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/freebsd/sys/net/ieee8023ad_lacp.c b/freebsd/sys/net/ieee8023ad_lacp.c index b20a391f..3e1e6764 100644 --- a/freebsd/sys/net/ieee8023ad_lacp.c +++ b/freebsd/sys/net/ieee8023ad_lacp.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ratelimit.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/callout.h> #include <sys/eventhandler.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/net/if.c b/freebsd/sys/net/if.c index 9c98366a..81989909 100644 --- a/freebsd/sys/net/if.c +++ b/freebsd/sys/net/if.c @@ -36,7 +36,7 @@ #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_inet.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/conf.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net/if.h b/freebsd/sys/net/if.h deleted file mode 100644 index e3b801b8..00000000 --- a/freebsd/sys/net/if.h +++ /dev/null @@ -1,551 +0,0 @@ -/*- - * Copyright (c) 1982, 1986, 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)if.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD$ - */ - -#ifndef _NET_IF_H_ -#define _NET_IF_H_ - -#include <sys/cdefs.h> - -#if __BSD_VISIBLE -/* - * <net/if.h> does not depend on <sys/time.h> on most other systems. This - * helps userland compatibility. (struct timeval ifi_lastchange) - * The same holds for <sys/socket.h>. (struct sockaddr ifru_addr) - */ -#ifndef _KERNEL -#include <sys/time.h> -#include <sys/socket.h> -#endif -#endif - -/* - * Length of interface external name, including terminating '\0'. - * Note: this is the same size as a generic device's external name. - */ -#define IF_NAMESIZE 16 -#if __BSD_VISIBLE -#define IFNAMSIZ IF_NAMESIZE -#define IF_MAXUNIT 0x7fff /* historical value */ -#endif -#if __BSD_VISIBLE - -/* - * Structure used to query names of interface cloners. - */ - -struct if_clonereq { - int ifcr_total; /* total cloners (out) */ - int ifcr_count; /* room for this many in user buffer */ - char *ifcr_buffer; /* buffer for cloner names */ -}; - -/* - * Structure describing information about an interface - * which may be of interest to management entities. - */ -struct if_data { - /* generic interface information */ - uint8_t ifi_type; /* ethernet, tokenring, etc */ - uint8_t ifi_physical; /* e.g., AUI, Thinnet, 10base-T, etc */ - uint8_t ifi_addrlen; /* media address length */ - uint8_t ifi_hdrlen; /* media header length */ - uint8_t ifi_link_state; /* current link state */ - uint8_t ifi_vhid; /* carp vhid */ - uint16_t ifi_datalen; /* length of this data struct */ - uint32_t ifi_mtu; /* maximum transmission unit */ - uint32_t ifi_metric; /* routing metric (external only) */ - uint64_t ifi_baudrate; /* linespeed */ - /* volatile statistics */ - uint64_t ifi_ipackets; /* packets received on interface */ - uint64_t ifi_ierrors; /* input errors on interface */ - uint64_t ifi_opackets; /* packets sent on interface */ - uint64_t ifi_oerrors; /* output errors on interface */ - uint64_t ifi_collisions; /* collisions on csma interfaces */ - uint64_t ifi_ibytes; /* total number of octets received */ - uint64_t ifi_obytes; /* total number of octets sent */ - uint64_t ifi_imcasts; /* packets received via multicast */ - uint64_t ifi_omcasts; /* packets sent via multicast */ - uint64_t ifi_iqdrops; /* dropped on input */ - uint64_t ifi_oqdrops; /* dropped on output */ - uint64_t ifi_noproto; /* destined for unsupported protocol */ - uint64_t ifi_hwassist; /* HW offload capabilities, see IFCAP */ - - /* Unions are here to make sizes MI. */ - union { /* uptime at attach or stat reset */ - time_t tt; - uint64_t ph; - } __ifi_epoch; -#define ifi_epoch __ifi_epoch.tt - union { /* time of last administrative change */ - struct timeval tv; - struct { - uint64_t ph1; - uint64_t ph2; - } ph; - } __ifi_lastchange; -#define ifi_lastchange __ifi_lastchange.tv -}; - -/*- - * Interface flags are of two types: network stack owned flags, and driver - * owned flags. Historically, these values were stored in the same ifnet - * flags field, but with the advent of fine-grained locking, they have been - * broken out such that the network stack is responsible for synchronizing - * the stack-owned fields, and the device driver the device-owned fields. - * Both halves can perform lockless reads of the other half's field, subject - * to accepting the involved races. - * - * Both sets of flags come from the same number space, and should not be - * permitted to conflict, as they are exposed to user space via a single - * field. - * - * The following symbols identify read and write requirements for fields: - * - * (i) if_flags field set by device driver before attach, read-only there - * after. - * (n) if_flags field written only by the network stack, read by either the - * stack or driver. - * (d) if_drv_flags field written only by the device driver, read by either - * the stack or driver. - */ -#define IFF_UP 0x1 /* (n) interface is up */ -#define IFF_BROADCAST 0x2 /* (i) broadcast address valid */ -#define IFF_DEBUG 0x4 /* (n) turn on debugging */ -#define IFF_LOOPBACK 0x8 /* (i) is a loopback net */ -#define IFF_POINTOPOINT 0x10 /* (i) is a point-to-point link */ -/* 0x20 was IFF_SMART */ -#define IFF_DRV_RUNNING 0x40 /* (d) resources allocated */ -#define IFF_NOARP 0x80 /* (n) no address resolution protocol */ -#define IFF_PROMISC 0x100 /* (n) receive all packets */ -#define IFF_ALLMULTI 0x200 /* (n) receive all multicast packets */ -#define IFF_DRV_OACTIVE 0x400 /* (d) tx hardware queue is full */ -#define IFF_SIMPLEX 0x800 /* (i) can't hear own transmissions */ -#define IFF_LINK0 0x1000 /* per link layer defined bit */ -#define IFF_LINK1 0x2000 /* per link layer defined bit */ -#define IFF_LINK2 0x4000 /* per link layer defined bit */ -#define IFF_ALTPHYS IFF_LINK2 /* use alternate physical connection */ -#define IFF_MULTICAST 0x8000 /* (i) supports multicast */ -#define IFF_CANTCONFIG 0x10000 /* (i) unconfigurable using ioctl(2) */ -#define IFF_PPROMISC 0x20000 /* (n) user-requested promisc mode */ -#define IFF_MONITOR 0x40000 /* (n) user-requested monitor mode */ -#define IFF_STATICARP 0x80000 /* (n) static ARP */ -#define IFF_DYING 0x200000 /* (n) interface is winding down */ -#define IFF_RENAMING 0x400000 /* (n) interface is being renamed */ -/* - * Old names for driver flags so that user space tools can continue to use - * the old (portable) names. - */ -#ifndef _KERNEL -#define IFF_RUNNING IFF_DRV_RUNNING -#define IFF_OACTIVE IFF_DRV_OACTIVE -#endif - -/* flags set internally only: */ -#define IFF_CANTCHANGE \ - (IFF_BROADCAST|IFF_POINTOPOINT|IFF_DRV_RUNNING|IFF_DRV_OACTIVE|\ - IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_PROMISC|\ - IFF_DYING|IFF_CANTCONFIG) - -/* - * Values for if_link_state. - */ -#define LINK_STATE_UNKNOWN 0 /* link invalid/unknown */ -#define LINK_STATE_DOWN 1 /* link is down */ -#define LINK_STATE_UP 2 /* link is up */ - -/* - * Some convenience macros used for setting ifi_baudrate. - * XXX 1000 vs. 1024? --thorpej@netbsd.org - */ -#define IF_Kbps(x) ((uintmax_t)(x) * 1000) /* kilobits/sec. */ -#define IF_Mbps(x) (IF_Kbps((x) * 1000)) /* megabits/sec. */ -#define IF_Gbps(x) (IF_Mbps((x) * 1000)) /* gigabits/sec. */ - -/* - * Capabilities that interfaces can advertise. - * - * struct ifnet.if_capabilities - * contains the optional features & capabilities a particular interface - * supports (not only the driver but also the detected hw revision). - * Capabilities are defined by IFCAP_* below. - * struct ifnet.if_capenable - * contains the enabled (either by default or through ifconfig) optional - * features & capabilities on this interface. - * Capabilities are defined by IFCAP_* below. - * struct if_data.ifi_hwassist in mbuf CSUM_ flag form, controlled by above - * contains the enabled optional feature & capabilites that can be used - * individually per packet and are specified in the mbuf pkthdr.csum_flags - * field. IFCAP_* and CSUM_* do not match one to one and CSUM_* may be - * more detailed or differenciated than IFCAP_*. - * Hwassist features are defined CSUM_* in sys/mbuf.h - * - * Capabilities that cannot be arbitrarily changed with ifconfig/ioctl - * are listed in IFCAP_CANTCHANGE, similar to IFF_CANTCHANGE. - * This is not strictly necessary because the common code never - * changes capabilities, and it is left to the individual driver - * to do the right thing. However, having the filter here - * avoids replication of the same code in all individual drivers. - */ -#define IFCAP_RXCSUM 0x00001 /* can offload checksum on RX */ -#define IFCAP_TXCSUM 0x00002 /* can offload checksum on TX */ -#define IFCAP_NETCONS 0x00004 /* can be a network console */ -#define IFCAP_VLAN_MTU 0x00008 /* VLAN-compatible MTU */ -#define IFCAP_VLAN_HWTAGGING 0x00010 /* hardware VLAN tag support */ -#define IFCAP_JUMBO_MTU 0x00020 /* 9000 byte MTU supported */ -#define IFCAP_POLLING 0x00040 /* driver supports polling */ -#define IFCAP_VLAN_HWCSUM 0x00080 /* can do IFCAP_HWCSUM on VLANs */ -#define IFCAP_TSO4 0x00100 /* can do TCP Segmentation Offload */ -#define IFCAP_TSO6 0x00200 /* can do TCP6 Segmentation Offload */ -#define IFCAP_LRO 0x00400 /* can do Large Receive Offload */ -#define IFCAP_WOL_UCAST 0x00800 /* wake on any unicast frame */ -#define IFCAP_WOL_MCAST 0x01000 /* wake on any multicast frame */ -#define IFCAP_WOL_MAGIC 0x02000 /* wake on any Magic Packet */ -#define IFCAP_TOE4 0x04000 /* interface can offload TCP */ -#define IFCAP_TOE6 0x08000 /* interface can offload TCP6 */ -#define IFCAP_VLAN_HWFILTER 0x10000 /* interface hw can filter vlan tag */ -#define IFCAP_POLLING_NOCOUNT 0x20000 /* polling ticks cannot be fragmented */ -#define IFCAP_VLAN_HWTSO 0x40000 /* can do IFCAP_TSO on VLANs */ -#define IFCAP_LINKSTATE 0x80000 /* the runtime link state is dynamic */ -#define IFCAP_NETMAP 0x100000 /* netmap mode supported/enabled */ -#define IFCAP_RXCSUM_IPV6 0x200000 /* can offload checksum on IPv6 RX */ -#define IFCAP_TXCSUM_IPV6 0x400000 /* can offload checksum on IPv6 TX */ -#define IFCAP_HWSTATS 0x800000 /* manages counters internally */ -#define IFCAP_TXRTLMT 0x1000000 /* hardware supports TX rate limiting */ - -#define IFCAP_HWCSUM_IPV6 (IFCAP_RXCSUM_IPV6 | IFCAP_TXCSUM_IPV6) - -#define IFCAP_HWCSUM (IFCAP_RXCSUM | IFCAP_TXCSUM) -#define IFCAP_TSO (IFCAP_TSO4 | IFCAP_TSO6) -#define IFCAP_WOL (IFCAP_WOL_UCAST | IFCAP_WOL_MCAST | IFCAP_WOL_MAGIC) -#define IFCAP_TOE (IFCAP_TOE4 | IFCAP_TOE6) - -#define IFCAP_CANTCHANGE (IFCAP_NETMAP) - -#define IFQ_MAXLEN 50 -#define IFNET_SLOWHZ 1 /* granularity is 1 second */ - -/* - * Message format for use in obtaining information about interfaces - * from getkerninfo and the routing socket - * For the new, extensible interface see struct if_msghdrl below. - */ -struct if_msghdr { - u_short ifm_msglen; /* to skip over non-understood messages */ - u_char ifm_version; /* future binary compatibility */ - u_char ifm_type; /* message type */ - int ifm_addrs; /* like rtm_addrs */ - int ifm_flags; /* value of if_flags */ - u_short ifm_index; /* index for associated ifp */ - struct if_data ifm_data;/* statistics and other data about if */ -}; - -/* - * The 'l' version shall be used by new interfaces, like NET_RT_IFLISTL. It is - * extensible after ifm_data_off or within ifm_data. Both the if_msghdr and - * if_data now have a member field detailing the struct length in addition to - * the routing message length. Macros are provided to find the start of - * ifm_data and the start of the socket address strucutres immediately following - * struct if_msghdrl given a pointer to struct if_msghdrl. - */ -#define IF_MSGHDRL_IFM_DATA(_l) \ - (struct if_data *)((char *)(_l) + (_l)->ifm_data_off) -#define IF_MSGHDRL_RTA(_l) \ - (void *)((uintptr_t)(_l) + (_l)->ifm_len) -struct if_msghdrl { - u_short ifm_msglen; /* to skip over non-understood messages */ - u_char ifm_version; /* future binary compatibility */ - u_char ifm_type; /* message type */ - int ifm_addrs; /* like rtm_addrs */ - int ifm_flags; /* value of if_flags */ - u_short ifm_index; /* index for associated ifp */ - u_short _ifm_spare1; /* spare space to grow if_index, see if_var.h */ - u_short ifm_len; /* length of if_msghdrl incl. if_data */ - u_short ifm_data_off; /* offset of if_data from beginning */ - struct if_data ifm_data;/* statistics and other data about if */ -}; - -/* - * Message format for use in obtaining information about interface addresses - * from getkerninfo and the routing socket - * For the new, extensible interface see struct ifa_msghdrl below. - */ -struct ifa_msghdr { - u_short ifam_msglen; /* to skip over non-understood messages */ - u_char ifam_version; /* future binary compatibility */ - u_char ifam_type; /* message type */ - int ifam_addrs; /* like rtm_addrs */ - int ifam_flags; /* value of ifa_flags */ - u_short ifam_index; /* index for associated ifp */ - int ifam_metric; /* value of ifa_ifp->if_metric */ -}; - -/* - * The 'l' version shall be used by new interfaces, like NET_RT_IFLISTL. It is - * extensible after ifam_metric or within ifam_data. Both the ifa_msghdrl and - * if_data now have a member field detailing the struct length in addition to - * the routing message length. Macros are provided to find the start of - * ifm_data and the start of the socket address strucutres immediately following - * struct ifa_msghdrl given a pointer to struct ifa_msghdrl. - */ -#define IFA_MSGHDRL_IFAM_DATA(_l) \ - (struct if_data *)((char *)(_l) + (_l)->ifam_data_off) -#define IFA_MSGHDRL_RTA(_l) \ - (void *)((uintptr_t)(_l) + (_l)->ifam_len) -struct ifa_msghdrl { - u_short ifam_msglen; /* to skip over non-understood messages */ - u_char ifam_version; /* future binary compatibility */ - u_char ifam_type; /* message type */ - int ifam_addrs; /* like rtm_addrs */ - int ifam_flags; /* value of ifa_flags */ - u_short ifam_index; /* index for associated ifp */ - u_short _ifam_spare1; /* spare space to grow if_index, see if_var.h */ - u_short ifam_len; /* length of ifa_msghdrl incl. if_data */ - u_short ifam_data_off; /* offset of if_data from beginning */ - int ifam_metric; /* value of ifa_ifp->if_metric */ - struct if_data ifam_data;/* statistics and other data about if or - * address */ -}; - -/* - * Message format for use in obtaining information about multicast addresses - * from the routing socket - */ -struct ifma_msghdr { - u_short ifmam_msglen; /* to skip over non-understood messages */ - u_char ifmam_version; /* future binary compatibility */ - u_char ifmam_type; /* message type */ - int ifmam_addrs; /* like rtm_addrs */ - int ifmam_flags; /* value of ifa_flags */ - u_short ifmam_index; /* index for associated ifp */ -}; - -/* - * Message format announcing the arrival or departure of a network interface. - */ -struct if_announcemsghdr { - u_short ifan_msglen; /* to skip over non-understood messages */ - u_char ifan_version; /* future binary compatibility */ - u_char ifan_type; /* message type */ - u_short ifan_index; /* index for associated ifp */ - char ifan_name[IFNAMSIZ]; /* if name, e.g. "en0" */ - u_short ifan_what; /* what type of announcement */ -}; - -#define IFAN_ARRIVAL 0 /* interface arrival */ -#define IFAN_DEPARTURE 1 /* interface departure */ - -/* - * Buffer with length to be used in SIOCGIFDESCR/SIOCSIFDESCR requests - */ -struct ifreq_buffer { - size_t length; - void *buffer; -}; - -/* - * Interface request structure used for socket - * ioctl's. All interface ioctl's must have parameter - * definitions which begin with ifr_name. The - * remainder may be interface specific. - */ -struct ifreq { - char ifr_name[IFNAMSIZ]; /* if name, e.g. "en0" */ - union { - struct sockaddr ifru_addr; - struct sockaddr ifru_dstaddr; - struct sockaddr ifru_broadaddr; - struct ifreq_buffer ifru_buffer; - short ifru_flags[2]; - short ifru_index; - int ifru_jid; - int ifru_metric; - int ifru_mtu; - int ifru_phys; - int ifru_media; - caddr_t ifru_data; - int ifru_cap[2]; - u_int ifru_fib; - u_char ifru_vlan_pcp; - } ifr_ifru; -#define ifr_addr ifr_ifru.ifru_addr /* address */ -#define ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-to-p link */ -#define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */ -#define ifr_buffer ifr_ifru.ifru_buffer /* user supplied buffer with its length */ -#define ifr_flags ifr_ifru.ifru_flags[0] /* flags (low 16 bits) */ -#define ifr_flagshigh ifr_ifru.ifru_flags[1] /* flags (high 16 bits) */ -#define ifr_jid ifr_ifru.ifru_jid /* jail/vnet */ -#define ifr_metric ifr_ifru.ifru_metric /* metric */ -#define ifr_mtu ifr_ifru.ifru_mtu /* mtu */ -#define ifr_phys ifr_ifru.ifru_phys /* physical wire */ -#define ifr_media ifr_ifru.ifru_media /* physical media */ -#define ifr_data ifr_ifru.ifru_data /* for use by interface */ -#define ifr_reqcap ifr_ifru.ifru_cap[0] /* requested capabilities */ -#define ifr_curcap ifr_ifru.ifru_cap[1] /* current capabilities */ -#define ifr_index ifr_ifru.ifru_index /* interface index */ -#define ifr_fib ifr_ifru.ifru_fib /* interface fib */ -#define ifr_vlan_pcp ifr_ifru.ifru_vlan_pcp /* VLAN priority */ -}; - -#define _SIZEOF_ADDR_IFREQ(ifr) \ - ((ifr).ifr_addr.sa_len > sizeof(struct sockaddr) ? \ - (sizeof(struct ifreq) - sizeof(struct sockaddr) + \ - (ifr).ifr_addr.sa_len) : sizeof(struct ifreq)) - -struct ifaliasreq { - char ifra_name[IFNAMSIZ]; /* if name, e.g. "en0" */ - struct sockaddr ifra_addr; - struct sockaddr ifra_broadaddr; - struct sockaddr ifra_mask; - int ifra_vhid; -}; - -/* 9.x compat */ -struct oifaliasreq { - char ifra_name[IFNAMSIZ]; - struct sockaddr ifra_addr; - struct sockaddr ifra_broadaddr; - struct sockaddr ifra_mask; -}; - -struct ifmediareq { - char ifm_name[IFNAMSIZ]; /* if name, e.g. "en0" */ - int ifm_current; /* current media options */ - int ifm_mask; /* don't care mask */ - int ifm_status; /* media status */ - int ifm_active; /* active options */ - int ifm_count; /* # entries in ifm_ulist array */ - int *ifm_ulist; /* media words */ -}; - -struct ifdrv { - char ifd_name[IFNAMSIZ]; /* if name, e.g. "en0" */ - unsigned long ifd_cmd; - size_t ifd_len; - void *ifd_data; -}; - -/* - * Structure used to retrieve aux status data from interfaces. - * Kernel suppliers to this interface should respect the formatting - * needed by ifconfig(8): each line starts with a TAB and ends with - * a newline. The canonical example to copy and paste is in if_tun.c. - */ - -#define IFSTATMAX 800 /* 10 lines of text */ -struct ifstat { - char ifs_name[IFNAMSIZ]; /* if name, e.g. "en0" */ - char ascii[IFSTATMAX + 1]; -}; - -/* - * Structure used in SIOCGIFCONF request. - * Used to retrieve interface configuration - * for machine (useful for programs which - * must know all networks accessible). - */ -struct ifconf { - int ifc_len; /* size of associated buffer */ - union { - caddr_t ifcu_buf; - struct ifreq *ifcu_req; - } ifc_ifcu; -#define ifc_buf ifc_ifcu.ifcu_buf /* buffer address */ -#define ifc_req ifc_ifcu.ifcu_req /* array of structures returned */ -}; - -/* - * interface groups - */ - -#define IFG_ALL "all" /* group contains all interfaces */ -/* XXX: will we implement this? */ -#define IFG_EGRESS "egress" /* if(s) default route(s) point to */ - -struct ifg_req { - union { - char ifgrqu_group[IFNAMSIZ]; - char ifgrqu_member[IFNAMSIZ]; - } ifgrq_ifgrqu; -#define ifgrq_group ifgrq_ifgrqu.ifgrqu_group -#define ifgrq_member ifgrq_ifgrqu.ifgrqu_member -}; - -/* - * Used to lookup groups for an interface - */ -struct ifgroupreq { - char ifgr_name[IFNAMSIZ]; - u_int ifgr_len; - union { - char ifgru_group[IFNAMSIZ]; - struct ifg_req *ifgru_groups; - } ifgr_ifgru; -#define ifgr_group ifgr_ifgru.ifgru_group -#define ifgr_groups ifgr_ifgru.ifgru_groups -}; - -/* - * Structure used to request i2c data - * from interface transceivers. - */ -struct ifi2creq { - uint8_t dev_addr; /* i2c address (0xA0, 0xA2) */ - uint8_t offset; /* read offset */ - uint8_t len; /* read length */ - uint8_t spare0; - uint32_t spare1; - uint8_t data[8]; /* read buffer */ -}; - -#endif /* __BSD_VISIBLE */ - -#ifdef _KERNEL -#ifdef MALLOC_DECLARE -MALLOC_DECLARE(M_IFADDR); -MALLOC_DECLARE(M_IFMADDR); -#endif -#endif - -#ifndef _KERNEL -struct if_nameindex { - unsigned int if_index; /* 1, 2, ... */ - char *if_name; /* null terminated name: "le0", ... */ -}; - -__BEGIN_DECLS -void if_freenameindex(struct if_nameindex *); -char *if_indextoname(unsigned int, char *); -struct if_nameindex *if_nameindex(void); -unsigned int if_nametoindex(const char *); -__END_DECLS -#endif -#endif /* !_NET_IF_H_ */ diff --git a/freebsd/sys/net/if_arcsubr.c b/freebsd/sys/net/if_arcsubr.c index 042f3e84..c71dcb8e 100644 --- a/freebsd/sys/net/if_arcsubr.c +++ b/freebsd/sys/net/if_arcsubr.c @@ -43,7 +43,7 @@ #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> @@ -52,7 +52,7 @@ #include <sys/protosw.h> #include <sys/socket.h> #include <sys/sockio.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/syslog.h> #include <machine/cpu.h> diff --git a/freebsd/sys/net/if_atmsubr.c b/freebsd/sys/net/if_atmsubr.c index fff233c4..533c9bc2 100644 --- a/freebsd/sys/net/if_atmsubr.c +++ b/freebsd/sys/net/if_atmsubr.c @@ -43,14 +43,14 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_natm.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/sockio.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/sysctl.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net/if_bridge.c b/freebsd/sys/net/if_bridge.c index 31e92095..f49cad94 100644 --- a/freebsd/sys/net/if_bridge.c +++ b/freebsd/sys/net/if_bridge.c @@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/eventhandler.h> #include <sys/mbuf.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net/if_clone.c b/freebsd/sys/net/if_clone.c index cbc56c29..cb888f05 100644 --- a/freebsd/sys/net/if_clone.c +++ b/freebsd/sys/net/if_clone.c @@ -33,7 +33,7 @@ * $FreeBSD$ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/eventhandler.h> #include <sys/malloc.h> #include <sys/limits.h> diff --git a/freebsd/sys/net/if_dead.c b/freebsd/sys/net/if_dead.c index fc584f29..7626c604 100644 --- a/freebsd/sys/net/if_dead.c +++ b/freebsd/sys/net/if_dead.c @@ -36,7 +36,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/freebsd/sys/net/if_disc.c b/freebsd/sys/net/if_disc.c index aaaea715..8daeee82 100644 --- a/freebsd/sys/net/if_disc.c +++ b/freebsd/sys/net/if_disc.c @@ -37,7 +37,7 @@ * (Based on the loopback.) */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net/if_edsc.c b/freebsd/sys/net/if_edsc.c index cff77c6b..9a1398b2 100644 --- a/freebsd/sys/net/if_edsc.c +++ b/freebsd/sys/net/if_edsc.c @@ -37,7 +37,7 @@ * Mimics an Ethernet device so that VLANs can be attached to it etc. */ -#include <rtems/bsd/sys/param.h> /* types, important constants */ +#include <sys/param.h> /* types, important constants */ #include <sys/kernel.h> /* SYSINIT for load-time initializations */ #include <sys/malloc.h> /* malloc(9) */ #include <sys/module.h> /* module(9) */ diff --git a/freebsd/sys/net/if_enc.c b/freebsd/sys/net/if_enc.c index 80be97ca..42b399d2 100644 --- a/freebsd/sys/net/if_enc.c +++ b/freebsd/sys/net/if_enc.c @@ -33,7 +33,7 @@ #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/hhook.h> #include <sys/kernel.h> diff --git a/freebsd/sys/net/if_epair.c b/freebsd/sys/net/if_epair.c index 13294912..7d546fcc 100644 --- a/freebsd/sys/net/if_epair.c +++ b/freebsd/sys/net/if_epair.c @@ -52,7 +52,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/net/if_ethersubr.c b/freebsd/sys/net/if_ethersubr.c index a9f20571..9a52df96 100644 --- a/freebsd/sys/net/if_ethersubr.c +++ b/freebsd/sys/net/if_ethersubr.c @@ -38,7 +38,7 @@ #include <rtems/bsd/local/opt_mbuf_profiling.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/net/if_fddisubr.c b/freebsd/sys/net/if_fddisubr.c index 3e7983c1..5243f6cd 100644 --- a/freebsd/sys/net/if_fddisubr.c +++ b/freebsd/sys/net/if_fddisubr.c @@ -41,7 +41,7 @@ #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net/if_fwsubr.c b/freebsd/sys/net/if_fwsubr.c index 3414daf1..a31be7e1 100644 --- a/freebsd/sys/net/if_fwsubr.c +++ b/freebsd/sys/net/if_fwsubr.c @@ -35,7 +35,7 @@ #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net/if_gif.c b/freebsd/sys/net/if_gif.c index e07a2da0..098fb30d 100644 --- a/freebsd/sys/net/if_gif.c +++ b/freebsd/sys/net/if_gif.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/jail.h> #include <sys/kernel.h> @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/sockio.h> #include <sys/sx.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/time.h> #include <sys/sysctl.h> #include <sys/syslog.h> diff --git a/freebsd/sys/net/if_gre.c b/freebsd/sys/net/if_gre.c index 68b515ea..f0243b05 100644 --- a/freebsd/sys/net/if_gre.c +++ b/freebsd/sys/net/if_gre.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/jail.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/net/if_iso88025subr.c b/freebsd/sys/net/if_iso88025subr.c index bd9fcfa4..7dbce8d3 100644 --- a/freebsd/sys/net/if_iso88025subr.c +++ b/freebsd/sys/net/if_iso88025subr.c @@ -45,7 +45,7 @@ #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net/if_lagg.c b/freebsd/sys/net/if_lagg.c index 41fc35f0..3978b50b 100644 --- a/freebsd/sys/net/if_lagg.c +++ b/freebsd/sys/net/if_lagg.c @@ -27,7 +27,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_ratelimit.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/net/if_llatbl.c b/freebsd/sys/net/if_llatbl.c index a4741884..604bba39 100644 --- a/freebsd/sys/net/if_llatbl.c +++ b/freebsd/sys/net/if_llatbl.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/net/if_loop.c b/freebsd/sys/net/if_loop.c index fd650270..fd290b2d 100644 --- a/freebsd/sys/net/if_loop.c +++ b/freebsd/sys/net/if_loop.c @@ -40,7 +40,7 @@ #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/net/if_media.c b/freebsd/sys/net/if_media.c index d8167d14..006afb04 100644 --- a/freebsd/sys/net/if_media.c +++ b/freebsd/sys/net/if_media.c @@ -50,7 +50,7 @@ #include <rtems/bsd/local/opt_ifmedia.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/socket.h> #include <sys/sockio.h> diff --git a/freebsd/sys/net/if_mib.c b/freebsd/sys/net/if_mib.c index d91c94ab..b545f7c7 100644 --- a/freebsd/sys/net/if_mib.c +++ b/freebsd/sys/net/if_mib.c @@ -31,7 +31,7 @@ * $FreeBSD$ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net/if_spppfr.c b/freebsd/sys/net/if_spppfr.c index d30509d5..ee9abb31 100644 --- a/freebsd/sys/net/if_spppfr.c +++ b/freebsd/sys/net/if_spppfr.c @@ -25,7 +25,7 @@ * $FreeBSD$ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #if defined(__FreeBSD__) #include <rtems/bsd/local/opt_inet.h> diff --git a/freebsd/sys/net/if_spppsubr.c b/freebsd/sys/net/if_spppsubr.c index e7a62277..1cb8a09c 100644 --- a/freebsd/sys/net/if_spppsubr.c +++ b/freebsd/sys/net/if_spppsubr.c @@ -23,7 +23,7 @@ * $FreeBSD$ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> diff --git a/freebsd/sys/net/if_stf.c b/freebsd/sys/net/if_stf.c index e07cf0fe..db07f934 100644 --- a/freebsd/sys/net/if_stf.c +++ b/freebsd/sys/net/if_stf.c @@ -76,12 +76,12 @@ * Note that there is no way to be 100% secure. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/socket.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/module.h> diff --git a/freebsd/sys/net/if_tap.c b/freebsd/sys/net/if_tap.c index 24ae0092..ca499606 100644 --- a/freebsd/sys/net/if_tap.c +++ b/freebsd/sys/net/if_tap.c @@ -40,7 +40,7 @@ #include <rtems/bsd/local/opt_compat.h> #include <rtems/bsd/local/opt_inet.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/conf.h> #include <sys/fcntl.h> #include <sys/filio.h> diff --git a/freebsd/sys/net/if_tun.c b/freebsd/sys/net/if_tun.c index edb30d04..dc742b8f 100644 --- a/freebsd/sys/net/if_tun.c +++ b/freebsd/sys/net/if_tun.c @@ -21,7 +21,7 @@ #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/priv.h> #include <sys/proc.h> #include <sys/systm.h> diff --git a/freebsd/sys/net/if_vlan.c b/freebsd/sys/net/if_vlan.c index 381231b6..46e1eee2 100644 --- a/freebsd/sys/net/if_vlan.c +++ b/freebsd/sys/net/if_vlan.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_vlan.h> #include <rtems/bsd/local/opt_ratelimit.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/eventhandler.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/net/iflib.h b/freebsd/sys/net/iflib.h index f5f98cdf..9af87a2c 100644 --- a/freebsd/sys/net/iflib.h +++ b/freebsd/sys/net/iflib.h @@ -31,7 +31,7 @@ #include <sys/kobj.h> #include <sys/bus.h> -#include <rtems/bsd/sys/cpuset.h> +#include <sys/cpuset.h> #include <machine/bus.h> #include <sys/bus_dma.h> #include <sys/nv.h> diff --git a/freebsd/sys/net/netisr.c b/freebsd/sys/net/netisr.c index b90ab80e..2803fadf 100644 --- a/freebsd/sys/net/netisr.c +++ b/freebsd/sys/net/netisr.c @@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ddb.h> #include <rtems/bsd/local/opt_device_polling.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/bus.h> #include <sys/kernel.h> #include <sys/kthread.h> diff --git a/freebsd/sys/net/pfil.c b/freebsd/sys/net/pfil.c index 54407f65..4ea1bfc5 100644 --- a/freebsd/sys/net/pfil.c +++ b/freebsd/sys/net/pfil.c @@ -31,9 +31,9 @@ * SUCH DAMAGE. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> #include <sys/rmlock.h> diff --git a/freebsd/sys/net/pfvar.h b/freebsd/sys/net/pfvar.h index cf0b3b2c..c5e8567f 100644 --- a/freebsd/sys/net/pfvar.h +++ b/freebsd/sys/net/pfvar.h @@ -33,7 +33,7 @@ #ifndef _NET_PFVAR_H_ #define _NET_PFVAR_H_ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/counter.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net/radix.c b/freebsd/sys/net/radix.c index 35a5cfb4..f423bb7c 100644 --- a/freebsd/sys/net/radix.c +++ b/freebsd/sys/net/radix.c @@ -35,7 +35,7 @@ /* * Routines to build and maintain radix trees for routing lookups. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #ifdef _KERNEL #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> diff --git a/freebsd/sys/net/radix_mpath.c b/freebsd/sys/net/radix_mpath.c index f5215205..cb61fa56 100644 --- a/freebsd/sys/net/radix_mpath.c +++ b/freebsd/sys/net/radix_mpath.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/socket.h> diff --git a/freebsd/sys/net/raw_cb.c b/freebsd/sys/net/raw_cb.c index 498495ac..371752a0 100644 --- a/freebsd/sys/net/raw_cb.c +++ b/freebsd/sys/net/raw_cb.c @@ -33,7 +33,7 @@ * $FreeBSD$ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/domain.h> #include <rtems/bsd/sys/lock.h> #include <sys/kernel.h> diff --git a/freebsd/sys/net/raw_usrreq.c b/freebsd/sys/net/raw_usrreq.c index 96b610a0..03e65004 100644 --- a/freebsd/sys/net/raw_usrreq.c +++ b/freebsd/sys/net/raw_usrreq.c @@ -33,7 +33,7 @@ * $FreeBSD$ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net/route.c b/freebsd/sys/net/route.c index a16617f8..f7768737 100644 --- a/freebsd/sys/net/route.c +++ b/freebsd/sys/net/route.c @@ -43,7 +43,7 @@ #include <rtems/bsd/local/opt_mrouting.h> #include <rtems/bsd/local/opt_mpath.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/net/rtsock.c b/freebsd/sys/net/rtsock.c index e9a31018..ec134575 100644 --- a/freebsd/sys/net/rtsock.c +++ b/freebsd/sys/net/rtsock.c @@ -36,7 +36,7 @@ #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/jail.h> #include <sys/kernel.h> #include <sys/domain.h> diff --git a/freebsd/sys/net/slcompress.c b/freebsd/sys/net/slcompress.c index db1c75eb..1c850552 100644 --- a/freebsd/sys/net/slcompress.c +++ b/freebsd/sys/net/slcompress.c @@ -41,7 +41,7 @@ * */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> diff --git a/freebsd/sys/net80211/ieee80211.c b/freebsd/sys/net80211/ieee80211.c index 9e9be3d7..bf6aa8dc 100644 --- a/freebsd/sys/net80211/ieee80211.c +++ b/freebsd/sys/net80211/ieee80211.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_acl.c b/freebsd/sys/net80211/ieee80211_acl.c index d9997a84..703769b7 100644 --- a/freebsd/sys/net80211/ieee80211_acl.c +++ b/freebsd/sys/net80211/ieee80211_acl.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_action.c b/freebsd/sys/net80211/ieee80211_action.c index 6c1f1b91..7fb26dff 100644 --- a/freebsd/sys/net80211/ieee80211_action.c +++ b/freebsd/sys/net80211/ieee80211_action.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/systm.h> diff --git a/freebsd/sys/net80211/ieee80211_adhoc.c b/freebsd/sys/net80211/ieee80211_adhoc.c index 15a037f6..1f3a6207 100644 --- a/freebsd/sys/net80211/ieee80211_adhoc.c +++ b/freebsd/sys/net80211/ieee80211_adhoc.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/sockio.h> #include <sys/endian.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/proc.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/net80211/ieee80211_ageq.c b/freebsd/sys/net80211/ieee80211_ageq.c index 2d6bd89e..e161208c 100644 --- a/freebsd/sys/net80211/ieee80211_ageq.c +++ b/freebsd/sys/net80211/ieee80211_ageq.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_alq.c b/freebsd/sys/net80211/ieee80211_alq.c index b0df55d2..82da726e 100644 --- a/freebsd/sys/net80211/ieee80211_alq.c +++ b/freebsd/sys/net80211/ieee80211_alq.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_amrr.c b/freebsd/sys/net80211/ieee80211_amrr.c index 865bcaf9..84cc0f9b 100644 --- a/freebsd/sys/net80211/ieee80211_amrr.c +++ b/freebsd/sys/net80211/ieee80211_amrr.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/module.h> diff --git a/freebsd/sys/net80211/ieee80211_crypto.c b/freebsd/sys/net80211/ieee80211_crypto.c index 9dd6eb21..077e44f7 100644 --- a/freebsd/sys/net80211/ieee80211_crypto.c +++ b/freebsd/sys/net80211/ieee80211_crypto.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/net80211/ieee80211_crypto_ccmp.c b/freebsd/sys/net80211/ieee80211_crypto_ccmp.c index bc3929e5..017b5381 100644 --- a/freebsd/sys/net80211/ieee80211_crypto_ccmp.c +++ b/freebsd/sys/net80211/ieee80211_crypto_ccmp.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_crypto_none.c b/freebsd/sys/net80211/ieee80211_crypto_none.c index 625b4b2b..67815393 100644 --- a/freebsd/sys/net80211/ieee80211_crypto_none.c +++ b/freebsd/sys/net80211/ieee80211_crypto_none.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/systm.h> diff --git a/freebsd/sys/net80211/ieee80211_crypto_tkip.c b/freebsd/sys/net80211/ieee80211_crypto_tkip.c index b4eb8838..bf21056b 100644 --- a/freebsd/sys/net80211/ieee80211_crypto_tkip.c +++ b/freebsd/sys/net80211/ieee80211_crypto_tkip.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_crypto_wep.c b/freebsd/sys/net80211/ieee80211_crypto_wep.c index 4b3b67ab..8931436f 100644 --- a/freebsd/sys/net80211/ieee80211_crypto_wep.c +++ b/freebsd/sys/net80211/ieee80211_crypto_wep.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_ddb.c b/freebsd/sys/net80211/ieee80211_ddb.c index 25c1c93a..c942c06d 100644 --- a/freebsd/sys/net80211/ieee80211_ddb.c +++ b/freebsd/sys/net80211/ieee80211_ddb.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); /* * IEEE 802.11 DDB support */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_dfs.c b/freebsd/sys/net80211/ieee80211_dfs.c index 5fccefaf..bb1efcb4 100644 --- a/freebsd/sys/net80211/ieee80211_dfs.c +++ b/freebsd/sys/net80211/ieee80211_dfs.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/sockio.h> #include <sys/endian.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/proc.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/net80211/ieee80211_freebsd.c b/freebsd/sys/net80211/ieee80211_freebsd.c index 61c0b81d..e811955e 100644 --- a/freebsd/sys/net80211/ieee80211_freebsd.c +++ b/freebsd/sys/net80211/ieee80211_freebsd.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/eventhandler.h> #include <sys/kernel.h> diff --git a/freebsd/sys/net80211/ieee80211_freebsd.h b/freebsd/sys/net80211/ieee80211_freebsd.h index 01b9a8f6..40d32b74 100644 --- a/freebsd/sys/net80211/ieee80211_freebsd.h +++ b/freebsd/sys/net80211/ieee80211_freebsd.h @@ -28,7 +28,7 @@ #define _NET80211_IEEE80211_FREEBSD_H_ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/counter.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/net80211/ieee80211_hostap.c b/freebsd/sys/net80211/ieee80211_hostap.c index 6009ead7..1ac79035 100644 --- a/freebsd/sys/net80211/ieee80211_hostap.c +++ b/freebsd/sys/net80211/ieee80211_hostap.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/sockio.h> #include <sys/endian.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/proc.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/net80211/ieee80211_ht.c b/freebsd/sys/net80211/ieee80211_ht.c index 28093ed1..4b2834a1 100644 --- a/freebsd/sys/net80211/ieee80211_ht.c +++ b/freebsd/sys/net80211/ieee80211_ht.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/systm.h> diff --git a/freebsd/sys/net80211/ieee80211_hwmp.c b/freebsd/sys/net80211/ieee80211_hwmp.c index 820b29d2..62c27e29 100644 --- a/freebsd/sys/net80211/ieee80211_hwmp.c +++ b/freebsd/sys/net80211/ieee80211_hwmp.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/sockio.h> #include <sys/endian.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/proc.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/net80211/ieee80211_input.c b/freebsd/sys/net80211/ieee80211_input.c index 22d9a565..27f979e8 100644 --- a/freebsd/sys/net80211/ieee80211_input.c +++ b/freebsd/sys/net80211/ieee80211_input.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_ioctl.c b/freebsd/sys/net80211/ieee80211_ioctl.c index 4b874574..8f9e4658 100644 --- a/freebsd/sys/net80211/ieee80211_ioctl.c +++ b/freebsd/sys/net80211/ieee80211_ioctl.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> #include <sys/endian.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/priv.h> diff --git a/freebsd/sys/net80211/ieee80211_mesh.c b/freebsd/sys/net80211/ieee80211_mesh.c index 98359ea0..ab7291dd 100644 --- a/freebsd/sys/net80211/ieee80211_mesh.c +++ b/freebsd/sys/net80211/ieee80211_mesh.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/sockio.h> #include <sys/endian.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/proc.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/net80211/ieee80211_monitor.c b/freebsd/sys/net80211/ieee80211_monitor.c index ec2086eb..11559985 100644 --- a/freebsd/sys/net80211/ieee80211_monitor.c +++ b/freebsd/sys/net80211/ieee80211_monitor.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/sockio.h> #include <sys/endian.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/proc.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/net80211/ieee80211_node.c b/freebsd/sys/net80211/ieee80211_node.c index b15a782f..d5eec26a 100644 --- a/freebsd/sys/net80211/ieee80211_node.c +++ b/freebsd/sys/net80211/ieee80211_node.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_output.c b/freebsd/sys/net80211/ieee80211_output.c index bb42f945..5e67b82d 100644 --- a/freebsd/sys/net80211/ieee80211_output.c +++ b/freebsd/sys/net80211/ieee80211_output.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_phy.c b/freebsd/sys/net80211/ieee80211_phy.c index 20458b2c..1558257e 100644 --- a/freebsd/sys/net80211/ieee80211_phy.c +++ b/freebsd/sys/net80211/ieee80211_phy.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_power.c b/freebsd/sys/net80211/ieee80211_power.c index d557689c..cd526855 100644 --- a/freebsd/sys/net80211/ieee80211_power.c +++ b/freebsd/sys/net80211/ieee80211_power.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_proto.c b/freebsd/sys/net80211/ieee80211_proto.c index 8389404b..5fc764a9 100644 --- a/freebsd/sys/net80211/ieee80211_proto.c +++ b/freebsd/sys/net80211/ieee80211_proto.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_radiotap.c b/freebsd/sys/net80211/ieee80211_radiotap.c index 19780fc6..e62be743 100644 --- a/freebsd/sys/net80211/ieee80211_radiotap.c +++ b/freebsd/sys/net80211/ieee80211_radiotap.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_ratectl.c b/freebsd/sys/net80211/ieee80211_ratectl.c index 57f890fb..d12032df 100644 --- a/freebsd/sys/net80211/ieee80211_ratectl.c +++ b/freebsd/sys/net80211/ieee80211_ratectl.c @@ -28,7 +28,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/sbuf.h> #include <sys/systm.h> diff --git a/freebsd/sys/net80211/ieee80211_ratectl_none.c b/freebsd/sys/net80211/ieee80211_ratectl_none.c index 24324c5f..2b4a9916 100644 --- a/freebsd/sys/net80211/ieee80211_ratectl_none.c +++ b/freebsd/sys/net80211/ieee80211_ratectl_none.c @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_regdomain.c b/freebsd/sys/net80211/ieee80211_regdomain.c index a1de5e41..beda077c 100644 --- a/freebsd/sys/net80211/ieee80211_regdomain.c +++ b/freebsd/sys/net80211/ieee80211_regdomain.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_rssadapt.c b/freebsd/sys/net80211/ieee80211_rssadapt.c index 80d06256..e4421e6a 100644 --- a/freebsd/sys/net80211/ieee80211_rssadapt.c +++ b/freebsd/sys/net80211/ieee80211_rssadapt.c @@ -34,7 +34,7 @@ */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/net80211/ieee80211_scan.c b/freebsd/sys/net80211/ieee80211_scan.c index c3dfdb5e..1f3f95a5 100644 --- a/freebsd/sys/net80211/ieee80211_scan.c +++ b/freebsd/sys/net80211/ieee80211_scan.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> #include <sys/kernel.h> diff --git a/freebsd/sys/net80211/ieee80211_scan_sta.c b/freebsd/sys/net80211/ieee80211_scan_sta.c index cbef5cd8..1a930bc3 100644 --- a/freebsd/sys/net80211/ieee80211_scan_sta.c +++ b/freebsd/sys/net80211/ieee80211_scan_sta.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/endian.h> diff --git a/freebsd/sys/net80211/ieee80211_scan_sw.c b/freebsd/sys/net80211/ieee80211_scan_sw.c index ca6d9136..2e454b0b 100644 --- a/freebsd/sys/net80211/ieee80211_scan_sw.c +++ b/freebsd/sys/net80211/ieee80211_scan_sw.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> #include <sys/kernel.h> diff --git a/freebsd/sys/net80211/ieee80211_sta.c b/freebsd/sys/net80211/ieee80211_sta.c index 68bbb36b..664c3b8f 100644 --- a/freebsd/sys/net80211/ieee80211_sta.c +++ b/freebsd/sys/net80211/ieee80211_sta.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/sockio.h> #include <sys/endian.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/proc.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/net80211/ieee80211_superg.c b/freebsd/sys/net80211/ieee80211_superg.c index 4a5f68d5..a9968b49 100644 --- a/freebsd/sys/net80211/ieee80211_superg.c +++ b/freebsd/sys/net80211/ieee80211_superg.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #ifdef IEEE80211_SUPPORT_SUPERG -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/kernel.h> diff --git a/freebsd/sys/net80211/ieee80211_tdma.c b/freebsd/sys/net80211/ieee80211_tdma.c index 45c71f20..d7c1269c 100644 --- a/freebsd/sys/net80211/ieee80211_tdma.c +++ b/freebsd/sys/net80211/ieee80211_tdma.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #ifdef IEEE80211_SUPPORT_TDMA -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/sockio.h> #include <sys/endian.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/proc.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/net80211/ieee80211_vht.c b/freebsd/sys/net80211/ieee80211_vht.c index acd939d3..180be4f6 100644 --- a/freebsd/sys/net80211/ieee80211_vht.c +++ b/freebsd/sys/net80211/ieee80211_vht.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/systm.h> diff --git a/freebsd/sys/net80211/ieee80211_wds.c b/freebsd/sys/net80211/ieee80211_wds.c index 49f1df2e..500d060a 100644 --- a/freebsd/sys/net80211/ieee80211_wds.c +++ b/freebsd/sys/net80211/ieee80211_wds.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/sockio.h> #include <sys/endian.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/proc.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/net80211/ieee80211_xauth.c b/freebsd/sys/net80211/ieee80211_xauth.c index 755cd40b..5efce39a 100644 --- a/freebsd/sys/net80211/ieee80211_xauth.c +++ b/freebsd/sys/net80211/ieee80211_xauth.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); */ #include <rtems/bsd/local/opt_wlan.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/accf_data.c b/freebsd/sys/netinet/accf_data.c index 4d4037f0..ae91bfa6 100644 --- a/freebsd/sys/netinet/accf_data.c +++ b/freebsd/sys/netinet/accf_data.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #define ACCEPT_FILTER_MOD -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/netinet/accf_dns.c b/freebsd/sys/netinet/accf_dns.c index b6d2ff63..5d11a024 100644 --- a/freebsd/sys/netinet/accf_dns.c +++ b/freebsd/sys/netinet/accf_dns.c @@ -30,7 +30,7 @@ #define ACCEPT_FILTER_MOD -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/accf_http.c b/freebsd/sys/netinet/accf_http.c index 83093db3..65dc2621 100644 --- a/freebsd/sys/netinet/accf_http.c +++ b/freebsd/sys/netinet/accf_http.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #define ACCEPT_FILTER_MOD -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/cc/cc.c b/freebsd/sys/netinet/cc/cc.c index ab3e831e..3cd0ef79 100644 --- a/freebsd/sys/netinet/cc/cc.c +++ b/freebsd/sys/netinet/cc/cc.c @@ -51,7 +51,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/libkern.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet/cc/cc_newreno.c b/freebsd/sys/netinet/cc/cc_newreno.c index 4c21036a..fb6c1087 100644 --- a/freebsd/sys/netinet/cc/cc_newreno.c +++ b/freebsd/sys/netinet/cc/cc_newreno.c @@ -53,7 +53,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/if_atm.c b/freebsd/sys/netinet/if_atm.c index cb0317fb..b38de023 100644 --- a/freebsd/sys/netinet/if_atm.c +++ b/freebsd/sys/netinet/if_atm.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #if defined(INET) || defined(INET6) -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/queue.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netinet/if_ether.c b/freebsd/sys/netinet/if_ether.c index d2b0595a..fd4ae62e 100644 --- a/freebsd/sys/netinet/if_ether.c +++ b/freebsd/sys/netinet/if_ether.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/queue.h> diff --git a/freebsd/sys/netinet/igmp.c b/freebsd/sys/netinet/igmp.c index 9443bb64..cd41e781 100644 --- a/freebsd/sys/netinet/igmp.c +++ b/freebsd/sys/netinet/igmp.c @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ddb.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/module.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/in.c b/freebsd/sys/netinet/in.c index a02e3034..48768f9a 100644 --- a/freebsd/sys/netinet/in.c +++ b/freebsd/sys/netinet/in.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_mpath.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/eventhandler.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/freebsd/sys/netinet/in.h b/freebsd/sys/netinet/in.h deleted file mode 100644 index 6b831344..00000000 --- a/freebsd/sys/netinet/in.h +++ /dev/null @@ -1,676 +0,0 @@ -/*- - * Copyright (c) 1982, 1986, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD$ - */ - -#ifndef _NETINET_IN_H_ -#define _NETINET_IN_H_ - -#include <sys/cdefs.h> -#include <sys/_types.h> -#ifndef __rtems__ -#include <machine/endian.h> -#else /* __rtems__ */ -#include <machine/endian.h> -#endif /* __rtems__ */ - -/* Protocols common to RFC 1700, POSIX, and X/Open. */ -#define IPPROTO_IP 0 /* dummy for IP */ -#define IPPROTO_ICMP 1 /* control message protocol */ -#define IPPROTO_TCP 6 /* tcp */ -#define IPPROTO_UDP 17 /* user datagram protocol */ - -#define INADDR_ANY ((in_addr_t)0x00000000) -#define INADDR_BROADCAST ((in_addr_t)0xffffffff) /* must be masked */ - -#ifndef _UINT8_T_DECLARED -typedef __uint8_t uint8_t; -#define _UINT8_T_DECLARED -#endif - -#ifndef _UINT16_T_DECLARED -typedef __uint16_t uint16_t; -#define _UINT16_T_DECLARED -#endif - -#ifndef _UINT32_T_DECLARED -typedef __uint32_t uint32_t; -#define _UINT32_T_DECLARED -#endif - -#ifndef _IN_ADDR_T_DECLARED -typedef uint32_t in_addr_t; -#define _IN_ADDR_T_DECLARED -#endif - -#ifndef _IN_PORT_T_DECLARED -typedef uint16_t in_port_t; -#define _IN_PORT_T_DECLARED -#endif - -#ifndef _SA_FAMILY_T_DECLARED -typedef __sa_family_t sa_family_t; -#define _SA_FAMILY_T_DECLARED -#endif - -/* Internet address (a structure for historical reasons). */ -#ifndef _STRUCT_IN_ADDR_DECLARED -struct in_addr { - in_addr_t s_addr; -}; -#define _STRUCT_IN_ADDR_DECLARED -#endif - -#ifndef _SOCKLEN_T_DECLARED -typedef __socklen_t socklen_t; -#define _SOCKLEN_T_DECLARED -#endif - -#include <sys/_sockaddr_storage.h> - -/* Socket address, internet style. */ -struct sockaddr_in { - uint8_t sin_len; - sa_family_t sin_family; - in_port_t sin_port; - struct in_addr sin_addr; - char sin_zero[8]; -}; - -#if !defined(_KERNEL) && __POSIX_VISIBLE >= 200112 - -#ifndef _BYTEORDER_PROTOTYPED -#define _BYTEORDER_PROTOTYPED -__BEGIN_DECLS -uint32_t htonl(uint32_t); -uint16_t htons(uint16_t); -uint32_t ntohl(uint32_t); -uint16_t ntohs(uint16_t); -__END_DECLS -#endif - -#ifndef _BYTEORDER_FUNC_DEFINED -#define _BYTEORDER_FUNC_DEFINED -#define htonl(x) __htonl(x) -#define htons(x) __htons(x) -#define ntohl(x) __ntohl(x) -#define ntohs(x) __ntohs(x) -#endif - -#endif /* !_KERNEL && __POSIX_VISIBLE >= 200112 */ - -#if __POSIX_VISIBLE >= 200112 -#define IPPROTO_IPV6 41 /* IP6 header */ -#define IPPROTO_RAW 255 /* raw IP packet */ -#define INET_ADDRSTRLEN 16 -#endif - -#if __BSD_VISIBLE -/* - * Constants and structures defined by the internet system, - * Per RFC 790, September 1981, and numerous additions. - */ - -/* - * Protocols (RFC 1700) - */ -#define IPPROTO_HOPOPTS 0 /* IP6 hop-by-hop options */ -#define IPPROTO_IGMP 2 /* group mgmt protocol */ -#define IPPROTO_GGP 3 /* gateway^2 (deprecated) */ -#define IPPROTO_IPV4 4 /* IPv4 encapsulation */ -#define IPPROTO_IPIP IPPROTO_IPV4 /* for compatibility */ -#define IPPROTO_ST 7 /* Stream protocol II */ -#define IPPROTO_EGP 8 /* exterior gateway protocol */ -#define IPPROTO_PIGP 9 /* private interior gateway */ -#define IPPROTO_RCCMON 10 /* BBN RCC Monitoring */ -#define IPPROTO_NVPII 11 /* network voice protocol*/ -#define IPPROTO_PUP 12 /* pup */ -#define IPPROTO_ARGUS 13 /* Argus */ -#define IPPROTO_EMCON 14 /* EMCON */ -#define IPPROTO_XNET 15 /* Cross Net Debugger */ -#define IPPROTO_CHAOS 16 /* Chaos*/ -#define IPPROTO_MUX 18 /* Multiplexing */ -#define IPPROTO_MEAS 19 /* DCN Measurement Subsystems */ -#define IPPROTO_HMP 20 /* Host Monitoring */ -#define IPPROTO_PRM 21 /* Packet Radio Measurement */ -#define IPPROTO_IDP 22 /* xns idp */ -#define IPPROTO_TRUNK1 23 /* Trunk-1 */ -#define IPPROTO_TRUNK2 24 /* Trunk-2 */ -#define IPPROTO_LEAF1 25 /* Leaf-1 */ -#define IPPROTO_LEAF2 26 /* Leaf-2 */ -#define IPPROTO_RDP 27 /* Reliable Data */ -#define IPPROTO_IRTP 28 /* Reliable Transaction */ -#define IPPROTO_TP 29 /* tp-4 w/ class negotiation */ -#define IPPROTO_BLT 30 /* Bulk Data Transfer */ -#define IPPROTO_NSP 31 /* Network Services */ -#define IPPROTO_INP 32 /* Merit Internodal */ -#define IPPROTO_SEP 33 /* Sequential Exchange */ -#define IPPROTO_3PC 34 /* Third Party Connect */ -#define IPPROTO_IDPR 35 /* InterDomain Policy Routing */ -#define IPPROTO_XTP 36 /* XTP */ -#define IPPROTO_DDP 37 /* Datagram Delivery */ -#define IPPROTO_CMTP 38 /* Control Message Transport */ -#define IPPROTO_TPXX 39 /* TP++ Transport */ -#define IPPROTO_IL 40 /* IL transport protocol */ -#define IPPROTO_SDRP 42 /* Source Demand Routing */ -#define IPPROTO_ROUTING 43 /* IP6 routing header */ -#define IPPROTO_FRAGMENT 44 /* IP6 fragmentation header */ -#define IPPROTO_IDRP 45 /* InterDomain Routing*/ -#define IPPROTO_RSVP 46 /* resource reservation */ -#define IPPROTO_GRE 47 /* General Routing Encap. */ -#define IPPROTO_MHRP 48 /* Mobile Host Routing */ -#define IPPROTO_BHA 49 /* BHA */ -#define IPPROTO_ESP 50 /* IP6 Encap Sec. Payload */ -#define IPPROTO_AH 51 /* IP6 Auth Header */ -#define IPPROTO_INLSP 52 /* Integ. Net Layer Security */ -#define IPPROTO_SWIPE 53 /* IP with encryption */ -#define IPPROTO_NHRP 54 /* Next Hop Resolution */ -#define IPPROTO_MOBILE 55 /* IP Mobility */ -#define IPPROTO_TLSP 56 /* Transport Layer Security */ -#define IPPROTO_SKIP 57 /* SKIP */ -#define IPPROTO_ICMPV6 58 /* ICMP6 */ -#define IPPROTO_NONE 59 /* IP6 no next header */ -#define IPPROTO_DSTOPTS 60 /* IP6 destination option */ -#define IPPROTO_AHIP 61 /* any host internal protocol */ -#define IPPROTO_CFTP 62 /* CFTP */ -#define IPPROTO_HELLO 63 /* "hello" routing protocol */ -#define IPPROTO_SATEXPAK 64 /* SATNET/Backroom EXPAK */ -#define IPPROTO_KRYPTOLAN 65 /* Kryptolan */ -#define IPPROTO_RVD 66 /* Remote Virtual Disk */ -#define IPPROTO_IPPC 67 /* Pluribus Packet Core */ -#define IPPROTO_ADFS 68 /* Any distributed FS */ -#define IPPROTO_SATMON 69 /* Satnet Monitoring */ -#define IPPROTO_VISA 70 /* VISA Protocol */ -#define IPPROTO_IPCV 71 /* Packet Core Utility */ -#define IPPROTO_CPNX 72 /* Comp. Prot. Net. Executive */ -#define IPPROTO_CPHB 73 /* Comp. Prot. HeartBeat */ -#define IPPROTO_WSN 74 /* Wang Span Network */ -#define IPPROTO_PVP 75 /* Packet Video Protocol */ -#define IPPROTO_BRSATMON 76 /* BackRoom SATNET Monitoring */ -#define IPPROTO_ND 77 /* Sun net disk proto (temp.) */ -#define IPPROTO_WBMON 78 /* WIDEBAND Monitoring */ -#define IPPROTO_WBEXPAK 79 /* WIDEBAND EXPAK */ -#define IPPROTO_EON 80 /* ISO cnlp */ -#define IPPROTO_VMTP 81 /* VMTP */ -#define IPPROTO_SVMTP 82 /* Secure VMTP */ -#define IPPROTO_VINES 83 /* Banyon VINES */ -#define IPPROTO_TTP 84 /* TTP */ -#define IPPROTO_IGP 85 /* NSFNET-IGP */ -#define IPPROTO_DGP 86 /* dissimilar gateway prot. */ -#define IPPROTO_TCF 87 /* TCF */ -#define IPPROTO_IGRP 88 /* Cisco/GXS IGRP */ -#define IPPROTO_OSPFIGP 89 /* OSPFIGP */ -#define IPPROTO_SRPC 90 /* Strite RPC protocol */ -#define IPPROTO_LARP 91 /* Locus Address Resoloution */ -#define IPPROTO_MTP 92 /* Multicast Transport */ -#define IPPROTO_AX25 93 /* AX.25 Frames */ -#define IPPROTO_IPEIP 94 /* IP encapsulated in IP */ -#define IPPROTO_MICP 95 /* Mobile Int.ing control */ -#define IPPROTO_SCCSP 96 /* Semaphore Comm. security */ -#define IPPROTO_ETHERIP 97 /* Ethernet IP encapsulation */ -#define IPPROTO_ENCAP 98 /* encapsulation header */ -#define IPPROTO_APES 99 /* any private encr. scheme */ -#define IPPROTO_GMTP 100 /* GMTP*/ -#define IPPROTO_IPCOMP 108 /* payload compression (IPComp) */ -#define IPPROTO_SCTP 132 /* SCTP */ -#define IPPROTO_MH 135 /* IPv6 Mobility Header */ -#define IPPROTO_UDPLITE 136 /* UDP-Lite */ -#define IPPROTO_HIP 139 /* IP6 Host Identity Protocol */ -#define IPPROTO_SHIM6 140 /* IP6 Shim6 Protocol */ -/* 101-254: Partly Unassigned */ -#define IPPROTO_PIM 103 /* Protocol Independent Mcast */ -#define IPPROTO_CARP 112 /* CARP */ -#define IPPROTO_PGM 113 /* PGM */ -#define IPPROTO_MPLS 137 /* MPLS-in-IP */ -#define IPPROTO_PFSYNC 240 /* PFSYNC */ -#define IPPROTO_RESERVED_253 253 /* Reserved */ -#define IPPROTO_RESERVED_254 254 /* Reserved */ -/* 255: Reserved */ -/* BSD Private, local use, namespace incursion, no longer used */ -#define IPPROTO_OLD_DIVERT 254 /* OLD divert pseudo-proto */ -#define IPPROTO_MAX 256 - -/* last return value of *_input(), meaning "all job for this pkt is done". */ -#define IPPROTO_DONE 257 - -/* Only used internally, so can be outside the range of valid IP protocols. */ -#define IPPROTO_DIVERT 258 /* divert pseudo-protocol */ -#define IPPROTO_SEND 259 /* SeND pseudo-protocol */ - -/* - * Defined to avoid confusion. The master value is defined by - * PROTO_SPACER in sys/protosw.h. - */ -#define IPPROTO_SPACER 32767 /* spacer for loadable protos */ - -/* - * Local port number conventions: - * - * When a user does a bind(2) or connect(2) with a port number of zero, - * a non-conflicting local port address is chosen. - * The default range is IPPORT_HIFIRSTAUTO through - * IPPORT_HILASTAUTO, although that is settable by sysctl. - * - * A user may set the IPPROTO_IP option IP_PORTRANGE to change this - * default assignment range. - * - * The value IP_PORTRANGE_DEFAULT causes the default behavior. - * - * The value IP_PORTRANGE_HIGH changes the range of candidate port numbers - * into the "high" range. These are reserved for client outbound connections - * which do not want to be filtered by any firewalls. - * - * The value IP_PORTRANGE_LOW changes the range to the "low" are - * that is (by convention) restricted to privileged processes. This - * convention is based on "vouchsafe" principles only. It is only secure - * if you trust the remote host to restrict these ports. - * - * The default range of ports and the high range can be changed by - * sysctl(3). (net.inet.ip.port{hi,low}{first,last}_auto) - * - * Changing those values has bad security implications if you are - * using a stateless firewall that is allowing packets outside of that - * range in order to allow transparent outgoing connections. - * - * Such a firewall configuration will generally depend on the use of these - * default values. If you change them, you may find your Security - * Administrator looking for you with a heavy object. - * - * For a slightly more orthodox text view on this: - * - * ftp://ftp.isi.edu/in-notes/iana/assignments/port-numbers - * - * port numbers are divided into three ranges: - * - * 0 - 1023 Well Known Ports - * 1024 - 49151 Registered Ports - * 49152 - 65535 Dynamic and/or Private Ports - * - */ - -/* - * Ports < IPPORT_RESERVED are reserved for - * privileged processes (e.g. root). (IP_PORTRANGE_LOW) - */ -#define IPPORT_RESERVED 1024 - -/* - * Default local port range, used by IP_PORTRANGE_DEFAULT - */ -#define IPPORT_EPHEMERALFIRST 10000 -#define IPPORT_EPHEMERALLAST 65535 - -/* - * Dynamic port range, used by IP_PORTRANGE_HIGH. - */ -#define IPPORT_HIFIRSTAUTO 49152 -#define IPPORT_HILASTAUTO 65535 - -/* - * Scanning for a free reserved port return a value below IPPORT_RESERVED, - * but higher than IPPORT_RESERVEDSTART. Traditionally the start value was - * 512, but that conflicts with some well-known-services that firewalls may - * have a fit if we use. - */ -#define IPPORT_RESERVEDSTART 600 - -#define IPPORT_MAX 65535 - -/* - * Definitions of bits in internet address integers. - * On subnets, the decomposition of addresses to host and net parts - * is done according to subnet mask, not the masks here. - */ -#define IN_CLASSA(i) (((in_addr_t)(i) & 0x80000000) == 0) -#define IN_CLASSA_NET 0xff000000 -#define IN_CLASSA_NSHIFT 24 -#define IN_CLASSA_HOST 0x00ffffff -#define IN_CLASSA_MAX 128 - -#define IN_CLASSB(i) (((in_addr_t)(i) & 0xc0000000) == 0x80000000) -#define IN_CLASSB_NET 0xffff0000 -#define IN_CLASSB_NSHIFT 16 -#define IN_CLASSB_HOST 0x0000ffff -#define IN_CLASSB_MAX 65536 - -#define IN_CLASSC(i) (((in_addr_t)(i) & 0xe0000000) == 0xc0000000) -#define IN_CLASSC_NET 0xffffff00 -#define IN_CLASSC_NSHIFT 8 -#define IN_CLASSC_HOST 0x000000ff - -#define IN_CLASSD(i) (((in_addr_t)(i) & 0xf0000000) == 0xe0000000) -#define IN_CLASSD_NET 0xf0000000 /* These ones aren't really */ -#define IN_CLASSD_NSHIFT 28 /* net and host fields, but */ -#define IN_CLASSD_HOST 0x0fffffff /* routing needn't know. */ -#define IN_MULTICAST(i) IN_CLASSD(i) - -#define IN_EXPERIMENTAL(i) (((in_addr_t)(i) & 0xf0000000) == 0xf0000000) -#define IN_BADCLASS(i) (((in_addr_t)(i) & 0xf0000000) == 0xf0000000) - -#define IN_LINKLOCAL(i) (((in_addr_t)(i) & 0xffff0000) == 0xa9fe0000) -#define IN_LOOPBACK(i) (((in_addr_t)(i) & 0xff000000) == 0x7f000000) -#define IN_ZERONET(i) (((in_addr_t)(i) & 0xff000000) == 0) - -#define IN_PRIVATE(i) ((((in_addr_t)(i) & 0xff000000) == 0x0a000000) || \ - (((in_addr_t)(i) & 0xfff00000) == 0xac100000) || \ - (((in_addr_t)(i) & 0xffff0000) == 0xc0a80000)) - -#define IN_LOCAL_GROUP(i) (((in_addr_t)(i) & 0xffffff00) == 0xe0000000) - -#define IN_ANY_LOCAL(i) (IN_LINKLOCAL(i) || IN_LOCAL_GROUP(i)) - -#define INADDR_LOOPBACK ((in_addr_t)0x7f000001) -#ifndef _KERNEL -#define INADDR_NONE ((in_addr_t)0xffffffff) /* -1 return */ -#endif - -#define INADDR_UNSPEC_GROUP ((in_addr_t)0xe0000000) /* 224.0.0.0 */ -#define INADDR_ALLHOSTS_GROUP ((in_addr_t)0xe0000001) /* 224.0.0.1 */ -#define INADDR_ALLRTRS_GROUP ((in_addr_t)0xe0000002) /* 224.0.0.2 */ -#define INADDR_ALLRPTS_GROUP ((in_addr_t)0xe0000016) /* 224.0.0.22, IGMPv3 */ -#define INADDR_CARP_GROUP ((in_addr_t)0xe0000012) /* 224.0.0.18 */ -#define INADDR_PFSYNC_GROUP ((in_addr_t)0xe00000f0) /* 224.0.0.240 */ -#define INADDR_ALLMDNS_GROUP ((in_addr_t)0xe00000fb) /* 224.0.0.251 */ -#define INADDR_MAX_LOCAL_GROUP ((in_addr_t)0xe00000ff) /* 224.0.0.255 */ - -#define IN_LOOPBACKNET 127 /* official! */ - -#define IN_RFC3021_MASK ((in_addr_t)0xfffffffe) - -/* - * Options for use with [gs]etsockopt at the IP level. - * First word of comment is data type; bool is stored in int. - */ -#define IP_OPTIONS 1 /* buf/ip_opts; set/get IP options */ -#define IP_HDRINCL 2 /* int; header is included with data */ -#define IP_TOS 3 /* int; IP type of service and preced. */ -#define IP_TTL 4 /* int; IP time to live */ -#define IP_RECVOPTS 5 /* bool; receive all IP opts w/dgram */ -#define IP_RECVRETOPTS 6 /* bool; receive IP opts for response */ -#define IP_RECVDSTADDR 7 /* bool; receive IP dst addr w/dgram */ -#define IP_SENDSRCADDR IP_RECVDSTADDR /* cmsg_type to set src addr */ -#define IP_RETOPTS 8 /* ip_opts; set/get IP options */ -#define IP_MULTICAST_IF 9 /* struct in_addr *or* struct ip_mreqn; - * set/get IP multicast i/f */ -#define IP_MULTICAST_TTL 10 /* u_char; set/get IP multicast ttl */ -#define IP_MULTICAST_LOOP 11 /* u_char; set/get IP multicast loopback */ -#define IP_ADD_MEMBERSHIP 12 /* ip_mreq; add an IP group membership */ -#define IP_DROP_MEMBERSHIP 13 /* ip_mreq; drop an IP group membership */ -#define IP_MULTICAST_VIF 14 /* set/get IP mcast virt. iface */ -#define IP_RSVP_ON 15 /* enable RSVP in kernel */ -#define IP_RSVP_OFF 16 /* disable RSVP in kernel */ -#define IP_RSVP_VIF_ON 17 /* set RSVP per-vif socket */ -#define IP_RSVP_VIF_OFF 18 /* unset RSVP per-vif socket */ -#define IP_PORTRANGE 19 /* int; range to choose for unspec port */ -#define IP_RECVIF 20 /* bool; receive reception if w/dgram */ -/* for IPSEC */ -#define IP_IPSEC_POLICY 21 /* int; set/get security policy */ - /* unused; was IP_FAITH */ -#define IP_ONESBCAST 23 /* bool: send all-ones broadcast */ -#define IP_BINDANY 24 /* bool: allow bind to any address */ -#define IP_BINDMULTI 25 /* bool: allow multiple listeners on a tuple */ -#define IP_RSS_LISTEN_BUCKET 26 /* int; set RSS listen bucket */ -#define IP_ORIGDSTADDR 27 /* bool: receive IP dst addr/port w/dgram */ -#define IP_RECVORIGDSTADDR IP_ORIGDSTADDR - -/* - * Options for controlling the firewall and dummynet. - * Historical options (from 40 to 64) will eventually be - * replaced by only two options, IP_FW3 and IP_DUMMYNET3. - */ -#define IP_FW_TABLE_ADD 40 /* add entry */ -#define IP_FW_TABLE_DEL 41 /* delete entry */ -#define IP_FW_TABLE_FLUSH 42 /* flush table */ -#define IP_FW_TABLE_GETSIZE 43 /* get table size */ -#define IP_FW_TABLE_LIST 44 /* list table contents */ - -#define IP_FW3 48 /* generic ipfw v.3 sockopts */ -#define IP_DUMMYNET3 49 /* generic dummynet v.3 sockopts */ - -#define IP_FW_ADD 50 /* add a firewall rule to chain */ -#define IP_FW_DEL 51 /* delete a firewall rule from chain */ -#define IP_FW_FLUSH 52 /* flush firewall rule chain */ -#define IP_FW_ZERO 53 /* clear single/all firewall counter(s) */ -#define IP_FW_GET 54 /* get entire firewall rule chain */ -#define IP_FW_RESETLOG 55 /* reset logging counters */ - -#define IP_FW_NAT_CFG 56 /* add/config a nat rule */ -#define IP_FW_NAT_DEL 57 /* delete a nat rule */ -#define IP_FW_NAT_GET_CONFIG 58 /* get configuration of a nat rule */ -#define IP_FW_NAT_GET_LOG 59 /* get log of a nat rule */ - -#define IP_DUMMYNET_CONFIGURE 60 /* add/configure a dummynet pipe */ -#define IP_DUMMYNET_DEL 61 /* delete a dummynet pipe from chain */ -#define IP_DUMMYNET_FLUSH 62 /* flush dummynet */ -#define IP_DUMMYNET_GET 64 /* get entire dummynet pipes */ - -#define IP_RECVTTL 65 /* bool; receive IP TTL w/dgram */ -#define IP_MINTTL 66 /* minimum TTL for packet or drop */ -#define IP_DONTFRAG 67 /* don't fragment packet */ -#define IP_RECVTOS 68 /* bool; receive IP TOS w/dgram */ - -/* IPv4 Source Filter Multicast API [RFC3678] */ -#define IP_ADD_SOURCE_MEMBERSHIP 70 /* join a source-specific group */ -#define IP_DROP_SOURCE_MEMBERSHIP 71 /* drop a single source */ -#define IP_BLOCK_SOURCE 72 /* block a source */ -#define IP_UNBLOCK_SOURCE 73 /* unblock a source */ - -/* The following option is private; do not use it from user applications. */ -#define IP_MSFILTER 74 /* set/get filter list */ - -/* Protocol Independent Multicast API [RFC3678] */ -#define MCAST_JOIN_GROUP 80 /* join an any-source group */ -#define MCAST_LEAVE_GROUP 81 /* leave all sources for group */ -#define MCAST_JOIN_SOURCE_GROUP 82 /* join a source-specific group */ -#define MCAST_LEAVE_SOURCE_GROUP 83 /* leave a single source */ -#define MCAST_BLOCK_SOURCE 84 /* block a source */ -#define MCAST_UNBLOCK_SOURCE 85 /* unblock a source */ - -/* Flow and RSS definitions */ -#define IP_FLOWID 90 /* get flow id for the given socket/inp */ -#define IP_FLOWTYPE 91 /* get flow type (M_HASHTYPE) */ -#define IP_RSSBUCKETID 92 /* get RSS flowid -> bucket mapping */ -#define IP_RECVFLOWID 93 /* bool; receive IP flowid/flowtype w/ datagram */ -#define IP_RECVRSSBUCKETID 94 /* bool; receive IP RSS bucket id w/ datagram */ - -/* - * Defaults and limits for options - */ -#define IP_DEFAULT_MULTICAST_TTL 1 /* normally limit m'casts to 1 hop */ -#define IP_DEFAULT_MULTICAST_LOOP 1 /* normally hear sends if a member */ - -/* - * The imo_membership vector for each socket is now dynamically allocated at - * run-time, bounded by USHRT_MAX, and is reallocated when needed, sized - * according to a power-of-two increment. - */ -#define IP_MIN_MEMBERSHIPS 31 -#define IP_MAX_MEMBERSHIPS 4095 -#define IP_MAX_SOURCE_FILTER 1024 /* XXX to be unused */ - -/* - * Default resource limits for IPv4 multicast source filtering. - * These may be modified by sysctl. - */ -#define IP_MAX_GROUP_SRC_FILTER 512 /* sources per group */ -#define IP_MAX_SOCK_SRC_FILTER 128 /* sources per socket/group */ -#define IP_MAX_SOCK_MUTE_FILTER 128 /* XXX no longer used */ - -/* - * Argument structure for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP. - */ -struct ip_mreq { - struct in_addr imr_multiaddr; /* IP multicast address of group */ - struct in_addr imr_interface; /* local IP address of interface */ -}; - -/* - * Modified argument structure for IP_MULTICAST_IF, obtained from Linux. - * This is used to specify an interface index for multicast sends, as - * the IPv4 legacy APIs do not support this (unless IP_SENDIF is available). - */ -struct ip_mreqn { - struct in_addr imr_multiaddr; /* IP multicast address of group */ - struct in_addr imr_address; /* local IP address of interface */ - int imr_ifindex; /* Interface index; cast to uint32_t */ -}; - -/* - * Argument structure for IPv4 Multicast Source Filter APIs. [RFC3678] - */ -struct ip_mreq_source { - struct in_addr imr_multiaddr; /* IP multicast address of group */ - struct in_addr imr_sourceaddr; /* IP address of source */ - struct in_addr imr_interface; /* local IP address of interface */ -}; - -/* - * Argument structures for Protocol-Independent Multicast Source - * Filter APIs. [RFC3678] - */ -struct group_req { - uint32_t gr_interface; /* interface index */ - struct sockaddr_storage gr_group; /* group address */ -}; - -struct group_source_req { - uint32_t gsr_interface; /* interface index */ - struct sockaddr_storage gsr_group; /* group address */ - struct sockaddr_storage gsr_source; /* source address */ -}; - -#ifndef __MSFILTERREQ_DEFINED -#define __MSFILTERREQ_DEFINED -/* - * The following structure is private; do not use it from user applications. - * It is used to communicate IP_MSFILTER/IPV6_MSFILTER information between - * the RFC 3678 libc functions and the kernel. - */ -struct __msfilterreq { - uint32_t msfr_ifindex; /* interface index */ - uint32_t msfr_fmode; /* filter mode for group */ - uint32_t msfr_nsrcs; /* # of sources in msfr_srcs */ - struct sockaddr_storage msfr_group; /* group address */ - struct sockaddr_storage *msfr_srcs; /* pointer to the first member - * of a contiguous array of - * sources to filter in full. - */ -}; -#endif - -struct sockaddr; - -/* - * Advanced (Full-state) APIs [RFC3678] - * The RFC specifies uint_t for the 6th argument to [sg]etsourcefilter(). - * We use uint32_t here to be consistent. - */ -int setipv4sourcefilter(int, struct in_addr, struct in_addr, uint32_t, - uint32_t, struct in_addr *); -int getipv4sourcefilter(int, struct in_addr, struct in_addr, uint32_t *, - uint32_t *, struct in_addr *); -int setsourcefilter(int, uint32_t, struct sockaddr *, socklen_t, - uint32_t, uint32_t, struct sockaddr_storage *); -int getsourcefilter(int, uint32_t, struct sockaddr *, socklen_t, - uint32_t *, uint32_t *, struct sockaddr_storage *); - -/* - * Filter modes; also used to represent per-socket filter mode internally. - */ -#define MCAST_UNDEFINED 0 /* fmode: not yet defined */ -#define MCAST_INCLUDE 1 /* fmode: include these source(s) */ -#define MCAST_EXCLUDE 2 /* fmode: exclude these source(s) */ - -/* - * Argument for IP_PORTRANGE: - * - which range to search when port is unspecified at bind() or connect() - */ -#define IP_PORTRANGE_DEFAULT 0 /* default range */ -#define IP_PORTRANGE_HIGH 1 /* "high" - request firewall bypass */ -#define IP_PORTRANGE_LOW 2 /* "low" - vouchsafe security */ - -/* - * Identifiers for IP sysctl nodes - */ -#define IPCTL_FORWARDING 1 /* act as router */ -#define IPCTL_SENDREDIRECTS 2 /* may send redirects when forwarding */ -#define IPCTL_DEFTTL 3 /* default TTL */ -#ifdef notyet -#define IPCTL_DEFMTU 4 /* default MTU */ -#endif -/* IPCTL_RTEXPIRE 5 deprecated */ -/* IPCTL_RTMINEXPIRE 6 deprecated */ -/* IPCTL_RTMAXCACHE 7 deprecated */ -#define IPCTL_SOURCEROUTE 8 /* may perform source routes */ -#define IPCTL_DIRECTEDBROADCAST 9 /* may re-broadcast received packets */ -#define IPCTL_INTRQMAXLEN 10 /* max length of netisr queue */ -#define IPCTL_INTRQDROPS 11 /* number of netisr q drops */ -#define IPCTL_STATS 12 /* ipstat structure */ -#define IPCTL_ACCEPTSOURCEROUTE 13 /* may accept source routed packets */ -#define IPCTL_FASTFORWARDING 14 /* use fast IP forwarding code */ - /* 15, unused, was: IPCTL_KEEPFAITH */ -#define IPCTL_GIF_TTL 16 /* default TTL for gif encap packet */ - -#endif /* __BSD_VISIBLE */ - -#ifdef _KERNEL - -struct ifnet; struct mbuf; /* forward declarations for Standard C */ -struct in_ifaddr; - -int in_broadcast(struct in_addr, struct ifnet *); -int in_ifaddr_broadcast(struct in_addr, struct in_ifaddr *); -int in_canforward(struct in_addr); -int in_localaddr(struct in_addr); -int in_localip(struct in_addr); -int in_ifhasaddr(struct ifnet *, struct in_addr); -int inet_aton(const char *, struct in_addr *); /* in libkern */ -char *inet_ntoa_r(struct in_addr ina, char *buf); /* in libkern */ -char *inet_ntop(int, const void *, char *, socklen_t); /* in libkern */ -int inet_pton(int af, const char *, void *); /* in libkern */ -void in_ifdetach(struct ifnet *); - -#define in_hosteq(s, t) ((s).s_addr == (t).s_addr) -#define in_nullhost(x) ((x).s_addr == INADDR_ANY) -#define in_allhosts(x) ((x).s_addr == htonl(INADDR_ALLHOSTS_GROUP)) - -#define satosin(sa) ((struct sockaddr_in *)(sa)) -#define sintosa(sin) ((struct sockaddr *)(sin)) -#define ifatoia(ifa) ((struct in_ifaddr *)(ifa)) -#endif /* _KERNEL */ - -/* INET6 stuff */ -#if __POSIX_VISIBLE >= 200112 -#define __KAME_NETINET_IN_H_INCLUDED_ -#include <netinet6/in6.h> -#undef __KAME_NETINET_IN_H_INCLUDED_ -#endif - -#endif /* !_NETINET_IN_H_*/ diff --git a/freebsd/sys/netinet/in_fib.c b/freebsd/sys/netinet/in_fib.c index 159b8f28..323821b8 100644 --- a/freebsd/sys/netinet/in_fib.c +++ b/freebsd/sys/netinet/in_fib.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_route.h> #include <rtems/bsd/local/opt_mpath.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> #include <sys/rwlock.h> diff --git a/freebsd/sys/netinet/in_gif.c b/freebsd/sys/netinet/in_gif.c index 02e2efd8..b994de8a 100644 --- a/freebsd/sys/netinet/in_gif.c +++ b/freebsd/sys/netinet/in_gif.c @@ -37,14 +37,14 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/rmlock.h> #include <sys/systm.h> #include <sys/socket.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/kernel.h> #include <sys/sysctl.h> #include <sys/protosw.h> diff --git a/freebsd/sys/netinet/in_mcast.c b/freebsd/sys/netinet/in_mcast.c index 635b2579..f4ea91a3 100644 --- a/freebsd/sys/netinet/in_mcast.c +++ b/freebsd/sys/netinet/in_mcast.c @@ -37,7 +37,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet/in_pcb.c b/freebsd/sys/netinet/in_pcb.c index e423eed8..677cdb86 100644 --- a/freebsd/sys/netinet/in_pcb.c +++ b/freebsd/sys/netinet/in_pcb.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_pcbgroup.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/in_proto.c b/freebsd/sys/netinet/in_proto.c index 62472d7e..de2f2057 100644 --- a/freebsd/sys/netinet/in_proto.c +++ b/freebsd/sys/netinet/in_proto.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_sctp.h> #include <rtems/bsd/local/opt_mpath.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/in_rmx.c b/freebsd/sys/netinet/in_rmx.c index 2062d1d1..5e07e7e6 100644 --- a/freebsd/sys/netinet/in_rmx.c +++ b/freebsd/sys/netinet/in_rmx.c @@ -32,7 +32,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/netinet/ip_carp.c b/freebsd/sys/netinet/ip_carp.c index da29ecc9..8b09a8c3 100644 --- a/freebsd/sys/netinet/ip_carp.c +++ b/freebsd/sys/netinet/ip_carp.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/jail.h> diff --git a/freebsd/sys/netinet/ip_divert.c b/freebsd/sys/netinet/ip_divert.c index 9fb17fb2..854e25ed 100644 --- a/freebsd/sys/netinet/ip_divert.c +++ b/freebsd/sys/netinet/ip_divert.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #error "IPDIVERT requires INET" #endif -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/eventhandler.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet/ip_ecn.c b/freebsd/sys/netinet/ip_ecn.c index cee961bf..cc5fd9dd 100644 --- a/freebsd/sys/netinet/ip_ecn.c +++ b/freebsd/sys/netinet/ip_ecn.c @@ -42,10 +42,10 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <netinet/in.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/netinet/ip_encap.c b/freebsd/sys/netinet/ip_encap.c index 19ff1a09..f55fed91 100644 --- a/freebsd/sys/netinet/ip_encap.c +++ b/freebsd/sys/netinet/ip_encap.c @@ -65,14 +65,14 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/socket.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/protosw.h> #include <sys/queue.h> diff --git a/freebsd/sys/netinet/ip_fastfwd.c b/freebsd/sys/netinet/ip_fastfwd.c index 1d948781..823dee35 100644 --- a/freebsd/sys/netinet/ip_fastfwd.c +++ b/freebsd/sys/netinet/ip_fastfwd.c @@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipstealth.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/ip_gre.c b/freebsd/sys/netinet/ip_gre.c index 36d3ed69..e7738a6b 100644 --- a/freebsd/sys/netinet/ip_gre.c +++ b/freebsd/sys/netinet/ip_gre.c @@ -40,13 +40,13 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/protosw.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/time.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet/ip_icmp.c b/freebsd/sys/netinet/ip_icmp.c index 77a1c179..d74b13ff 100644 --- a/freebsd/sys/netinet/ip_icmp.c +++ b/freebsd/sys/netinet/ip_icmp.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/protosw.h> diff --git a/freebsd/sys/netinet/ip_id.c b/freebsd/sys/netinet/ip_id.c index 17352cfb..41195651 100644 --- a/freebsd/sys/netinet/ip_id.c +++ b/freebsd/sys/netinet/ip_id.c @@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$"); * enabled. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/counter.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netinet/ip_input.c b/freebsd/sys/netinet/ip_input.c index 4e500e7c..05a40a3a 100644 --- a/freebsd/sys/netinet/ip_input.c +++ b/freebsd/sys/netinet/ip_input.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_route.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/hhook.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netinet/ip_mroute.c b/freebsd/sys/netinet/ip_mroute.c index 85623b21..7859bd92 100644 --- a/freebsd/sys/netinet/ip_mroute.c +++ b/freebsd/sys/netinet/ip_mroute.c @@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$"); #define _PIM_VT 1 -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/stddef.h> #include <sys/eventhandler.h> diff --git a/freebsd/sys/netinet/ip_options.c b/freebsd/sys/netinet/ip_options.c index 72eed66b..9d5310f1 100644 --- a/freebsd/sys/netinet/ip_options.c +++ b/freebsd/sys/netinet/ip_options.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipstealth.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/domain.h> diff --git a/freebsd/sys/netinet/ip_output.c b/freebsd/sys/netinet/ip_output.c index dfb3f8ad..256173c1 100644 --- a/freebsd/sys/netinet/ip_output.c +++ b/freebsd/sys/netinet/ip_output.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_sctp.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet/ip_reass.c b/freebsd/sys/netinet/ip_reass.c index 4cfabc8f..bf46a726 100644 --- a/freebsd/sys/netinet/ip_reass.c +++ b/freebsd/sys/netinet/ip_reass.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/eventhandler.h> #include <sys/hash.h> diff --git a/freebsd/sys/netinet/libalias/alias.c b/freebsd/sys/netinet/libalias/alias.c index a2cd987c..cd3b5e05 100644 --- a/freebsd/sys/netinet/libalias/alias.c +++ b/freebsd/sys/netinet/libalias/alias.c @@ -114,7 +114,7 @@ __FBSDID("$FreeBSD$"); */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/netinet/libalias/alias_cuseeme.c b/freebsd/sys/netinet/libalias/alias_cuseeme.c index d6c9520c..1d3cfa54 100644 --- a/freebsd/sys/netinet/libalias/alias_cuseeme.c +++ b/freebsd/sys/netinet/libalias/alias_cuseeme.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/module.h> #else diff --git a/freebsd/sys/netinet/libalias/alias_db.c b/freebsd/sys/netinet/libalias/alias_db.c index 219d5d34..9040273c 100644 --- a/freebsd/sys/netinet/libalias/alias_db.c +++ b/freebsd/sys/netinet/libalias/alias_db.c @@ -146,7 +146,7 @@ __FBSDID("$FreeBSD$"); #ifdef _KERNEL #include <machine/stdarg.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> @@ -157,7 +157,7 @@ __FBSDID("$FreeBSD$"); #include <stdarg.h> #include <stdlib.h> #include <stdio.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/time.h> #include <unistd.h> #endif diff --git a/freebsd/sys/netinet/libalias/alias_dummy.c b/freebsd/sys/netinet/libalias/alias_dummy.c index b4c00c20..8b5ba1eb 100644 --- a/freebsd/sys/netinet/libalias/alias_dummy.c +++ b/freebsd/sys/netinet/libalias/alias_dummy.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/module.h> #else diff --git a/freebsd/sys/netinet/libalias/alias_ftp.c b/freebsd/sys/netinet/libalias/alias_ftp.c index ccf15275..2e1f4d3a 100644 --- a/freebsd/sys/netinet/libalias/alias_ftp.c +++ b/freebsd/sys/netinet/libalias/alias_ftp.c @@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$"); /* Includes */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ctype.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netinet/libalias/alias_irc.c b/freebsd/sys/netinet/libalias/alias_irc.c index 44ff6d92..19bf0db1 100644 --- a/freebsd/sys/netinet/libalias/alias_irc.c +++ b/freebsd/sys/netinet/libalias/alias_irc.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); /* Includes */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ctype.h> #include <sys/limits.h> #include <sys/systm.h> diff --git a/freebsd/sys/netinet/libalias/alias_local.h b/freebsd/sys/netinet/libalias/alias_local.h index b8632359..873ea11d 100644 --- a/freebsd/sys/netinet/libalias/alias_local.h +++ b/freebsd/sys/netinet/libalias/alias_local.h @@ -51,7 +51,7 @@ #ifdef _KERNEL #include <sys/malloc.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> diff --git a/freebsd/sys/netinet/libalias/alias_mod.c b/freebsd/sys/netinet/libalias/alias_mod.c index 6acbbee6..d6f60ac0 100644 --- a/freebsd/sys/netinet/libalias/alias_mod.c +++ b/freebsd/sys/netinet/libalias/alias_mod.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #ifdef _KERNEL #include <sys/libkern.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/rwlock.h> #else diff --git a/freebsd/sys/netinet/libalias/alias_nbt.c b/freebsd/sys/netinet/libalias/alias_nbt.c index d3fbb98d..9e3b8b00 100644 --- a/freebsd/sys/netinet/libalias/alias_nbt.c +++ b/freebsd/sys/netinet/libalias/alias_nbt.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); /* Includes */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/libalias/alias_pptp.c b/freebsd/sys/netinet/libalias/alias_pptp.c index 39861c5c..e3da53b7 100644 --- a/freebsd/sys/netinet/libalias/alias_pptp.c +++ b/freebsd/sys/netinet/libalias/alias_pptp.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); /* Includes */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/limits.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/libalias/alias_proxy.c b/freebsd/sys/netinet/libalias/alias_proxy.c index fdd46b1d..233d5154 100644 --- a/freebsd/sys/netinet/libalias/alias_proxy.c +++ b/freebsd/sys/netinet/libalias/alias_proxy.c @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); /* System includes */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ctype.h> #include <sys/libkern.h> #include <sys/limits.h> diff --git a/freebsd/sys/netinet/libalias/alias_sctp.c b/freebsd/sys/netinet/libalias/alias_sctp.c index c4048410..c3d76c3b 100644 --- a/freebsd/sys/netinet/libalias/alias_sctp.c +++ b/freebsd/sys/netinet/libalias/alias_sctp.c @@ -74,7 +74,7 @@ #ifdef _KERNEL #include <machine/stdarg.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/libalias/alias_sctp.h b/freebsd/sys/netinet/libalias/alias_sctp.h index 99cceee4..7bef6f8f 100644 --- a/freebsd/sys/netinet/libalias/alias_sctp.h +++ b/freebsd/sys/netinet/libalias/alias_sctp.h @@ -50,7 +50,7 @@ #ifndef _ALIAS_SCTP_H_ #define _ALIAS_SCTP_H_ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #ifdef _KERNEL #include <sys/malloc.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/libalias/alias_skinny.c b/freebsd/sys/netinet/libalias/alias_skinny.c index b1f8f8c7..49e80eeb 100644 --- a/freebsd/sys/netinet/libalias/alias_skinny.c +++ b/freebsd/sys/netinet/libalias/alias_skinny.c @@ -33,7 +33,7 @@ */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/module.h> #else diff --git a/freebsd/sys/netinet/libalias/alias_smedia.c b/freebsd/sys/netinet/libalias/alias_smedia.c index 9578a4af..93f93296 100644 --- a/freebsd/sys/netinet/libalias/alias_smedia.c +++ b/freebsd/sys/netinet/libalias/alias_smedia.c @@ -101,7 +101,7 @@ __FBSDID("$FreeBSD$"); */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/libalias/alias_util.c b/freebsd/sys/netinet/libalias/alias_util.c index 6455fb43..622121ee 100644 --- a/freebsd/sys/netinet/libalias/alias_util.c +++ b/freebsd/sys/netinet/libalias/alias_util.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/proc.h> #else #include <sys/types.h> diff --git a/freebsd/sys/netinet/raw_ip.c b/freebsd/sys/netinet/raw_ip.c index b9fae844..5a615a03 100644 --- a/freebsd/sys/netinet/raw_ip.c +++ b/freebsd/sys/netinet/raw_ip.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_ipsec.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/jail.h> #include <sys/kernel.h> #include <sys/eventhandler.h> diff --git a/freebsd/sys/netinet/sctp_os_bsd.h b/freebsd/sys/netinet/sctp_os_bsd.h index f603cec6..8ddb4808 100644 --- a/freebsd/sys/netinet/sctp_os_bsd.h +++ b/freebsd/sys/netinet/sctp_os_bsd.h @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_sctp.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ktr.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/tcp.h b/freebsd/sys/netinet/tcp.h deleted file mode 100644 index 62a177de..00000000 --- a/freebsd/sys/netinet/tcp.h +++ /dev/null @@ -1,261 +0,0 @@ -/*- - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)tcp.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD$ - */ - -#ifndef _NETINET_TCP_H_ -#define _NETINET_TCP_H_ - -#include <sys/cdefs.h> -#include <sys/types.h> - -#if __BSD_VISIBLE - -typedef u_int32_t tcp_seq; - -#define tcp6_seq tcp_seq /* for KAME src sync over BSD*'s */ -#define tcp6hdr tcphdr /* for KAME src sync over BSD*'s */ - -/* - * TCP header. - * Per RFC 793, September, 1981. - */ -struct tcphdr { - u_short th_sport; /* source port */ - u_short th_dport; /* destination port */ - tcp_seq th_seq; /* sequence number */ - tcp_seq th_ack; /* acknowledgement number */ -#if BYTE_ORDER == LITTLE_ENDIAN - u_char th_x2:4, /* (unused) */ - th_off:4; /* data offset */ -#endif -#if BYTE_ORDER == BIG_ENDIAN - u_char th_off:4, /* data offset */ - th_x2:4; /* (unused) */ -#endif - u_char th_flags; -#define TH_FIN 0x01 -#define TH_SYN 0x02 -#define TH_RST 0x04 -#define TH_PUSH 0x08 -#define TH_ACK 0x10 -#define TH_URG 0x20 -#define TH_ECE 0x40 -#define TH_CWR 0x80 -#define TH_FLAGS (TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG|TH_ECE|TH_CWR) -#define PRINT_TH_FLAGS "\20\1FIN\2SYN\3RST\4PUSH\5ACK\6URG\7ECE\10CWR" - - u_short th_win; /* window */ - u_short th_sum; /* checksum */ - u_short th_urp; /* urgent pointer */ -}; - -#define TCPOPT_EOL 0 -#define TCPOLEN_EOL 1 -#define TCPOPT_PAD 0 /* padding after EOL */ -#define TCPOLEN_PAD 1 -#define TCPOPT_NOP 1 -#define TCPOLEN_NOP 1 -#define TCPOPT_MAXSEG 2 -#define TCPOLEN_MAXSEG 4 -#define TCPOPT_WINDOW 3 -#define TCPOLEN_WINDOW 3 -#define TCPOPT_SACK_PERMITTED 4 -#define TCPOLEN_SACK_PERMITTED 2 -#define TCPOPT_SACK 5 -#define TCPOLEN_SACKHDR 2 -#define TCPOLEN_SACK 8 /* 2*sizeof(tcp_seq) */ -#define TCPOPT_TIMESTAMP 8 -#define TCPOLEN_TIMESTAMP 10 -#define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ -#define TCPOPT_SIGNATURE 19 /* Keyed MD5: RFC 2385 */ -#define TCPOLEN_SIGNATURE 18 -#define TCPOPT_FAST_OPEN 34 -#define TCPOLEN_FAST_OPEN_EMPTY 2 -#define TCPOLEN_FAST_OPEN_MIN 6 -#define TCPOLEN_FAST_OPEN_MAX 18 - -/* Miscellaneous constants */ -#define MAX_SACK_BLKS 6 /* Max # SACK blocks stored at receiver side */ -#define TCP_MAX_SACK 4 /* MAX # SACKs sent in any segment */ - - -/* - * The default maximum segment size (MSS) to be used for new TCP connections - * when path MTU discovery is not enabled. - * - * RFC879 derives the default MSS from the largest datagram size hosts are - * minimally required to handle directly or through IP reassembly minus the - * size of the IP and TCP header. With IPv6 the minimum MTU is specified - * in RFC2460. - * - * For IPv4 the MSS is 576 - sizeof(struct tcpiphdr) - * For IPv6 the MSS is IPV6_MMTU - sizeof(struct ip6_hdr) - sizeof(struct tcphdr) - * - * We use explicit numerical definition here to avoid header pollution. - */ -#define TCP_MSS 536 -#define TCP6_MSS 1220 - -/* - * Limit the lowest MSS we accept for path MTU discovery and the TCP SYN MSS - * option. Allowing low values of MSS can consume significant resources and - * be used to mount a resource exhaustion attack. - * Connections requesting lower MSS values will be rounded up to this value - * and the IP_DF flag will be cleared to allow fragmentation along the path. - * - * See tcp_subr.c tcp_minmss SYSCTL declaration for more comments. Setting - * it to "0" disables the minmss check. - * - * The default value is fine for TCP across the Internet's smallest official - * link MTU (256 bytes for AX.25 packet radio). However, a connection is very - * unlikely to come across such low MTU interfaces these days (anno domini 2003). - */ -#define TCP_MINMSS 216 - -#define TCP_MAXWIN 65535 /* largest value for (unscaled) window */ -#define TTCP_CLIENT_SND_WND 4096 /* dflt send window for T/TCP client */ - -#define TCP_MAX_WINSHIFT 14 /* maximum window shift */ - -#define TCP_MAXBURST 4 /* maximum segments in a burst */ - -#define TCP_MAXHLEN (0xf<<2) /* max length of header in bytes */ -#define TCP_MAXOLEN (TCP_MAXHLEN - sizeof(struct tcphdr)) - /* max space left for options */ -#endif /* __BSD_VISIBLE */ - -/* - * User-settable options (used with setsockopt). These are discrete - * values and are not masked together. Some values appear to be - * bitmasks for historical reasons. - */ -#define TCP_NODELAY 1 /* don't delay send to coalesce packets */ -#if __BSD_VISIBLE -#define TCP_MAXSEG 2 /* set maximum segment size */ -#define TCP_NOPUSH 4 /* don't push last block of write */ -#define TCP_NOOPT 8 /* don't use TCP options */ -#define TCP_MD5SIG 16 /* use MD5 digests (RFC2385) */ -#define TCP_INFO 32 /* retrieve tcp_info structure */ -#define TCP_CONGESTION 64 /* get/set congestion control algorithm */ -#define TCP_CCALGOOPT 65 /* get/set cc algorithm specific options */ -#define TCP_KEEPINIT 128 /* N, time to establish connection */ -#define TCP_KEEPIDLE 256 /* L,N,X start keeplives after this period */ -#define TCP_KEEPINTVL 512 /* L,N interval between keepalives */ -#define TCP_KEEPCNT 1024 /* L,N number of keepalives before close */ -#define TCP_FASTOPEN 1025 /* enable TFO / was created via TFO */ -#define TCP_PCAP_OUT 2048 /* number of output packets to keep */ -#define TCP_PCAP_IN 4096 /* number of input packets to keep */ -#define TCP_FUNCTION_BLK 8192 /* Set the tcp function pointers to the specified stack */ -/* Start of reserved space for third-party user-settable options. */ -#define TCP_VENDOR SO_VENDOR - -#define TCP_CA_NAME_MAX 16 /* max congestion control name length */ - -#define TCPI_OPT_TIMESTAMPS 0x01 -#define TCPI_OPT_SACK 0x02 -#define TCPI_OPT_WSCALE 0x04 -#define TCPI_OPT_ECN 0x08 -#define TCPI_OPT_TOE 0x10 - -/* - * The TCP_INFO socket option comes from the Linux 2.6 TCP API, and permits - * the caller to query certain information about the state of a TCP - * connection. We provide an overlapping set of fields with the Linux - * implementation, but since this is a fixed size structure, room has been - * left for growth. In order to maximize potential future compatibility with - * the Linux API, the same variable names and order have been adopted, and - * padding left to make room for omitted fields in case they are added later. - * - * XXX: This is currently an unstable ABI/API, in that it is expected to - * change. - */ -struct tcp_info { - u_int8_t tcpi_state; /* TCP FSM state. */ - u_int8_t __tcpi_ca_state; - u_int8_t __tcpi_retransmits; - u_int8_t __tcpi_probes; - u_int8_t __tcpi_backoff; - u_int8_t tcpi_options; /* Options enabled on conn. */ - u_int8_t tcpi_snd_wscale:4, /* RFC1323 send shift value. */ - tcpi_rcv_wscale:4; /* RFC1323 recv shift value. */ - - u_int32_t tcpi_rto; /* Retransmission timeout (usec). */ - u_int32_t __tcpi_ato; - u_int32_t tcpi_snd_mss; /* Max segment size for send. */ - u_int32_t tcpi_rcv_mss; /* Max segment size for receive. */ - - u_int32_t __tcpi_unacked; - u_int32_t __tcpi_sacked; - u_int32_t __tcpi_lost; - u_int32_t __tcpi_retrans; - u_int32_t __tcpi_fackets; - - /* Times; measurements in usecs. */ - u_int32_t __tcpi_last_data_sent; - u_int32_t __tcpi_last_ack_sent; /* Also unimpl. on Linux? */ - u_int32_t tcpi_last_data_recv; /* Time since last recv data. */ - u_int32_t __tcpi_last_ack_recv; - - /* Metrics; variable units. */ - u_int32_t __tcpi_pmtu; - u_int32_t __tcpi_rcv_ssthresh; - u_int32_t tcpi_rtt; /* Smoothed RTT in usecs. */ - u_int32_t tcpi_rttvar; /* RTT variance in usecs. */ - u_int32_t tcpi_snd_ssthresh; /* Slow start threshold. */ - u_int32_t tcpi_snd_cwnd; /* Send congestion window. */ - u_int32_t __tcpi_advmss; - u_int32_t __tcpi_reordering; - - u_int32_t __tcpi_rcv_rtt; - u_int32_t tcpi_rcv_space; /* Advertised recv window. */ - - /* FreeBSD extensions to tcp_info. */ - u_int32_t tcpi_snd_wnd; /* Advertised send window. */ - u_int32_t tcpi_snd_bwnd; /* No longer used. */ - u_int32_t tcpi_snd_nxt; /* Next egress seqno */ - u_int32_t tcpi_rcv_nxt; /* Next ingress seqno */ - u_int32_t tcpi_toe_tid; /* HWTID for TOE endpoints */ - u_int32_t tcpi_snd_rexmitpack; /* Retransmitted packets */ - u_int32_t tcpi_rcv_ooopack; /* Out-of-order packets */ - u_int32_t tcpi_snd_zerowin; /* Zero-sized windows sent */ - - /* Padding to grow without breaking ABI. */ - u_int32_t __tcpi_pad[26]; /* Padding. */ -}; -#endif -#define TCP_FUNCTION_NAME_LEN_MAX 32 - -struct tcp_function_set { - char function_set_name[TCP_FUNCTION_NAME_LEN_MAX]; - uint32_t pcbcnt; -}; - -#endif /* !_NETINET_TCP_H_ */ diff --git a/freebsd/sys/netinet/tcp_debug.c b/freebsd/sys/netinet/tcp_debug.c index 3a9b6d6a..03eba1d4 100644 --- a/freebsd/sys/netinet/tcp_debug.c +++ b/freebsd/sys/netinet/tcp_debug.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #define TANAMES #endif -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet/tcp_hostcache.c b/freebsd/sys/netinet/tcp_hostcache.c index ef04cf98..02462fa4 100644 --- a/freebsd/sys/netinet/tcp_hostcache.c +++ b/freebsd/sys/netinet/tcp_hostcache.c @@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/jail.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netinet/tcp_input.c b/freebsd/sys/netinet/tcp_input.c index d23e1d31..89f2bf0c 100644 --- a/freebsd/sys/netinet/tcp_input.c +++ b/freebsd/sys/netinet/tcp_input.c @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_tcpdebug.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #ifdef TCP_HHOOK #include <sys/hhook.h> diff --git a/freebsd/sys/netinet/tcp_lro.c b/freebsd/sys/netinet/tcp_lro.c index f318e78b..13866134 100644 --- a/freebsd/sys/netinet/tcp_lro.c +++ b/freebsd/sys/netinet/tcp_lro.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/tcp_offload.c b/freebsd/sys/netinet/tcp_offload.c index 78275fb8..12882225 100644 --- a/freebsd/sys/netinet/tcp_offload.c +++ b/freebsd/sys/netinet/tcp_offload.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/types.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netinet/tcp_output.c b/freebsd/sys/netinet/tcp_output.c index 75b52df5..6ecc0cc2 100644 --- a/freebsd/sys/netinet/tcp_output.c +++ b/freebsd/sys/netinet/tcp_output.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_tcpdebug.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/domain.h> #ifdef TCP_HHOOK diff --git a/freebsd/sys/netinet/tcp_reass.c b/freebsd/sys/netinet/tcp_reass.c index ba973e5c..779de5e0 100644 --- a/freebsd/sys/netinet/tcp_reass.c +++ b/freebsd/sys/netinet/tcp_reass.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_tcpdebug.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/eventhandler.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/tcp_sack.c b/freebsd/sys/netinet/tcp_sack.c index 170d263e..00876890 100644 --- a/freebsd/sys/netinet/tcp_sack.c +++ b/freebsd/sys/netinet/tcp_sack.c @@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_tcpdebug.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/netinet/tcp_subr.c b/freebsd/sys/netinet/tcp_subr.c index e4e4ca6a..48f4cfda 100644 --- a/freebsd/sys/netinet/tcp_subr.c +++ b/freebsd/sys/netinet/tcp_subr.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_tcpdebug.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/callout.h> #include <sys/eventhandler.h> diff --git a/freebsd/sys/netinet/tcp_syncache.c b/freebsd/sys/netinet/tcp_syncache.c index 78303625..05e076f8 100644 --- a/freebsd/sys/netinet/tcp_syncache.c +++ b/freebsd/sys/netinet/tcp_syncache.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_pcbgroup.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/hash.h> #include <sys/refcount.h> diff --git a/freebsd/sys/netinet/tcp_timer.c b/freebsd/sys/netinet/tcp_timer.c index 4743b4fd..7e7836ab 100644 --- a/freebsd/sys/netinet/tcp_timer.c +++ b/freebsd/sys/netinet/tcp_timer.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_tcpdebug.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netinet/tcp_timewait.c b/freebsd/sys/netinet/tcp_timewait.c index 8ff6e63b..de7d08da 100644 --- a/freebsd/sys/netinet/tcp_timewait.c +++ b/freebsd/sys/netinet/tcp_timewait.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_tcpdebug.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/callout.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netinet/tcp_usrreq.c b/freebsd/sys/netinet/tcp_usrreq.c index 314bc954..05fed2d5 100644 --- a/freebsd/sys/netinet/tcp_usrreq.c +++ b/freebsd/sys/netinet/tcp_usrreq.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_tcpdebug.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/limits.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/udp_usrreq.c b/freebsd/sys/netinet/udp_usrreq.c index 093b7f32..44be4d52 100644 --- a/freebsd/sys/netinet/udp_usrreq.c +++ b/freebsd/sys/netinet/udp_usrreq.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/domain.h> #include <sys/eventhandler.h> #include <sys/jail.h> diff --git a/freebsd/sys/netinet6/dest6.c b/freebsd/sys/netinet6/dest6.c index 94386ddd..8d2f79e4 100644 --- a/freebsd/sys/netinet6/dest6.c +++ b/freebsd/sys/netinet6/dest6.c @@ -37,14 +37,14 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/domain.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/time.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netinet6/frag6.c b/freebsd/sys/netinet6/frag6.c index f0721a4c..ae209b60 100644 --- a/freebsd/sys/netinet6/frag6.c +++ b/freebsd/sys/netinet6/frag6.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <sys/eventhandler.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/time.h> #include <sys/kernel.h> #include <sys/syslog.h> diff --git a/freebsd/sys/netinet6/icmp6.c b/freebsd/sys/netinet6/icmp6.c index 48066467..d9f84991 100644 --- a/freebsd/sys/netinet6/icmp6.c +++ b/freebsd/sys/netinet6/icmp6.c @@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/domain.h> #include <sys/jail.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netinet6/in6.c b/freebsd/sys/netinet6/in6.c index bc390e50..9124fa78 100644 --- a/freebsd/sys/netinet6/in6.c +++ b/freebsd/sys/netinet6/in6.c @@ -69,9 +69,9 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/eventhandler.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/jail.h> #include <sys/malloc.h> #include <sys/socket.h> diff --git a/freebsd/sys/netinet6/in6.h b/freebsd/sys/netinet6/in6.h deleted file mode 100644 index ed26a7cd..00000000 --- a/freebsd/sys/netinet6/in6.h +++ /dev/null @@ -1,748 +0,0 @@ -/*- - * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $KAME: in6.h,v 1.89 2001/05/27 13:28:35 itojun Exp $ - */ - -/*- - * Copyright (c) 1982, 1986, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD$ - */ - -#ifndef __KAME_NETINET_IN_H_INCLUDED_ -#error "do not include netinet6/in6.h directly, include netinet/in.h. see RFC2553" -#endif - -#ifndef _NETINET6_IN6_H_ -#define _NETINET6_IN6_H_ - -/* - * Identification of the network protocol stack - * for *BSD-current/release: http://www.kame.net/dev/cvsweb.cgi/kame/COVERAGE - * has the table of implementation/integration differences. - */ -#define __KAME__ -#define __KAME_VERSION "FreeBSD" - -/* - * IPv6 port allocation rules should mirror the IPv4 rules and are controlled - * by the net.inet.ip.portrange sysctl tree. The following defines exist - * for compatibility with userland applications that need them. - */ -#if __BSD_VISIBLE -#define IPV6PORT_RESERVED 1024 -#define IPV6PORT_ANONMIN 49152 -#define IPV6PORT_ANONMAX 65535 -#define IPV6PORT_RESERVEDMIN 600 -#define IPV6PORT_RESERVEDMAX (IPV6PORT_RESERVED-1) -#endif - -/* - * IPv6 address - */ -struct in6_addr { - union { - uint8_t __u6_addr8[16]; - uint16_t __u6_addr16[8]; - uint32_t __u6_addr32[4]; - } __u6_addr; /* 128-bit IP6 address */ -}; - -#define s6_addr __u6_addr.__u6_addr8 -#ifdef _KERNEL /* XXX nonstandard */ -#define s6_addr8 __u6_addr.__u6_addr8 -#define s6_addr16 __u6_addr.__u6_addr16 -#define s6_addr32 __u6_addr.__u6_addr32 -#endif - -#define INET6_ADDRSTRLEN 46 - -/* - * XXX missing POSIX.1-2001 macro IPPROTO_IPV6. - */ - -/* - * Socket address for IPv6 - */ -#if __BSD_VISIBLE -#define SIN6_LEN -#endif - -struct sockaddr_in6 { - uint8_t sin6_len; /* length of this struct */ - sa_family_t sin6_family; /* AF_INET6 */ - in_port_t sin6_port; /* Transport layer port # */ - uint32_t sin6_flowinfo; /* IP6 flow information */ - struct in6_addr sin6_addr; /* IP6 address */ - uint32_t sin6_scope_id; /* scope zone index */ -}; - -/* - * Local definition for masks - */ -#ifdef _KERNEL /* XXX nonstandard */ -#define IN6MASK0 {{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }}} -#define IN6MASK32 {{{ 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}} -#define IN6MASK64 {{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}} -#define IN6MASK96 {{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \ - 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }}} -#define IN6MASK128 {{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }}} -#endif - -#ifdef _KERNEL -extern const struct sockaddr_in6 sa6_any; - -extern const struct in6_addr in6mask0; -extern const struct in6_addr in6mask32; -extern const struct in6_addr in6mask64; -extern const struct in6_addr in6mask96; -extern const struct in6_addr in6mask128; -#endif /* _KERNEL */ - -/* - * Macros started with IPV6_ADDR is KAME local - */ -#ifdef _KERNEL /* XXX nonstandard */ -#if _BYTE_ORDER == _BIG_ENDIAN -#define IPV6_ADDR_INT32_ONE 1 -#define IPV6_ADDR_INT32_TWO 2 -#define IPV6_ADDR_INT32_MNL 0xff010000 -#define IPV6_ADDR_INT32_MLL 0xff020000 -#define IPV6_ADDR_INT32_SMP 0x0000ffff -#define IPV6_ADDR_INT16_ULL 0xfe80 -#define IPV6_ADDR_INT16_USL 0xfec0 -#define IPV6_ADDR_INT16_MLL 0xff02 -#elif _BYTE_ORDER == _LITTLE_ENDIAN -#define IPV6_ADDR_INT32_ONE 0x01000000 -#define IPV6_ADDR_INT32_TWO 0x02000000 -#define IPV6_ADDR_INT32_MNL 0x000001ff -#define IPV6_ADDR_INT32_MLL 0x000002ff -#define IPV6_ADDR_INT32_SMP 0xffff0000 -#define IPV6_ADDR_INT16_ULL 0x80fe -#define IPV6_ADDR_INT16_USL 0xc0fe -#define IPV6_ADDR_INT16_MLL 0x02ff -#endif -#endif - -/* - * Definition of some useful macros to handle IP6 addresses - */ -#if __BSD_VISIBLE -#define IN6ADDR_ANY_INIT \ - {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}} -#define IN6ADDR_LOOPBACK_INIT \ - {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}} -#define IN6ADDR_NODELOCAL_ALLNODES_INIT \ - {{{ 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}} -#define IN6ADDR_INTFACELOCAL_ALLNODES_INIT \ - {{{ 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}} -#define IN6ADDR_LINKLOCAL_ALLNODES_INIT \ - {{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}} -#define IN6ADDR_LINKLOCAL_ALLROUTERS_INIT \ - {{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 }}} -#define IN6ADDR_LINKLOCAL_ALLV2ROUTERS_INIT \ - {{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16 }}} -#endif - -extern const struct in6_addr in6addr_any; -extern const struct in6_addr in6addr_loopback; -#if __BSD_VISIBLE -extern const struct in6_addr in6addr_nodelocal_allnodes; -extern const struct in6_addr in6addr_linklocal_allnodes; -extern const struct in6_addr in6addr_linklocal_allrouters; -extern const struct in6_addr in6addr_linklocal_allv2routers; -#endif - -/* - * Equality - * NOTE: Some of kernel programming environment (for example, openbsd/sparc) - * does not supply memcmp(). For userland memcmp() is preferred as it is - * in ANSI standard. - */ -#ifdef _KERNEL -#define IN6_ARE_ADDR_EQUAL(a, b) \ - (bcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0) -#else -#if __BSD_VISIBLE -#define IN6_ARE_ADDR_EQUAL(a, b) \ - (memcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0) -#endif -#endif - -/* - * Unspecified - */ -#define IN6_IS_ADDR_UNSPECIFIED(a) \ - ((a)->__u6_addr.__u6_addr32[0] == 0 && \ - (a)->__u6_addr.__u6_addr32[1] == 0 && \ - (a)->__u6_addr.__u6_addr32[2] == 0 && \ - (a)->__u6_addr.__u6_addr32[3] == 0) - -/* - * Loopback - */ -#define IN6_IS_ADDR_LOOPBACK(a) \ - ((a)->__u6_addr.__u6_addr32[0] == 0 && \ - (a)->__u6_addr.__u6_addr32[1] == 0 && \ - (a)->__u6_addr.__u6_addr32[2] == 0 && \ - (a)->__u6_addr.__u6_addr32[3] == ntohl(1)) - -/* - * IPv4 compatible - */ -#define IN6_IS_ADDR_V4COMPAT(a) \ - ((a)->__u6_addr.__u6_addr32[0] == 0 && \ - (a)->__u6_addr.__u6_addr32[1] == 0 && \ - (a)->__u6_addr.__u6_addr32[2] == 0 && \ - (a)->__u6_addr.__u6_addr32[3] != 0 && \ - (a)->__u6_addr.__u6_addr32[3] != ntohl(1)) - -/* - * Mapped - */ -#define IN6_IS_ADDR_V4MAPPED(a) \ - ((a)->__u6_addr.__u6_addr32[0] == 0 && \ - (a)->__u6_addr.__u6_addr32[1] == 0 && \ - (a)->__u6_addr.__u6_addr32[2] == ntohl(0x0000ffff)) - -/* - * KAME Scope Values - */ - -#ifdef _KERNEL /* XXX nonstandard */ -#define IPV6_ADDR_SCOPE_NODELOCAL 0x01 -#define IPV6_ADDR_SCOPE_INTFACELOCAL 0x01 -#define IPV6_ADDR_SCOPE_LINKLOCAL 0x02 -#define IPV6_ADDR_SCOPE_SITELOCAL 0x05 -#define IPV6_ADDR_SCOPE_ORGLOCAL 0x08 /* just used in this file */ -#define IPV6_ADDR_SCOPE_GLOBAL 0x0e -#else -#define __IPV6_ADDR_SCOPE_NODELOCAL 0x01 -#define __IPV6_ADDR_SCOPE_INTFACELOCAL 0x01 -#define __IPV6_ADDR_SCOPE_LINKLOCAL 0x02 -#define __IPV6_ADDR_SCOPE_SITELOCAL 0x05 -#define __IPV6_ADDR_SCOPE_ORGLOCAL 0x08 /* just used in this file */ -#define __IPV6_ADDR_SCOPE_GLOBAL 0x0e -#endif - -/* - * Unicast Scope - * Note that we must check topmost 10 bits only, not 16 bits (see RFC2373). - */ -#define IN6_IS_ADDR_LINKLOCAL(a) \ - (((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0x80)) -#define IN6_IS_ADDR_SITELOCAL(a) \ - (((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0xc0)) - -/* - * Multicast - */ -#define IN6_IS_ADDR_MULTICAST(a) ((a)->s6_addr[0] == 0xff) - -#ifdef _KERNEL /* XXX nonstandard */ -#define IPV6_ADDR_MC_SCOPE(a) ((a)->s6_addr[1] & 0x0f) -#else -#define __IPV6_ADDR_MC_SCOPE(a) ((a)->s6_addr[1] & 0x0f) -#endif - -/* - * Multicast Scope - */ -#ifdef _KERNEL /* refers nonstandard items */ -#define IN6_IS_ADDR_MC_NODELOCAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_NODELOCAL)) -#define IN6_IS_ADDR_MC_INTFACELOCAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_INTFACELOCAL)) -#define IN6_IS_ADDR_MC_LINKLOCAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_LINKLOCAL)) -#define IN6_IS_ADDR_MC_SITELOCAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_SITELOCAL)) -#define IN6_IS_ADDR_MC_ORGLOCAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_ORGLOCAL)) -#define IN6_IS_ADDR_MC_GLOBAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_GLOBAL)) -#else -#define IN6_IS_ADDR_MC_NODELOCAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_NODELOCAL)) -#define IN6_IS_ADDR_MC_LINKLOCAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_LINKLOCAL)) -#define IN6_IS_ADDR_MC_SITELOCAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_SITELOCAL)) -#define IN6_IS_ADDR_MC_ORGLOCAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_ORGLOCAL)) -#define IN6_IS_ADDR_MC_GLOBAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_GLOBAL)) -#endif - -#ifdef _KERNEL /* nonstandard */ -/* - * KAME Scope - */ -#define IN6_IS_SCOPE_LINKLOCAL(a) \ - ((IN6_IS_ADDR_LINKLOCAL(a)) || \ - (IN6_IS_ADDR_MC_LINKLOCAL(a))) -#define IN6_IS_SCOPE_EMBED(a) \ - ((IN6_IS_ADDR_LINKLOCAL(a)) || \ - (IN6_IS_ADDR_MC_LINKLOCAL(a)) || \ - (IN6_IS_ADDR_MC_INTFACELOCAL(a))) - -#define IFA6_IS_DEPRECATED(a) \ - ((a)->ia6_lifetime.ia6t_pltime != ND6_INFINITE_LIFETIME && \ - (u_int32_t)((time_uptime - (a)->ia6_updatetime)) > \ - (a)->ia6_lifetime.ia6t_pltime) -#define IFA6_IS_INVALID(a) \ - ((a)->ia6_lifetime.ia6t_vltime != ND6_INFINITE_LIFETIME && \ - (u_int32_t)((time_uptime - (a)->ia6_updatetime)) > \ - (a)->ia6_lifetime.ia6t_vltime) -#endif /* _KERNEL */ - -/* - * IP6 route structure - */ -#if __BSD_VISIBLE -struct route_in6 { - struct rtentry *ro_rt; - struct llentry *ro_lle; - /* - * ro_prepend and ro_plen are only used for bpf to pass in a - * preformed header. They are not cacheable. - */ - char *ro_prepend; - uint16_t ro_plen; - uint16_t ro_flags; - uint16_t ro_mtu; /* saved ro_rt mtu */ - uint16_t spare; - struct sockaddr_in6 ro_dst; -}; -#endif - -#ifdef _KERNEL -#define MTAG_ABI_IPV6 1444287380 /* IPv6 ABI */ -#define IPV6_TAG_DIRECT 0 /* direct-dispatch IPv6 */ -#endif /* _KERNEL */ - -/* - * Options for use with [gs]etsockopt at the IPV6 level. - * First word of comment is data type; bool is stored in int. - */ -/* no hdrincl */ -#if 0 /* the followings are relic in IPv4 and hence are disabled */ -#define IPV6_OPTIONS 1 /* buf/ip6_opts; set/get IP6 options */ -#define IPV6_RECVOPTS 5 /* bool; receive all IP6 opts w/dgram */ -#define IPV6_RECVRETOPTS 6 /* bool; receive IP6 opts for response */ -#define IPV6_RECVDSTADDR 7 /* bool; receive IP6 dst addr w/dgram */ -#define IPV6_RETOPTS 8 /* ip6_opts; set/get IP6 options */ -#endif -#define IPV6_SOCKOPT_RESERVED1 3 /* reserved for future use */ -#define IPV6_UNICAST_HOPS 4 /* int; IP6 hops */ -#define IPV6_MULTICAST_IF 9 /* u_int; set/get IP6 multicast i/f */ -#define IPV6_MULTICAST_HOPS 10 /* int; set/get IP6 multicast hops */ -#define IPV6_MULTICAST_LOOP 11 /* u_int; set/get IP6 multicast loopback */ -#define IPV6_JOIN_GROUP 12 /* ipv6_mreq; join a group membership */ -#define IPV6_LEAVE_GROUP 13 /* ipv6_mreq; leave a group membership */ -#define IPV6_PORTRANGE 14 /* int; range to choose for unspec port */ -#define ICMP6_FILTER 18 /* icmp6_filter; icmp6 filter */ -/* RFC2292 options */ -#ifdef _KERNEL -#define IPV6_2292PKTINFO 19 /* bool; send/recv if, src/dst addr */ -#define IPV6_2292HOPLIMIT 20 /* bool; hop limit */ -#define IPV6_2292NEXTHOP 21 /* bool; next hop addr */ -#define IPV6_2292HOPOPTS 22 /* bool; hop-by-hop option */ -#define IPV6_2292DSTOPTS 23 /* bool; destinaion option */ -#define IPV6_2292RTHDR 24 /* bool; routing header */ -#define IPV6_2292PKTOPTIONS 25 /* buf/cmsghdr; set/get IPv6 options */ -#endif - -#define IPV6_CHECKSUM 26 /* int; checksum offset for raw socket */ -#define IPV6_V6ONLY 27 /* bool; make AF_INET6 sockets v6 only */ -#ifndef _KERNEL -#define IPV6_BINDV6ONLY IPV6_V6ONLY -#endif - -#define IPV6_IPSEC_POLICY 28 /* struct; get/set security policy */ - /* 29; unused; was IPV6_FAITH */ -#if 1 /* IPV6FIREWALL */ -#define IPV6_FW_ADD 30 /* add a firewall rule to chain */ -#define IPV6_FW_DEL 31 /* delete a firewall rule from chain */ -#define IPV6_FW_FLUSH 32 /* flush firewall rule chain */ -#define IPV6_FW_ZERO 33 /* clear single/all firewall counter(s) */ -#define IPV6_FW_GET 34 /* get entire firewall rule chain */ -#endif - -/* new socket options introduced in RFC3542 */ -#define IPV6_RTHDRDSTOPTS 35 /* ip6_dest; send dst option before rthdr */ - -#define IPV6_RECVPKTINFO 36 /* bool; recv if, dst addr */ -#define IPV6_RECVHOPLIMIT 37 /* bool; recv hop limit */ -#define IPV6_RECVRTHDR 38 /* bool; recv routing header */ -#define IPV6_RECVHOPOPTS 39 /* bool; recv hop-by-hop option */ -#define IPV6_RECVDSTOPTS 40 /* bool; recv dst option after rthdr */ -#ifdef _KERNEL -#define IPV6_RECVRTHDRDSTOPTS 41 /* bool; recv dst option before rthdr */ -#endif - -#define IPV6_USE_MIN_MTU 42 /* bool; send packets at the minimum MTU */ -#define IPV6_RECVPATHMTU 43 /* bool; notify an according MTU */ - -#define IPV6_PATHMTU 44 /* mtuinfo; get the current path MTU (sopt), - 4 bytes int; MTU notification (cmsg) */ -#if 0 /*obsoleted during 2292bis -> 3542*/ -#define IPV6_REACHCONF 45 /* no data; ND reachability confirm - (cmsg only/not in of RFC3542) */ -#endif - -/* more new socket options introduced in RFC3542 */ -#define IPV6_PKTINFO 46 /* in6_pktinfo; send if, src addr */ -#define IPV6_HOPLIMIT 47 /* int; send hop limit */ -#define IPV6_NEXTHOP 48 /* sockaddr; next hop addr */ -#define IPV6_HOPOPTS 49 /* ip6_hbh; send hop-by-hop option */ -#define IPV6_DSTOPTS 50 /* ip6_dest; send dst option befor rthdr */ -#define IPV6_RTHDR 51 /* ip6_rthdr; send routing header */ -#if 0 -#define IPV6_PKTOPTIONS 52 /* buf/cmsghdr; set/get IPv6 options */ - /* obsoleted by RFC3542 */ -#endif - -#define IPV6_RECVTCLASS 57 /* bool; recv traffic class values */ - -#define IPV6_AUTOFLOWLABEL 59 /* bool; attach flowlabel automagically */ - -#define IPV6_TCLASS 61 /* int; send traffic class value */ -#define IPV6_DONTFRAG 62 /* bool; disable IPv6 fragmentation */ - -#define IPV6_PREFER_TEMPADDR 63 /* int; prefer temporary addresses as - * the source address. - */ - -#define IPV6_BINDANY 64 /* bool: allow bind to any address */ - -#define IPV6_BINDMULTI 65 /* bool; allow multibind to same addr/port */ -#define IPV6_RSS_LISTEN_BUCKET 66 /* int; set RSS listen bucket */ -#define IPV6_FLOWID 67 /* int; flowid of given socket */ -#define IPV6_FLOWTYPE 68 /* int; flowtype of given socket */ -#define IPV6_RSSBUCKETID 69 /* int; RSS bucket ID of given socket */ -#define IPV6_RECVFLOWID 70 /* bool; receive IP6 flowid/flowtype w/ datagram */ -#define IPV6_RECVRSSBUCKETID 71 /* bool; receive IP6 RSS bucket id w/ datagram */ - -#define IPV6_ORIGDSTADDR 72 /* bool: allow getting dstaddr /port info */ -#define IPV6_RECVORIGDSTADDR IPV6_ORIGDSTADDR - -/* - * The following option is private; do not use it from user applications. - * It is deliberately defined to the same value as IP_MSFILTER. - */ -#define IPV6_MSFILTER 74 /* struct __msfilterreq; - * set/get multicast source filter list. - */ - -/* to define items, should talk with KAME guys first, for *BSD compatibility */ - -#define IPV6_RTHDR_LOOSE 0 /* this hop need not be a neighbor. XXX old spec */ -#define IPV6_RTHDR_STRICT 1 /* this hop must be a neighbor. XXX old spec */ -#define IPV6_RTHDR_TYPE_0 0 /* IPv6 routing header type 0 */ - -/* - * Defaults and limits for options - */ -#define IPV6_DEFAULT_MULTICAST_HOPS 1 /* normally limit m'casts to 1 hop */ -#define IPV6_DEFAULT_MULTICAST_LOOP 1 /* normally hear sends if a member */ - -/* - * The im6o_membership vector for each socket is now dynamically allocated at - * run-time, bounded by USHRT_MAX, and is reallocated when needed, sized - * according to a power-of-two increment. - */ -#define IPV6_MIN_MEMBERSHIPS 31 -#define IPV6_MAX_MEMBERSHIPS 4095 - -/* - * Default resource limits for IPv6 multicast source filtering. - * These may be modified by sysctl. - */ -#define IPV6_MAX_GROUP_SRC_FILTER 512 /* sources per group */ -#define IPV6_MAX_SOCK_SRC_FILTER 128 /* sources per socket/group */ - -/* - * Argument structure for IPV6_JOIN_GROUP and IPV6_LEAVE_GROUP. - */ -struct ipv6_mreq { - struct in6_addr ipv6mr_multiaddr; - unsigned int ipv6mr_interface; -}; - -/* - * IPV6_PKTINFO: Packet information(RFC2292 sec 5) - */ -struct in6_pktinfo { - struct in6_addr ipi6_addr; /* src/dst IPv6 address */ - unsigned int ipi6_ifindex; /* send/recv interface index */ -}; - -/* - * Control structure for IPV6_RECVPATHMTU socket option. - */ -struct ip6_mtuinfo { - struct sockaddr_in6 ip6m_addr; /* or sockaddr_storage? */ - uint32_t ip6m_mtu; -}; - -/* - * Argument for IPV6_PORTRANGE: - * - which range to search when port is unspecified at bind() or connect() - */ -#define IPV6_PORTRANGE_DEFAULT 0 /* default range */ -#define IPV6_PORTRANGE_HIGH 1 /* "high" - request firewall bypass */ -#define IPV6_PORTRANGE_LOW 2 /* "low" - vouchsafe security */ - -#if __BSD_VISIBLE -/* - * Definitions for inet6 sysctl operations. - * - * Third level is protocol number. - * Fourth level is desired variable within that protocol. - */ -#define IPV6PROTO_MAXID (IPPROTO_PIM + 1) /* don't list to IPV6PROTO_MAX */ - -/* - * Names for IP sysctl objects - */ -#define IPV6CTL_FORWARDING 1 /* act as router */ -#define IPV6CTL_SENDREDIRECTS 2 /* may send redirects when forwarding*/ -#define IPV6CTL_DEFHLIM 3 /* default Hop-Limit */ -#ifdef notyet -#define IPV6CTL_DEFMTU 4 /* default MTU */ -#endif -#define IPV6CTL_FORWSRCRT 5 /* forward source-routed dgrams */ -#define IPV6CTL_STATS 6 /* stats */ -#define IPV6CTL_MRTSTATS 7 /* multicast forwarding stats */ -#define IPV6CTL_MRTPROTO 8 /* multicast routing protocol */ -#define IPV6CTL_MAXFRAGPACKETS 9 /* max packets reassembly queue */ -#define IPV6CTL_SOURCECHECK 10 /* verify source route and intf */ -#define IPV6CTL_SOURCECHECK_LOGINT 11 /* minimume logging interval */ -#define IPV6CTL_ACCEPT_RTADV 12 - /* 13; unused; was: IPV6CTL_KEEPFAITH */ -#define IPV6CTL_LOG_INTERVAL 14 -#define IPV6CTL_HDRNESTLIMIT 15 -#define IPV6CTL_DAD_COUNT 16 -#define IPV6CTL_AUTO_FLOWLABEL 17 -#define IPV6CTL_DEFMCASTHLIM 18 -#define IPV6CTL_GIF_HLIM 19 /* default HLIM for gif encap packet */ -#define IPV6CTL_KAME_VERSION 20 -#define IPV6CTL_USE_DEPRECATED 21 /* use deprecated addr (RFC2462 5.5.4) */ -#define IPV6CTL_RR_PRUNE 22 /* walk timer for router renumbering */ -#if 0 /* obsolete */ -#define IPV6CTL_MAPPED_ADDR 23 -#endif -#define IPV6CTL_V6ONLY 24 -/* IPV6CTL_RTEXPIRE 25 deprecated */ -/* IPV6CTL_RTMINEXPIRE 26 deprecated */ -/* IPV6CTL_RTMAXCACHE 27 deprecated */ - -#define IPV6CTL_USETEMPADDR 32 /* use temporary addresses (RFC3041) */ -#define IPV6CTL_TEMPPLTIME 33 /* preferred lifetime for tmpaddrs */ -#define IPV6CTL_TEMPVLTIME 34 /* valid lifetime for tmpaddrs */ -#define IPV6CTL_AUTO_LINKLOCAL 35 /* automatic link-local addr assign */ -#define IPV6CTL_RIP6STATS 36 /* raw_ip6 stats */ -#define IPV6CTL_PREFER_TEMPADDR 37 /* prefer temporary addr as src */ -#define IPV6CTL_ADDRCTLPOLICY 38 /* get/set address selection policy */ -#define IPV6CTL_USE_DEFAULTZONE 39 /* use default scope zone */ - -#define IPV6CTL_MAXFRAGS 41 /* max fragments */ -#if 0 -#define IPV6CTL_IFQ 42 /* ip6intrq node */ -#define IPV6CTL_ISATAPRTR 43 /* isatap router */ -#endif -#define IPV6CTL_MCAST_PMTU 44 /* enable pMTU discovery for multicast? */ - -/* New entries should be added here from current IPV6CTL_MAXID value. */ -/* to define items, should talk with KAME guys first, for *BSD compatibility */ -#define IPV6CTL_STEALTH 45 - -#define ICMPV6CTL_ND6_ONLINKNSRFC4861 47 -#define IPV6CTL_NO_RADR 48 /* No defroute from RA */ -#define IPV6CTL_NORBIT_RAIF 49 /* Disable R-bit in NA on RA - * receiving IF. */ -#define IPV6CTL_RFC6204W3 50 /* Accept defroute even when forwarding - enabled */ -#define IPV6CTL_INTRQMAXLEN 51 /* max length of IPv6 netisr queue */ -#define IPV6CTL_INTRDQMAXLEN 52 /* max length of direct IPv6 netisr - * queue */ -#define IPV6CTL_MAXID 53 -#endif /* __BSD_VISIBLE */ - -/* - * Since both netinet/ and netinet6/ call into netipsec/ and netpfil/, - * the protocol specific mbuf flags are shared between them. - */ -#define M_FASTFWD_OURS M_PROTO1 /* changed dst to local */ -#define M_IP6_NEXTHOP M_PROTO2 /* explicit ip nexthop */ -#define M_IP_NEXTHOP M_PROTO2 /* explicit ip nexthop */ -#define M_SKIP_FIREWALL M_PROTO3 /* skip firewall processing */ -#define M_AUTHIPHDR M_PROTO4 -#define M_DECRYPTED M_PROTO5 -#define M_LOOP M_PROTO6 -#define M_AUTHIPDGM M_PROTO7 -#define M_RTALERT_MLD M_PROTO8 - -#ifdef _KERNEL -struct cmsghdr; -struct ip6_hdr; - -int in6_cksum_pseudo(struct ip6_hdr *, uint32_t, uint8_t, uint16_t); -int in6_cksum(struct mbuf *, u_int8_t, u_int32_t, u_int32_t); -int in6_cksum_partial(struct mbuf *, u_int8_t, u_int32_t, u_int32_t, - u_int32_t); -int in6_localaddr(struct in6_addr *); -int in6_localip(struct in6_addr *); -int in6_ifhasaddr(struct ifnet *, struct in6_addr *); -int in6_addrscope(const struct in6_addr *); -char *ip6_sprintf(char *, const struct in6_addr *); -struct in6_ifaddr *in6_ifawithifp(struct ifnet *, struct in6_addr *); -extern void in6_if_up(struct ifnet *); -struct sockaddr; -extern u_char ip6_protox[]; - -void in6_sin6_2_sin(struct sockaddr_in *sin, - struct sockaddr_in6 *sin6); -void in6_sin_2_v4mapsin6(struct sockaddr_in *sin, - struct sockaddr_in6 *sin6); -void in6_sin6_2_sin_in_sock(struct sockaddr *nam); -void in6_sin_2_v4mapsin6_in_sock(struct sockaddr **nam); -extern void addrsel_policy_init(void); - -#define satosin6(sa) ((struct sockaddr_in6 *)(sa)) -#define sin6tosa(sin6) ((struct sockaddr *)(sin6)) -#define ifatoia6(ifa) ((struct in6_ifaddr *)(ifa)) - -#endif /* _KERNEL */ - -#ifndef _SIZE_T_DECLARED -typedef __size_t size_t; -#define _SIZE_T_DECLARED -#endif - -#ifndef _SOCKLEN_T_DECLARED -typedef __socklen_t socklen_t; -#define _SOCKLEN_T_DECLARED -#endif - -#if __BSD_VISIBLE - -__BEGIN_DECLS -struct cmsghdr; - -extern int inet6_option_space(int); -extern int inet6_option_init(void *, struct cmsghdr **, int); -extern int inet6_option_append(struct cmsghdr *, const uint8_t *, - int, int); -extern uint8_t *inet6_option_alloc(struct cmsghdr *, int, int, int); -extern int inet6_option_next(const struct cmsghdr *, uint8_t **); -extern int inet6_option_find(const struct cmsghdr *, uint8_t **, int); - -extern size_t inet6_rthdr_space(int, int); -extern struct cmsghdr *inet6_rthdr_init(void *, int); -extern int inet6_rthdr_add(struct cmsghdr *, const struct in6_addr *, - unsigned int); -extern int inet6_rthdr_lasthop(struct cmsghdr *, unsigned int); -#if 0 /* not implemented yet */ -extern int inet6_rthdr_reverse(const struct cmsghdr *, struct cmsghdr *); -#endif -extern int inet6_rthdr_segments(const struct cmsghdr *); -extern struct in6_addr *inet6_rthdr_getaddr(struct cmsghdr *, int); -extern int inet6_rthdr_getflags(const struct cmsghdr *, int); - -extern int inet6_opt_init(void *, socklen_t); -extern int inet6_opt_append(void *, socklen_t, int, uint8_t, socklen_t, - uint8_t, void **); -extern int inet6_opt_finish(void *, socklen_t, int); -extern int inet6_opt_set_val(void *, int, void *, socklen_t); - -extern int inet6_opt_next(void *, socklen_t, int, uint8_t *, socklen_t *, - void **); -extern int inet6_opt_find(void *, socklen_t, int, uint8_t, socklen_t *, - void **); -extern int inet6_opt_get_val(void *, int, void *, socklen_t); -extern socklen_t inet6_rth_space(int, int); -extern void *inet6_rth_init(void *, socklen_t, int, int); -extern int inet6_rth_add(void *, const struct in6_addr *); -extern int inet6_rth_reverse(const void *, void *); -extern int inet6_rth_segments(const void *); -extern struct in6_addr *inet6_rth_getaddr(const void *, int); -__END_DECLS - -#endif /* __BSD_VISIBLE */ - -#endif /* !_NETINET6_IN6_H_ */ diff --git a/freebsd/sys/netinet6/in6_cksum.c b/freebsd/sys/netinet6/in6_cksum.c index 14e5dd30..be9e191e 100644 --- a/freebsd/sys/netinet6/in6_cksum.c +++ b/freebsd/sys/netinet6/in6_cksum.c @@ -65,7 +65,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in.h> diff --git a/freebsd/sys/netinet6/in6_fib.c b/freebsd/sys/netinet6/in6_fib.c index 3c94b0c5..8bc60fa4 100644 --- a/freebsd/sys/netinet6/in6_fib.c +++ b/freebsd/sys/netinet6/in6_fib.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_route.h> #include <rtems/bsd/local/opt_mpath.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> #include <sys/rwlock.h> diff --git a/freebsd/sys/netinet6/in6_gif.c b/freebsd/sys/netinet6/in6_gif.c index 6e1fb8b1..66da8fd7 100644 --- a/freebsd/sys/netinet6/in6_gif.c +++ b/freebsd/sys/netinet6/in6_gif.c @@ -37,14 +37,14 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/rmlock.h> #include <sys/systm.h> #include <sys/socket.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/kernel.h> #include <sys/queue.h> #include <sys/syslog.h> diff --git a/freebsd/sys/netinet6/in6_ifattach.c b/freebsd/sys/netinet6/in6_ifattach.c index 88bd95d4..e312108c 100644 --- a/freebsd/sys/netinet6/in6_ifattach.c +++ b/freebsd/sys/netinet6/in6_ifattach.c @@ -34,7 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/socket.h> diff --git a/freebsd/sys/netinet6/in6_mcast.c b/freebsd/sys/netinet6/in6_mcast.c index 174f1109..33eff90b 100644 --- a/freebsd/sys/netinet6/in6_mcast.c +++ b/freebsd/sys/netinet6/in6_mcast.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet6/in6_pcb.c b/freebsd/sys/netinet6/in6_pcb.c index 960d8d1f..65096c78 100644 --- a/freebsd/sys/netinet6/in6_pcb.c +++ b/freebsd/sys/netinet6/in6_pcb.c @@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_pcbgroup.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> @@ -88,7 +88,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/sockio.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/time.h> #include <sys/priv.h> #include <sys/proc.h> diff --git a/freebsd/sys/netinet6/in6_proto.c b/freebsd/sys/netinet6/in6_proto.c index 03bbbeac..f52a683e 100644 --- a/freebsd/sys/netinet6/in6_proto.c +++ b/freebsd/sys/netinet6/in6_proto.c @@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_mpath.h> #include <rtems/bsd/local/opt_route.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/proc.h> diff --git a/freebsd/sys/netinet6/in6_rmx.c b/freebsd/sys/netinet6/in6_rmx.c index f04e0058..88e6bd27 100644 --- a/freebsd/sys/netinet6/in6_rmx.c +++ b/freebsd/sys/netinet6/in6_rmx.c @@ -64,7 +64,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet6/in6_src.c b/freebsd/sys/netinet6/in6_src.c index cae96274..2d7d05f3 100644 --- a/freebsd/sys/netinet6/in6_src.c +++ b/freebsd/sys/netinet6/in6_src.c @@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_mpath.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> @@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socketvar.h> #include <sys/sockio.h> #include <sys/sysctl.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/time.h> #include <sys/jail.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netinet6/ip6_fastfwd.c b/freebsd/sys/netinet6/ip6_fastfwd.c index 8ce6a87e..2f00c554 100644 --- a/freebsd/sys/netinet6/ip6_fastfwd.c +++ b/freebsd/sys/netinet6/ip6_fastfwd.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_ipstealth.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/freebsd/sys/netinet6/ip6_forward.c b/freebsd/sys/netinet6/ip6_forward.c index f3e6c11c..542de6de 100644 --- a/freebsd/sys/netinet6/ip6_forward.c +++ b/freebsd/sys/netinet6/ip6_forward.c @@ -39,14 +39,14 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_ipstealth.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/domain.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/time.h> #include <sys/kernel.h> #include <sys/syslog.h> diff --git a/freebsd/sys/netinet6/ip6_id.c b/freebsd/sys/netinet6/ip6_id.c index 4e1a74e6..21a0bb51 100644 --- a/freebsd/sys/netinet6/ip6_id.c +++ b/freebsd/sys/netinet6/ip6_id.c @@ -92,7 +92,7 @@ __FBSDID("$FreeBSD$"); */ #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/socket.h> #include <sys/libkern.h> diff --git a/freebsd/sys/netinet6/ip6_input.c b/freebsd/sys/netinet6/ip6_input.c index 5ef0e29a..fed16c05 100644 --- a/freebsd/sys/netinet6/ip6_input.c +++ b/freebsd/sys/netinet6/ip6_input.c @@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_route.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/hhook.h> #include <sys/malloc.h> @@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$"); #include <sys/sdt.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/time.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet6/ip6_mroute.c b/freebsd/sys/netinet6/ip6_mroute.c index 0a597191..139db2b4 100644 --- a/freebsd/sys/netinet6/ip6_mroute.c +++ b/freebsd/sys/netinet6/ip6_mroute.c @@ -85,9 +85,9 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/callout.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet6/ip6_output.c b/freebsd/sys/netinet6/ip6_output.c index 3be690a4..ac5563c6 100644 --- a/freebsd/sys/netinet6/ip6_output.c +++ b/freebsd/sys/netinet6/ip6_output.c @@ -73,11 +73,11 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_route.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/mbuf.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/priv.h> #include <sys/proc.h> #include <sys/protosw.h> diff --git a/freebsd/sys/netinet6/mld6.c b/freebsd/sys/netinet6/mld6.c index 420b2b4b..37625990 100644 --- a/freebsd/sys/netinet6/mld6.c +++ b/freebsd/sys/netinet6/mld6.c @@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/freebsd/sys/netinet6/nd6.c b/freebsd/sys/netinet6/nd6.c index cb626e5a..488389db 100644 --- a/freebsd/sys/netinet6/nd6.c +++ b/freebsd/sys/netinet6/nd6.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/callout.h> #include <rtems/bsd/sys/lock.h> @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #include <sys/time.h> #include <sys/kernel.h> #include <sys/protosw.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/syslog.h> #include <sys/rwlock.h> #include <sys/queue.h> diff --git a/freebsd/sys/netinet6/nd6_nbr.c b/freebsd/sys/netinet6/nd6_nbr.c index 4fece39e..95c2ab16 100644 --- a/freebsd/sys/netinet6/nd6_nbr.c +++ b/freebsd/sys/netinet6/nd6_nbr.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_mpath.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/libkern.h> @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include <sys/sockio.h> #include <sys/time.h> #include <sys/kernel.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/sysctl.h> #include <sys/syslog.h> #include <sys/queue.h> diff --git a/freebsd/sys/netinet6/nd6_rtr.c b/freebsd/sys/netinet6/nd6_rtr.c index 6e8d330f..4b1c6ba3 100644 --- a/freebsd/sys/netinet6/nd6_rtr.c +++ b/freebsd/sys/netinet6/nd6_rtr.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #include <sys/time.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/rmlock.h> #include <sys/rwlock.h> #include <sys/syslog.h> diff --git a/freebsd/sys/netinet6/raw_ip6.c b/freebsd/sys/netinet6/raw_ip6.c index 0c73429b..b03bae76 100644 --- a/freebsd/sys/netinet6/raw_ip6.c +++ b/freebsd/sys/netinet6/raw_ip6.c @@ -67,8 +67,8 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/param.h> +#include <sys/errno.h> #include <sys/jail.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet6/route6.c b/freebsd/sys/netinet6/route6.c index d698d328..061d0a67 100644 --- a/freebsd/sys/netinet6/route6.c +++ b/freebsd/sys/netinet6/route6.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/systm.h> diff --git a/freebsd/sys/netinet6/scope6.c b/freebsd/sys/netinet6/scope6.c index 0f8ead2d..3e8e7cef 100644 --- a/freebsd/sys/netinet6/scope6.c +++ b/freebsd/sys/netinet6/scope6.c @@ -34,7 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/freebsd/sys/netinet6/udp6_usrreq.c b/freebsd/sys/netinet6/udp6_usrreq.c index 0f5c6bd9..5abd99e3 100644 --- a/freebsd/sys/netinet6/udp6_usrreq.c +++ b/freebsd/sys/netinet6/udp6_usrreq.c @@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/jail.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netipsec/ipsec.c b/freebsd/sys/netipsec/ipsec.c index 20aad0b6..4b44a8ce 100644 --- a/freebsd/sys/netipsec/ipsec.c +++ b/freebsd/sys/netipsec/ipsec.c @@ -40,7 +40,7 @@ #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_ipsec.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> @@ -49,7 +49,7 @@ #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/hhook.h> #include <sys/time.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netipsec/ipsec_input.c b/freebsd/sys/netipsec/ipsec_input.c index 50e7d646..62143c79 100644 --- a/freebsd/sys/netipsec/ipsec_input.c +++ b/freebsd/sys/netipsec/ipsec_input.c @@ -49,14 +49,14 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_ipsec.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/domain.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/hhook.h> #include <sys/syslog.h> diff --git a/freebsd/sys/netipsec/ipsec_mbuf.c b/freebsd/sys/netipsec/ipsec_mbuf.c index d81c0deb..ba0321ef 100644 --- a/freebsd/sys/netipsec/ipsec_mbuf.c +++ b/freebsd/sys/netipsec/ipsec_mbuf.c @@ -32,7 +32,7 @@ * IPsec-specific mbuf routines. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netipsec/ipsec_mod.c b/freebsd/sys/netipsec/ipsec_mod.c index 78b9f1da..32f6cc4c 100644 --- a/freebsd/sys/netipsec/ipsec_mod.c +++ b/freebsd/sys/netipsec/ipsec_mod.c @@ -33,7 +33,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netipsec/ipsec_output.c b/freebsd/sys/netipsec/ipsec_output.c index 3403b0bc..b68d61a1 100644 --- a/freebsd/sys/netipsec/ipsec_output.c +++ b/freebsd/sys/netipsec/ipsec_output.c @@ -37,13 +37,13 @@ #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_sctp.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/domain.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/hhook.h> #include <sys/syslog.h> diff --git a/freebsd/sys/netipsec/ipsec_pcb.c b/freebsd/sys/netipsec/ipsec_pcb.c index 21a8182d..5822185a 100644 --- a/freebsd/sys/netipsec/ipsec_pcb.c +++ b/freebsd/sys/netipsec/ipsec_pcb.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_ipsec.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netipsec/key.c b/freebsd/sys/netipsec/key.c index 5d3a612d..bf4eb9d0 100644 --- a/freebsd/sys/netipsec/key.c +++ b/freebsd/sys/netipsec/key.c @@ -41,7 +41,7 @@ #include <rtems/bsd/local/opt_ipsec.h> #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/fnv_hash.h> @@ -55,7 +55,7 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/sysctl.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/proc.h> #include <sys/queue.h> #include <sys/refcount.h> diff --git a/freebsd/sys/netipsec/key_debug.c b/freebsd/sys/netipsec/key_debug.c index 51ac1fdc..362b5529 100644 --- a/freebsd/sys/netipsec/key_debug.c +++ b/freebsd/sys/netipsec/key_debug.c @@ -38,7 +38,7 @@ #include <rtems/bsd/local/opt_ipsec.h> #endif -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #ifdef _KERNEL #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netipsec/keysock.c b/freebsd/sys/netipsec/keysock.c index 21430347..12fecfa5 100644 --- a/freebsd/sys/netipsec/keysock.c +++ b/freebsd/sys/netipsec/keysock.c @@ -37,9 +37,9 @@ /* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */ #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/domain.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netipsec/subr_ipsec.c b/freebsd/sys/netipsec/subr_ipsec.c index ff830564..cf6b317b 100644 --- a/freebsd/sys/netipsec/subr_ipsec.c +++ b/freebsd/sys/netipsec/subr_ipsec.c @@ -33,7 +33,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netipsec/udpencap.c b/freebsd/sys/netipsec/udpencap.c index fd2ca444..fbf9ae6e 100644 --- a/freebsd/sys/netipsec/udpencap.c +++ b/freebsd/sys/netipsec/udpencap.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_ipsec.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netipsec/xform_ah.c b/freebsd/sys/netipsec/xform_ah.c index 5dd41282..d08089c8 100644 --- a/freebsd/sys/netipsec/xform_ah.c +++ b/freebsd/sys/netipsec/xform_ah.c @@ -41,7 +41,7 @@ #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/freebsd/sys/netipsec/xform_esp.c b/freebsd/sys/netipsec/xform_esp.c index bf98dc03..ebd18234 100644 --- a/freebsd/sys/netipsec/xform_esp.c +++ b/freebsd/sys/netipsec/xform_esp.c @@ -40,7 +40,7 @@ #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/freebsd/sys/netipsec/xform_ipcomp.c b/freebsd/sys/netipsec/xform_ipcomp.c index f5a7aad4..6b11d800 100644 --- a/freebsd/sys/netipsec/xform_ipcomp.c +++ b/freebsd/sys/netipsec/xform_ipcomp.c @@ -34,7 +34,7 @@ #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netipsec/xform_tcp.c b/freebsd/sys/netipsec/xform_tcp.c index 81b4f1d0..7306a50e 100644 --- a/freebsd/sys/netipsec/xform_tcp.c +++ b/freebsd/sys/netipsec/xform_tcp.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_ipsec.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netpfil/ipfw/ip_fw2.c b/freebsd/sys/netpfil/ipfw/ip_fw2.c index 1425d95f..42ba575f 100644 --- a/freebsd/sys/netpfil/ipfw/ip_fw2.c +++ b/freebsd/sys/netpfil/ipfw/ip_fw2.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_ipsec.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/condvar.h> #include <sys/counter.h> diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_bpf.c b/freebsd/sys/netpfil/ipfw/ip_fw_bpf.c index 3127809b..fed39f8b 100644 --- a/freebsd/sys/netpfil/ipfw/ip_fw_bpf.c +++ b/freebsd/sys/netpfil/ipfw/ip_fw_bpf.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_dynamic.c b/freebsd/sys/netpfil/ipfw/ip_fw_dynamic.c index e21cb07e..11661e85 100644 --- a/freebsd/sys/netpfil/ipfw/ip_fw_dynamic.c +++ b/freebsd/sys/netpfil/ipfw/ip_fw_dynamic.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #endif /* INET */ #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_eaction.c b/freebsd/sys/netpfil/ipfw/ip_fw_eaction.c index 817aaca4..dc207a2a 100644 --- a/freebsd/sys/netpfil/ipfw/ip_fw_eaction.c +++ b/freebsd/sys/netpfil/ipfw/ip_fw_eaction.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_iface.c b/freebsd/sys/netpfil/ipfw/ip_fw_iface.c index f93c20db..5a7411db 100644 --- a/freebsd/sys/netpfil/ipfw/ip_fw_iface.c +++ b/freebsd/sys/netpfil/ipfw/ip_fw_iface.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #endif /* INET */ #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_log.c b/freebsd/sys/netpfil/ipfw/ip_fw_log.c index 15b611e6..6d251cda 100644 --- a/freebsd/sys/netpfil/ipfw/ip_fw_log.c +++ b/freebsd/sys/netpfil/ipfw/ip_fw_log.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #endif /* INET */ #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_nat.c b/freebsd/sys/netpfil/ipfw/ip_fw_nat.c index 8baa313a..0c3d6c58 100644 --- a/freebsd/sys/netpfil/ipfw/ip_fw_nat.c +++ b/freebsd/sys/netpfil/ipfw/ip_fw_nat.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/eventhandler.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_pfil.c b/freebsd/sys/netpfil/ipfw/ip_fw_pfil.c index 167d2028..85fc3a64 100644 --- a/freebsd/sys/netpfil/ipfw/ip_fw_pfil.c +++ b/freebsd/sys/netpfil/ipfw/ip_fw_pfil.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #error IPFIREWALL requires INET. #endif /* INET */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_sockopt.c b/freebsd/sys/netpfil/ipfw/ip_fw_sockopt.c index d9d37758..fae86e12 100644 --- a/freebsd/sys/netpfil/ipfw/ip_fw_sockopt.c +++ b/freebsd/sys/netpfil/ipfw/ip_fw_sockopt.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #endif /* INET */ #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> /* struct m_tag used by nested headers */ diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_table.c b/freebsd/sys/netpfil/ipfw/ip_fw_table.c index 48a969da..29e62a4f 100644 --- a/freebsd/sys/netpfil/ipfw/ip_fw_table.c +++ b/freebsd/sys/netpfil/ipfw/ip_fw_table.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipfw.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_table_algo.c b/freebsd/sys/netpfil/ipfw/ip_fw_table_algo.c index e4c82131..6ba8254d 100644 --- a/freebsd/sys/netpfil/ipfw/ip_fw_table_algo.c +++ b/freebsd/sys/netpfil/ipfw/ip_fw_table_algo.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #endif /* INET */ #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_table_value.c b/freebsd/sys/netpfil/ipfw/ip_fw_table_value.c index 4ef70b8a..fe905e26 100644 --- a/freebsd/sys/netpfil/ipfw/ip_fw_table_value.c +++ b/freebsd/sys/netpfil/ipfw/ip_fw_table_value.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipfw.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netpfil/ipfw/nat64/ip_fw_nat64.c b/freebsd/sys/netpfil/ipfw/nat64/ip_fw_nat64.c index 03ca9599..8e25fe6f 100644 --- a/freebsd/sys/netpfil/ipfw/nat64/ip_fw_nat64.c +++ b/freebsd/sys/netpfil/ipfw/nat64/ip_fw_nat64.c @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netpfil/ipfw/nat64/nat64_translate.c b/freebsd/sys/netpfil/ipfw/nat64/nat64_translate.c index 2f881476..e7ffb0b3 100644 --- a/freebsd/sys/netpfil/ipfw/nat64/nat64_translate.c +++ b/freebsd/sys/netpfil/ipfw/nat64/nat64_translate.c @@ -32,10 +32,10 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/counter.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netpfil/ipfw/nat64/nat64lsn.c b/freebsd/sys/netpfil/ipfw/nat64/nat64lsn.c index ae072a68..67d31e6e 100644 --- a/freebsd/sys/netpfil/ipfw/nat64/nat64lsn.c +++ b/freebsd/sys/netpfil/ipfw/nat64/nat64lsn.c @@ -31,10 +31,10 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/counter.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netpfil/ipfw/nat64/nat64lsn_control.c b/freebsd/sys/netpfil/ipfw/nat64/nat64lsn_control.c index a20a52ea..89869233 100644 --- a/freebsd/sys/netpfil/ipfw/nat64/nat64lsn_control.c +++ b/freebsd/sys/netpfil/ipfw/nat64/nat64lsn_control.c @@ -31,10 +31,10 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/counter.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netpfil/ipfw/nat64/nat64stl.c b/freebsd/sys/netpfil/ipfw/nat64/nat64stl.c index 552267be..662b6340 100644 --- a/freebsd/sys/netpfil/ipfw/nat64/nat64stl.c +++ b/freebsd/sys/netpfil/ipfw/nat64/nat64stl.c @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/counter.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netpfil/ipfw/nat64/nat64stl_control.c b/freebsd/sys/netpfil/ipfw/nat64/nat64stl_control.c index 6ee04867..851c5b00 100644 --- a/freebsd/sys/netpfil/ipfw/nat64/nat64stl_control.c +++ b/freebsd/sys/netpfil/ipfw/nat64/nat64stl_control.c @@ -31,10 +31,10 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/counter.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netpfil/ipfw/nptv6/ip_fw_nptv6.c b/freebsd/sys/netpfil/ipfw/nptv6/ip_fw_nptv6.c index 92a2c7a3..ebedf338 100644 --- a/freebsd/sys/netpfil/ipfw/nptv6/ip_fw_nptv6.c +++ b/freebsd/sys/netpfil/ipfw/nptv6/ip_fw_nptv6.c @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netpfil/ipfw/nptv6/nptv6.c b/freebsd/sys/netpfil/ipfw/nptv6/nptv6.c index 819ba4fe..536c683b 100644 --- a/freebsd/sys/netpfil/ipfw/nptv6/nptv6.c +++ b/freebsd/sys/netpfil/ipfw/nptv6/nptv6.c @@ -30,10 +30,10 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/counter.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netpfil/pf/if_pflog.c b/freebsd/sys/netpfil/pf/if_pflog.c index 09473f17..1ad6a774 100644 --- a/freebsd/sys/netpfil/pf/if_pflog.c +++ b/freebsd/sys/netpfil/pf/if_pflog.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_bpf.h> #include <rtems/bsd/local/opt_pf.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/module.h> diff --git a/freebsd/sys/netpfil/pf/if_pfsync.c b/freebsd/sys/netpfil/pf/if_pfsync.c index 5543bb54..b7b00d91 100644 --- a/freebsd/sys/netpfil/pf/if_pfsync.c +++ b/freebsd/sys/netpfil/pf/if_pfsync.c @@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_pf.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/bus.h> #include <sys/endian.h> #include <sys/interrupt.h> diff --git a/freebsd/sys/netpfil/pf/in4_cksum.c b/freebsd/sys/netpfil/pf/in4_cksum.c index 19cc8ac4..87993ac6 100644 --- a/freebsd/sys/netpfil/pf/in4_cksum.c +++ b/freebsd/sys/netpfil/pf/in4_cksum.c @@ -65,7 +65,7 @@ * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netpfil/pf/pf.c b/freebsd/sys/netpfil/pf/pf.c index 0d7a353e..42f9132d 100644 --- a/freebsd/sys/netpfil/pf/pf.c +++ b/freebsd/sys/netpfil/pf/pf.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_bpf.h> #include <rtems/bsd/local/opt_pf.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/bus.h> #include <sys/endian.h> #include <sys/hash.h> diff --git a/freebsd/sys/netpfil/pf/pf_if.c b/freebsd/sys/netpfil/pf/pf_if.c index 29f8e941..80ff2550 100644 --- a/freebsd/sys/netpfil/pf/pf_if.c +++ b/freebsd/sys/netpfil/pf/pf_if.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/eventhandler.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netpfil/pf/pf_ioctl.c b/freebsd/sys/netpfil/pf/pf_ioctl.c index 3cf3eec8..4779477f 100644 --- a/freebsd/sys/netpfil/pf/pf_ioctl.c +++ b/freebsd/sys/netpfil/pf/pf_ioctl.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_bpf.h> #include <rtems/bsd/local/opt_pf.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/bus.h> #include <sys/conf.h> #include <sys/endian.h> diff --git a/freebsd/sys/netpfil/pf/pf_lb.c b/freebsd/sys/netpfil/pf/pf_lb.c index 3fe8dfb6..c6e616b9 100644 --- a/freebsd/sys/netpfil/pf/pf_lb.c +++ b/freebsd/sys/netpfil/pf/pf_lb.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mbuf.h> #include <sys/rwlock.h> diff --git a/freebsd/sys/netpfil/pf/pf_norm.c b/freebsd/sys/netpfil/pf/pf_norm.c index 42b44c70..7134d471 100644 --- a/freebsd/sys/netpfil/pf/pf_norm.c +++ b/freebsd/sys/netpfil/pf/pf_norm.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_pf.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netpfil/pf/pf_osfp.c b/freebsd/sys/netpfil/pf/pf_osfp.c index b6b51636..8202a387 100644 --- a/freebsd/sys/netpfil/pf/pf_osfp.c +++ b/freebsd/sys/netpfil/pf/pf_osfp.c @@ -23,7 +23,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netpfil/pf/pf_ruleset.c b/freebsd/sys/netpfil/pf/pf_ruleset.c index e16643aa..b8428f7f 100644 --- a/freebsd/sys/netpfil/pf/pf_ruleset.c +++ b/freebsd/sys/netpfil/pf/pf_ruleset.c @@ -39,7 +39,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #ifdef _KERNEL # include <sys/systm.h> diff --git a/freebsd/sys/netpfil/pf/pf_table.c b/freebsd/sys/netpfil/pf/pf_table.c index 26b6f4e9..1999c63e 100644 --- a/freebsd/sys/netpfil/pf/pf_table.c +++ b/freebsd/sys/netpfil/pf/pf_table.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> diff --git a/freebsd/sys/nios2/nios2/in_cksum.c b/freebsd/sys/nios2/nios2/in_cksum.c index 7c680bbe..22e19d83 100644 --- a/freebsd/sys/nios2/nios2/in_cksum.c +++ b/freebsd/sys/nios2/nios2/in_cksum.c @@ -40,7 +40,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/opencrypto/criov.c b/freebsd/sys/opencrypto/criov.c index 83a30716..f5d64953 100644 --- a/freebsd/sys/opencrypto/criov.c +++ b/freebsd/sys/opencrypto/criov.c @@ -32,10 +32,10 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/malloc.h> #include <sys/kernel.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/opencrypto/crypto.c b/freebsd/sys/opencrypto/crypto.c index f5119aa6..5fa2aa6c 100644 --- a/freebsd/sys/opencrypto/crypto.c +++ b/freebsd/sys/opencrypto/crypto.c @@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ddb.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/eventhandler.h> #include <sys/kernel.h> diff --git a/freebsd/sys/opencrypto/cryptodeflate.c b/freebsd/sys/opencrypto/cryptodeflate.c index ed891964..8ab063f4 100644 --- a/freebsd/sys/opencrypto/cryptodeflate.c +++ b/freebsd/sys/opencrypto/cryptodeflate.c @@ -38,9 +38,9 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/malloc.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/sdt.h> #include <sys/systm.h> diff --git a/freebsd/sys/opencrypto/cryptosoft.c b/freebsd/sys/opencrypto/cryptosoft.c index 53569456..233fe5b9 100644 --- a/freebsd/sys/opencrypto/cryptosoft.c +++ b/freebsd/sys/opencrypto/cryptosoft.c @@ -33,13 +33,13 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/module.h> #include <sys/sysctl.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/random.h> #include <sys/kernel.h> #include <sys/uio.h> diff --git a/freebsd/sys/opencrypto/deflate.c b/freebsd/sys/opencrypto/deflate.c index 26a3d3c5..0bfd96e2 100644 --- a/freebsd/sys/opencrypto/deflate.c +++ b/freebsd/sys/opencrypto/deflate.c @@ -40,9 +40,9 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_kdtrace.h> #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/malloc.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/sdt.h> #include <sys/systm.h> diff --git a/freebsd/sys/opencrypto/rmd160.c b/freebsd/sys/opencrypto/rmd160.c index e8beb811..5b131263 100644 --- a/freebsd/sys/opencrypto/rmd160.c +++ b/freebsd/sys/opencrypto/rmd160.c @@ -34,7 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/endian.h> #include <opencrypto/rmd160.h> diff --git a/freebsd/sys/opencrypto/skipjack.c b/freebsd/sys/opencrypto/skipjack.c index e22044ff..047cf642 100644 --- a/freebsd/sys/opencrypto/skipjack.c +++ b/freebsd/sys/opencrypto/skipjack.c @@ -17,7 +17,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <opencrypto/skipjack.h> diff --git a/freebsd/sys/opencrypto/xform.c b/freebsd/sys/opencrypto/xform.c index f0ffb153..3fb98da2 100644 --- a/freebsd/sys/opencrypto/xform.c +++ b/freebsd/sys/opencrypto/xform.c @@ -52,11 +52,11 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/sysctl.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/time.h> #include <sys/kernel.h> #include <machine/cpu.h> diff --git a/freebsd/sys/opencrypto/xform_auth.h b/freebsd/sys/opencrypto/xform_auth.h index dac6e811..c51f9400 100644 --- a/freebsd/sys/opencrypto/xform_auth.h +++ b/freebsd/sys/opencrypto/xform_auth.h @@ -32,7 +32,7 @@ #define _CRYPTO_XFORM_AUTH_H_ #include <sys/malloc.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/md5.h> #include <crypto/sha1.h> diff --git a/freebsd/sys/opencrypto/xform_comp.h b/freebsd/sys/opencrypto/xform_comp.h index 30bf288c..23e4eacf 100644 --- a/freebsd/sys/opencrypto/xform_comp.h +++ b/freebsd/sys/opencrypto/xform_comp.h @@ -32,7 +32,7 @@ #define _CRYPTO_XFORM_COMP_H_ #include <sys/malloc.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <opencrypto/deflate.h> #include <opencrypto/cryptodev.h> diff --git a/freebsd/sys/opencrypto/xform_enc.h b/freebsd/sys/opencrypto/xform_enc.h index aa99b1e1..7bb6a9dd 100644 --- a/freebsd/sys/opencrypto/xform_enc.h +++ b/freebsd/sys/opencrypto/xform_enc.h @@ -32,7 +32,7 @@ #define _CRYPTO_XFORM_ENC_H_ #include <sys/malloc.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <crypto/blowfish/blowfish.h> #include <crypto/des/des.h> #include <crypto/rijndael/rijndael.h> diff --git a/freebsd/sys/powerpc/powerpc/in_cksum.c b/freebsd/sys/powerpc/powerpc/in_cksum.c index 44c62e12..d73fed4e 100644 --- a/freebsd/sys/powerpc/powerpc/in_cksum.c +++ b/freebsd/sys/powerpc/powerpc/in_cksum.c @@ -42,7 +42,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/sh/sh/in_cksum.c b/freebsd/sys/sh/sh/in_cksum.c index 7c680bbe..22e19d83 100644 --- a/freebsd/sys/sh/sh/in_cksum.c +++ b/freebsd/sys/sh/sh/in_cksum.c @@ -40,7 +40,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/sparc/sparc/in_cksum.c b/freebsd/sys/sparc/sparc/in_cksum.c index 7c680bbe..22e19d83 100644 --- a/freebsd/sys/sparc/sparc/in_cksum.c +++ b/freebsd/sys/sparc/sparc/in_cksum.c @@ -40,7 +40,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/sparc64/sparc64/in_cksum.c b/freebsd/sys/sparc64/sparc64/in_cksum.c index ab8ab600..bc8e5f62 100644 --- a/freebsd/sys/sparc64/sparc64/in_cksum.c +++ b/freebsd/sys/sparc64/sparc64/in_cksum.c @@ -60,7 +60,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/sys/_bitset.h b/freebsd/sys/sys/_bitset.h deleted file mode 100644 index 2f5301d5..00000000 --- a/freebsd/sys/sys/_bitset.h +++ /dev/null @@ -1,58 +0,0 @@ -/*- - * Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org> - * All rights reserved. - * - * Copyright (c) 2008 Nokia Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice unmodified, this list of conditions, and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _SYS__BITSET_H_ -#define _SYS__BITSET_H_ - -/* - * Macros addressing word and bit within it, tuned to make compiler - * optimize cases when SETSIZE fits into single machine word. - */ -#define _BITSET_BITS (sizeof(long) * 8) - -#define __howmany(x, y) (((x) + ((y) - 1)) / (y)) - -#define __bitset_words(_s) (__howmany(_s, _BITSET_BITS)) - -#define BITSET_DEFINE(t, _s) \ -struct t { \ - long __bits[__bitset_words((_s))]; \ -} - -/* - * Helper to declare a bitset without it's size being a constant. - * - * Sadly we cannot declare a bitset struct with '__bits[]', because it's - * the only member of the struct and the compiler complains. - */ -#define BITSET_DEFINE_VAR(t) BITSET_DEFINE(t, 1) - -#endif /* !_SYS__BITSET_H_ */ diff --git a/freebsd/sys/sys/_cpuset.h b/freebsd/sys/sys/_cpuset.h deleted file mode 100644 index 1ddafac2..00000000 --- a/freebsd/sys/sys/_cpuset.h +++ /dev/null @@ -1,50 +0,0 @@ -/*- - * Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org> - * All rights reserved. - * - * Copyright (c) 2008 Nokia Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice unmodified, this list of conditions, and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _SYS__CPUSET_H_ -#define _SYS__CPUSET_H_ - -#include <sys/_bitset.h> - -#ifdef _KERNEL -#define CPU_SETSIZE MAXCPU -#endif - -#define CPU_MAXSIZE 256 - -#ifndef CPU_SETSIZE -#define CPU_SETSIZE CPU_MAXSIZE -#endif - -BITSET_DEFINE(_cpuset, CPU_SETSIZE); -typedef struct _cpuset cpuset_t; - -#endif /* !_SYS__CPUSET_H_ */ diff --git a/freebsd/sys/sys/_sockaddr_storage.h b/freebsd/sys/sys/_sockaddr_storage.h deleted file mode 100644 index 189e16d8..00000000 --- a/freebsd/sys/sys/_sockaddr_storage.h +++ /dev/null @@ -1,54 +0,0 @@ -/*- - * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)socket.h 8.4 (Berkeley) 2/21/94 - * $FreeBSD$ - */ - -#ifndef _SYS__SOCKADDR_STORAGE_H_ -#define _SYS__SOCKADDR_STORAGE_H_ - -/* - * RFC 2553: protocol-independent placeholder for socket addresses - */ -#define _SS_MAXSIZE 128U -#define _SS_ALIGNSIZE (sizeof(__int64_t)) -#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(unsigned char) - \ - sizeof(sa_family_t)) -#define _SS_PAD2SIZE (_SS_MAXSIZE - sizeof(unsigned char) - \ - sizeof(sa_family_t) - _SS_PAD1SIZE - _SS_ALIGNSIZE) - -struct sockaddr_storage { - unsigned char ss_len; /* address length */ - sa_family_t ss_family; /* address family */ - char __ss_pad1[_SS_PAD1SIZE]; - __int64_t __ss_align; /* force desired struct alignment */ - char __ss_pad2[_SS_PAD2SIZE]; -}; - -#endif /* !_SYS__SOCKADDR_STORAGE_H_ */ diff --git a/freebsd/sys/sys/acl.h b/freebsd/sys/sys/acl.h index 21b3e381..9806a54a 100644 --- a/freebsd/sys/sys/acl.h +++ b/freebsd/sys/sys/acl.h @@ -36,7 +36,7 @@ #ifndef _SYS_ACL_H_ #define _SYS_ACL_H_ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <vm/uma.h> diff --git a/freebsd/sys/sys/bitset.h b/freebsd/sys/sys/bitset.h deleted file mode 100644 index 723c39b0..00000000 --- a/freebsd/sys/sys/bitset.h +++ /dev/null @@ -1,208 +0,0 @@ -/*- - * Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org> - * All rights reserved. - * - * Copyright (c) 2008 Nokia Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice unmodified, this list of conditions, and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _SYS_BITSET_H_ -#define _SYS_BITSET_H_ - -#define __bitset_mask(_s, n) \ - (1L << ((__bitset_words((_s)) == 1) ? \ - (__size_t)(n) : ((n) % _BITSET_BITS))) - -#define __bitset_word(_s, n) \ - ((__bitset_words((_s)) == 1) ? 0 : ((n) / _BITSET_BITS)) - -#define BIT_CLR(_s, n, p) \ - ((p)->__bits[__bitset_word(_s, n)] &= ~__bitset_mask((_s), (n))) - -#define BIT_COPY(_s, f, t) (void)(*(t) = *(f)) - -#define BIT_ISSET(_s, n, p) \ - ((((p)->__bits[__bitset_word(_s, n)] & __bitset_mask((_s), (n))) != 0)) - -#define BIT_SET(_s, n, p) \ - ((p)->__bits[__bitset_word(_s, n)] |= __bitset_mask((_s), (n))) - -#define BIT_ZERO(_s, p) do { \ - __size_t __i; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) \ - (p)->__bits[__i] = 0L; \ -} while (0) - -#define BIT_FILL(_s, p) do { \ - __size_t __i; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) \ - (p)->__bits[__i] = -1L; \ -} while (0) - -#define BIT_SETOF(_s, n, p) do { \ - BIT_ZERO(_s, p); \ - (p)->__bits[__bitset_word(_s, n)] = __bitset_mask((_s), (n)); \ -} while (0) - -/* Is p empty. */ -#define BIT_EMPTY(_s, p) __extension__ ({ \ - __size_t __i; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) \ - if ((p)->__bits[__i]) \ - break; \ - __i == __bitset_words((_s)); \ -}) - -/* Is p full set. */ -#define BIT_ISFULLSET(_s, p) __extension__ ({ \ - __size_t __i; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) \ - if ((p)->__bits[__i] != (long)-1) \ - break; \ - __i == __bitset_words((_s)); \ -}) - -/* Is c a subset of p. */ -#define BIT_SUBSET(_s, p, c) __extension__ ({ \ - __size_t __i; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) \ - if (((c)->__bits[__i] & \ - (p)->__bits[__i]) != \ - (c)->__bits[__i]) \ - break; \ - __i == __bitset_words((_s)); \ -}) - -/* Are there any common bits between b & c? */ -#define BIT_OVERLAP(_s, p, c) __extension__ ({ \ - __size_t __i; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) \ - if (((c)->__bits[__i] & \ - (p)->__bits[__i]) != 0) \ - break; \ - __i != __bitset_words((_s)); \ -}) - -/* Compare two sets, returns 0 if equal 1 otherwise. */ -#define BIT_CMP(_s, p, c) __extension__ ({ \ - __size_t __i; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) \ - if (((c)->__bits[__i] != \ - (p)->__bits[__i])) \ - break; \ - __i != __bitset_words((_s)); \ -}) - -#define BIT_OR(_s, d, s) do { \ - __size_t __i; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) \ - (d)->__bits[__i] |= (s)->__bits[__i]; \ -} while (0) - -#define BIT_AND(_s, d, s) do { \ - __size_t __i; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) \ - (d)->__bits[__i] &= (s)->__bits[__i]; \ -} while (0) - -#define BIT_NAND(_s, d, s) do { \ - __size_t __i; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) \ - (d)->__bits[__i] &= ~(s)->__bits[__i]; \ -} while (0) - -#define BIT_CLR_ATOMIC(_s, n, p) \ - atomic_clear_long(&(p)->__bits[__bitset_word(_s, n)], \ - __bitset_mask((_s), n)) - -#define BIT_SET_ATOMIC(_s, n, p) \ - atomic_set_long(&(p)->__bits[__bitset_word(_s, n)], \ - __bitset_mask((_s), n)) - -#define BIT_SET_ATOMIC_ACQ(_s, n, p) \ - atomic_set_acq_long(&(p)->__bits[__bitset_word(_s, n)], \ - __bitset_mask((_s), n)) - -/* Convenience functions catering special cases. */ -#define BIT_AND_ATOMIC(_s, d, s) do { \ - __size_t __i; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) \ - atomic_clear_long(&(d)->__bits[__i], \ - ~(s)->__bits[__i]); \ -} while (0) - -#define BIT_OR_ATOMIC(_s, d, s) do { \ - __size_t __i; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) \ - atomic_set_long(&(d)->__bits[__i], \ - (s)->__bits[__i]); \ -} while (0) - -#define BIT_COPY_STORE_REL(_s, f, t) do { \ - __size_t __i; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) \ - atomic_store_rel_long(&(t)->__bits[__i], \ - (f)->__bits[__i]); \ -} while (0) - -#define BIT_FFS(_s, p) __extension__ ({ \ - __size_t __i; \ - int __bit; \ - \ - __bit = 0; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) { \ - if ((p)->__bits[__i] != 0) { \ - __bit = ffsl((p)->__bits[__i]); \ - __bit += __i * _BITSET_BITS; \ - break; \ - } \ - } \ - __bit; \ -}) - -#define BIT_COUNT(_s, p) __extension__ ({ \ - __size_t __i; \ - int __count; \ - \ - __count = 0; \ - for (__i = 0; __i < __bitset_words((_s)); __i++) \ - __count += __bitcountl((p)->__bits[__i]); \ - __count; \ -}) - -#define BITSET_T_INITIALIZER(x) \ - { .__bits = { x } } - -#define BITSET_FSET(n) \ - [ 0 ... ((n) - 1) ] = (-1L) - -/* - * Dynamically allocate a bitset. - */ -#define BITSET_ALLOC(_s, mt, mf) \ - malloc(__bitset_words(_s) * sizeof(long), mt, (mf)) - -#endif /* !_SYS_BITSET_H_ */ diff --git a/freebsd/sys/sys/bitstring.h b/freebsd/sys/sys/bitstring.h index 8fd9b25a..18c91878 100644 --- a/freebsd/sys/sys/bitstring.h +++ b/freebsd/sys/sys/bitstring.h @@ -68,9 +68,6 @@ #endif #include <sys/types.h> -#ifdef __rtems__ -#include <machine/bitstring.h> -#endif /* __rtems__ */ typedef unsigned long bitstr_t; diff --git a/freebsd/sys/sys/capsicum.h b/freebsd/sys/sys/capsicum.h index a5e64925..ae466952 100644 --- a/freebsd/sys/sys/capsicum.h +++ b/freebsd/sys/sys/capsicum.h @@ -40,7 +40,7 @@ #define _SYS_CAPSICUM_H_ #include <sys/cdefs.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/caprights.h> #include <sys/file.h> diff --git a/freebsd/sys/sys/fail.h b/freebsd/sys/sys/fail.h index 45499af2..34aa593f 100644 --- a/freebsd/sys/sys/fail.h +++ b/freebsd/sys/sys/fail.h @@ -32,7 +32,7 @@ #ifndef _SYS_FAIL_H_ #define _SYS_FAIL_H_ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/cdefs.h> #include <sys/linker_set.h> #include <sys/queue.h> diff --git a/freebsd/sys/sys/ktr.h b/freebsd/sys/sys/ktr.h index e25cfe03..07d7c45b 100644 --- a/freebsd/sys/sys/ktr.h +++ b/freebsd/sys/sys/ktr.h @@ -48,7 +48,7 @@ #ifndef LOCORE -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/_cpuset.h> struct ktr_entry { diff --git a/freebsd/sys/sys/lockstat.h b/freebsd/sys/sys/lockstat.h index 705f3bb5..64745052 100644 --- a/freebsd/sys/sys/lockstat.h +++ b/freebsd/sys/sys/lockstat.h @@ -34,7 +34,7 @@ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/sdt.h> diff --git a/freebsd/sys/sys/malloc.h b/freebsd/sys/sys/malloc.h index c59456de..c93439f3 100644 --- a/freebsd/sys/sys/malloc.h +++ b/freebsd/sys/sys/malloc.h @@ -35,7 +35,7 @@ #ifndef _SYS_MALLOC_H_ #define _SYS_MALLOC_H_ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/_lock.h> #include <sys/_mutex.h> diff --git a/freebsd/sys/sys/smp.h b/freebsd/sys/sys/smp.h index 96a3fe59..d98b7ecf 100644 --- a/freebsd/sys/sys/smp.h +++ b/freebsd/sys/sys/smp.h @@ -16,7 +16,7 @@ #ifndef LOCORE -#include <rtems/bsd/sys/cpuset.h> +#include <sys/cpuset.h> #include <sys/queue.h> /* diff --git a/freebsd/sys/sys/socket.h b/freebsd/sys/sys/socket.h deleted file mode 100644 index 0ef59dc4..00000000 --- a/freebsd/sys/sys/socket.h +++ /dev/null @@ -1,712 +0,0 @@ -/*- - * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)socket.h 8.4 (Berkeley) 2/21/94 - * $FreeBSD$ - */ - -#ifndef _SYS_SOCKET_H_ -#define _SYS_SOCKET_H_ - -#include <sys/cdefs.h> -#include <sys/_types.h> -#include <sys/_iovec.h> -#include <machine/_align.h> - -/* - * Definitions related to sockets: types, address families, options. - */ - -/* - * Data types. - */ -#if __BSD_VISIBLE -#ifndef _GID_T_DECLARED -typedef __gid_t gid_t; -#define _GID_T_DECLARED -#endif - -#ifndef _OFF_T_DECLARED -typedef __off_t off_t; -#define _OFF_T_DECLARED -#endif - -#ifndef _PID_T_DECLARED -typedef __pid_t pid_t; -#define _PID_T_DECLARED -#endif -#endif - -#ifndef _SA_FAMILY_T_DECLARED -typedef __sa_family_t sa_family_t; -#define _SA_FAMILY_T_DECLARED -#endif - -#ifndef _SOCKLEN_T_DECLARED -typedef __socklen_t socklen_t; -#define _SOCKLEN_T_DECLARED -#endif - -#ifndef _SSIZE_T_DECLARED -typedef __ssize_t ssize_t; -#define _SSIZE_T_DECLARED -#endif - -#if __BSD_VISIBLE -#ifndef _UID_T_DECLARED -typedef __uid_t uid_t; -#define _UID_T_DECLARED -#endif -#endif - -#ifndef _UINT32_T_DECLARED -typedef __uint32_t uint32_t; -#define _UINT32_T_DECLARED -#endif - -#ifndef _UINTPTR_T_DECLARED -typedef __uintptr_t uintptr_t; -#define _UINTPTR_T_DECLARED -#endif - -/* - * Types - */ -#define SOCK_STREAM 1 /* stream socket */ -#define SOCK_DGRAM 2 /* datagram socket */ -#define SOCK_RAW 3 /* raw-protocol interface */ -#if __BSD_VISIBLE -#define SOCK_RDM 4 /* reliably-delivered message */ -#endif -#define SOCK_SEQPACKET 5 /* sequenced packet stream */ - -#if __BSD_VISIBLE -/* - * Creation flags, OR'ed into socket() and socketpair() type argument. - */ -#define SOCK_CLOEXEC 0x10000000 -#define SOCK_NONBLOCK 0x20000000 -#endif - -/* - * Option flags per-socket. - */ -#define SO_DEBUG 0x0001 /* turn on debugging info recording */ -#define SO_ACCEPTCONN 0x0002 /* socket has had listen() */ -#define SO_REUSEADDR 0x0004 /* allow local address reuse */ -#define SO_KEEPALIVE 0x0008 /* keep connections alive */ -#define SO_DONTROUTE 0x0010 /* just use interface addresses */ -#define SO_BROADCAST 0x0020 /* permit sending of broadcast msgs */ -#if __BSD_VISIBLE -#define SO_USELOOPBACK 0x0040 /* bypass hardware when possible */ -#endif -#define SO_LINGER 0x0080 /* linger on close if data present */ -#define SO_OOBINLINE 0x0100 /* leave received OOB data in line */ -#if __BSD_VISIBLE -#define SO_REUSEPORT 0x0200 /* allow local address & port reuse */ -#define SO_TIMESTAMP 0x0400 /* timestamp received dgram traffic */ -#define SO_NOSIGPIPE 0x0800 /* no SIGPIPE from EPIPE */ -#define SO_ACCEPTFILTER 0x1000 /* there is an accept filter */ -#define SO_BINTIME 0x2000 /* timestamp received dgram traffic */ -#endif -#define SO_NO_OFFLOAD 0x4000 /* socket cannot be offloaded */ -#define SO_NO_DDP 0x8000 /* disable direct data placement */ - -/* - * Additional options, not kept in so_options. - */ -#define SO_SNDBUF 0x1001 /* send buffer size */ -#define SO_RCVBUF 0x1002 /* receive buffer size */ -#define SO_SNDLOWAT 0x1003 /* send low-water mark */ -#define SO_RCVLOWAT 0x1004 /* receive low-water mark */ -#define SO_SNDTIMEO 0x1005 /* send timeout */ -#define SO_RCVTIMEO 0x1006 /* receive timeout */ -#define SO_ERROR 0x1007 /* get error status and clear */ -#define SO_TYPE 0x1008 /* get socket type */ -#if __BSD_VISIBLE -#define SO_LABEL 0x1009 /* socket's MAC label */ -#define SO_PEERLABEL 0x1010 /* socket's peer's MAC label */ -#define SO_LISTENQLIMIT 0x1011 /* socket's backlog limit */ -#define SO_LISTENQLEN 0x1012 /* socket's complete queue length */ -#define SO_LISTENINCQLEN 0x1013 /* socket's incomplete queue length */ -#define SO_SETFIB 0x1014 /* use this FIB to route */ -#define SO_USER_COOKIE 0x1015 /* user cookie (dummynet etc.) */ -#define SO_PROTOCOL 0x1016 /* get socket protocol (Linux name) */ -#define SO_PROTOTYPE SO_PROTOCOL /* alias for SO_PROTOCOL (SunOS name) */ -#define SO_TS_CLOCK 0x1017 /* clock type used for SO_TIMESTAMP */ -#define SO_MAX_PACING_RATE 0x1018 /* socket's max TX pacing rate (Linux name) */ -#endif - -#if __BSD_VISIBLE -#define SO_TS_REALTIME_MICRO 0 /* microsecond resolution, realtime */ -#define SO_TS_BINTIME 1 /* sub-nanosecond resolution, realtime */ -#define SO_TS_REALTIME 2 /* nanosecond resolution, realtime */ -#define SO_TS_MONOTONIC 3 /* nanosecond resolution, monotonic */ -#define SO_TS_DEFAULT SO_TS_REALTIME_MICRO -#define SO_TS_CLOCK_MAX SO_TS_MONOTONIC -#endif - -/* - * Space reserved for new socket options added by third-party vendors. - * This range applies to all socket option levels. New socket options - * in FreeBSD should always use an option value less than SO_VENDOR. - */ -#if __BSD_VISIBLE -#define SO_VENDOR 0x80000000 -#endif - -/* - * Structure used for manipulating linger option. - */ -struct linger { - int l_onoff; /* option on/off */ - int l_linger; /* linger time */ -}; - -#if __BSD_VISIBLE -struct accept_filter_arg { - char af_name[16]; - char af_arg[256-16]; -}; -#endif - -/* - * Level number for (get/set)sockopt() to apply to socket itself. - */ -#define SOL_SOCKET 0xffff /* options for socket level */ - -/* - * Address families. - */ -#define AF_UNSPEC 0 /* unspecified */ -#if __BSD_VISIBLE -#define AF_LOCAL AF_UNIX /* local to host (pipes, portals) */ -#endif -#define AF_UNIX 1 /* standardized name for AF_LOCAL */ -#define AF_INET 2 /* internetwork: UDP, TCP, etc. */ -#if __BSD_VISIBLE -#define AF_IMPLINK 3 /* arpanet imp addresses */ -#define AF_PUP 4 /* pup protocols: e.g. BSP */ -#define AF_CHAOS 5 /* mit CHAOS protocols */ -#define AF_NETBIOS 6 /* SMB protocols */ -#define AF_ISO 7 /* ISO protocols */ -#define AF_OSI AF_ISO -#define AF_ECMA 8 /* European computer manufacturers */ -#define AF_DATAKIT 9 /* datakit protocols */ -#define AF_CCITT 10 /* CCITT protocols, X.25 etc */ -#define AF_SNA 11 /* IBM SNA */ -#define AF_DECnet 12 /* DECnet */ -#define AF_DLI 13 /* DEC Direct data link interface */ -#define AF_LAT 14 /* LAT */ -#define AF_HYLINK 15 /* NSC Hyperchannel */ -#define AF_APPLETALK 16 /* Apple Talk */ -#define AF_ROUTE 17 /* Internal Routing Protocol */ -#define AF_LINK 18 /* Link layer interface */ -#define pseudo_AF_XTP 19 /* eXpress Transfer Protocol (no AF) */ -#define AF_COIP 20 /* connection-oriented IP, aka ST II */ -#define AF_CNT 21 /* Computer Network Technology */ -#define pseudo_AF_RTIP 22 /* Help Identify RTIP packets */ -#define AF_IPX 23 /* Novell Internet Protocol */ -#define AF_SIP 24 /* Simple Internet Protocol */ -#define pseudo_AF_PIP 25 /* Help Identify PIP packets */ -#define AF_ISDN 26 /* Integrated Services Digital Network*/ -#define AF_E164 AF_ISDN /* CCITT E.164 recommendation */ -#define pseudo_AF_KEY 27 /* Internal key-management function */ -#endif -#define AF_INET6 28 /* IPv6 */ -#if __BSD_VISIBLE -#define AF_NATM 29 /* native ATM access */ -#define AF_ATM 30 /* ATM */ -#define pseudo_AF_HDRCMPLT 31 /* Used by BPF to not rewrite headers - * in interface output routine - */ -#define AF_NETGRAPH 32 /* Netgraph sockets */ -#define AF_SLOW 33 /* 802.3ad slow protocol */ -#define AF_SCLUSTER 34 /* Sitara cluster protocol */ -#define AF_ARP 35 -#define AF_BLUETOOTH 36 /* Bluetooth sockets */ -#define AF_IEEE80211 37 /* IEEE 802.11 protocol */ -#define AF_INET_SDP 40 /* OFED Socket Direct Protocol ipv4 */ -#define AF_INET6_SDP 42 /* OFED Socket Direct Protocol ipv6 */ -#define AF_MAX 42 -/* - * When allocating a new AF_ constant, please only allocate - * even numbered constants for FreeBSD until 134 as odd numbered AF_ - * constants 39-133 are now reserved for vendors. - */ -#define AF_VENDOR00 39 -#define AF_VENDOR01 41 -#define AF_VENDOR02 43 -#define AF_VENDOR03 45 -#define AF_VENDOR04 47 -#define AF_VENDOR05 49 -#define AF_VENDOR06 51 -#define AF_VENDOR07 53 -#define AF_VENDOR08 55 -#define AF_VENDOR09 57 -#define AF_VENDOR10 59 -#define AF_VENDOR11 61 -#define AF_VENDOR12 63 -#define AF_VENDOR13 65 -#define AF_VENDOR14 67 -#define AF_VENDOR15 69 -#define AF_VENDOR16 71 -#define AF_VENDOR17 73 -#define AF_VENDOR18 75 -#define AF_VENDOR19 77 -#define AF_VENDOR20 79 -#define AF_VENDOR21 81 -#define AF_VENDOR22 83 -#define AF_VENDOR23 85 -#define AF_VENDOR24 87 -#define AF_VENDOR25 89 -#define AF_VENDOR26 91 -#define AF_VENDOR27 93 -#define AF_VENDOR28 95 -#define AF_VENDOR29 97 -#define AF_VENDOR30 99 -#define AF_VENDOR31 101 -#define AF_VENDOR32 103 -#define AF_VENDOR33 105 -#define AF_VENDOR34 107 -#define AF_VENDOR35 109 -#define AF_VENDOR36 111 -#define AF_VENDOR37 113 -#define AF_VENDOR38 115 -#define AF_VENDOR39 117 -#define AF_VENDOR40 119 -#define AF_VENDOR41 121 -#define AF_VENDOR42 123 -#define AF_VENDOR43 125 -#define AF_VENDOR44 127 -#define AF_VENDOR45 129 -#define AF_VENDOR46 131 -#define AF_VENDOR47 133 -#endif - -/* - * Structure used by kernel to store most - * addresses. - */ -struct sockaddr { - unsigned char sa_len; /* total length */ - sa_family_t sa_family; /* address family */ - char sa_data[14]; /* actually longer; address value */ -}; -#if __BSD_VISIBLE -#define SOCK_MAXADDRLEN 255 /* longest possible addresses */ - -/* - * Structure used by kernel to pass protocol - * information in raw sockets. - */ -struct sockproto { - unsigned short sp_family; /* address family */ - unsigned short sp_protocol; /* protocol */ -}; -#endif - -#include <sys/_sockaddr_storage.h> - -#if __BSD_VISIBLE -/* - * Protocol families, same as address families for now. - */ -#define PF_UNSPEC AF_UNSPEC -#define PF_LOCAL AF_LOCAL -#define PF_UNIX PF_LOCAL /* backward compatibility */ -#define PF_INET AF_INET -#define PF_IMPLINK AF_IMPLINK -#define PF_PUP AF_PUP -#define PF_CHAOS AF_CHAOS -#define PF_NETBIOS AF_NETBIOS -#define PF_ISO AF_ISO -#define PF_OSI AF_ISO -#define PF_ECMA AF_ECMA -#define PF_DATAKIT AF_DATAKIT -#define PF_CCITT AF_CCITT -#define PF_SNA AF_SNA -#define PF_DECnet AF_DECnet -#define PF_DLI AF_DLI -#define PF_LAT AF_LAT -#define PF_HYLINK AF_HYLINK -#define PF_APPLETALK AF_APPLETALK -#define PF_ROUTE AF_ROUTE -#define PF_LINK AF_LINK -#define PF_XTP pseudo_AF_XTP /* really just proto family, no AF */ -#define PF_COIP AF_COIP -#define PF_CNT AF_CNT -#define PF_SIP AF_SIP -#define PF_IPX AF_IPX -#define PF_RTIP pseudo_AF_RTIP /* same format as AF_INET */ -#define PF_PIP pseudo_AF_PIP -#define PF_ISDN AF_ISDN -#define PF_KEY pseudo_AF_KEY -#define PF_INET6 AF_INET6 -#define PF_NATM AF_NATM -#define PF_ATM AF_ATM -#define PF_NETGRAPH AF_NETGRAPH -#define PF_SLOW AF_SLOW -#define PF_SCLUSTER AF_SCLUSTER -#define PF_ARP AF_ARP -#define PF_BLUETOOTH AF_BLUETOOTH -#define PF_IEEE80211 AF_IEEE80211 -#define PF_INET_SDP AF_INET_SDP -#define PF_INET6_SDP AF_INET6_SDP - -#define PF_MAX AF_MAX - -/* - * Definitions for network related sysctl, CTL_NET. - * - * Second level is protocol family. - * Third level is protocol number. - * - * Further levels are defined by the individual families. - */ - -/* - * PF_ROUTE - Routing table - * - * Three additional levels are defined: - * Fourth: address family, 0 is wildcard - * Fifth: type of info, defined below - * Sixth: flag(s) to mask with for NET_RT_FLAGS - */ -#define NET_RT_DUMP 1 /* dump; may limit to a.f. */ -#define NET_RT_FLAGS 2 /* by flags, e.g. RESOLVING */ -#define NET_RT_IFLIST 3 /* survey interface list */ -#define NET_RT_IFMALIST 4 /* return multicast address list */ -#define NET_RT_IFLISTL 5 /* Survey interface list, using 'l'en - * versions of msghdr structs. */ -#endif /* __BSD_VISIBLE */ - -/* - * Maximum queue length specifiable by listen. - */ -#define SOMAXCONN 128 - -/* - * Message header for recvmsg and sendmsg calls. - * Used value-result for recvmsg, value only for sendmsg. - */ -struct msghdr { - void *msg_name; /* optional address */ - socklen_t msg_namelen; /* size of address */ - struct iovec *msg_iov; /* scatter/gather array */ - int msg_iovlen; /* # elements in msg_iov */ - void *msg_control; /* ancillary data, see below */ - socklen_t msg_controllen; /* ancillary data buffer len */ - int msg_flags; /* flags on received message */ -}; - -#define MSG_OOB 0x00000001 /* process out-of-band data */ -#define MSG_PEEK 0x00000002 /* peek at incoming message */ -#define MSG_DONTROUTE 0x00000004 /* send without using routing tables */ -#define MSG_EOR 0x00000008 /* data completes record */ -#define MSG_TRUNC 0x00000010 /* data discarded before delivery */ -#define MSG_CTRUNC 0x00000020 /* control data lost before delivery */ -#define MSG_WAITALL 0x00000040 /* wait for full request or error */ -#if __BSD_VISIBLE -#define MSG_DONTWAIT 0x00000080 /* this message should be nonblocking */ -#define MSG_EOF 0x00000100 /* data completes connection */ -/* 0x00000200 unused */ -/* 0x00000400 unused */ -/* 0x00000800 unused */ -/* 0x00001000 unused */ -#define MSG_NOTIFICATION 0x00002000 /* SCTP notification */ -#define MSG_NBIO 0x00004000 /* FIONBIO mode, used by fifofs */ -#define MSG_COMPAT 0x00008000 /* used in sendit() */ -#endif -#ifdef _KERNEL -#define MSG_SOCALLBCK 0x00010000 /* for use by socket callbacks - soreceive (TCP) */ -#endif -#if __POSIX_VISIBLE >= 200809 -#define MSG_NOSIGNAL 0x00020000 /* do not generate SIGPIPE on EOF */ -#endif -#if __BSD_VISIBLE -#define MSG_CMSG_CLOEXEC 0x00040000 /* make received fds close-on-exec */ -#define MSG_WAITFORONE 0x00080000 /* for recvmmsg() */ -#endif -#ifdef _KERNEL -#define MSG_MORETOCOME 0x00100000 /* additional data pending */ -#endif - -/* - * Header for ancillary data objects in msg_control buffer. - * Used for additional information with/about a datagram - * not expressible by flags. The format is a sequence - * of message elements headed by cmsghdr structures. - */ -struct cmsghdr { - socklen_t cmsg_len; /* data byte count, including hdr */ - int cmsg_level; /* originating protocol */ - int cmsg_type; /* protocol-specific type */ -/* followed by u_char cmsg_data[]; */ -}; - -#if __BSD_VISIBLE -/* - * While we may have more groups than this, the cmsgcred struct must - * be able to fit in an mbuf and we have historically supported a - * maximum of 16 groups. -*/ -#define CMGROUP_MAX 16 - -/* - * Credentials structure, used to verify the identity of a peer - * process that has sent us a message. This is allocated by the - * peer process but filled in by the kernel. This prevents the - * peer from lying about its identity. (Note that cmcred_groups[0] - * is the effective GID.) - */ -struct cmsgcred { - pid_t cmcred_pid; /* PID of sending process */ - uid_t cmcred_uid; /* real UID of sending process */ - uid_t cmcred_euid; /* effective UID of sending process */ - gid_t cmcred_gid; /* real GID of sending process */ - short cmcred_ngroups; /* number or groups */ - gid_t cmcred_groups[CMGROUP_MAX]; /* groups */ -}; - -/* - * Socket credentials. - */ -struct sockcred { - uid_t sc_uid; /* real user id */ - uid_t sc_euid; /* effective user id */ - gid_t sc_gid; /* real group id */ - gid_t sc_egid; /* effective group id */ - int sc_ngroups; /* number of supplemental groups */ - gid_t sc_groups[1]; /* variable length */ -}; - -/* - * Compute size of a sockcred structure with groups. - */ -#define SOCKCREDSIZE(ngrps) \ - (sizeof(struct sockcred) + (sizeof(gid_t) * ((ngrps) - 1))) - -#endif /* __BSD_VISIBLE */ - -/* given pointer to struct cmsghdr, return pointer to data */ -#define CMSG_DATA(cmsg) ((unsigned char *)(cmsg) + \ - _ALIGN(sizeof(struct cmsghdr))) - -/* given pointer to struct cmsghdr, return pointer to next cmsghdr */ -#define CMSG_NXTHDR(mhdr, cmsg) \ - ((char *)(cmsg) == (char *)0 ? CMSG_FIRSTHDR(mhdr) : \ - ((char *)(cmsg) + _ALIGN(((struct cmsghdr *)(cmsg))->cmsg_len) + \ - _ALIGN(sizeof(struct cmsghdr)) > \ - (char *)(mhdr)->msg_control + (mhdr)->msg_controllen) ? \ - (struct cmsghdr *)0 : \ - (struct cmsghdr *)(void *)((char *)(cmsg) + \ - _ALIGN(((struct cmsghdr *)(cmsg))->cmsg_len))) - -/* - * RFC 2292 requires to check msg_controllen, in case that the kernel returns - * an empty list for some reasons. - */ -#define CMSG_FIRSTHDR(mhdr) \ - ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \ - (struct cmsghdr *)(mhdr)->msg_control : \ - (struct cmsghdr *)0) - -#if __BSD_VISIBLE -/* RFC 2292 additions */ -#define CMSG_SPACE(l) (_ALIGN(sizeof(struct cmsghdr)) + _ALIGN(l)) -#define CMSG_LEN(l) (_ALIGN(sizeof(struct cmsghdr)) + (l)) -#endif - -#ifdef _KERNEL -#define CMSG_ALIGN(n) _ALIGN(n) -#endif - -/* "Socket"-level control message types: */ -#define SCM_RIGHTS 0x01 /* access rights (array of int) */ -#if __BSD_VISIBLE -#define SCM_TIMESTAMP 0x02 /* timestamp (struct timeval) */ -#define SCM_CREDS 0x03 /* process creds (struct cmsgcred) */ -#define SCM_BINTIME 0x04 /* timestamp (struct bintime) */ -#define SCM_REALTIME 0x05 /* timestamp (struct timespec) */ -#define SCM_MONOTONIC 0x06 /* timestamp (struct timespec) */ -#endif - -#if __BSD_VISIBLE -/* - * 4.3 compat sockaddr, move to compat file later - */ -struct osockaddr { - unsigned short sa_family; /* address family */ - char sa_data[14]; /* up to 14 bytes of direct address */ -}; - -/* - * 4.3-compat message header (move to compat file later). - */ -struct omsghdr { - char *msg_name; /* optional address */ - int msg_namelen; /* size of address */ - struct iovec *msg_iov; /* scatter/gather array */ - int msg_iovlen; /* # elements in msg_iov */ - char *msg_accrights; /* access rights sent/received */ - int msg_accrightslen; -}; -#endif - -/* - * howto arguments for shutdown(2), specified by Posix.1g. - */ -#define SHUT_RD 0 /* shut down the reading side */ -#define SHUT_WR 1 /* shut down the writing side */ -#define SHUT_RDWR 2 /* shut down both sides */ - -#if __BSD_VISIBLE -/* for SCTP */ -/* we cheat and use the SHUT_XX defines for these */ -#define PRU_FLUSH_RD SHUT_RD -#define PRU_FLUSH_WR SHUT_WR -#define PRU_FLUSH_RDWR SHUT_RDWR -#endif - - -#if __BSD_VISIBLE -/* - * sendfile(2) header/trailer struct - */ -struct sf_hdtr { - struct iovec *headers; /* pointer to an array of header struct iovec's */ - int hdr_cnt; /* number of header iovec's */ - struct iovec *trailers; /* pointer to an array of trailer struct iovec's */ - int trl_cnt; /* number of trailer iovec's */ -}; - -/* - * Sendfile-specific flag(s) - */ -#define SF_NODISKIO 0x00000001 -#define SF_MNOWAIT 0x00000002 /* obsolete */ -#define SF_SYNC 0x00000004 -#define SF_USER_READAHEAD 0x00000008 -#define SF_NOCACHE 0x00000010 -#define SF_FLAGS(rh, flags) (((rh) << 16) | (flags)) - -#ifdef _KERNEL -#define SF_READAHEAD(flags) ((flags) >> 16) -#endif /* _KERNEL */ - -/* - * Sendmmsg/recvmmsg specific structure(s) - */ -struct mmsghdr { - struct msghdr msg_hdr; /* message header */ - ssize_t msg_len; /* message length */ -}; -#endif /* __BSD_VISIBLE */ - -#ifndef _KERNEL - -#include <sys/cdefs.h> - -__BEGIN_DECLS -int accept(int, struct sockaddr * __restrict, socklen_t * __restrict); -int bind(int, const struct sockaddr *, socklen_t); -int connect(int, const struct sockaddr *, socklen_t); -#if __BSD_VISIBLE -int accept4(int, struct sockaddr * __restrict, socklen_t * __restrict, int); -int bindat(int, int, const struct sockaddr *, socklen_t); -int connectat(int, int, const struct sockaddr *, socklen_t); -#endif -int getpeername(int, struct sockaddr * __restrict, socklen_t * __restrict); -int getsockname(int, struct sockaddr * __restrict, socklen_t * __restrict); -int getsockopt(int, int, int, void * __restrict, socklen_t * __restrict); -int listen(int, int); -ssize_t recv(int, void *, size_t, int); -ssize_t recvfrom(int, void *, size_t, int, struct sockaddr * __restrict, socklen_t * __restrict); -ssize_t recvmsg(int, struct msghdr *, int); -#if __BSD_VISIBLE -struct timespec; -ssize_t recvmmsg(int, struct mmsghdr * __restrict, size_t, int, - const struct timespec * __restrict); -#endif -ssize_t send(int, const void *, size_t, int); -ssize_t sendto(int, const void *, - size_t, int, const struct sockaddr *, socklen_t); -ssize_t sendmsg(int, const struct msghdr *, int); -#if __BSD_VISIBLE -int sendfile(int, int, off_t, size_t, struct sf_hdtr *, off_t *, int); -ssize_t sendmmsg(int, struct mmsghdr * __restrict, size_t, int); -int setfib(int); -#endif -int setsockopt(int, int, int, const void *, socklen_t); -int shutdown(int, int); -int sockatmark(int); -int socket(int, int, int); -int socketpair(int, int, int, int *); -__END_DECLS - -#endif /* !_KERNEL */ - -#ifdef _KERNEL -struct socket; - -struct tcpcb *so_sototcpcb(struct socket *so); -struct inpcb *so_sotoinpcb(struct socket *so); -struct sockbuf *so_sockbuf_snd(struct socket *); -struct sockbuf *so_sockbuf_rcv(struct socket *); - -int so_state_get(const struct socket *); -void so_state_set(struct socket *, int); - -int so_options_get(const struct socket *); -void so_options_set(struct socket *, int); - -int so_error_get(const struct socket *); -void so_error_set(struct socket *, int); - -int so_linger_get(const struct socket *); -void so_linger_set(struct socket *, int); - -struct protosw *so_protosw_get(const struct socket *); -void so_protosw_set(struct socket *, struct protosw *); - -void so_sorwakeup_locked(struct socket *so); -void so_sowwakeup_locked(struct socket *so); - -void so_sorwakeup(struct socket *so); -void so_sowwakeup(struct socket *so); - -void so_lock(struct socket *so); -void so_unlock(struct socket *so); - -void so_listeners_apply_all(struct socket *so, void (*func)(struct socket *, void *), void *arg); - -#endif - - -#endif /* !_SYS_SOCKET_H_ */ diff --git a/freebsd/sys/sys/sysproto.h b/freebsd/sys/sys/sysproto.h index bdd20804..e73e37dd 100644 --- a/freebsd/sys/sys/sysproto.h +++ b/freebsd/sys/sys/sysproto.h @@ -10,7 +10,7 @@ #include <sys/signal.h> #include <sys/acl.h> -#include <rtems/bsd/sys/cpuset.h> +#include <sys/cpuset.h> #include <sys/_ffcounter.h> #include <sys/_semaphore.h> #include <sys/ucontext.h> diff --git a/freebsd/sys/sys/tty.h b/freebsd/sys/sys/tty.h index a82aedf4..d6d6ee64 100644 --- a/freebsd/sys/sys/tty.h +++ b/freebsd/sys/sys/tty.h @@ -32,7 +32,7 @@ #ifndef _SYS_TTY_H_ #define _SYS_TTY_H_ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> diff --git a/freebsd/sys/sys/user.h b/freebsd/sys/sys/user.h index 762841ee..077baf46 100644 --- a/freebsd/sys/sys/user.h +++ b/freebsd/sys/sys/user.h @@ -38,7 +38,7 @@ #include <machine/pcb.h> #ifndef _KERNEL /* stuff that *used* to be included by user.h, or is now needed */ -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/time.h> #include <rtems/bsd/sys/resource.h> #include <sys/ucred.h> diff --git a/freebsd/sys/v850/v850/in_cksum.c b/freebsd/sys/v850/v850/in_cksum.c index 7c680bbe..22e19d83 100644 --- a/freebsd/sys/v850/v850/in_cksum.c +++ b/freebsd/sys/v850/v850/in_cksum.c @@ -40,7 +40,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/vm/uma.h b/freebsd/sys/vm/uma.h index 605ba9b1..5e0bdd7c 100644 --- a/freebsd/sys/vm/uma.h +++ b/freebsd/sys/vm/uma.h @@ -36,7 +36,7 @@ #ifndef _VM_UMA_H_ #define _VM_UMA_H_ -#include <rtems/bsd/sys/param.h> /* For NULL */ +#include <sys/param.h> /* For NULL */ #include <sys/malloc.h> /* For M_* */ /* User visible parameters */ diff --git a/freebsd/sys/vm/uma_core.c b/freebsd/sys/vm/uma_core.c index 58fd5336..45e8462a 100644 --- a/freebsd/sys/vm/uma_core.c +++ b/freebsd/sys/vm/uma_core.c @@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_param.h> #include <rtems/bsd/local/opt_vm.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bitset.h> #include <sys/eventhandler.h> diff --git a/freebsd/sys/vm/uma_dbg.c b/freebsd/sys/vm/uma_dbg.c index 0c6be82d..ee9e7431 100644 --- a/freebsd/sys/vm/uma_dbg.c +++ b/freebsd/sys/vm/uma_dbg.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_vm.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bitset.h> #include <sys/kernel.h> diff --git a/freebsd/sys/x86/pci/pci_bus.c b/freebsd/sys/x86/pci/pci_bus.c index 3ef87cf1..c08e115e 100644 --- a/freebsd/sys/x86/pci/pci_bus.c +++ b/freebsd/sys/x86/pci/pci_bus.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_cpu.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/kernel.h> diff --git a/freebsd/tools/tools/net80211/wlanstats/main.c b/freebsd/tools/tools/net80211/wlanstats/main.c index 5f3816da..3a6fd204 100644 --- a/freebsd/tools/tools/net80211/wlanstats/main.c +++ b/freebsd/tools/tools/net80211/wlanstats/main.c @@ -46,7 +46,7 @@ #include <machine/rtems-bsd-program.h> #include <machine/rtems-bsd-commands.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <net/ethernet.h> diff --git a/freebsd/tools/tools/net80211/wlanstats/wlanstats.c b/freebsd/tools/tools/net80211/wlanstats/wlanstats.c index 8211029a..120eeaa2 100644 --- a/freebsd/tools/tools/net80211/wlanstats/wlanstats.c +++ b/freebsd/tools/tools/net80211/wlanstats/wlanstats.c @@ -42,7 +42,7 @@ #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/file.h> #include <sys/sockio.h> #include <sys/socket.h> diff --git a/freebsd/usr.bin/netstat/bpf.c b/freebsd/usr.bin/netstat/bpf.c index 6b8cb819..6e7aad31 100644 --- a/freebsd/usr.bin/netstat/bpf.c +++ b/freebsd/usr.bin/netstat/bpf.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/sysctl.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/user.h> #include <net/if.h> diff --git a/freebsd/usr.bin/netstat/flowtable.c b/freebsd/usr.bin/netstat/flowtable.c index 890ac22b..2b1f2975 100644 --- a/freebsd/usr.bin/netstat/flowtable.c +++ b/freebsd/usr.bin/netstat/flowtable.c @@ -38,7 +38,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <net/flowtable.h> diff --git a/freebsd/usr.bin/netstat/if.c b/freebsd/usr.bin/netstat/if.c index ebdcd85a..210660bc 100644 --- a/freebsd/usr.bin/netstat/if.c +++ b/freebsd/usr.bin/netstat/if.c @@ -46,7 +46,7 @@ static char sccsid[] = "@(#)if.c 8.3 (Berkeley) 4/28/95"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/freebsd/usr.bin/netstat/inet.c b/freebsd/usr.bin/netstat/inet.c index 30965229..299eee3d 100644 --- a/freebsd/usr.bin/netstat/inet.c +++ b/freebsd/usr.bin/netstat/inet.c @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)inet.c 8.5 (Berkeley) 5/24/95"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/domain.h> #include <sys/protosw.h> diff --git a/freebsd/usr.bin/netstat/inet6.c b/freebsd/usr.bin/netstat/inet6.c index 21572711..6f8d4c53 100644 --- a/freebsd/usr.bin/netstat/inet6.c +++ b/freebsd/usr.bin/netstat/inet6.c @@ -47,7 +47,7 @@ static char sccsid[] = "@(#)inet6.c 8.4 (Berkeley) 4/20/94"; __FBSDID("$FreeBSD$"); #ifdef INET6 -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/ioctl.h> diff --git a/freebsd/usr.bin/netstat/ipsec.c b/freebsd/usr.bin/netstat/ipsec.c index 78aa8680..5c0d9481 100644 --- a/freebsd/usr.bin/netstat/ipsec.c +++ b/freebsd/usr.bin/netstat/ipsec.c @@ -100,7 +100,7 @@ static char sccsid[] = "@(#)inet.c 8.5 (Berkeley) 5/24/95"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/freebsd/usr.bin/netstat/main.c b/freebsd/usr.bin/netstat/main.c index 2ac9ed7c..24fc3442 100644 --- a/freebsd/usr.bin/netstat/main.c +++ b/freebsd/usr.bin/netstat/main.c @@ -54,7 +54,7 @@ static char sccsid[] = "@(#)main.c 8.4 (Berkeley) 3/1/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/file.h> #include <sys/protosw.h> #include <sys/socket.h> diff --git a/freebsd/usr.bin/netstat/mbuf.c b/freebsd/usr.bin/netstat/mbuf.c index 446592ae..355be1a6 100644 --- a/freebsd/usr.bin/netstat/mbuf.c +++ b/freebsd/usr.bin/netstat/mbuf.c @@ -51,7 +51,7 @@ static char sccsid[] = "@(#)mbuf.c 8.1 (Berkeley) 6/6/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/sf_buf.h> diff --git a/freebsd/usr.bin/netstat/mroute.c b/freebsd/usr.bin/netstat/mroute.c index 79c7c982..e6143204 100644 --- a/freebsd/usr.bin/netstat/mroute.c +++ b/freebsd/usr.bin/netstat/mroute.c @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); * MROUTING 1.0 */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/freebsd/usr.bin/netstat/mroute6.c b/freebsd/usr.bin/netstat/mroute6.c index 8a5ca63d..c4a87de1 100644 --- a/freebsd/usr.bin/netstat/mroute6.c +++ b/freebsd/usr.bin/netstat/mroute6.c @@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$"); #ifdef INET6 -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/freebsd/usr.bin/netstat/nl_symbols.c b/freebsd/usr.bin/netstat/nl_symbols.c index d719f8f5..0370f16f 100644 --- a/freebsd/usr.bin/netstat/nl_symbols.c +++ b/freebsd/usr.bin/netstat/nl_symbols.c @@ -7,7 +7,7 @@ #ifdef __rtems__ #include <machine/rtems-bsd-program.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <nlist.h> #ifdef __rtems__ #include "rtems-bsd-netstat-nl_symbols-data.h" diff --git a/freebsd/usr.bin/netstat/pfkey.c b/freebsd/usr.bin/netstat/pfkey.c index e76dddb2..ba54a30c 100644 --- a/freebsd/usr.bin/netstat/pfkey.c +++ b/freebsd/usr.bin/netstat/pfkey.c @@ -75,7 +75,7 @@ static char sccsid[] = "@(#)inet.c 8.5 (Berkeley) 5/24/95"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/freebsd/usr.bin/netstat/route.c b/freebsd/usr.bin/netstat/route.c index 8e163dbb..62fb376a 100644 --- a/freebsd/usr.bin/netstat/route.c +++ b/freebsd/usr.bin/netstat/route.c @@ -45,7 +45,7 @@ static char sccsid[] = "From: @(#)route.c 8.6 (Berkeley) 4/28/95"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #ifdef __rtems__ #include <rtems/rtems/clock.h> #endif /* __rtems__ */ diff --git a/freebsd/usr.bin/netstat/sctp.c b/freebsd/usr.bin/netstat/sctp.c index e2b368fd..dc4be803 100644 --- a/freebsd/usr.bin/netstat/sctp.c +++ b/freebsd/usr.bin/netstat/sctp.c @@ -47,7 +47,7 @@ static char sccsid[] = "@(#)sctp.c 0.1 (Berkeley) 4/18/2007"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/freebsd/usr.bin/netstat/unix.c b/freebsd/usr.bin/netstat/unix.c index e9532c74..42093c25 100644 --- a/freebsd/usr.bin/netstat/unix.c +++ b/freebsd/usr.bin/netstat/unix.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); /* * Display protocol blocks in the unix domain. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/protosw.h> #include <sys/socket.h> diff --git a/freebsd/usr.bin/vmstat/vmstat.c b/freebsd/usr.bin/vmstat/vmstat.c index 558c3f48..bc62eb3c 100644 --- a/freebsd/usr.bin/vmstat/vmstat.c +++ b/freebsd/usr.bin/vmstat/vmstat.c @@ -50,7 +50,7 @@ static char sccsid[] = "@(#)vmstat.c 8.1 (Berkeley) 6/6/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/proc.h> #include <sys/uio.h> #include <sys/namei.h> diff --git a/freebsd/usr.sbin/arp/arp.c b/freebsd/usr.sbin/arp/arp.c index 7c9882fb..e3f28b97 100644 --- a/freebsd/usr.sbin/arp/arp.c +++ b/freebsd/usr.sbin/arp/arp.c @@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$"); #include <machine/rtems-bsd-program.h> #include <machine/rtems-bsd-commands.h> #endif /* __rtems__ */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/file.h> #include <sys/socket.h> #include <sys/sockio.h> @@ -221,9 +221,6 @@ def base(mm): 'sys/security/mac/mac_framework.h', 'sys/sys/acl.h', 'sys/sys/aio.h', - 'sys/sys/_bitset.h', - 'sys/sys/bitset.h', - 'sys/sys/bitstring.h', 'sys/sys/bufobj.h', 'sys/sys/buf_ring.h', 'sys/sys/_bus_dma.h', @@ -238,7 +235,6 @@ def base(mm): 'sys/sys/conf.h', 'sys/sys/counter.h', 'sys/sys/cpu.h', - 'sys/sys/_cpuset.h', 'sys/sys/ctype.h', 'sys/sys/domain.h', 'sys/sys/eventhandler.h', @@ -308,9 +304,7 @@ def base(mm): 'sys/sys/signalvar.h', 'sys/sys/smp.h', 'sys/sys/sleepqueue.h', - 'sys/sys/_sockaddr_storage.h', 'sys/sys/sockbuf.h', - 'sys/sys/socket.h', 'sys/sys/socketvar.h', 'sys/sys/sockopt.h', 'sys/sys/sockstate.h', @@ -1185,7 +1179,6 @@ def dev_net(mm): 'sys/net/ethernet.h', 'sys/net/if_arp.h', 'sys/net/if_dl.h', - 'sys/net/if.h', 'sys/net/iflib.h', 'sys/net/if_media.h', 'sys/net/ifq.h', @@ -1475,7 +1468,6 @@ def net(mm): 'sys/net/if_enc.h', 'sys/net/if_gif.h', 'sys/net/if_gre.h', - 'sys/net/if.h', 'sys/net/if_lagg.h', 'sys/net/if_llatbl.h', 'sys/net/if_llc.h', @@ -1573,7 +1565,6 @@ def netinet(mm): 'sys/netinet/if_ether.h', 'sys/netinet/igmp.h', 'sys/netinet/igmp_var.h', - 'sys/netinet/in.h', 'sys/netinet/in_kdtrace.h', 'sys/netinet/in_pcb.h', 'sys/netinet/in_rss.h', @@ -1618,7 +1609,6 @@ def netinet(mm): 'sys/netinet/sctp_var.h', 'sys/netinet/tcp_debug.h', 'sys/netinet/tcp_fsm.h', - 'sys/netinet/tcp.h', 'sys/netinet/tcp_hostcache.h', 'sys/netinet/tcpip.h', 'sys/netinet/tcp_lro.h', @@ -1725,7 +1715,6 @@ def netinet6(mm): [ 'sys/netinet6/icmp6.h', 'sys/netinet6/in6_fib.h', - 'sys/netinet6/in6.h', 'sys/netinet6/in6_ifattach.h', 'sys/netinet6/in6_pcb.h', 'sys/netinet6/in6_rss.h', @@ -2197,7 +2186,6 @@ def user_space(mm): 'sbin/pfctl/pfctl.h', 'sbin/pfctl/pfctl_parser.h', 'include/arpa/ftp.h', - 'include/arpa/inet.h', 'include/arpa/nameser_compat.h', 'include/arpa/nameser.h', 'include/db.h', diff --git a/rtemsbsd/include/machine/_align.h b/rtemsbsd/include/machine/_align.h deleted file mode 100644 index 298e5733..00000000 --- a/rtemsbsd/include/machine/_align.h +++ /dev/null @@ -1 +0,0 @@ -#include <rtems/bsd/sys/param.h> diff --git a/rtemsbsd/include/machine/bitstring.h b/rtemsbsd/include/machine/bitstring.h deleted file mode 100644 index 419cb6dd..00000000 --- a/rtemsbsd/include/machine/bitstring.h +++ /dev/null @@ -1,107 +0,0 @@ -/*- - * Copyright (c) 1982, 1986, 1991, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)types.h 8.6 (Berkeley) 2/19/95 - * $FreeBSD$ - */ - -#ifndef _RTEMS_BSD_MACHINE_BITSTRING_H_ -#define _RTEMS_BSD_MACHINE_BITSTRING_H_ - -#ifndef _SYS_BITSTRING_H_ -#error "the header file <sys/bitstring.h> must be included first" -#endif - -#ifdef __POPCNT__ -#define __bitcount64(x) __builtin_popcountll((__uint64_t)(x)) -#define __bitcount32(x) __builtin_popcount((__uint32_t)(x)) -#define __bitcount16(x) __builtin_popcount((__uint16_t)(x)) -#define __bitcountl(x) __builtin_popcountl((unsigned long)(x)) -#define __bitcount(x) __builtin_popcount((unsigned int)(x)) -#else -/* - * Population count algorithm using SWAR approach - * - "SIMD Within A Register". - */ -static __inline __uint16_t -__bitcount16(__uint16_t _x) -{ - - _x = (_x & 0x5555) + ((_x & 0xaaaa) >> 1); - _x = (_x & 0x3333) + ((_x & 0xcccc) >> 2); - _x = (_x + (_x >> 4)) & 0x0f0f; - _x = (_x + (_x >> 8)) & 0x00ff; - return (_x); -} - -static __inline __uint32_t -__bitcount32(__uint32_t _x) -{ - - _x = (_x & 0x55555555) + ((_x & 0xaaaaaaaa) >> 1); - _x = (_x & 0x33333333) + ((_x & 0xcccccccc) >> 2); - _x = (_x + (_x >> 4)) & 0x0f0f0f0f; - _x = (_x + (_x >> 8)); - _x = (_x + (_x >> 16)) & 0x000000ff; - return (_x); -} - -#ifdef __LP64__ -static __inline __uint64_t -__bitcount64(__uint64_t _x) -{ - - _x = (_x & 0x5555555555555555) + ((_x & 0xaaaaaaaaaaaaaaaa) >> 1); - _x = (_x & 0x3333333333333333) + ((_x & 0xcccccccccccccccc) >> 2); - _x = (_x + (_x >> 4)) & 0x0f0f0f0f0f0f0f0f; - _x = (_x + (_x >> 8)); - _x = (_x + (_x >> 16)); - _x = (_x + (_x >> 32)) & 0x000000ff; - return (_x); -} - -#define __bitcountl(x) __bitcount64((unsigned long)(x)) -#else -static __inline __uint64_t -__bitcount64(__uint64_t _x) -{ - - return (__bitcount32(_x >> 32) + __bitcount32(_x)); -} - -#define __bitcountl(x) __bitcount32((unsigned long)(x)) -#endif -#define __bitcount(x) __bitcount32((unsigned int)(x)) -#endif - -#endif /* !_RTEMS_BSD_MACHINE_BITSTRING_H_ */ diff --git a/rtemsbsd/include/machine/rtems-bsd-bus-dma.h b/rtemsbsd/include/machine/rtems-bsd-bus-dma.h index 9ae74763..0ac37512 100644 --- a/rtemsbsd/include/machine/rtems-bsd-bus-dma.h +++ b/rtemsbsd/include/machine/rtems-bsd-bus-dma.h @@ -47,7 +47,7 @@ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_BUS_DMA_H_ #define _RTEMS_BSD_MACHINE_RTEMS_BSD_BUS_DMA_H_ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-space.h b/rtemsbsd/include/machine/rtems-bsd-kernel-space.h index 9d0484a4..bfdc27ec 100644 --- a/rtemsbsd/include/machine/rtems-bsd-kernel-space.h +++ b/rtemsbsd/include/machine/rtems-bsd-kernel-space.h @@ -55,6 +55,7 @@ /* General define to activate BSD kernel parts */ #define _KERNEL 1 +#include <machine/rtems-bsd-version.h> #include <machine/rtems-bsd-kernel-namespace.h> /* Assert */ @@ -69,6 +70,8 @@ void rtems_bsd_assert_func(const char *file, int line, const char *func, const c /* General definitions */ +#define MACHINE_ARCH "rtems" + #define M_RTEMS_HEAP 0 #define BSD_DEFAULT_FIB 0 @@ -83,4 +86,10 @@ void rtems_bsd_assert_func(const char *file, int line, const char *func, const c #define kdb_active 0 +/* pseudo-errors returned inside kernel to modify return to process */ +#define ERESTART (-1) /* restart syscall */ +#define EJUSTRETURN (-2) /* don't modify regs, just return */ +#define ENOIOCTL (-3) /* ioctl not handled by this layer */ +#define EDIRIOCTL (-4) /* do direct ioctl in GEOM */ + #endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ */ diff --git a/rtemsbsd/include/machine/rtems-bsd-param.h b/rtemsbsd/include/machine/rtems-bsd-param.h deleted file mode 100644 index ffcbf926..00000000 --- a/rtemsbsd/include/machine/rtems-bsd-param.h +++ /dev/null @@ -1,59 +0,0 @@ -/** - * @file - * - * @ingroup rtems_bsd_machine - * - * @brief TODO. - */ - -/* - * Copyright (c) 2009-2013 embedded brains GmbH. All rights reserved. - * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * <rtems@embedded-brains.de> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _RTEMS_BSD_MACHINE_PARAM_H_ -#define _RTEMS_BSD_MACHINE_PARAM_H_ - -#include <machine/param.h> - -#define _ALIGNBYTES ALIGNBYTES - -#define _ALIGN(p) ALIGN(p) - -#define MAXCPU 1 - -#define CACHE_LINE_SHIFT 7 - -#define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) - -#define MAXPAGESIZES 1 /* maximum number of supported page sizes */ - -#define MACHINE_ARCH "rtems" - -#endif /* _RTEMS_BSD_MACHINE_PARAM_H_ */ diff --git a/rtemsbsd/include/machine/rtems-bsd-thread.h b/rtemsbsd/include/machine/rtems-bsd-thread.h index a0bcda15..49652a7e 100644 --- a/rtemsbsd/include/machine/rtems-bsd-thread.h +++ b/rtemsbsd/include/machine/rtems-bsd-thread.h @@ -40,7 +40,7 @@ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_THREAD_H_ #define _RTEMS_BSD_MACHINE_RTEMS_BSD_THREAD_H_ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/proc.h> diff --git a/rtemsbsd/include/machine/rtems-bsd-user-space.h b/rtemsbsd/include/machine/rtems-bsd-user-space.h index 11663209..47f9e00b 100644 --- a/rtemsbsd/include/machine/rtems-bsd-user-space.h +++ b/rtemsbsd/include/machine/rtems-bsd-user-space.h @@ -42,6 +42,7 @@ #define __FreeBSD__ 1 +#include <machine/rtems-bsd-version.h> #include <sys/cdefs.h> #include <stdio.h> diff --git a/rtemsbsd/include/machine/rtems-bsd-version.h b/rtemsbsd/include/machine/rtems-bsd-version.h new file mode 100644 index 00000000..04215c08 --- /dev/null +++ b/rtemsbsd/include/machine/rtems-bsd-version.h @@ -0,0 +1 @@ +#define __FreeBSD_version 1200018 diff --git a/rtemsbsd/include/rtems/bsd/sys/cpuset.h b/rtemsbsd/include/rtems/bsd/sys/cpuset.h deleted file mode 100644 index f5940682..00000000 --- a/rtemsbsd/include/rtems/bsd/sys/cpuset.h +++ /dev/null @@ -1,150 +0,0 @@ -/*- - * Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org> - * All rights reserved. - * - * Copyright (c) 2008 Nokia Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice unmodified, this list of conditions, and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _RTEMS_BSD_SYS_CPUSET_H_ -#define _RTEMS_BSD_SYS_CPUSET_H_ - -#include <sys/_cpuset.h> -#include <sys/_bitset.h> -#include <sys/bitset.h> - -#define CPUSETBUFSIZ ((2 + sizeof(long) * 2) * _NCPUWORDS) - -#define CPU_CLR(n, p) BIT_CLR(CPU_SETSIZE, n, p) -#define CPU_COPY(f, t) BIT_COPY(CPU_SETSIZE, f, t) -#define CPU_ISSET(n, p) BIT_ISSET(CPU_SETSIZE, n, p) -#define CPU_SET(n, p) BIT_SET(CPU_SETSIZE, n, p) -#define CPU_ZERO(p) BIT_ZERO(CPU_SETSIZE, p) -#define CPU_FILL(p) BIT_FILL(CPU_SETSIZE, p) -#define CPU_SETOF(n, p) BIT_SETOF(CPU_SETSIZE, n, p) -#define CPU_EMPTY(p) BIT_EMPTY(CPU_SETSIZE, p) -#define CPU_ISFULLSET(p) BIT_ISFULLSET(CPU_SETSIZE, p) -#define CPU_SUBSET(p, c) BIT_SUBSET(CPU_SETSIZE, p, c) -#define CPU_OVERLAP(p, c) BIT_OVERLAP(CPU_SETSIZE, p, c) -#define CPU_CMP(p, c) BIT_CMP(CPU_SETSIZE, p, c) -#define CPU_OR(d, s) BIT_OR(CPU_SETSIZE, d, s) -#define CPU_AND(d, s) BIT_AND(CPU_SETSIZE, d, s) -#define CPU_NAND(d, s) BIT_NAND(CPU_SETSIZE, d, s) -#define CPU_CLR_ATOMIC(n, p) BIT_CLR_ATOMIC(CPU_SETSIZE, n, p) -#define CPU_SET_ATOMIC(n, p) BIT_SET_ATOMIC(CPU_SETSIZE, n, p) -#define CPU_SET_ATOMIC_ACQ(n, p) BIT_SET_ATOMIC_ACQ(CPU_SETSIZE, n, p) -#define CPU_AND_ATOMIC(n, p) BIT_AND_ATOMIC(CPU_SETSIZE, n, p) -#define CPU_OR_ATOMIC(d, s) BIT_OR_ATOMIC(CPU_SETSIZE, d, s) -#define CPU_COPY_STORE_REL(f, t) BIT_COPY_STORE_REL(CPU_SETSIZE, f, t) -#define CPU_FFS(p) BIT_FFS(CPU_SETSIZE, p) -#define CPU_COUNT(p) BIT_COUNT(CPU_SETSIZE, p) -#define CPUSET_FSET BITSET_FSET(_NCPUWORDS) -#define CPUSET_T_INITIALIZER BITSET_T_INITIALIZER - -/* - * Valid cpulevel_t values. - */ -#define CPU_LEVEL_ROOT 1 /* All system cpus. */ -#define CPU_LEVEL_CPUSET 2 /* Available cpus for which. */ -#define CPU_LEVEL_WHICH 3 /* Actual mask/id for which. */ - -/* - * Valid cpuwhich_t values. - */ -#define CPU_WHICH_TID 1 /* Specifies a thread id. */ -#define CPU_WHICH_PID 2 /* Specifies a process id. */ -#define CPU_WHICH_CPUSET 3 /* Specifies a set id. */ -#define CPU_WHICH_IRQ 4 /* Specifies an irq #. */ -#define CPU_WHICH_JAIL 5 /* Specifies a jail id. */ -#define CPU_WHICH_DOMAIN 6 /* Specifies a NUMA domain id. */ - -/* - * Reserved cpuset identifiers. - */ -#define CPUSET_INVALID -1 -#define CPUSET_DEFAULT 0 - -#ifdef _KERNEL -#include <sys/queue.h> - -LIST_HEAD(setlist, cpuset); - -/* - * cpusets encapsulate cpu binding information for one or more threads. - * - * a - Accessed with atomics. - * s - Set at creation, never modified. Only a ref required to read. - * c - Locked internally by a cpuset lock. - * - * The bitmask is only modified while holding the cpuset lock. It may be - * read while only a reference is held but the consumer must be prepared - * to deal with inconsistent results. - */ -struct cpuset { - cpuset_t cs_mask; /* bitmask of valid cpus. */ - volatile u_int cs_ref; /* (a) Reference count. */ - int cs_flags; /* (s) Flags from below. */ - cpusetid_t cs_id; /* (s) Id or INVALID. */ - struct cpuset *cs_parent; /* (s) Pointer to our parent. */ - LIST_ENTRY(cpuset) cs_link; /* (c) All identified sets. */ - LIST_ENTRY(cpuset) cs_siblings; /* (c) Sibling set link. */ - struct setlist cs_children; /* (c) List of children. */ -}; - -#define CPU_SET_ROOT 0x0001 /* Set is a root set. */ -#define CPU_SET_RDONLY 0x0002 /* No modification allowed. */ - -extern cpuset_t *cpuset_root; -struct prison; -struct proc; -struct thread; - -struct cpuset *cpuset_thread0(void); -struct cpuset *cpuset_ref(struct cpuset *); -void cpuset_rel(struct cpuset *); -int cpuset_setthread(lwpid_t id, cpuset_t *); -int cpuset_setithread(lwpid_t id, int cpu); -int cpuset_create_root(struct prison *, struct cpuset **); -int cpuset_setproc_update_set(struct proc *, struct cpuset *); -int cpuset_which(cpuwhich_t, id_t, struct proc **, - struct thread **, struct cpuset **); - -char *cpusetobj_strprint(char *, const cpuset_t *); -int cpusetobj_strscan(cpuset_t *, const char *); -#ifdef DDB -void ddb_display_cpuset(const cpuset_t *); -#endif - -#else -__BEGIN_DECLS -int cpuset(cpusetid_t *); -int cpuset_setid(cpuwhich_t, id_t, cpusetid_t); -int cpuset_getid(cpulevel_t, cpuwhich_t, id_t, cpusetid_t *); -int cpuset_getaffinity(cpulevel_t, cpuwhich_t, id_t, size_t, cpuset_t *); -int cpuset_setaffinity(cpulevel_t, cpuwhich_t, id_t, size_t, const cpuset_t *); -__END_DECLS -#endif -#endif /* !_RTEMS_BSD_SYS_CPUSET_H_ */ diff --git a/rtemsbsd/include/rtems/bsd/sys/errno.h b/rtemsbsd/include/rtems/bsd/sys/errno.h deleted file mode 100644 index 7fad3cf0..00000000 --- a/rtemsbsd/include/rtems/bsd/sys/errno.h +++ /dev/null @@ -1,198 +0,0 @@ -/*- - * Copyright (c) 1982, 1986, 1989, 1993 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)errno.h 8.5 (Berkeley) 1/21/94 - * $FreeBSD$ - */ - -#ifndef _RTEMS_BSD_SYS_ERRNO_H_ -#define _RTEMS_BSD_SYS_ERRNO_H_ - -#ifndef _KERNEL -#include <sys/cdefs.h> -#ifndef __rtems__ -__BEGIN_DECLS -int * __error(void); -__END_DECLS -#define errno (* __error()) -#endif /* __rtems__ */ -#endif - -#ifndef __rtems__ -#define EPERM 1 /* Operation not permitted */ -#define ENOENT 2 /* No such file or directory */ -#define ESRCH 3 /* No such process */ -#define EINTR 4 /* Interrupted system call */ -#define EIO 5 /* Input/output error */ -#define ENXIO 6 /* Device not configured */ -#define E2BIG 7 /* Argument list too long */ -#define ENOEXEC 8 /* Exec format error */ -#define EBADF 9 /* Bad file descriptor */ -#define ECHILD 10 /* No child processes */ -#define EDEADLK 11 /* Resource deadlock avoided */ - /* 11 was EAGAIN */ -#define ENOMEM 12 /* Cannot allocate memory */ -#define EACCES 13 /* Permission denied */ -#define EFAULT 14 /* Bad address */ -#ifndef _POSIX_SOURCE -#define ENOTBLK 15 /* Block device required */ -#endif -#define EBUSY 16 /* Device busy */ -#define EEXIST 17 /* File exists */ -#define EXDEV 18 /* Cross-device link */ -#define ENODEV 19 /* Operation not supported by device */ -#define ENOTDIR 20 /* Not a directory */ -#define EISDIR 21 /* Is a directory */ -#define EINVAL 22 /* Invalid argument */ -#define ENFILE 23 /* Too many open files in system */ -#define EMFILE 24 /* Too many open files */ -#define ENOTTY 25 /* Inappropriate ioctl for device */ -#ifndef _POSIX_SOURCE -#define ETXTBSY 26 /* Text file busy */ -#endif -#define EFBIG 27 /* File too large */ -#define ENOSPC 28 /* No space left on device */ -#define ESPIPE 29 /* Illegal seek */ -#define EROFS 30 /* Read-only filesystem */ -#define EMLINK 31 /* Too many links */ -#define EPIPE 32 /* Broken pipe */ - -/* math software */ -#define EDOM 33 /* Numerical argument out of domain */ -#define ERANGE 34 /* Result too large */ - -/* non-blocking and interrupt i/o */ -#define EAGAIN 35 /* Resource temporarily unavailable */ -#ifndef _POSIX_SOURCE -#define EWOULDBLOCK EAGAIN /* Operation would block */ -#define EINPROGRESS 36 /* Operation now in progress */ -#define EALREADY 37 /* Operation already in progress */ - -/* ipc/network software -- argument errors */ -#define ENOTSOCK 38 /* Socket operation on non-socket */ -#define EDESTADDRREQ 39 /* Destination address required */ -#define EMSGSIZE 40 /* Message too long */ -#define EPROTOTYPE 41 /* Protocol wrong type for socket */ -#define ENOPROTOOPT 42 /* Protocol not available */ -#define EPROTONOSUPPORT 43 /* Protocol not supported */ -#define ESOCKTNOSUPPORT 44 /* Socket type not supported */ -#define EOPNOTSUPP 45 /* Operation not supported */ -#define ENOTSUP EOPNOTSUPP /* Operation not supported */ -#define EPFNOSUPPORT 46 /* Protocol family not supported */ -#define EAFNOSUPPORT 47 /* Address family not supported by protocol family */ -#define EADDRINUSE 48 /* Address already in use */ -#define EADDRNOTAVAIL 49 /* Can't assign requested address */ - -/* ipc/network software -- operational errors */ -#define ENETDOWN 50 /* Network is down */ -#define ENETUNREACH 51 /* Network is unreachable */ -#define ENETRESET 52 /* Network dropped connection on reset */ -#define ECONNABORTED 53 /* Software caused connection abort */ -#define ECONNRESET 54 /* Connection reset by peer */ -#define ENOBUFS 55 /* No buffer space available */ -#define EISCONN 56 /* Socket is already connected */ -#define ENOTCONN 57 /* Socket is not connected */ -#define ESHUTDOWN 58 /* Can't send after socket shutdown */ -#define ETOOMANYREFS 59 /* Too many references: can't splice */ -#define ETIMEDOUT 60 /* Operation timed out */ -#define ECONNREFUSED 61 /* Connection refused */ - -#define ELOOP 62 /* Too many levels of symbolic links */ -#endif /* _POSIX_SOURCE */ -#define ENAMETOOLONG 63 /* File name too long */ - -/* should be rearranged */ -#ifndef _POSIX_SOURCE -#define EHOSTDOWN 64 /* Host is down */ -#define EHOSTUNREACH 65 /* No route to host */ -#endif /* _POSIX_SOURCE */ -#define ENOTEMPTY 66 /* Directory not empty */ - -/* quotas & mush */ -#ifndef _POSIX_SOURCE -#define EPROCLIM 67 /* Too many processes */ -#define EUSERS 68 /* Too many users */ -#define EDQUOT 69 /* Disc quota exceeded */ - -/* Network File System */ -#define ESTALE 70 /* Stale NFS file handle */ -#define EREMOTE 71 /* Too many levels of remote in path */ -#define EBADRPC 72 /* RPC struct is bad */ -#define ERPCMISMATCH 73 /* RPC version wrong */ -#define EPROGUNAVAIL 74 /* RPC prog. not avail */ -#define EPROGMISMATCH 75 /* Program version wrong */ -#define EPROCUNAVAIL 76 /* Bad procedure for program */ -#endif /* _POSIX_SOURCE */ - -#define ENOLCK 77 /* No locks available */ -#define ENOSYS 78 /* Function not implemented */ - -#ifndef _POSIX_SOURCE -#define EFTYPE 79 /* Inappropriate file type or format */ -#define EAUTH 80 /* Authentication error */ -#define ENEEDAUTH 81 /* Need authenticator */ -#define EIDRM 82 /* Identifier removed */ -#define ENOMSG 83 /* No message of desired type */ -#define EOVERFLOW 84 /* Value too large to be stored in data type */ -#define ECANCELED 85 /* Operation canceled */ -#define EILSEQ 86 /* Illegal byte sequence */ -#define ENOATTR 87 /* Attribute not found */ - -#define EDOOFUS 88 /* Programming error */ -#endif /* _POSIX_SOURCE */ - -#define EBADMSG 89 /* Bad message */ -#define EMULTIHOP 90 /* Multihop attempted */ -#define ENOLINK 91 /* Link has been severed */ -#define EPROTO 92 /* Protocol error */ - -#ifndef _POSIX_SOURCE -#define ENOTCAPABLE 93 /* Capabilities insufficient */ -#endif /* _POSIX_SOURCE */ - -#ifndef _POSIX_SOURCE -#define ELAST 93 /* Must be equal largest errno */ -#endif /* _POSIX_SOURCE */ -#else /* __rtems__ */ -#include <errno.h> -#endif /* __rtems__ */ - -#ifdef _KERNEL -/* pseudo-errors returned inside kernel to modify return to process */ -#define ERESTART (-1) /* restart syscall */ -#define EJUSTRETURN (-2) /* don't modify regs, just return */ -#define ENOIOCTL (-3) /* ioctl not handled by this layer */ -#define EDIRIOCTL (-4) /* do direct ioctl in GEOM */ -#endif - -#endif diff --git a/rtemsbsd/include/rtems/bsd/sys/param.h b/rtemsbsd/include/rtems/bsd/sys/param.h deleted file mode 100644 index 8042746c..00000000 --- a/rtemsbsd/include/rtems/bsd/sys/param.h +++ /dev/null @@ -1,357 +0,0 @@ -/*- - * Copyright (c) 1982, 1986, 1989, 1993 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD$ - */ - -#ifndef _RTEMS_BSD_SYS_PARAM_H_ -#define _RTEMS_BSD_SYS_PARAM_H_ - -#ifdef __rtems__ -#include <sys/param.h> -#include <sys/_bitset.h> -#endif /* __rtems__ */ -#include <sys/_null.h> - -#define BSD 199506 /* System version (year & month). */ -#define BSD4_3 1 -#define BSD4_4 1 - -/* - * __FreeBSD_version numbers are documented in the Porter's Handbook. - * If you bump the version for any reason, you should update the documentation - * there. - * Currently this lives here: - * - * doc/en_US.ISO8859-1/books/porters-handbook/book.sgml - * - * scheme is: <major><two digit minor>Rxx - * 'R' is in the range 0 to 4 if this is a release branch or - * x.0-CURRENT before RELENG_*_0 is created, otherwise 'R' is - * in the range 5 to 9. - */ -#undef __FreeBSD_version -#define __FreeBSD_version 1200018 /* Master, propagated to newvers */ - -#ifdef _KERNEL -#define P_OSREL_SIGWAIT 700000 -#define P_OSREL_SIGSEGV 700004 -#define P_OSREL_MAP_ANON 800104 -#define P_OSREL_MAP_FSTRICT 1100036 -#define P_OSREL_SHUTDOWN_ENOTCONN 1100077 - -#define P_OSREL_MAJOR(x) ((x) / 100000) -#endif - -#ifndef LOCORE -#include <sys/types.h> -#endif - -/* - * Machine-independent constants (some used in following include files). - * Redefined constants are from POSIX 1003.1 limits file. - * - * MAXCOMLEN should be >= sizeof(ac_comm) (see <acct.h>) - * MAXLOGNAME should be == UT_NAMESIZE+1 (see <utmp.h>) - */ -#include <sys/syslimits.h> - -#define MAXCOMLEN 19 /* max command name remembered */ -#define MAXINTERP PATH_MAX /* max interpreter file name length */ -#define MAXLOGNAME 33 /* max login name length (incl. NUL) */ -#define MAXUPRC CHILD_MAX /* max simultaneous processes */ -#define NCARGS ARG_MAX /* max bytes for an exec function */ -#define NGROUPS (NGROUPS_MAX+1) /* max number groups */ -#define NOFILE OPEN_MAX /* max open files per process */ -#define NOGROUP 65535 /* marker for empty group set member */ -#define MAXHOSTNAMELEN 256 /* max hostname size */ -#define SPECNAMELEN 63 /* max length of devicename */ - -/* More types and definitions used throughout the kernel. */ -#ifdef _KERNEL -#include <sys/cdefs.h> -#include <rtems/bsd/sys/errno.h> -#ifndef LOCORE -#include <sys/time.h> -#include <sys/priority.h> -#endif - -#ifndef FALSE -#define FALSE 0 -#endif -#ifndef TRUE -#define TRUE 1 -#endif -#endif - -#ifndef _KERNEL -/* Signals. */ -#include <sys/signal.h> -#endif - -/* Machine type dependent parameters. */ -#include <machine/rtems-bsd-param.h> -#ifndef _KERNEL -#include <sys/limits.h> -#endif - -#ifndef _NO_NAMESPACE_POLLUTION - -#ifndef DEV_BSHIFT -#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */ -#endif -#define DEV_BSIZE (1<<DEV_BSHIFT) - -#ifndef BLKDEV_IOSIZE -#define BLKDEV_IOSIZE PAGE_SIZE /* default block device I/O size */ -#endif -#ifndef DFLTPHYS -#define DFLTPHYS (64 * 1024) /* default max raw I/O transfer size */ -#endif -#ifndef MAXPHYS -#define MAXPHYS (128 * 1024) /* max raw I/O transfer size */ -#endif -#ifndef MAXDUMPPGS -#define MAXDUMPPGS (DFLTPHYS/PAGE_SIZE) -#endif - -/* - * Constants related to network buffer management. - * MCLBYTES must be no larger than PAGE_SIZE. - */ -#ifndef MSIZE -#define MSIZE 256 /* size of an mbuf */ -#endif /* MSIZE */ - -#ifndef MCLSHIFT -#define MCLSHIFT 11 /* convert bytes to mbuf clusters */ -#endif /* MCLSHIFT */ - -#define MCLBYTES (1 << MCLSHIFT) /* size of an mbuf cluster */ - -#define MJUMPAGESIZE PAGE_SIZE /* jumbo cluster 4k */ -#define MJUM9BYTES (9 * 1024) /* jumbo cluster 9k */ -#define MJUM16BYTES (16 * 1024) /* jumbo cluster 16k */ - -/* - * Round p (pointer or byte index) up to a correctly-aligned value - * for all data types (int, long, ...). The result is u_long and - * must be cast to any desired pointer type. - */ -#ifndef _ALIGNBYTES -#define _ALIGNBYTES (sizeof(long) - 1) -#endif -#ifndef _ALIGN -#define _ALIGN(p) (((uintptr_t)(p) + _ALIGNBYTES) &~ _ALIGNBYTES) -#endif - -/* - * ALIGNED_POINTER is a boolean macro that checks whether an address - * is valid to fetch data elements of type t from on this architecture. - * This does not reflect the optimal alignment, just the possibility - * (within reasonable limits). - */ -#define ALIGNED_POINTER(p, t) ((((u_long)(p)) & (sizeof(t) - 1)) == 0) - -/* - * Some macros for units conversion - */ - -/* clicks to bytes */ -#ifndef ctob -#define ctob(x) ((x)<<PAGE_SHIFT) -#endif - -/* bytes to clicks */ -#ifndef btoc -#define btoc(x) (((vm_offset_t)(x)+PAGE_MASK)>>PAGE_SHIFT) -#endif - -/* - * btodb() is messy and perhaps slow because `bytes' may be an off_t. We - * want to shift an unsigned type to avoid sign extension and we don't - * want to widen `bytes' unnecessarily. Assume that the result fits in - * a daddr_t. - */ -#ifndef btodb -#define btodb(bytes) /* calculates (bytes / DEV_BSIZE) */ \ - (sizeof (bytes) > sizeof(long) \ - ? (daddr_t)((unsigned long long)(bytes) >> DEV_BSHIFT) \ - : (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT)) -#endif - -#ifndef dbtob -#define dbtob(db) /* calculates (db * DEV_BSIZE) */ \ - ((off_t)(db) << DEV_BSHIFT) -#endif - -#endif /* _NO_NAMESPACE_POLLUTION */ - -#define PRIMASK 0x0ff -#define PCATCH 0x100 /* OR'd with pri for tsleep to check signals */ -#define PDROP 0x200 /* OR'd with pri to stop re-entry of interlock mutex */ -#define PBDRY 0x400 /* for PCATCH stop is done on the user boundary */ - -#define NZERO 0 /* default "nice" */ - -#define NBBY 8 /* number of bits in a byte */ -#define NBPW sizeof(int) /* number of bytes per word (integer) */ - -#define CMASK 022 /* default file mask: S_IWGRP|S_IWOTH */ - -#define NODEV (dev_t)(-1) /* non-existent device */ - -/* - * File system parameters and macros. - * - * MAXBSIZE - Filesystems are made out of blocks of at most MAXBSIZE bytes - * per block. MAXBSIZE may be made larger without effecting - * any existing filesystems as long as it does not exceed MAXPHYS, - * and may be made smaller at the risk of not being able to use - * filesystems which require a block size exceeding MAXBSIZE. - * - * BKVASIZE - Nominal buffer space per buffer, in bytes. BKVASIZE is the - * minimum KVM memory reservation the kernel is willing to make. - * Filesystems can of course request smaller chunks. Actual - * backing memory uses a chunk size of a page (PAGE_SIZE). - * - * If you make BKVASIZE too small you risk seriously fragmenting - * the buffer KVM map which may slow things down a bit. If you - * make it too big the kernel will not be able to optimally use - * the KVM memory reserved for the buffer cache and will wind - * up with too-few buffers. - * - * The default is 16384, roughly 2x the block size used by a - * normal UFS filesystem. - */ -#define MAXBSIZE 65536 /* must be power of 2 */ -#define BKVASIZE 16384 /* must be power of 2 */ -#define BKVAMASK (BKVASIZE-1) - -/* - * MAXPATHLEN defines the longest permissible path length after expanding - * symbolic links. It is used to allocate a temporary buffer from the buffer - * pool in which to do the name expansion, hence should be a power of two, - * and must be less than or equal to MAXBSIZE. MAXSYMLINKS defines the - * maximum number of symbolic links that may be expanded in a path name. - * It should be set high enough to allow all legitimate uses, but halt - * infinite loops reasonably quickly. - */ -#define MAXPATHLEN PATH_MAX -#define MAXSYMLINKS 32 - -/* Bit map related macros. */ -#define setbit(a,i) (((unsigned char *)(a))[(i)/NBBY] |= 1<<((i)%NBBY)) -#define clrbit(a,i) (((unsigned char *)(a))[(i)/NBBY] &= ~(1<<((i)%NBBY))) -#define isset(a,i) \ - (((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) -#define isclr(a,i) \ - ((((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) == 0) - -/* Macros for counting and rounding. */ -#ifndef howmany -#define howmany(x, y) (((x)+((y)-1))/(y)) -#endif -#define nitems(x) (sizeof((x)) / sizeof((x)[0])) -#define rounddown(x, y) (((x)/(y))*(y)) -#define rounddown2(x, y) ((x)&(~((y)-1))) /* if y is power of two */ -#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) /* to any y */ -#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */ -#define powerof2(x) ((((x)-1)&(x))==0) - -/* Macros for min/max. */ -#define MIN(a,b) (((a)<(b))?(a):(b)) -#define MAX(a,b) (((a)>(b))?(a):(b)) - -#ifdef _KERNEL -/* - * Basic byte order function prototypes for non-inline functions. - */ -#ifndef LOCORE -#ifndef _BYTEORDER_PROTOTYPED -#define _BYTEORDER_PROTOTYPED -__BEGIN_DECLS -__uint32_t htonl(__uint32_t); -__uint16_t htons(__uint16_t); -__uint32_t ntohl(__uint32_t); -__uint16_t ntohs(__uint16_t); -__END_DECLS -#endif -#endif - -#ifndef lint -#ifndef _BYTEORDER_FUNC_DEFINED -#define _BYTEORDER_FUNC_DEFINED -#define htonl(x) __htonl(x) -#define htons(x) __htons(x) -#define ntohl(x) __ntohl(x) -#define ntohs(x) __ntohs(x) -#endif /* !_BYTEORDER_FUNC_DEFINED */ -#endif /* lint */ -#endif /* _KERNEL */ - -/* - * Scale factor for scaled integers used to count %cpu time and load avgs. - * - * The number of CPU `tick's that map to a unique `%age' can be expressed - * by the formula (1 / (2 ^ (FSHIFT - 11))). The maximum load average that - * can be calculated (assuming 32 bits) can be closely approximated using - * the formula (2 ^ (2 * (16 - FSHIFT))) for (FSHIFT < 15). - * - * For the scheduler to maintain a 1:1 mapping of CPU `tick' to `%age', - * FSHIFT must be at least 11; this gives us a maximum load avg of ~1024. - */ -#define FSHIFT 11 /* bits to right of fixed binary point */ -#define FSCALE (1<<FSHIFT) - -#define dbtoc(db) /* calculates devblks to pages */ \ - ((db + (ctodb(1) - 1)) >> (PAGE_SHIFT - DEV_BSHIFT)) - -#define ctodb(db) /* calculates pages to devblks */ \ - ((db) << (PAGE_SHIFT - DEV_BSHIFT)) - -/* - * Given the pointer x to the member m of the struct s, return - * a pointer to the containing structure. - */ -#define member2struct(s, m, x) \ - ((struct s *)(void *)((char *)(x) - offsetof(struct s, m))) - -/* - * Access a variable length array that has been declared as a fixed - * length array. - */ -#define __PAST_END(array, offset) (((__typeof__(*(array)) *)(array))[offset]) - -#endif /* _RTEMS_BSD_SYS_PARAM_H_ */ diff --git a/rtemsbsd/include/sys/_cpuset.h b/rtemsbsd/include/sys/_cpuset.h deleted file mode 100644 index 402d1448..00000000 --- a/rtemsbsd/include/sys/_cpuset.h +++ /dev/null @@ -1,60 +0,0 @@ -/*- - * Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org> - * All rights reserved. - * - * Copyright (c) 2008 Nokia Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice unmodified, this list of conditions, and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _SYS__CPUSET_H_ -#define _SYS__CPUSET_H_ - -#ifdef _KERNEL -#ifndef __rtems__ -#define CPU_SETSIZE MAXCPU -#endif /* __rtems__ */ -#endif - -#define CPU_MAXSIZE 128 - -#ifndef CPU_SETSIZE -#define CPU_SETSIZE CPU_MAXSIZE -#endif - -#ifndef __rtems__ -#define _NCPUBITS (sizeof(long) * NBBY) /* bits per mask */ -#define _NCPUWORDS howmany(CPU_SETSIZE, _NCPUBITS) - -typedef struct _cpuset { - long __bits[howmany(CPU_SETSIZE, _NCPUBITS)]; -} cpuset_t; -#else /* __rtems__ */ -#include <sys/cpuset.h> - -typedef cpu_set_t cpuset_t; -#endif /* __rtems__ */ - -#endif /* !_SYS__CPUSET_H_ */ diff --git a/rtemsbsd/local/bus_if.c b/rtemsbsd/local/bus_if.c index 169ea7d5..5d34c6da 100644 --- a/rtemsbsd/local/bus_if.c +++ b/rtemsbsd/local/bus_if.c @@ -12,7 +12,7 @@ * See the source file for legal information */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/kernel.h> #include <sys/kobj.h> diff --git a/rtemsbsd/local/cryptodev_if.c b/rtemsbsd/local/cryptodev_if.c index 9b948816..648003d8 100644 --- a/rtemsbsd/local/cryptodev_if.c +++ b/rtemsbsd/local/cryptodev_if.c @@ -12,7 +12,7 @@ * See the source file for legal information */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/kernel.h> #include <sys/kobj.h> diff --git a/rtemsbsd/local/device_if.c b/rtemsbsd/local/device_if.c index 20ab6221..0bee5919 100644 --- a/rtemsbsd/local/device_if.c +++ b/rtemsbsd/local/device_if.c @@ -12,7 +12,7 @@ * See the source file for legal information */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/kernel.h> #include <sys/kobj.h> diff --git a/rtemsbsd/local/gpio_if.c b/rtemsbsd/local/gpio_if.c index ca15c8bd..86e26232 100644 --- a/rtemsbsd/local/gpio_if.c +++ b/rtemsbsd/local/gpio_if.c @@ -12,7 +12,7 @@ * See the source file for legal information */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/kernel.h> #include <sys/kobj.h> diff --git a/rtemsbsd/local/if_dwc_if.c b/rtemsbsd/local/if_dwc_if.c index cd8b8922..67b3ea5c 100644 --- a/rtemsbsd/local/if_dwc_if.c +++ b/rtemsbsd/local/if_dwc_if.c @@ -12,7 +12,7 @@ * See the source file for legal information */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/kernel.h> #include <sys/kobj.h> diff --git a/rtemsbsd/local/ifdi_if.c b/rtemsbsd/local/ifdi_if.c index 10e01b49..e5a81946 100644 --- a/rtemsbsd/local/ifdi_if.c +++ b/rtemsbsd/local/ifdi_if.c @@ -12,7 +12,7 @@ * See the source file for legal information */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/kernel.h> #include <sys/kobj.h> diff --git a/rtemsbsd/local/miibus_if.c b/rtemsbsd/local/miibus_if.c index fdb30e81..6073703b 100644 --- a/rtemsbsd/local/miibus_if.c +++ b/rtemsbsd/local/miibus_if.c @@ -12,7 +12,7 @@ * See the source file for legal information */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/kernel.h> #include <sys/kobj.h> diff --git a/rtemsbsd/local/mmcbr_if.c b/rtemsbsd/local/mmcbr_if.c index 954440b2..6a338f87 100644 --- a/rtemsbsd/local/mmcbr_if.c +++ b/rtemsbsd/local/mmcbr_if.c @@ -12,7 +12,7 @@ * See the source file for legal information */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/kernel.h> #include <sys/kobj.h> diff --git a/rtemsbsd/local/mmcbus_if.c b/rtemsbsd/local/mmcbus_if.c index fc5e6ffb..7a9ba510 100644 --- a/rtemsbsd/local/mmcbus_if.c +++ b/rtemsbsd/local/mmcbus_if.c @@ -12,7 +12,7 @@ * See the source file for legal information */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/kernel.h> #include <sys/kobj.h> diff --git a/rtemsbsd/local/pcib_if.c b/rtemsbsd/local/pcib_if.c index b40fa5ce..d227577f 100644 --- a/rtemsbsd/local/pcib_if.c +++ b/rtemsbsd/local/pcib_if.c @@ -12,7 +12,7 @@ * See the source file for legal information */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/kernel.h> #include <sys/kobj.h> diff --git a/rtemsbsd/local/usb_if.c b/rtemsbsd/local/usb_if.c index 4f334ec8..d66dd2d6 100644 --- a/rtemsbsd/local/usb_if.c +++ b/rtemsbsd/local/usb_if.c @@ -12,7 +12,7 @@ * See the source file for legal information */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/kernel.h> #include <sys/kobj.h> diff --git a/rtemsbsd/rtems/ipsec_get_policylen.c b/rtemsbsd/rtems/ipsec_get_policylen.c index 9e632bd6..160c5e52 100644 --- a/rtemsbsd/rtems/ipsec_get_policylen.c +++ b/rtemsbsd/rtems/ipsec_get_policylen.c @@ -1,6 +1,6 @@ #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <netipsec/ipsec.h> diff --git a/rtemsbsd/rtems/rtems-bsd-cxx.cc b/rtemsbsd/rtems/rtems-bsd-cxx.cc index d1c657ec..8ae13d47 100644 --- a/rtemsbsd/rtems/rtems-bsd-cxx.cc +++ b/rtemsbsd/rtems/rtems-bsd-cxx.cc @@ -42,7 +42,7 @@ extern "C" { #include <machine/rtems-bsd-kernel-space.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/mbuf.h> #include <sys/malloc.h> diff --git a/rtemsbsd/rtems/rtems-bsd-rc-conf-net.c b/rtemsbsd/rtems/rtems-bsd-rc-conf-net.c index 3b432c79..8d70834c 100644 --- a/rtemsbsd/rtems/rtems-bsd-rc-conf-net.c +++ b/rtemsbsd/rtems/rtems-bsd-rc-conf-net.c @@ -32,7 +32,7 @@ * - defaultrouter */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/queue.h> #include <sys/kernel.h> diff --git a/rtemsbsd/rtems/rtems-kernel-autoconf.c b/rtemsbsd/rtems/rtems-kernel-autoconf.c index b57394dd..49264478 100644 --- a/rtemsbsd/rtems/rtems-kernel-autoconf.c +++ b/rtemsbsd/rtems/rtems-kernel-autoconf.c @@ -40,7 +40,7 @@ #include <machine/rtems-bsd-kernel-space.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> #include <sys/bus.h> diff --git a/rtemsbsd/rtems/rtems-kernel-bus-root.c b/rtemsbsd/rtems/rtems-kernel-bus-root.c index f444f512..1ffdffcb 100644 --- a/rtemsbsd/rtems/rtems-kernel-bus-root.c +++ b/rtemsbsd/rtems/rtems-kernel-bus-root.c @@ -39,7 +39,7 @@ #include <machine/rtems-bsd-kernel-space.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/bus.h> #include <rtems/bsd.h> diff --git a/rtemsbsd/rtems/rtems-kernel-cam.c b/rtemsbsd/rtems/rtems-kernel-cam.c index 0f518586..a63e1bfc 100644 --- a/rtemsbsd/rtems/rtems-kernel-cam.c +++ b/rtemsbsd/rtems/rtems-kernel-cam.c @@ -41,7 +41,7 @@ #include <machine/rtems-bsd-kernel-space.h> #include <machine/rtems-bsd-support.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/kernel.h> diff --git a/rtemsbsd/rtems/rtems-kernel-chunk.c b/rtemsbsd/rtems/rtems-kernel-chunk.c index a327fe5e..ad02503c 100644 --- a/rtemsbsd/rtems/rtems-kernel-chunk.c +++ b/rtemsbsd/rtems/rtems-kernel-chunk.c @@ -40,7 +40,7 @@ #include <machine/rtems-bsd-kernel-space.h> #include <machine/rtems-bsd-chunk.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/malloc.h> #include <rtems/score/apimutex.h> diff --git a/rtemsbsd/rtems/rtems-kernel-configintrhook.c b/rtemsbsd/rtems/rtems-kernel-configintrhook.c index 40699bbf..7ff4e40c 100644 --- a/rtemsbsd/rtems/rtems-kernel-configintrhook.c +++ b/rtemsbsd/rtems/rtems-kernel-configintrhook.c @@ -39,7 +39,7 @@ #include <machine/rtems-bsd-kernel-space.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/kernel.h> diff --git a/rtemsbsd/rtems/rtems-kernel-init.c b/rtemsbsd/rtems/rtems-kernel-init.c index c42e35a6..45105c50 100644 --- a/rtemsbsd/rtems/rtems-kernel-init.c +++ b/rtemsbsd/rtems/rtems-kernel-init.c @@ -40,7 +40,7 @@ #include <machine/rtems-bsd-kernel-space.h> #include <machine/rtems-bsd-thread.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/rtemsbsd/rtems/rtems-kernel-jail.c b/rtemsbsd/rtems/rtems-kernel-jail.c index 2499846f..2a2d3097 100644 --- a/rtemsbsd/rtems/rtems-kernel-jail.c +++ b/rtemsbsd/rtems/rtems-kernel-jail.c @@ -46,11 +46,11 @@ #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h>*/ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/sysproto.h> #include <sys/malloc.h> #include <sys/osd.h> diff --git a/rtemsbsd/rtems/rtems-kernel-malloc.c b/rtemsbsd/rtems/rtems-kernel-malloc.c index b61f2911..b5cfc76d 100644 --- a/rtemsbsd/rtems/rtems-kernel-malloc.c +++ b/rtemsbsd/rtems/rtems-kernel-malloc.c @@ -40,7 +40,7 @@ #include <machine/rtems-bsd-kernel-space.h> #include <machine/rtems-bsd-support.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/rtemsbsd/rtems/rtems-kernel-mutex.c b/rtemsbsd/rtems/rtems-kernel-mutex.c index 8e8e1cd5..9a3b0583 100644 --- a/rtemsbsd/rtems/rtems-kernel-mutex.c +++ b/rtemsbsd/rtems/rtems-kernel-mutex.c @@ -40,7 +40,7 @@ #include <machine/rtems-bsd-kernel-space.h> #include <machine/rtems-bsd-muteximpl.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> diff --git a/rtemsbsd/rtems/rtems-kernel-nexus.c b/rtemsbsd/rtems/rtems-kernel-nexus.c index e4213551..008e4b27 100644 --- a/rtemsbsd/rtems/rtems-kernel-nexus.c +++ b/rtemsbsd/rtems/rtems-kernel-nexus.c @@ -40,7 +40,7 @@ #include <machine/rtems-bsd-kernel-space.h> #include <machine/rtems-bsd-thread.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> #include <sys/bus.h> diff --git a/rtemsbsd/rtems/rtems-kernel-page.c b/rtemsbsd/rtems/rtems-kernel-page.c index 8f8c235a..6f2531e7 100644 --- a/rtemsbsd/rtems/rtems-kernel-page.c +++ b/rtemsbsd/rtems/rtems-kernel-page.c @@ -40,7 +40,7 @@ #include <machine/rtems-bsd-kernel-space.h> #include <machine/rtems-bsd-page.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> diff --git a/rtemsbsd/rtems/rtems-kernel-panic.c b/rtemsbsd/rtems/rtems-kernel-panic.c index 2de4f931..2c85fa91 100644 --- a/rtemsbsd/rtems/rtems-kernel-panic.c +++ b/rtemsbsd/rtems/rtems-kernel-panic.c @@ -40,7 +40,7 @@ #include <machine/rtems-bsd-kernel-space.h> #include <machine/rtems-bsd-thread.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/rtemsbsd/rtems/rtems-kernel-pci_bus.c b/rtemsbsd/rtems/rtems-kernel-pci_bus.c index f687e0f5..d344e7a3 100644 --- a/rtemsbsd/rtems/rtems-kernel-pci_bus.c +++ b/rtemsbsd/rtems/rtems-kernel-pci_bus.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_cpu.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/kernel.h> diff --git a/rtemsbsd/rtems/rtems-kernel-pci_cfgreg.c b/rtemsbsd/rtems/rtems-kernel-pci_cfgreg.c index b9bdd31b..b5a5b8cd 100644 --- a/rtemsbsd/rtems/rtems-kernel-pci_cfgreg.c +++ b/rtemsbsd/rtems/rtems-kernel-pci_cfgreg.c @@ -39,7 +39,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <rtems/bsd/sys/lock.h> diff --git a/rtemsbsd/rtems/rtems-kernel-rwlock.c b/rtemsbsd/rtems/rtems-kernel-rwlock.c index 82fc00aa..ac7cc1b6 100644 --- a/rtemsbsd/rtems/rtems-kernel-rwlock.c +++ b/rtemsbsd/rtems/rtems-kernel-rwlock.c @@ -48,7 +48,7 @@ #include <machine/rtems-bsd-kernel-space.h> #include <machine/rtems-bsd-muteximpl.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> diff --git a/rtemsbsd/rtems/rtems-kernel-sx.c b/rtemsbsd/rtems/rtems-kernel-sx.c index ea0cf04e..2cc9d02d 100644 --- a/rtemsbsd/rtems/rtems-kernel-sx.c +++ b/rtemsbsd/rtems/rtems-kernel-sx.c @@ -41,7 +41,7 @@ #include <machine/rtems-bsd-muteximpl.h> #include <machine/rtems-bsd-thread.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> diff --git a/rtemsbsd/rtems/rtems-kernel-thread.c b/rtemsbsd/rtems/rtems-kernel-thread.c index 2852fcd6..028a0d89 100644 --- a/rtemsbsd/rtems/rtems-kernel-thread.c +++ b/rtemsbsd/rtems/rtems-kernel-thread.c @@ -41,7 +41,7 @@ #include <machine/rtems-bsd-thread.h> #include <machine/rtems-bsd-support.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/rtemsbsd/rtems/rtems-legacy-mii.c b/rtemsbsd/rtems/rtems-legacy-mii.c index f36f2ca5..60fe91bd 100644 --- a/rtemsbsd/rtems/rtems-legacy-mii.c +++ b/rtemsbsd/rtems/rtems-legacy-mii.c @@ -55,7 +55,7 @@ #include <machine/rtems-bsd-kernel-space.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/sockio.h> diff --git a/rtemsbsd/sys/dev/dw_mmc/dw_mmc.c b/rtemsbsd/sys/dev/dw_mmc/dw_mmc.c index 24e02a2b..c493dca7 100644 --- a/rtemsbsd/sys/dev/dw_mmc/dw_mmc.c +++ b/rtemsbsd/sys/dev/dw_mmc/dw_mmc.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bio.h> #include <sys/bus.h> diff --git a/rtemsbsd/sys/dev/ffec/if_ffec_mcf548x.c b/rtemsbsd/sys/dev/ffec/if_ffec_mcf548x.c index a6d55b19..9ec9ded6 100644 --- a/rtemsbsd/sys/dev/ffec/if_ffec_mcf548x.c +++ b/rtemsbsd/sys/dev/ffec/if_ffec_mcf548x.c @@ -48,7 +48,7 @@ #include <stdio.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/mbuf.h> #include <sys/malloc.h> diff --git a/rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c b/rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c index 32a9cb58..4cb60465 100644 --- a/rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c +++ b/rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_evdev.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/rman.h> #include <sys/bus.h> diff --git a/rtemsbsd/sys/dev/smc/if_smc_nexus.c b/rtemsbsd/sys/dev/smc/if_smc_nexus.c index 142c2361..9b6ecd57 100644 --- a/rtemsbsd/sys/dev/smc/if_smc_nexus.c +++ b/rtemsbsd/sys/dev/smc/if_smc_nexus.c @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/bus.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/rtemsbsd/sys/dev/usb/controller/dwc_otg_nexus.c b/rtemsbsd/sys/dev/usb/controller/dwc_otg_nexus.c index 0c49806b..411007fe 100644 --- a/rtemsbsd/sys/dev/usb/controller/dwc_otg_nexus.c +++ b/rtemsbsd/sys/dev/usb/controller/dwc_otg_nexus.c @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/condvar.h> diff --git a/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c b/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c index 906fc742..7eb81d76 100644 --- a/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c +++ b/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c @@ -54,7 +54,7 @@ #include <sys/cdefs.h> #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/rtemsbsd/sys/dev/usb/controller/ohci_lpc.c b/rtemsbsd/sys/dev/usb/controller/ohci_lpc.c index de5bf2d2..c42634f1 100755 --- a/rtemsbsd/sys/dev/usb/controller/ohci_lpc.c +++ b/rtemsbsd/sys/dev/usb/controller/ohci_lpc.c @@ -137,7 +137,7 @@ static int lpc_otg_clk_ctrl(uint32_t otg_clk_ctrl) #include <sys/cdefs.h> #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c b/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c index eaa0f5f9..5cd4c34a 100755 --- a/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c +++ b/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stdint.h> #include <sys/stddef.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/rtemsbsd/sys/dev/usb/controller/usb_otg_transceiver_dump.c b/rtemsbsd/sys/dev/usb/controller/usb_otg_transceiver_dump.c index f125c603..5a33a325 100644 --- a/rtemsbsd/sys/dev/usb/controller/usb_otg_transceiver_dump.c +++ b/rtemsbsd/sys/dev/usb/controller/usb_otg_transceiver_dump.c @@ -31,7 +31,7 @@ #include <machine/rtems-bsd-kernel-space.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <dev/usb/usb_otg_transceiver.h> diff --git a/rtemsbsd/sys/net/if_ppp.c b/rtemsbsd/sys/net/if_ppp.c index 8f8d29c6..709f13e0 100644 --- a/rtemsbsd/sys/net/if_ppp.c +++ b/rtemsbsd/sys/net/if_ppp.c @@ -92,12 +92,13 @@ #include <rtems/termiostypes.h> #include <rtems/rtems_bsdnet.h> #include <rtems/rtemspppd.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/ioctl.h> +#include <sys/sockio.h> +#include <sys/filio.h> #include <sys/kernel.h> #include <sys/time.h> #include <sys/malloc.h> diff --git a/rtemsbsd/sys/net/ppp_tty.c b/rtemsbsd/sys/net/ppp_tty.c index 9d416ea1..80d4fee1 100644 --- a/rtemsbsd/sys/net/ppp_tty.c +++ b/rtemsbsd/sys/net/ppp_tty.c @@ -84,12 +84,12 @@ #if NPPP > 0 -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/ioctl.h> +#include <sys/filio.h> #include <sys/file.h> #include <sys/kernel.h> diff --git a/testsuite/commands01/test_main.c b/testsuite/commands01/test_main.c index e4747857..f0ddab50 100644 --- a/testsuite/commands01/test_main.c +++ b/testsuite/commands01/test_main.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <assert.h> #include <errno.h> diff --git a/testsuite/condvar01/test_main.c b/testsuite/condvar01/test_main.c index 3c230dc3..9cd20cb3 100644 --- a/testsuite/condvar01/test_main.c +++ b/testsuite/condvar01/test_main.c @@ -31,7 +31,7 @@ #include <machine/rtems-bsd-kernel-space.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> diff --git a/testsuite/loopback01/test_main.c b/testsuite/loopback01/test_main.c index 5639d5d8..f0453e69 100644 --- a/testsuite/loopback01/test_main.c +++ b/testsuite/loopback01/test_main.c @@ -6,7 +6,7 @@ #include <stdlib.h> #include <stdio.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/testsuite/mutex01/test_main.c b/testsuite/mutex01/test_main.c index 7cc29e4c..8d871c9d 100644 --- a/testsuite/mutex01/test_main.c +++ b/testsuite/mutex01/test_main.c @@ -31,7 +31,7 @@ #include <machine/rtems-bsd-kernel-space.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> diff --git a/testsuite/netshell01/test_main.c b/testsuite/netshell01/test_main.c index 1b68971d..5fda46c2 100644 --- a/testsuite/netshell01/test_main.c +++ b/testsuite/netshell01/test_main.c @@ -38,6 +38,7 @@ #include <string.h> #include <rtems/shell.h> +#include <rtems/termiostypes.h> #define TEST_NAME "LIBBSD NETSHELL 1" diff --git a/testsuite/rcconf01/test_main.c b/testsuite/rcconf01/test_main.c index 51723bc7..4701390c 100644 --- a/testsuite/rcconf01/test_main.c +++ b/testsuite/rcconf01/test_main.c @@ -23,7 +23,7 @@ * SUCH DAMAGE. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <assert.h> #include <ctype.h> diff --git a/testsuite/rcconf02/test_main.c b/testsuite/rcconf02/test_main.c index ad177d25..c3a85df1 100644 --- a/testsuite/rcconf02/test_main.c +++ b/testsuite/rcconf02/test_main.c @@ -48,7 +48,7 @@ * 4. ftpd */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <assert.h> #include <ctype.h> diff --git a/testsuite/rwlock01/test_main.c b/testsuite/rwlock01/test_main.c index d515fe7d..071f339c 100644 --- a/testsuite/rwlock01/test_main.c +++ b/testsuite/rwlock01/test_main.c @@ -31,7 +31,7 @@ #include <machine/rtems-bsd-kernel-space.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> diff --git a/testsuite/selectpollkqueue01/test_main.c b/testsuite/selectpollkqueue01/test_main.c index c45fff78..8af59bf9 100755 --- a/testsuite/selectpollkqueue01/test_main.c +++ b/testsuite/selectpollkqueue01/test_main.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/event.h> #include <sys/filio.h> diff --git a/testsuite/sleep01/test_main.c b/testsuite/sleep01/test_main.c index 08b7dcd1..00fbb91b 100644 --- a/testsuite/sleep01/test_main.c +++ b/testsuite/sleep01/test_main.c @@ -31,7 +31,7 @@ #include <machine/rtems-bsd-kernel-space.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> diff --git a/testsuite/smp01/test_main.c b/testsuite/smp01/test_main.c index 54bfab19..f8c0df2c 100644 --- a/testsuite/smp01/test_main.c +++ b/testsuite/smp01/test_main.c @@ -31,7 +31,7 @@ #include <machine/rtems-bsd-kernel-space.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> diff --git a/testsuite/termios/test_main.c b/testsuite/termios/test_main.c index 90e33826..6a4431b9 100644 --- a/testsuite/termios/test_main.c +++ b/testsuite/termios/test_main.c @@ -13,6 +13,7 @@ #include <rtems/console.h> #include <rtems/shell.h> +#include <rtems/termiostypes.h> #include <rtems/bsd/bsd.h> #include <termios.h> @@ -113,87 +114,6 @@ void print_c_oflag( struct termios * tp ) if( tp->c_oflag & ONLRET ) printf( "ONLRET " ); - if( tp->c_oflag & OFILL ) - printf( "OFILL " ); - - if( tp->c_oflag & OFDEL ) - printf( "OFDEL " ); - - switch( tp->c_oflag & NLDLY ) { - case NL0: - printf( "NL0 " ); - break; - - case NL1: - printf( "NL1 " ); - break; - } - - switch( tp->c_oflag & CRDLY ) { - case CR0: - printf( "CR0 " ); - break; - - case CR1: - printf( "CR1 " ); - break; - - case CR2: - printf( "CR2 " ); - break; - - case CR3: - printf( "CR3 " ); - break; - } - - switch( tp->c_oflag & TABDLY ) { - case TAB0: - printf( "TAB0 " ); - break; - - case TAB1: - printf( "TAB1 " ); - break; - - case TAB2: - printf( "TAB2 " ); - break; - - case TAB3: - printf( "TAB3 " ); - break; - } - - switch( tp->c_oflag & BSDLY ) { - case BS0: - printf( "BS0 " ); - break; - - case BS1: - printf( "BS1 " ); - break; - } - - switch( tp->c_oflag & VTDLY ) { - case VT0: - printf( "VT0 " ); - break; - - case VT1: - printf( "VT1 " ); - break; - } - - switch( tp->c_oflag & FFDLY ) { - case FF0: - printf( "FF0" ); - break; - - case FF1: - printf( "FF1" ); - break; - } printf( "\n" ); } @@ -853,4 +773,4 @@ test_main(void) exit(0); } -#include <rtems/bsd/test/default-termios-init.h>
\ No newline at end of file +#include <rtems/bsd/test/default-termios-init.h> diff --git a/testsuite/termios/test_termios_utilities.c b/testsuite/termios/test_termios_utilities.c index e8caf812..e1429ef1 100644 --- a/testsuite/termios/test_termios_utilities.c +++ b/testsuite/termios/test_termios_utilities.c @@ -37,7 +37,7 @@ void open_it(void) change_iflag("BRKINT|ICRNL|IXON|IMAXBEL", 0xFFFFFFFF, BRKINT|ICRNL|IXON|IMAXBEL); change_lflag("ISIG|ICANON|IEXTEN|ECHO|ECHOK|ECHOE|ECHOCTL", 0xFFFFFFFF, ISIG|ICANON|IEXTEN|ECHO|ECHOK|ECHOE|ECHOCTL); - change_oflag("OPOST|ONLCR|XTABS", 0xFFFFFFFF, OPOST|ONLCR|XTABS); + change_oflag("OPOST|ONLCR|OXTABS", 0xFFFFFFFF, OPOST|ONLCR|OXTABS); } void close_it(void) diff --git a/testsuite/termios06/test_main.c b/testsuite/termios06/test_main.c index dc6e3d6b..9290ef26 100644 --- a/testsuite/termios06/test_main.c +++ b/testsuite/termios06/test_main.c @@ -396,7 +396,7 @@ static void test_xtabs(void) tt_softc.tp->t_column = 0; tcflush(Test_fd, TCOFLUSH); - change_oflag("OPOST|XTABS", 0, OPOST|XTABS); + change_oflag("OPOST|OXTABS", 0, OPOST|OXTABS); c = 'a'; n = write(Test_fd, &c, sizeof(c)); @@ -420,7 +420,7 @@ static void test_xtabs(void) assert(Tx_Buffer[5] == ' '); assert(Tx_Buffer[6] == ' '); - change_oflag("~(OPOST|XTABS)", OPOST|XTABS, 0); + change_oflag("~(OPOST|OXTABS)", OPOST|OXTABS, 0); } static void test_olcuc(void) diff --git a/testsuite/thread01/test_main.c b/testsuite/thread01/test_main.c index d3bb5a5c..f1cef304 100644 --- a/testsuite/thread01/test_main.c +++ b/testsuite/thread01/test_main.c @@ -38,7 +38,7 @@ #include <assert.h> #include <sys/types.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/proc.h> #include <sys/kthread.h> #include <sys/errno.h> diff --git a/testsuite/timeout01/timeout_test.c b/testsuite/timeout01/timeout_test.c index 766f1515..cecbfbe6 100644 --- a/testsuite/timeout01/timeout_test.c +++ b/testsuite/timeout01/timeout_test.c @@ -39,7 +39,7 @@ #include <sys/types.h> #include <sys/systm.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/rwlock.h> diff --git a/testsuite/unix01/test_main.c b/testsuite/unix01/test_main.c index fe9dde25..61f9aa4e 100644 --- a/testsuite/unix01/test_main.c +++ b/testsuite/unix01/test_main.c @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -#include <sys/types.h> +#include <sys/param.h> #include <sys/un.h> #include <sys/stat.h> #include <sys/socket.h> |