diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-09 22:52:54 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-10 09:08:23 +0200 |
commit | e599318e912d8836c59d8b5202e3e31a6b8dcae9 (patch) | |
tree | 1172b8b830a1c3236e45c834c2b80e01325ea144 /rtemsbsd/rtems/rtems-bsd-nexus.c | |
parent | Move files to match FreeBSD layout (diff) | |
download | rtems-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 'rtemsbsd/rtems/rtems-bsd-nexus.c')
-rw-r--r-- | rtemsbsd/rtems/rtems-bsd-nexus.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/rtemsbsd/rtems/rtems-bsd-nexus.c b/rtemsbsd/rtems/rtems-bsd-nexus.c index ba85c05d..1c2ef7a3 100644 --- a/rtemsbsd/rtems/rtems-bsd-nexus.c +++ b/rtemsbsd/rtems/rtems-bsd-nexus.c @@ -37,24 +37,24 @@ * SUCH DAMAGE. */ -#include <freebsd/machine/rtems-bsd-config.h> -#include <freebsd/machine/rtems-bsd-sysinit.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/rman.h> -#include <freebsd/sys/malloc.h> +#include <machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-sysinit.h> + +#include <rtems/bsd/sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/bus.h> +#include <sys/kernel.h> +#include <sys/module.h> +#include <sys/rman.h> +#include <sys/malloc.h> #include <bsp.h> -#include <freebsd/machine/rtems-bsd-devicet.h> +#include <machine/rtems-bsd-devicet.h> #include <bsp/irq.h> #include <rtems/irq.h> #include <rtems/irq-extension.h> -#include <freebsd/machine/bus.h> +#include <machine/bus.h> /* XXX Note: These defines should be moved. */ #if defined(__i386__) @@ -180,9 +180,10 @@ nexus_attach(device_t dev) static int nexus_probe(device_t dev) { - size_t unit = 0; #if 0 /* FIXME */ + size_t unit = 0; + for (unit = 0; _bsd_nexus_devices [unit] != NULL; ++unit) { device_add_child(dev, _bsd_nexus_devices [unit], unit); } @@ -353,9 +354,6 @@ nexus_release_resource(device_t bus, device_t child, int type, int rid, return (rman_release_resource(r)); } -static void noop(const rtems_irq_connect_data *unused) {}; -static int noop1(const rtems_irq_connect_data *unused) { return 0;}; - static int bspExtInstallSharedISR(int irqLine, void (*isr)(void *), void * uarg, int flags) { |