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.

9 files changed, 55 insertions, 55 deletions

diff --git a/freebsd/sys/cam/ata/ata_all.h b/freebsd/sys/cam/ata/ata_all.h
index 6b23bd79..2e838fdc 100644
--- a/freebsd/sys/cam/ata/ata_all.h
+++ b/freebsd/sys/cam/ata/ata_all.h
@@ -29,7 +29,7 @@
 #ifndef	CAM_ATA_ALL_H
 #define CAM_ATA_ALL_H 1
 
-#include <freebsd/sys/ata.h>
+#include <sys/ata.h>
 
 struct ccb_ataio;
 struct cam_periph;
diff --git a/freebsd/sys/cam/cam.c b/freebsd/sys/cam/cam.c
index 852d1d5b..5b21ae8a 100644
--- a/freebsd/sys/cam/cam.c
+++ b/freebsd/sys/cam/cam.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*-
  * Generic utility routines for the Common Access Method layer.
@@ -28,29 +28,29 @@
  * SUCH DAMAGE.
  */
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <freebsd/sys/param.h>
+#include <rtems/bsd/sys/param.h>
 #ifdef _KERNEL
-#include <freebsd/sys/systm.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/sysctl.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
 #else /* _KERNEL */
-#include <freebsd/stdlib.h>
-#include <freebsd/stdio.h>
-#include <freebsd/camlib.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <camlib.h>
 #endif /* _KERNEL */
 
-#include <freebsd/cam/cam.h>
-#include <freebsd/cam/cam_ccb.h>
-#include <freebsd/cam/scsi/scsi_all.h>
-#include <freebsd/sys/sbuf.h>
+#include <cam/cam.h>
+#include <cam/cam_ccb.h>
+#include <cam/scsi/scsi_all.h>
+#include <sys/sbuf.h>
 
 #ifdef _KERNEL
-#include <freebsd/sys/libkern.h>
-#include <freebsd/cam/cam_queue.h>
-#include <freebsd/cam/cam_xpt.h>
+#include <sys/libkern.h>
+#include <cam/cam_queue.h>
+#include <cam/cam_xpt.h>
 #endif
 
 static int	camstatusentrycomp(const void *key, const void *member);
diff --git a/freebsd/sys/cam/cam.h b/freebsd/sys/cam/cam.h
index 6533fa42..5a58db6c 100644
--- a/freebsd/sys/cam/cam.h
+++ b/freebsd/sys/cam/cam.h
@@ -33,13 +33,13 @@
 
 #ifdef _KERNEL
 #ifndef __rtems__
-#include <freebsd/opt_cam.h>
+#include <opt_cam.h>
 #else /* __rtems__ */
-#include <freebsd/local/opt_cam.h>
+#include <rtems/bsd/local/opt_cam.h>
 #endif /* __rtems__ */
 #endif
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 typedef u_int path_id_t;
 typedef u_int target_id_t;
diff --git a/freebsd/sys/cam/cam_ccb.h b/freebsd/sys/cam/cam_ccb.h
index d8b14458..89042942 100644
--- a/freebsd/sys/cam/cam_ccb.h
+++ b/freebsd/sys/cam/cam_ccb.h
@@ -31,16 +31,16 @@
 #ifndef _CAM_CAM_CCB_H
 #define _CAM_CAM_CCB_H 1
 
-#include <freebsd/sys/queue.h>
-#include <freebsd/sys/cdefs.h>
-#include <freebsd/sys/time.h>
-#include <freebsd/sys/limits.h>
+#include <sys/queue.h>
+#include <sys/cdefs.h>
+#include <rtems/bsd/sys/time.h>
+#include <sys/limits.h>
 #ifndef _KERNEL
-#include <freebsd/sys/callout.h>
+#include <sys/callout.h>
 #endif
-#include <freebsd/cam/cam_debug.h>
-#include <freebsd/cam/scsi/scsi_all.h>
-#include <freebsd/cam/ata/ata_all.h>
+#include <cam/cam_debug.h>
+#include <cam/scsi/scsi_all.h>
+#include <cam/ata/ata_all.h>
 
 #ifdef __rtems__
 #include <rtems/blkdev.h>
diff --git a/freebsd/sys/cam/cam_periph.h b/freebsd/sys/cam/cam_periph.h
index 8bf8fd21..33e9f758 100644
--- a/freebsd/sys/cam/cam_periph.h
+++ b/freebsd/sys/cam/cam_periph.h
@@ -31,8 +31,8 @@
 #ifndef _CAM_CAM_PERIPH_H
 #define _CAM_CAM_PERIPH_H 1
 
