Update files to match FreeBSD layout

Add compatibility with Newlib header files.  Some FreeBSD header files
are mapped by the translation script:

     o rtems/bsd/sys/_types.h
     o rtems/bsd/sys/errno.h
     o rtems/bsd/sys/lock.h
     o rtems/bsd/sys/param.h
     o rtems/bsd/sys/resource.h
     o rtems/bsd/sys/time.h
     o rtems/bsd/sys/timespec.h
     o rtems/bsd/sys/types.h
     o rtems/bsd/sys/unistd.h

It is now possible to include <sys/socket.h> directly for example.

Generate one Makefile which builds everything including tests.

15 files changed, 29 insertions, 203 deletions

diff --git a/freebsd/usr.bin/netstat/atalk.c b/freebsd/usr.bin/netstat/atalk.c
index 2c7e7a18..c9c8c3f6 100644
--- a/freebsd/usr.bin/netstat/atalk.c
+++ b/freebsd/usr.bin/netstat/atalk.c
@@ -40,15 +40,11 @@ static char sccsid[] = "@(#)atalk.c	1.1 (Whistle) 6/6/96";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#ifdef __rtems__
-#include <freebsd/sys/protosw.h>
-#else
 #include <sys/protosw.h>
-#endif
 
 #include <arpa/inet.h>
 #include <net/route.h>
diff --git a/freebsd/usr.bin/netstat/bpf.c b/freebsd/usr.bin/netstat/bpf.c
index 3e3053d7..09261889 100644
--- a/freebsd/usr.bin/netstat/bpf.c
+++ b/freebsd/usr.bin/netstat/bpf.c
@@ -27,30 +27,20 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
-#ifdef __rtems__
-#include <freebsd/sys/protosw.h>
-#else
+#include <rtems/bsd/sys/types.h>
 #include <sys/protosw.h>
-#endif
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
-#include <sys/param.h>
+#include <rtems/bsd/sys/param.h>
 #ifndef __rtems__
 #include <sys/user.h>
-#endif
+#endif /* __rtems__ */
 
 #include <net/if.h>
-#ifdef __rtems__
-#include <freebsd/net/if_var.h>
-#include <freebsd/net/bpf.h>
-#include <freebsd/net/bpfdesc.h>
-#else
 #include <net/if_var.h>
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
-#endif
 #include <arpa/inet.h>
 
 #include <err.h>
diff --git a/freebsd/usr.bin/netstat/if.c b/freebsd/usr.bin/netstat/if.c
index 2bf86b69..f5b1f380 100644
--- a/freebsd/usr.bin/netstat/if.c
+++ b/freebsd/usr.bin/netstat/if.c
@@ -40,42 +40,26 @@ static char sccsid[] = "@(#)if.c	8.3 (Berkeley) 4/28/95";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
-#ifdef __rtems__
-#include <freebsd/sys/protosw.h>
-#else
+#include <rtems/bsd/sys/types.h>
 #include <sys/protosw.h>
-#endif
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
-#include <sys/time.h>
+#include <rtems/bsd/sys/time.h>
 
 #include <net/if.h>
-#ifdef __rtems__
-#include <freebsd/net/if_var.h>
-#else
 #include <net/if_var.h>
-#endif
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/ethernet.h>
-#ifdef __rtems__
-#include <freebsd/net/pfvar.h>
-#include <freebsd/net/if_pfsync.h>
-#include <netinet/in.h>
-#include <freebsd/netinet/in_var.h>
-/* IPX not on RTEMS */
-/* #include <netipx/ipx.h> */
-/* #include <netipx/ipx_if.h> */
-#else
 #include <net/pfvar.h>
 #include <net/if_pfsync.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
+#ifndef __rtems__
 #include <netipx/ipx.h>
 #include <netipx/ipx_if.h>
-#endif
+#endif /* __rtems__ */
 #include <arpa/inet.h>
 
 #include <err.h>
diff --git a/freebsd/usr.bin/netstat/inet.c b/freebsd/usr.bin/netstat/inet.c
index f6d111f3..5a414592 100644
--- a/freebsd/usr.bin/netstat/inet.c
+++ b/freebsd/usr.bin/netstat/inet.c
@@ -40,15 +40,10 @@ static char sccsid[] = "@(#)inet.c	8.5 (Berkeley) 5/24/95";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#ifdef __rtems__
-#include <freebsd/sys/domain.h>
-#include <freebsd/sys/protosw.h>
-#else
 #include <sys/domain.h>
 #include <sys/protosw.h>
