summaryrefslogtreecommitdiffstats
path: root/freebsd/sys/dev/dc
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2013-10-09 22:52:54 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2013-10-10 09:08:23 +0200
commite599318e912d8836c59d8b5202e3e31a6b8dcae9 (patch)
tree1172b8b830a1c3236e45c834c2b80e01325ea144 /freebsd/sys/dev/dc
parentMove files to match FreeBSD layout (diff)
downloadrtems-libbsd-e599318e912d8836c59d8b5202e3e31a6b8dcae9.tar.bz2
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.
Diffstat (limited to 'freebsd/sys/dev/dc')
-rw-r--r--freebsd/sys/dev/dc/dcphy.c46
-rw-r--r--freebsd/sys/dev/dc/if_dc.c74
-rw-r--r--freebsd/sys/dev/dc/pnphy.c44
3 files changed, 82 insertions, 82 deletions
diff --git a/freebsd/sys/dev/dc/dcphy.c b/freebsd/sys/dev/dc/dcphy.c
index 75ba2ce5..fcfa7d6c 100644
--- a/freebsd/sys/dev/dc/dcphy.c
+++ b/freebsd/sys/dev/dc/dcphy.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
/*-
* Copyright (c) 1997, 1998, 1999
@@ -32,7 +32,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
/*
@@ -44,33 +44,33 @@ __FBSDID("$FreeBSD$");
* which is harder to do.
*/
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/systm.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/socket.h>
-#include <freebsd/sys/errno.h>
-#include <freebsd/sys/lock.h>
-#include <freebsd/sys/module.h>
-#include <freebsd/sys/mutex.h>
-#include <freebsd/sys/bus.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/socket.h>
+#include <rtems/bsd/sys/errno.h>
+#include <rtems/bsd/sys/lock.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/bus.h>
-#include <freebsd/net/if.h>
-#include <freebsd/net/if_arp.h>
-#include <freebsd/net/if_media.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/if_media.h>
-#include <freebsd/dev/mii/mii.h>
-#include <freebsd/dev/mii/miivar.h>
-#include <freebsd/local/miidevs.h>
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+#include <rtems/bsd/local/miidevs.h>
-#include <freebsd/machine/bus.h>
-#include <freebsd/machine/resource.h>
-#include <freebsd/sys/bus.h>
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/bus.h>
-#include <freebsd/dev/pci/pcivar.h>
+#include <dev/pci/pcivar.h>
-#include <freebsd/dev/dc/if_dcreg.h>
+#include <dev/dc/if_dcreg.h>
-#include <freebsd/local/miibus_if.h>
+#include <rtems/bsd/local/miibus_if.h>
#define DC_SETBIT(sc, reg, x) \
CSR_WRITE_4(sc, reg, \
diff --git a/freebsd/sys/dev/dc/if_dc.c b/freebsd/sys/dev/dc/if_dc.c
index 512555b5..9b60bc06 100644
--- a/freebsd/sys/dev/dc/if_dc.c
+++ b/freebsd/sys/dev/dc/if_dc.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
/*-
* Copyright (c) 1997, 1998, 1999
@@ -32,7 +32,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
/*
@@ -95,47 +95,47 @@ __FBSDID("$FreeBSD$");
*/
#ifdef HAVE_KERNEL_OPTION_HEADERS
-#include <freebsd/local/opt_device_polling.h>
+#include <rtems/bsd/local/opt_device_polling.h>
#endif
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/endian.h>
-#include <freebsd/sys/systm.h>
-#include <freebsd/sys/sockio.h>
-#include <freebsd/sys/mbuf.h>
-#include <freebsd/sys/malloc.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/module.h>
-#include <freebsd/sys/socket.h>
-
-#include <freebsd/net/if.h>
-#include <freebsd/net/if_arp.h>
-#include <freebsd/net/ethernet.h>
-#include <freebsd/net/if_dl.h>
-#include <freebsd/net/if_media.h>
-#include <freebsd/net/if_types.h>
-#include <freebsd/net/if_vlan_var.h>
-
-#include <freebsd/net/bpf.h>
-
-#include <freebsd/machine/bus.h>
-#include <freebsd/machine/resource.h>
-#include <freebsd/sys/bus.h>
-#include <freebsd/sys/rman.h>
-
-#include <freebsd/dev/mii/mii.h>
-#include <freebsd/dev/mii/miivar.h>
-
-#include <freebsd/dev/pci/pcireg.h>
-#include <freebsd/dev/pci/pcivar.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/endian.h>
+#include <sys/systm.h>
+#include <sys/sockio.h>
+#include <sys/mbuf.h>
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/ethernet.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+#include <net/if_vlan_var.h>
+
+#include <net/bpf.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/bus.h>
+#include <sys/rman.h>
+
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#define DC_USEIOSPACE
-#include <freebsd/dev/dc/if_dcreg.h>
+#include <dev/dc/if_dcreg.h>
#ifdef __sparc64__
-#include <freebsd/dev/ofw/openfirm.h>
-#include <freebsd/machine/ofw_machdep.h>
+#include <dev/ofw/openfirm.h>
+#include <machine/ofw_machdep.h>
#endif
MODULE_DEPEND(dc, pci, 1, 1, 1);
@@ -146,7 +146,7 @@ MODULE_DEPEND(dc, miibus, 1, 1, 1);
* "device miibus" is required in kernel config. See GENERIC if you get
* errors here.
*/
-#include <freebsd/local/miibus_if.h>
+#include <rtems/bsd/local/miibus_if.h>
/*
* Various supported device vendors/types and their names.
diff --git a/freebsd/sys/dev/dc/pnphy.c b/freebsd/sys/dev/dc/pnphy.c
index d5837e54..b59ddf61 100644
--- a/freebsd/sys/dev/dc/pnphy.c
+++ b/freebsd/sys/dev/dc/pnphy.c
@@ -1,4 +1,4 @@
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
/*
* Copyright (c) 1997, 1998, 1999
@@ -32,7 +32,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <freebsd/sys/cdefs.h>
+#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
/*
@@ -42,31 +42,31 @@ __FBSDID("$FreeBSD$");
* NWAY to work right is amazingly difficult.
*/
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/systm.h>
-#include <freebsd/sys/kernel.h>
-#include <freebsd/sys/socket.h>
-#include <freebsd/sys/errno.h>
-#include <freebsd/sys/lock.h>
-#include <freebsd/sys/module.h>
-#include <freebsd/sys/mutex.h>
-#include <freebsd/sys/bus.h>
+#include <rtems/bsd/sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/socket.h>
+#include <rtems/bsd/sys/errno.h>
+#include <rtems/bsd/sys/lock.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/bus.h>
-#include <freebsd/net/if.h>
-#include <freebsd/net/if_arp.h>
-#include <freebsd/net/if_media.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/if_media.h>
-#include <freebsd/dev/mii/mii.h>
-#include <freebsd/dev/mii/miivar.h>
-#include <freebsd/local/miidevs.h>
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+#include <rtems/bsd/local/miidevs.h>
-#include <freebsd/machine/bus.h>
-#include <freebsd/machine/resource.h>
-#include <freebsd/sys/bus.h>
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/bus.h>
-#include <freebsd/dev/dc/if_dcreg.h>
+#include <dev/dc/if_dcreg.h>
-#include <freebsd/local/miibus_if.h>
+#include <rtems/bsd/local/miibus_if.h>
#define DC_SETBIT(sc, reg, x) \
CSR_WRITE_4(sc, reg, \