-#include <freebsd/sys/queue.h>
-#include <freebsd/cam/cam_sim.h>
+#include <sys/queue.h>
+#include <cam/cam_sim.h>
 
 #ifdef _KERNEL
 
@@ -44,7 +44,7 @@ extern struct periph_driver **periph_drivers;
 void periphdriver_register(void *);
 void periphdriver_init(int level);
 
-#include <freebsd/sys/module.h>
+#include <sys/module.h>
 #define PERIPHDRIVER_DECLARE(name, driver) \
 	static int name ## _modevent(module_t mod, int type, void *data) \
 	{ \
diff --git a/freebsd/sys/cam/cam_xpt_sim.h b/freebsd/sys/cam/cam_xpt_sim.h
index 32c3082b..323f786c 100644
--- a/freebsd/sys/cam/cam_xpt_sim.h
+++ b/freebsd/sys/cam/cam_xpt_sim.h
@@ -32,8 +32,8 @@
 #ifndef _CAM_CAM_XPT_SIM_H
 #define _CAM_CAM_XPT_SIM_H 1
 
-#include <freebsd/cam/cam_xpt.h>
-#include <freebsd/cam/cam_queue.h>
+#include <cam/cam_xpt.h>
+#include <cam/cam_queue.h>
 
 /* Functions accessed by SIM drivers */
 #ifdef _KERNEL
diff --git a/freebsd/sys/cam/scsi/scsi_all.c b/freebsd/sys/cam/scsi/scsi_all.c
index a25a20b8..324a8e3a 100644
--- a/freebsd/sys/cam/scsi/scsi_all.c
+++ b/freebsd/sys/cam/scsi/scsi_all.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*-
  * Implementation of Utility functions for all SCSI device types.
@@ -29,37 +29,37 @@
  * SUCH DAMAGE.
  */
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <freebsd/sys/param.h>
+#include <rtems/bsd/sys/param.h>
 
 #ifdef _KERNEL
 #ifndef __rtems__
-#include <freebsd/opt_scsi.h>
+#include <opt_scsi.h>
 #else /* __rtems__ */
-#include <freebsd/local/opt_scsi.h>
+#include <rtems/bsd/local/opt_scsi.h>
 #endif /* __rtems__ */
 
-#include <freebsd/sys/systm.h>
-#include <freebsd/sys/libkern.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/sysctl.h>
+#include <sys/systm.h>
+#include <sys/libkern.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
 #else
-#include <freebsd/errno.h>
-#include <freebsd/stdio.h>
-#include <freebsd/stdlib.h>
-#include <freebsd/string.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #endif
 
-#include <freebsd/cam/cam.h>
-#include <freebsd/cam/cam_ccb.h>
-#include <freebsd/cam/cam_queue.h>
-#include <freebsd/cam/cam_xpt.h>
-#include <freebsd/cam/scsi/scsi_all.h>
-#include <freebsd/sys/sbuf.h>
+#include <cam/cam.h>
+#include <cam/cam_ccb.h>
+#include <cam/cam_queue.h>
+#include <cam/cam_xpt.h>
+#include <cam/scsi/scsi_all.h>
+#include <sys/sbuf.h>
 #ifndef _KERNEL
-#include <freebsd/camlib.h>
+#include <camlib.h>
 
 #ifndef FALSE
 #define FALSE   0
diff --git a/freebsd/sys/cam/scsi/scsi_all.h b/freebsd/sys/cam/scsi/scsi_all.h
index 47908b82..cddf4f9f 100644
--- a/freebsd/sys/cam/scsi/scsi_all.h
+++ b/freebsd/sys/cam/scsi/scsi_all.h
@@ -24,7 +24,7 @@
 #ifndef	_SCSI_SCSI_ALL_H
 #define	_SCSI_SCSI_ALL_H 1
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 #ifdef _KERNEL
 /*
diff --git a/freebsd/sys/cam/scsi/scsi_da.h b/freebsd/sys/cam/scsi/scsi_da.h
index 69dafefc..da099f69 100644
--- a/freebsd/sys/cam/scsi/scsi_da.h
+++ b/freebsd/sys/cam/scsi/scsi_da.h
@@ -52,7 +52,7 @@
 #ifndef	_SCSI_SCSI_DA_H
 #define _SCSI_SCSI_DA_H 1
 
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 struct scsi_rezero_unit
 {