-#endif
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
@@ -58,36 +53,12 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#ifdef __rtems__
-#include <freebsd/netinet/ip_carp.h>
-#else
 #include <netinet/ip_carp.h>
-#endif
 #ifdef INET6
 #include <netinet/ip6.h>
 #endif /* INET6 */
-#ifdef __rtems__
-#include <freebsd/netinet/in_pcb.h>
-#else
 #include <netinet/in_pcb.h>
-#endif
 #include <netinet/ip_icmp.h>
-#ifdef __rtems__
-#include <freebsd/netinet/icmp_var.h>
-#include <freebsd/netinet/igmp_var.h>
-#include <freebsd/netinet/ip_var.h>
-#include <freebsd/netinet/pim_var.h>
-#include <netinet/tcp.h>
-#include <freebsd/netinet/tcpip.h>
-#include <freebsd/netinet/tcp_seq.h>
-#define	TCPSTATES
-#include <freebsd/netinet/tcp_fsm.h>
-#include <freebsd/netinet/tcp_timer.h>
-#include <freebsd/netinet/tcp_var.h>
-#include <freebsd/netinet/tcp_debug.h>
-#include <netinet/udp.h>
-#include <freebsd/netinet/udp_var.h>
-#else
 #include <netinet/icmp_var.h>
 #include <netinet/igmp_var.h>
 #include <netinet/ip_var.h>
@@ -102,7 +73,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_debug.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
-#endif
 
 #include <arpa/inet.h>
 #include <err.h>
diff --git a/freebsd/usr.bin/netstat/inet6.c b/freebsd/usr.bin/netstat/inet6.c
index 64b645ee..9f179569 100644
--- a/freebsd/usr.bin/netstat/inet6.c
+++ b/freebsd/usr.bin/netstat/inet6.c
@@ -41,47 +41,27 @@ static char sccsid[] = "@(#)inet6.c	8.4 (Berkeley) 4/20/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#ifdef __rtems__
-#include "port_before.h"
-#endif
 #ifdef INET6
-#include <sys/param.h>
+#include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/ioctl.h>
-#ifdef __rtems__
-#include <freebsd/sys/mbuf.h>
-#include <freebsd/sys/protosw.h>
-#else
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
-#endif
 #include <sys/sysctl.h>
 
 #include <net/route.h>
 #include <net/if.h>
-#ifdef __rtems__
-#include <freebsd/net/if_var.h>
-#else
 #include <net/if_var.h>
-#endif
 #include <netinet/in.h>
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
 #include <netinet/in_systm.h>
-#ifdef __rtems__
-#include <freebsd/netinet6/in6_pcb.h>
-#include <freebsd/netinet6/in6_var.h>
-#include <freebsd/netinet6/ip6_var.h>
-#include <freebsd/netinet6/pim6_var.h>
-#include <freebsd/netinet6/raw_ip6.h>
-#else
 #include <netinet6/in6_pcb.h>
 #include <netinet6/in6_var.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/pim6_var.h>
 #include <netinet6/raw_ip6.h>
-#endif
 
 #include <arpa/inet.h>
 #include <netdb.h>
diff --git a/freebsd/usr.bin/netstat/ipsec.c b/freebsd/usr.bin/netstat/ipsec.c
index a6ef510c..392f5a70 100644
--- a/freebsd/usr.bin/netstat/ipsec.c
+++ b/freebsd/usr.bin/netstat/ipsec.c
@@ -95,7 +95,7 @@ static char sccsid[] = "@(#)inet.c	8.5 (Berkeley) 5/24/95";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
@@ -103,18 +103,11 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 
 #ifdef IPSEC
-#ifdef __rtems__
-#include <freebsd/netipsec/ipsec.h>
-#include <freebsd/netipsec/ah_var.h>
-#include <freebsd/netipsec/esp_var.h>
-#include <freebsd/netipsec/ipcomp_var.h>
-#else
 #include <netipsec/ipsec.h>
 #include <netipsec/ah_var.h>
 #include <netipsec/esp_var.h>
 #include <netipsec/ipcomp_var.h>
 #endif
-#endif
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/freebsd/usr.bin/netstat/main.c b/freebsd/usr.bin/netstat/main.c
index 1c2461b0..a072801a 100644
--- a/freebsd/usr.bin/netstat/main.c
+++ b/freebsd/usr.bin/netstat/main.c
@@ -50,13 +50,9 @@ static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 3/1/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <rtems/bsd/sys/param.h>
 #include <sys/file.h>
