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 /freebsd/sys/dev/smc | |
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 'freebsd/sys/dev/smc')
-rw-r--r-- | freebsd/sys/dev/smc/if_smc.c | 78 | ||||
-rw-r--r-- | freebsd/sys/dev/smc/if_smcreg.h | 6 | ||||
-rw-r--r-- | freebsd/sys/dev/smc/if_smcvar.h | 6 |
3 files changed, 45 insertions, 45 deletions
diff --git a/freebsd/sys/dev/smc/if_smc.c b/freebsd/sys/dev/smc/if_smc.c index d943111f..236eb546 100644 --- a/freebsd/sys/dev/smc/if_smc.c +++ b/freebsd/sys/dev/smc/if_smc.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2008 Benno Rice. All rights reserved. @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* @@ -32,51 +32,51 @@ __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/systm.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/syslog.h> -#include <freebsd/sys/taskqueue.h> - -#include <freebsd/sys/module.h> -#include <freebsd/sys/bus.h> - -#include <freebsd/machine/bus.h> -#include <freebsd/machine/resource.h> -#include <freebsd/sys/rman.h> - -#include <freebsd/net/ethernet.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_arp.h> -#include <freebsd/net/if_dl.h> -#include <freebsd/net/if_types.h> -#include <freebsd/net/if_mib.h> -#include <freebsd/net/if_media.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/kernel.h> +#include <sys/sockio.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/queue.h> +#include <sys/socket.h> +#include <sys/syslog.h> +#include <sys/taskqueue.h> + +#include <sys/module.h> +#include <sys/bus.h> + +#include <machine/bus.h> +#include <machine/resource.h> +#include <sys/rman.h> + +#include <net/ethernet.h> +#include <net/if.h> +#include <net/if_arp.h> +#include <net/if_dl.h> +#include <net/if_types.h> +#include <net/if_mib.h> +#include <net/if_media.h> #ifdef INET -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/in_var.h> -#include <freebsd/netinet/ip.h> +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/in_var.h> +#include <netinet/ip.h> #endif -#include <freebsd/net/bpf.h> -#include <freebsd/net/bpfdesc.h> +#include <net/bpf.h> +#include <net/bpfdesc.h> -#include <freebsd/dev/smc/if_smcreg.h> -#include <freebsd/dev/smc/if_smcvar.h> +#include <dev/smc/if_smcreg.h> +#include <dev/smc/if_smcvar.h> -#include <freebsd/dev/mii/mii.h> -#include <freebsd/dev/mii/miivar.h> +#include <dev/mii/mii.h> +#include <dev/mii/miivar.h> #define SMC_LOCK(sc) mtx_lock(&(sc)->smc_mtx) #define SMC_UNLOCK(sc) mtx_unlock(&(sc)->smc_mtx) diff --git a/freebsd/sys/dev/smc/if_smcreg.h b/freebsd/sys/dev/smc/if_smcreg.h index 50af8077..4b939076 100644 --- a/freebsd/sys/dev/smc/if_smcreg.h +++ b/freebsd/sys/dev/smc/if_smcreg.h @@ -25,8 +25,8 @@ * */ -#ifndef _IF_SMCREG_HH_ -#define _IF_SMCREG_HH_ +#ifndef _IF_SMCREG_H_ +#define _IF_SMCREG_H_ /* All Banks, Offset 0xe: Bank Select Register */ #define BSR 0xe @@ -258,4 +258,4 @@ /* Number of times to spin on TX allocations */ #define TX_ALLOC_WAIT_TIME 1000 -#endif /* IF_SMCREG_HH_ */ +#endif /* IF_SMCREG_H_ */ diff --git a/freebsd/sys/dev/smc/if_smcvar.h b/freebsd/sys/dev/smc/if_smcvar.h index a9e4a668..fd42edbb 100644 --- a/freebsd/sys/dev/smc/if_smcvar.h +++ b/freebsd/sys/dev/smc/if_smcvar.h @@ -25,8 +25,8 @@ * */ -#ifndef _IF_SMCVAR_HH_ -#define _IF_SMCVAR_HH_ +#ifndef _IF_SMCVAR_H_ +#define _IF_SMCVAR_H_ struct smc_softc { struct ifnet *smc_ifp; @@ -74,4 +74,4 @@ int smc_miibus_readreg(device_t, int, int); int smc_miibus_writereg(device_t, int, int, int); void smc_miibus_statchg(device_t); -#endif /* _IF_SMCVAR_HH_ */ +#endif /* _IF_SMCVAR_H_ */ |