From e599318e912d8836c59d8b5202e3e31a6b8dcae9 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Wed, 9 Oct 2013 22:52:54 +0200
Subject: 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.
---
 rtemsbsd/local/bus_if.c       | 18 +++++++++---------
 rtemsbsd/local/cryptodev_if.c | 16 ++++++++--------
 rtemsbsd/local/device_if.c    | 14 +++++++-------
 rtemsbsd/local/miibus_if.c    | 14 +++++++-------
 rtemsbsd/local/pci_if.c       | 14 +++++++-------
 rtemsbsd/local/pcib_if.c      | 16 ++++++++--------
 rtemsbsd/local/usb_if.c       | 14 +++++++-------
 7 files changed, 53 insertions(+), 53 deletions(-)

(limited to 'rtemsbsd/local')

diff --git a/rtemsbsd/local/bus_if.c b/rtemsbsd/local/bus_if.c
index 10f9ef46..77a982b8 100644
--- a/rtemsbsd/local/bus_if.c
+++ b/rtemsbsd/local/bus_if.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*
  * This file is produced automatically.
@@ -12,14 +12,14 @@
  * See the source file for legal information
  */
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/queue.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/kobj.h>
-#include <freebsd/sys/types.h>
-#include <freebsd/sys/systm.h>
-#include <freebsd/sys/bus.h>
-#include <freebsd/local/bus_if.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/queue.h>
+#include <sys/kernel.h>
+#include <sys/kobj.h>
+#include <rtems/bsd/sys/types.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <rtems/bsd/local/bus_if.h>
 
 
 static struct resource *
diff --git a/rtemsbsd/local/cryptodev_if.c b/rtemsbsd/local/cryptodev_if.c
index d4875e46..6b252130 100644
--- a/rtemsbsd/local/cryptodev_if.c
+++ b/rtemsbsd/local/cryptodev_if.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*
  * This file is produced automatically.
@@ -12,13 +12,13 @@
  * See the source file for legal information
  */
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/queue.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/kobj.h>
-#include <freebsd/sys/malloc.h>
-#include <freebsd/opencrypto/cryptodev.h>
-#include <freebsd/local/cryptodev_if.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/queue.h>
+#include <sys/kernel.h>
+#include <sys/kobj.h>
+#include <sys/malloc.h>
+#include <opencrypto/cryptodev.h>
+#include <rtems/bsd/local/cryptodev_if.h>
 
 struct kobj_method cryptodev_newsession_method_default = {
 	&cryptodev_newsession_desc, (kobjop_t) kobj_error_method
diff --git a/rtemsbsd/local/device_if.c b/rtemsbsd/local/device_if.c
index e6f3189a..ba29ef4a 100644
--- a/rtemsbsd/local/device_if.c
+++ b/rtemsbsd/local/device_if.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*
  * This file is produced automatically.
@@ -12,12 +12,12 @@
  * See the source file for legal information
  */
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/queue.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/kobj.h>
-#include <freebsd/sys/bus.h>
-#include <freebsd/local/device_if.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/queue.h>
+#include <sys/kernel.h>
+#include <sys/kobj.h>
+#include <sys/bus.h>
+#include <rtems/bsd/local/device_if.h>
 
 
 static int null_shutdown(device_t dev)
diff --git a/rtemsbsd/local/miibus_if.c b/rtemsbsd/local/miibus_if.c
index 2f5127e8..6fbdd911 100644
--- a/rtemsbsd/local/miibus_if.c
+++ b/rtemsbsd/local/miibus_if.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*
  * This file is produced automatically.
@@ -12,12 +12,12 @@
  * See the source file for legal information
  */
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/queue.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/kobj.h>
-#include <freebsd/sys/bus.h>
-#include <freebsd/local/miibus_if.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/queue.h>
+#include <sys/kernel.h>
+#include <sys/kobj.h>
+#include <sys/bus.h>
+#include <rtems/bsd/local/miibus_if.h>
 
 struct kobj_method miibus_readreg_method_default = {
 	&miibus_readreg_desc, (kobjop_t) kobj_error_method
diff --git a/rtemsbsd/local/pci_if.c b/rtemsbsd/local/pci_if.c
index 257e890b..7a939f6a 100644
--- a/rtemsbsd/local/pci_if.c
+++ b/rtemsbsd/local/pci_if.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*
  * This file is produced automatically.
@@ -12,12 +12,12 @@
  * See the source file for legal information
  */
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/queue.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/kobj.h>
-#include <freebsd/sys/bus.h>
-#include <freebsd/local/pci_if.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/queue.h>
+#include <sys/kernel.h>
+#include <sys/kobj.h>
+#include <sys/bus.h>
+#include <rtems/bsd/local/pci_if.h>
 
 
 static int
diff --git a/rtemsbsd/local/pcib_if.c b/rtemsbsd/local/pcib_if.c
index cc460893..bdb60e44 100644
--- a/rtemsbsd/local/pcib_if.c
+++ b/rtemsbsd/local/pcib_if.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*
  * This file is produced automatically.
@@ -12,13 +12,13 @@
  * See the source file for legal information
  */
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/queue.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/kobj.h>
-#include <freebsd/sys/bus.h>
-#include <freebsd/dev/pci/pcivar.h>
-#include <freebsd/local/pcib_if.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/queue.h>
+#include <sys/kernel.h>
+#include <sys/kobj.h>
+#include <sys/bus.h>
+#include <dev/pci/pcivar.h>
+#include <rtems/bsd/local/pcib_if.h>
 
 
 static int
diff --git a/rtemsbsd/local/usb_if.c b/rtemsbsd/local/usb_if.c
index db9b2670..766b1243 100644
--- a/rtemsbsd/local/usb_if.c
+++ b/rtemsbsd/local/usb_if.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
 /*
  * This file is produced automatically.
@@ -12,12 +12,12 @@
  * See the source file for legal information
  */
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/queue.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/kobj.h>
-#include <freebsd/sys/bus.h>
-#include <freebsd/local/usb_if.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/queue.h>
+#include <sys/kernel.h>
+#include <sys/kobj.h>
+#include <sys/bus.h>
+#include <rtems/bsd/local/usb_if.h>
 
 struct kobj_method usb_handle_request_method_default = {
 	&usb_handle_request_desc, (kobjop_t) kobj_error_method
-- 
cgit v1.2.3