-#ifdef __rtems__
-#include <freebsd/sys/protosw.h>
-#else
 #include <sys/protosw.h>
-#endif
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 
diff --git a/freebsd/usr.bin/netstat/mbuf.c b/freebsd/usr.bin/netstat/mbuf.c
index 418c761b..1869cd76 100644
--- a/freebsd/usr.bin/netstat/mbuf.c
+++ b/freebsd/usr.bin/netstat/mbuf.c
@@ -42,15 +42,9 @@ static char sccsid[] = "@(#)mbuf.c	8.1 (Berkeley) 6/6/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
-#ifdef __rtems__
-#include <stdint.h>
-#include <freebsd/sys/mbuf.h>
-#include <freebsd/sys/protosw.h>
-#else
+#include <rtems/bsd/sys/param.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
-#endif
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
diff --git a/freebsd/usr.bin/netstat/mroute.c b/freebsd/usr.bin/netstat/mroute.c
index 7669ff07..d26505b4 100644
--- a/freebsd/usr.bin/netstat/mroute.c
+++ b/freebsd/usr.bin/netstat/mroute.c
@@ -46,22 +46,14 @@ __FBSDID("$FreeBSD$");
  * MROUTING 1.0
  */
 
-#include <sys/param.h>
+#include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
-#ifdef __rtems__
-#include <freebsd/sys/protosw.h>
-#else
 #include <sys/protosw.h>
-#endif
-#ifdef __rtems__
-#include <freebsd/sys/mbuf.h>
-#else
 #include <sys/mbuf.h>
-#endif
-#include <sys/time.h>
+#include <rtems/bsd/sys/time.h>
 
 #include <net/if.h>
 #include <netinet/in.h>
@@ -69,11 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <net/route.h>
 
 #define _KERNEL 1
-#ifdef __rtems__
-#include <freebsd/netinet/ip_mroute.h>
-#else
 #include <netinet/ip_mroute.h>
-#endif
 #undef _KERNEL
 
 #include <err.h>
diff --git a/freebsd/usr.bin/netstat/mroute6.c b/freebsd/usr.bin/netstat/mroute6.c
index 4fff5462..cdd7eaf2 100644
--- a/freebsd/usr.bin/netstat/mroute6.c
+++ b/freebsd/usr.bin/netstat/mroute6.c
@@ -68,33 +68,18 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#ifdef __rtems__
-#include "port_before.h"
-#endif
 #ifdef INET6
-#include <sys/param.h>
+#include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
-#ifdef __rtems__
-#include <freebsd/sys/protosw.h>
-#else
 #include <sys/protosw.h>
-#endif
-#ifdef __rtems__
-#include <freebsd/sys/mbuf.h>
-#else
 #include <sys/mbuf.h>
-#endif
-#include <sys/time.h>
+#include <rtems/bsd/sys/time.h>
 
 #include <net/if.h>
-#ifdef __rtems__
-#include <freebsd/net/if_var.h>
-#else
 #include <net/if_var.h>
-#endif
 #include <net/route.h>
 
 #include <netinet/in.h>
@@ -105,11 +90,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 
 #define	KERNEL 1
-#ifdef __rtems__
-#include <freebsd/netinet6/ip6_mroute.h>
-#else
 #include <netinet6/ip6_mroute.h>
-#endif
 #undef KERNEL
 
 #include "netstat.h"
diff --git a/freebsd/usr.bin/netstat/netstat.h b/freebsd/usr.bin/netstat/netstat.h
index c7564c6f..c3073ec3 100644
--- a/freebsd/usr.bin/netstat/netstat.h
+++ b/freebsd/usr.bin/netstat/netstat.h
@@ -35,12 +35,6 @@
  */
 
 #include <sys/cdefs.h>
-#ifdef __rtems__
-#define __BSD_VISIBLE 1
-#include <freebsd/sys/types.h>
-
-#define rt_tables netstat_rt_tables
-#endif
 
 extern int	Aflag;	/* show addresses of protocol control block */
 extern int	aflag;	/* show all sockets (including servers) */
@@ -133,6 +127,7 @@ char	*ns_phost(struct sockaddr *);
 void	upHex(char *);
 
 #ifdef __rtems__
+#define rt_tables netstat_rt_tables
 #define routename rtems_shell_netstats_routername
 #define netname rtems_shell_netstats_netname
 #define sotoxsocket rtems_shell_netstats_sotoxsocket
