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.

1 files changed, 64 insertions, 64 deletions

diff --git a/freebsd/sys/contrib/pf/net/pf.c b/freebsd/sys/contrib/pf/net/pf.c
index 4ac395f1..bad7a1cd 100644
--- a/freebsd/sys/contrib/pf/net/pf.c
+++ b/freebsd/sys/contrib/pf/net/pf.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*	$OpenBSD: pf.c,v 1.527 2007/02/22 15:23:23 pyr Exp $ */
 /* add:	$OpenBSD: pf.c,v 1.559 2007/09/18 18:45:59 markus Exp $ */
@@ -39,16 +39,16 @@
  */
 
 #ifdef __FreeBSD__
-#include <freebsd/local/opt_inet.h>
-#include <freebsd/local/opt_inet6.h>
+#include <rtems/bsd/local/opt_inet.h>
+#include <rtems/bsd/local/opt_inet6.h>
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 #endif
 
 #ifdef __FreeBSD__
-#include <freebsd/local/opt_bpf.h>
-#include <freebsd/local/opt_pf.h>
+#include <rtems/bsd/local/opt_bpf.h>
+#include <rtems/bsd/local/opt_pf.h>
 
 #ifdef DEV_BPF
 #define	NBPFILTER	DEV_BPF
@@ -69,84 +69,84 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #else
-#include <freebsd/local/bpfilter.h>
-#include <freebsd/local/pflog.h>
-#include <freebsd/local/pfsync.h>
-#endif
-
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/systm.h>
-#include <freebsd/sys/mbuf.h>
-#include <freebsd/sys/filio.h>
-#include <freebsd/sys/socket.h>
-#include <freebsd/sys/socketvar.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/time.h>
-#ifdef __FreeBSD__
-#include <freebsd/sys/sysctl.h>
-#include <freebsd/sys/endian.h>
+#include <rtems/bsd/local/bpfilter.h>
+#include <rtems/bsd/local/pflog.h>
+#include <rtems/bsd/local/pfsync.h>
+#endif
+
+#include <rtems/bsd/sys/param.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/filio.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/kernel.h>
+#include <rtems/bsd/sys/time.h>
+#ifdef __FreeBSD__
+#include <sys/sysctl.h>
+#include <sys/endian.h>
 #else
-#include <freebsd/sys/pool.h>
+#include <sys/pool.h>
 #endif
-#include <freebsd/sys/proc.h>
+#include <sys/proc.h>
 #ifdef __FreeBSD__
-#include <freebsd/sys/kthread.h>
-#include <freebsd/sys/lock.h>
-#include <freebsd/sys/sx.h>
+#include <sys/kthread.h>
+#include <rtems/bsd/sys/lock.h>
+#include <sys/sx.h>
 #else
-#include <freebsd/sys/rwlock.h>
+#include <sys/rwlock.h>
 #endif
 
-#include <freebsd/net/if.h>
-#include <freebsd/net/if_types.h>
-#include <freebsd/net/bpf.h>
-#include <freebsd/net/route.h>
+#include <net/if.h>
+#include <net/if_types.h>
+#include <net/bpf.h>
+#include <net/route.h>
 #ifndef __FreeBSD__
-#include <freebsd/net/radix_mpath.h>
-#endif
-
-#include <freebsd/netinet/in.h>
-#include <freebsd/netinet/in_var.h>
-#include <freebsd/netinet/in_systm.h>
-#include <freebsd/netinet/ip.h>
-#include <freebsd/netinet/ip_var.h>
-#include <freebsd/netinet/tcp.h>
-#include <freebsd/netinet/tcp_seq.h>
-#include <freebsd/netinet/udp.h>
-#include <freebsd/netinet/ip_icmp.h>
-#include <freebsd/netinet/in_pcb.h>
-#include <freebsd/netinet/tcp_timer.h>
-#include <freebsd/netinet/tcp_var.h>
-#include <freebsd/netinet/udp_var.h>
-#include <freebsd/netinet/icmp_var.h>
-#include <freebsd/netinet/if_ether.h>
+#include <net/radix_mpath.h>
+#endif
+
+#include <netinet/in.h>
+#include <netinet/in_var.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/ip_var.h>
+#include <netinet/tcp.h>
+#include <netinet/tcp_seq.h>
+#include <netinet/udp.h>
+#include <netinet/ip_icmp.h>
+#include <netinet/in_pcb.h>
+#include <netinet/tcp_timer.h>
+#include <netinet/tcp_var.h>
+#include <netinet/udp_var.h>
+#include <netinet/icmp_var.h>
+#include <netinet/if_ether.h>
 
 #ifndef __FreeBSD__
-#include <freebsd/dev/rndvar.h>
+#include <dev/rndvar.h>
 #endif
-#include <freebsd/net/pfvar.h>
-#include <freebsd/net/if_pflog.h>
+#include <net/pfvar.h>
+#include <net/if_pflog.h>
 
 #if NPFSYNC > 0
-#include <freebsd/net/if_pfsync.h>
+#include <net/if_pfsync.h>
 #endif /* NPFSYNC > 0 */
 
 #ifdef INET6
-#include <freebsd/netinet/ip6.h>
-#include <freebsd/netinet/in_pcb.h>
-#include <freebsd/netinet/icmp6.h>
-#include <freebsd/netinet6/nd6.h>
+#include <netinet/ip6.h>
+#include <netinet/in_pcb.h>
+#include <netinet/icmp6.h>
+#include <netinet6/nd6.h>
 #ifdef __FreeBSD__
-#include <freebsd/netinet6/ip6_var.h>
-#include <freebsd/netinet6/in6_pcb.h>
+#include <netinet6/ip6_var.h>
+#include <netinet6/in6_pcb.h>
 #endif
 #endif /* INET6 */
 
 #ifdef __FreeBSD__
-#include <freebsd/machine/in_cksum.h>
-#include <freebsd/sys/limits.h>
-#include <freebsd/sys/ucred.h>
-#include <freebsd/security/mac/mac_framework.h>
+#include <machine/in_cksum.h>
+#include <sys/limits.h>
+#include <sys/ucred.h>
+#include <security/mac/mac_framework.h>
 
 extern int ip_optcopy(struct ip *, struct ip *);
 extern int debug_pfugidhack;