diff --git a/freebsd/usr.bin/netstat/pfkey.c b/freebsd/usr.bin/netstat/pfkey.c
index 7c5af07b..9d91532f 100644
--- a/freebsd/usr.bin/netstat/pfkey.c
+++ b/freebsd/usr.bin/netstat/pfkey.c
@@ -70,7 +70,7 @@ static char sccsid[] = "@(#)inet.c	8.5 (Berkeley) 5/24/95";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
@@ -78,12 +78,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 
 #ifdef IPSEC
-#ifdef __rtems__
-#include <freebsd/netipsec/keysock.h>
-#else
 #include <netipsec/keysock.h>
 #endif
-#endif
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/freebsd/usr.bin/netstat/route.c b/freebsd/usr.bin/netstat/route.c
index 55042814..bc6bb63d 100644
--- a/freebsd/usr.bin/netstat/route.c
+++ b/freebsd/usr.bin/netstat/route.c
@@ -40,54 +40,38 @@ static char sccsid[] = "From: @(#)route.c	8.6 (Berkeley) 4/28/95";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
-#ifdef __rtems__
-#include <freebsd/sys/protosw.h>
-#else
+#include <rtems/bsd/sys/param.h>
 #include <sys/protosw.h>
-#endif
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/time.h>
+#include <rtems/bsd/sys/time.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
-#ifdef __rtems__
-#include <freebsd/net/if_var.h>
-#else
 #include <net/if_var.h>
-#endif
 #include <net/if_dl.h>
 #include <net/if_types.h>
-#ifdef __rtems__
-#include <freebsd/net/radix.h>
-#else
 #include <net/radix.h>
-#endif
 #include <net/route.h>
 
 #include <netinet/in.h>
 #ifdef __rtems__
 /* no IPX on RTEMS */
 /* no AppleTalk on RTEMS */
-#else
+#else /* __rtems__ */
 #include <netipx/ipx.h>
 #include <netatalk/at.h>
-#endif
+#endif /* __rtems__ */
 #ifdef __rtems__
 /* why isn't this protected by a NETGRAPH define */
-#else
+#else /* __rtems__ */
 #include <netgraph/ng_socket.h>
-#endif
+#endif /* __rtems__ */
 
 #include <sys/sysctl.h>
 
 #include <arpa/inet.h>
-#ifdef __rtems__
-/* apparently libutil.h is not needed */
-#else
 #include <libutil.h>
-#endif
 #include <netdb.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/freebsd/usr.bin/netstat/sctp.c b/freebsd/usr.bin/netstat/sctp.c
index 0c02db9f..d32d28d1 100644
--- a/freebsd/usr.bin/netstat/sctp.c
+++ b/freebsd/usr.bin/netstat/sctp.c
@@ -37,35 +37,22 @@ static char sccsid[] = "@(#)sctp.c	0.1 (Berkeley) 4/18/2007";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <sys/types.h>
+#include <rtems/bsd/sys/types.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
-#ifdef __rtems__
-#include <freebsd/sys/protosw.h>
-#else
 #include <sys/protosw.h>
-#endif
 
 #include <netinet/in.h>
-#ifdef __rtems__
-#include <freebsd/netinet/sctp.h>
-#include <freebsd/netinet/sctp_constants.h>
-#else
 #include <netinet/sctp.h>
 #include <netinet/sctp_constants.h>
-#endif
 #include <arpa/inet.h>
 
 #include <err.h>
 #include <errno.h>
-#ifdef __rtems__
-/* apparently libutil.h is not needed */
-#else
 #include <libutil.h>
-#endif
 #include <netdb.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/freebsd/usr.bin/netstat/unix.c b/freebsd/usr.bin/netstat/unix.c
index 15bea05c..602cec7f 100644
--- a/freebsd/usr.bin/netstat/unix.c
+++ b/freebsd/usr.bin/netstat/unix.c
@@ -43,25 +43,17 @@ __FBSDID("$FreeBSD$");
 /*
  * Display protocol blocks in the unix domain.
  */
-#include <sys/param.h>
+#include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#ifdef __rtems__
-#include <freebsd/sys/protosw.h>
-#else
 #include <sys/protosw.h>
-#endif
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#ifdef __rtems__
-#include <freebsd/sys/mbuf.h>
-#else
 #include <sys/mbuf.h>
-#endif
 #include <sys/sysctl.h>
 #include <sys/un.h>
 #ifndef __rtems__
 #include <sys/unpcb.h>
-#endif
+#endif /* __rtems__ */
 
 #include <netinet/in.h>