diff options
Diffstat (limited to 'freebsd/sys/dev')
117 files changed, 1748 insertions, 1748 deletions
diff --git a/freebsd/sys/dev/bce/if_bce.c b/freebsd/sys/dev/bce/if_bce.c index 646e6cbf..ab8c938e 100644 --- a/freebsd/sys/dev/bce/if_bce.c +++ b/freebsd/sys/dev/bce/if_bce.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2006-2010 Broadcom Corporation @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* @@ -53,10 +53,10 @@ __FBSDID("$FreeBSD$"); * BCM5709S A0, B0, B1, B2 (pre-production) */ -#include <freebsd/local/opt_bce.h> +#include <rtems/bsd/local/opt_bce.h> -#include <freebsd/dev/bce/if_bcereg.h> -#include <freebsd/dev/bce/if_bcefw.h> +#include <dev/bce/if_bcereg.h> +#include <dev/bce/if_bcefw.h> /****************************************************************************/ /* BCE Debug Options */ diff --git a/freebsd/sys/dev/bce/if_bcereg.h b/freebsd/sys/dev/bce/if_bcereg.h index 4ed5fdda..1f2ed1df 100644 --- a/freebsd/sys/dev/bce/if_bcereg.h +++ b/freebsd/sys/dev/bce/if_bcereg.h @@ -33,53 +33,53 @@ #define _BCEREG_HH_DEFINED #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/sys/sysctl.h> -#include <freebsd/sys/queue.h> - -#include <freebsd/net/bpf.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_media.h> - -#include <freebsd/net/if_types.h> -#include <freebsd/net/if_vlan_var.h> - -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/if_ether.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip6.h> -#include <freebsd/netinet/tcp.h> -#include <freebsd/netinet/udp.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/local/miidevs.h> -#include <freebsd/dev/mii/brgphyreg.h> - -#include <freebsd/dev/pci/pcireg.h> -#include <freebsd/dev/pci/pcivar.h> - -#include <freebsd/local/miibus_if.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 <sys/sysctl.h> +#include <sys/queue.h> + +#include <net/bpf.h> +#include <net/ethernet.h> +#include <net/if.h> +#include <net/if_arp.h> +#include <net/if_dl.h> +#include <net/if_media.h> + +#include <net/if_types.h> +#include <net/if_vlan_var.h> + +#include <netinet/in_systm.h> +#include <netinet/in.h> +#include <netinet/if_ether.h> +#include <netinet/ip.h> +#include <netinet/ip6.h> +#include <netinet/tcp.h> +#include <netinet/udp.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 <rtems/bsd/local/miidevs.h> +#include <dev/mii/brgphyreg.h> + +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> + +#include <rtems/bsd/local/miibus_if.h> /****************************************************************************/ /* Conversion to FreeBSD type definitions. */ @@ -468,7 +468,7 @@ bce_debug = bce_debug_temp; /* Needed for random() function which is only used in debugging. */ -#include <freebsd/sys/random.h> +#include <sys/random.h> /* Returns FALSE in "defects" per 2^31 - 1 calls, otherwise returns TRUE. */ #define DB_RANDOMFALSE(defects) (random() > defects) diff --git a/freebsd/sys/dev/bfe/if_bfe.c b/freebsd/sys/dev/bfe/if_bfe.c index 7ce821b8..74746c28 100644 --- a/freebsd/sys/dev/bfe/if_bfe.c +++ b/freebsd/sys/dev/bfe/if_bfe.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2003 Stuart Walsh<stu@ipng.org.uk> @@ -27,46 +27,46 @@ */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/rman.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/net/bpf.h> -#include <freebsd/net/if.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/dev/mii/mii.h> -#include <freebsd/dev/mii/miivar.h> - -#include <freebsd/dev/pci/pcireg.h> -#include <freebsd/dev/pci/pcivar.h> - -#include <freebsd/machine/bus.h> - -#include <freebsd/dev/bfe/if_bfereg.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/bus.h> +#include <sys/endian.h> +#include <sys/kernel.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/module.h> +#include <sys/rman.h> +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/sysctl.h> + +#include <net/bpf.h> +#include <net/if.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 <dev/mii/mii.h> +#include <dev/mii/miivar.h> + +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> + +#include <machine/bus.h> + +#include <dev/bfe/if_bfereg.h> MODULE_DEPEND(bfe, pci, 1, 1, 1); MODULE_DEPEND(bfe, ether, 1, 1, 1); MODULE_DEPEND(bfe, miibus, 1, 1, 1); /* "device miibus" required. See GENERIC if you get errors here. */ -#include <freebsd/local/miibus_if.h> +#include <rtems/bsd/local/miibus_if.h> #define BFE_DEVDESC_MAX 64 /* Maximum device description length */ diff --git a/freebsd/sys/dev/bge/if_bge.c b/freebsd/sys/dev/bge/if_bge.c index 4ae441bd..06f5ba7b 100644 --- a/freebsd/sys/dev/bge/if_bge.c +++ b/freebsd/sys/dev/bge/if_bge.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2001 Wind River Systems @@ -33,7 +33,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* @@ -69,58 +69,58 @@ __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/sys/sysctl.h> -#include <freebsd/sys/taskqueue.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/bpf.h> - -#include <freebsd/net/if_types.h> -#include <freebsd/net/if_vlan_var.h> - -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/tcp.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/local/miidevs.h> -#include <freebsd/dev/mii/brgphyreg.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 <sys/sysctl.h> +#include <sys/taskqueue.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/bpf.h> + +#include <net/if_types.h> +#include <net/if_vlan_var.h> + +#include <netinet/in_systm.h> +#include <netinet/in.h> +#include <netinet/ip.h> +#include <netinet/tcp.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 <rtems/bsd/local/miidevs.h> +#include <dev/mii/brgphyreg.h> #ifdef __sparc64__ -#include <freebsd/dev/ofw/ofw_bus.h> -#include <freebsd/dev/ofw/openfirm.h> -#include <freebsd/machine/ofw_machdep.h> -#include <freebsd/machine/ver.h> +#include <dev/ofw/ofw_bus.h> +#include <dev/ofw/openfirm.h> +#include <machine/ofw_machdep.h> +#include <machine/ver.h> #endif -#include <freebsd/dev/pci/pcireg.h> -#include <freebsd/dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> -#include <freebsd/dev/bge/if_bgereg.h> +#include <dev/bge/if_bgereg.h> #define BGE_CSUM_FEATURES (CSUM_IP | CSUM_TCP) #define ETHER_MIN_NOPAD (ETHER_MIN_LEN - ETHER_CRC_LEN) /* i.e., 60 */ @@ -130,7 +130,7 @@ MODULE_DEPEND(bge, ether, 1, 1, 1); MODULE_DEPEND(bge, miibus, 1, 1, 1); /* "device miibus" required. 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. Note: the 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, \ diff --git a/freebsd/sys/dev/e1000/e1000_80003es2lan.c b/freebsd/sys/dev/e1000/e1000_80003es2lan.c index bec2a8ac..79fba337 100644 --- a/freebsd/sys/dev/e1000/e1000_80003es2lan.c +++ b/freebsd/sys/dev/e1000/e1000_80003es2lan.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -40,9 +40,9 @@ */ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw); diff --git a/freebsd/sys/dev/e1000/e1000_80003es2lan.h b/freebsd/sys/dev/e1000/e1000_80003es2lan.h index 923d66b3..3ab1ec9d 100644 --- a/freebsd/sys/dev/e1000/e1000_80003es2lan.h +++ b/freebsd/sys/dev/e1000/e1000_80003es2lan.h @@ -32,8 +32,8 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_80003ES2LAN_HH_ -#define _E1000_80003ES2LAN_HH_ +#ifndef _E1000_80003ES2LAN_H_ +#define _E1000_80003ES2LAN_H_ #define E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL 0x00 #define E1000_KMRNCTRLSTA_OFFSET_INB_CTRL 0x02 diff --git a/freebsd/sys/dev/e1000/e1000_82540.c b/freebsd/sys/dev/e1000/e1000_82540.c index 2f2f0b08..c0e8932f 100644 --- a/freebsd/sys/dev/e1000/e1000_82540.c +++ b/freebsd/sys/dev/e1000/e1000_82540.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -46,9 +46,9 @@ */ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif static s32 e1000_init_phy_params_82540(struct e1000_hw *hw); diff --git a/freebsd/sys/dev/e1000/e1000_82541.c b/freebsd/sys/dev/e1000/e1000_82541.c index 9faee5fd..2b655738 100644 --- a/freebsd/sys/dev/e1000/e1000_82541.c +++ b/freebsd/sys/dev/e1000/e1000_82541.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -44,9 +44,9 @@ */ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif static s32 e1000_init_phy_params_82541(struct e1000_hw *hw); diff --git a/freebsd/sys/dev/e1000/e1000_82541.h b/freebsd/sys/dev/e1000/e1000_82541.h index f730c3a4..3b6b9612 100644 --- a/freebsd/sys/dev/e1000/e1000_82541.h +++ b/freebsd/sys/dev/e1000/e1000_82541.h @@ -32,8 +32,8 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_82541_HH_ -#define _E1000_82541_HH_ +#ifndef _E1000_82541_H_ +#define _E1000_82541_H_ #define NVM_WORD_SIZE_BASE_SHIFT_82541 (NVM_WORD_SIZE_BASE_SHIFT + 1) diff --git a/freebsd/sys/dev/e1000/e1000_82542.c b/freebsd/sys/dev/e1000/e1000_82542.c index 96687ed4..1e2f8671 100644 --- a/freebsd/sys/dev/e1000/e1000_82542.c +++ b/freebsd/sys/dev/e1000/e1000_82542.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -39,9 +39,9 @@ */ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif static s32 e1000_init_phy_params_82542(struct e1000_hw *hw); diff --git a/freebsd/sys/dev/e1000/e1000_82543.c b/freebsd/sys/dev/e1000/e1000_82543.c index 0836cf51..ccf5bddf 100644 --- a/freebsd/sys/dev/e1000/e1000_82543.c +++ b/freebsd/sys/dev/e1000/e1000_82543.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -44,9 +44,9 @@ */ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif static s32 e1000_init_phy_params_82543(struct e1000_hw *hw); diff --git a/freebsd/sys/dev/e1000/e1000_82543.h b/freebsd/sys/dev/e1000/e1000_82543.h index a95ad502..60e5c15d 100644 --- a/freebsd/sys/dev/e1000/e1000_82543.h +++ b/freebsd/sys/dev/e1000/e1000_82543.h @@ -32,8 +32,8 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_82543_HH_ -#define _E1000_82543_HH_ +#ifndef _E1000_82543_H_ +#define _E1000_82543_H_ #define PHY_PREAMBLE 0xFFFFFFFF #define PHY_PREAMBLE_SIZE 32 diff --git a/freebsd/sys/dev/e1000/e1000_82571.c b/freebsd/sys/dev/e1000/e1000_82571.c index bb122d3e..8faf6f91 100644 --- a/freebsd/sys/dev/e1000/e1000_82571.c +++ b/freebsd/sys/dev/e1000/e1000_82571.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -52,9 +52,9 @@ */ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif static s32 e1000_init_phy_params_82571(struct e1000_hw *hw); diff --git a/freebsd/sys/dev/e1000/e1000_82571.h b/freebsd/sys/dev/e1000/e1000_82571.h index afccbf04..c76f16fe 100644 --- a/freebsd/sys/dev/e1000/e1000_82571.h +++ b/freebsd/sys/dev/e1000/e1000_82571.h @@ -32,8 +32,8 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_82571_HH_ -#define _E1000_82571_HH_ +#ifndef _E1000_82571_H_ +#define _E1000_82571_H_ #define ID_LED_RESERVED_F746 0xF746 #define ID_LED_DEFAULT_82573 ((ID_LED_DEF1_DEF2 << 12) | \ diff --git a/freebsd/sys/dev/e1000/e1000_82575.c b/freebsd/sys/dev/e1000/e1000_82575.c index 5637832c..4ce9d194 100644 --- a/freebsd/sys/dev/e1000/e1000_82575.c +++ b/freebsd/sys/dev/e1000/e1000_82575.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -44,9 +44,9 @@ */ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif static s32 e1000_init_phy_params_82575(struct e1000_hw *hw); diff --git a/freebsd/sys/dev/e1000/e1000_82575.h b/freebsd/sys/dev/e1000/e1000_82575.h index 11a27b9b..eb05262d 100644 --- a/freebsd/sys/dev/e1000/e1000_82575.h +++ b/freebsd/sys/dev/e1000/e1000_82575.h @@ -32,8 +32,8 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_82575_HH_ -#define _E1000_82575_HH_ +#ifndef _E1000_82575_H_ +#define _E1000_82575_H_ #define ID_LED_DEFAULT_82575_SERDES ((ID_LED_DEF1_DEF2 << 12) | \ (ID_LED_DEF1_DEF2 << 8) | \ @@ -472,4 +472,4 @@ void e1000_vfta_set_vf(struct e1000_hw *, u16, bool); void e1000_rlpml_set_vf(struct e1000_hw *, u16); s32 e1000_promisc_set_vf(struct e1000_hw *, enum e1000_promisc_type type); u16 e1000_rxpbs_adjust_82580(u32 data); -#endif /* _E1000_82575_HH_ */ +#endif /* _E1000_82575_H_ */ diff --git a/freebsd/sys/dev/e1000/e1000_api.c b/freebsd/sys/dev/e1000/e1000_api.c index b7f72837..17b4c817 100644 --- a/freebsd/sys/dev/e1000/e1000_api.c +++ b/freebsd/sys/dev/e1000/e1000_api.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -35,9 +35,9 @@ /*$FreeBSD$*/ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif /** diff --git a/freebsd/sys/dev/e1000/e1000_api.h b/freebsd/sys/dev/e1000/e1000_api.h index 94af19ce..c28fc2de 100644 --- a/freebsd/sys/dev/e1000/e1000_api.h +++ b/freebsd/sys/dev/e1000/e1000_api.h @@ -32,13 +32,13 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_API_HH_ -#define _E1000_API_HH_ +#ifndef _E1000_API_H_ +#define _E1000_API_H_ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_hw.h> +#include <dev/e1000/e1000_hw.h> #else -#include <freebsd/local/e1000_hw.h> +#include <rtems/bsd/local/e1000_hw.h> #endif extern void e1000_init_function_pointers_82542(struct e1000_hw *hw); diff --git a/freebsd/sys/dev/e1000/e1000_defines.h b/freebsd/sys/dev/e1000/e1000_defines.h index 142903f9..5d09ad92 100644 --- a/freebsd/sys/dev/e1000/e1000_defines.h +++ b/freebsd/sys/dev/e1000/e1000_defines.h @@ -32,8 +32,8 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_DEFINES_HH_ -#define _E1000_DEFINES_HH_ +#ifndef _E1000_DEFINES_H_ +#define _E1000_DEFINES_H_ /* Number of Transmit and Receive Descriptors must be a multiple of 8 */ #define REQ_TX_DESCRIPTOR_MULTIPLE 8 @@ -1720,4 +1720,4 @@ on DMA coal */ -#endif /* _E1000_DEFINES_HH_ */ +#endif /* _E1000_DEFINES_H_ */ diff --git a/freebsd/sys/dev/e1000/e1000_hw.h b/freebsd/sys/dev/e1000/e1000_hw.h index c51089f8..e5dfe84d 100644 --- a/freebsd/sys/dev/e1000/e1000_hw.h +++ b/freebsd/sys/dev/e1000/e1000_hw.h @@ -32,17 +32,17 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_HW_HH_ -#define _E1000_HW_HH_ +#ifndef _E1000_HW_H_ +#define _E1000_HW_H_ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_osdep.h> -#include <freebsd/dev/e1000/e1000_regs.h> -#include <freebsd/dev/e1000/e1000_defines.h> +#include <dev/e1000/e1000_osdep.h> +#include <dev/e1000/e1000_regs.h> +#include <dev/e1000/e1000_defines.h> #else -#include <freebsd/local/e1000_osdep.h> -#include <freebsd/local/e1000_regs.h> -#include <freebsd/local/e1000_defines.h> +#include <rtems/bsd/local/e1000_osdep.h> +#include <rtems/bsd/local/e1000_regs.h> +#include <rtems/bsd/local/e1000_defines.h> #endif struct e1000_hw; @@ -630,17 +630,17 @@ struct e1000_host_mng_command_info { }; #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_mac.h> -#include <freebsd/dev/e1000/e1000_phy.h> -#include <freebsd/dev/e1000/e1000_nvm.h> -#include <freebsd/dev/e1000/e1000_manage.h> -#include <freebsd/dev/e1000/e1000_mbx.h> +#include <dev/e1000/e1000_mac.h> +#include <dev/e1000/e1000_phy.h> +#include <dev/e1000/e1000_nvm.h> +#include <dev/e1000/e1000_manage.h> +#include <dev/e1000/e1000_mbx.h> #else -#include <freebsd/local/e1000_mac.h> -#include <freebsd/local/e1000_phy.h> -#include <freebsd/local/e1000_nvm.h> -#include <freebsd/local/e1000_manage.h> -#include <freebsd/local/e1000_mbx.h> +#include <rtems/bsd/local/e1000_mac.h> +#include <rtems/bsd/local/e1000_phy.h> +#include <rtems/bsd/local/e1000_nvm.h> +#include <rtems/bsd/local/e1000_manage.h> +#include <rtems/bsd/local/e1000_mbx.h> #endif struct e1000_mac_operations { @@ -942,19 +942,19 @@ struct e1000_hw { }; #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_82541.h> -#include <freebsd/dev/e1000/e1000_82543.h> -#include <freebsd/dev/e1000/e1000_82571.h> -#include <freebsd/dev/e1000/e1000_80003es2lan.h> -#include <freebsd/dev/e1000/e1000_ich8lan.h> -#include <freebsd/dev/e1000/e1000_82575.h> +#include <dev/e1000/e1000_82541.h> +#include <dev/e1000/e1000_82543.h> +#include <dev/e1000/e1000_82571.h> +#include <dev/e1000/e1000_80003es2lan.h> +#include <dev/e1000/e1000_ich8lan.h> +#include <dev/e1000/e1000_82575.h> #else -#include <freebsd/local/e1000_82541.h> -#include <freebsd/local/e1000_82543.h> -#include <freebsd/local/e1000_82571.h> -#include <freebsd/local/e1000_80003es2lan.h> -#include <freebsd/local/e1000_ich8lan.h> -#include <freebsd/local/e1000_82575.h> +#include <rtems/bsd/local/e1000_82541.h> +#include <rtems/bsd/local/e1000_82543.h> +#include <rtems/bsd/local/e1000_82571.h> +#include <rtems/bsd/local/e1000_80003es2lan.h> +#include <rtems/bsd/local/e1000_ich8lan.h> +#include <rtems/bsd/local/e1000_82575.h> #endif /* These functions must be implemented by drivers */ diff --git a/freebsd/sys/dev/e1000/e1000_ich8lan.c b/freebsd/sys/dev/e1000/e1000_ich8lan.c index d8c02cb5..6bf287c8 100644 --- a/freebsd/sys/dev/e1000/e1000_ich8lan.c +++ b/freebsd/sys/dev/e1000/e1000_ich8lan.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -65,9 +65,9 @@ */ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw); diff --git a/freebsd/sys/dev/e1000/e1000_ich8lan.h b/freebsd/sys/dev/e1000/e1000_ich8lan.h index 9e87f4d5..2935af56 100644 --- a/freebsd/sys/dev/e1000/e1000_ich8lan.h +++ b/freebsd/sys/dev/e1000/e1000_ich8lan.h @@ -32,8 +32,8 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_ICH8LAN_HH_ -#define _E1000_ICH8LAN_HH_ +#ifndef _E1000_ICH8LAN_H_ +#define _E1000_ICH8LAN_H_ #define ICH_FLASH_GFPREG 0x0000 #define ICH_FLASH_HSFSTS 0x0004 diff --git a/freebsd/sys/dev/e1000/e1000_mac.c b/freebsd/sys/dev/e1000/e1000_mac.c index 8b38ef9d..0a78d95d 100644 --- a/freebsd/sys/dev/e1000/e1000_mac.c +++ b/freebsd/sys/dev/e1000/e1000_mac.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -35,9 +35,9 @@ /*$FreeBSD$*/ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif static s32 e1000_validate_mdi_setting_generic(struct e1000_hw *hw); diff --git a/freebsd/sys/dev/e1000/e1000_mac.h b/freebsd/sys/dev/e1000/e1000_mac.h index e1ec987e..348d660f 100644 --- a/freebsd/sys/dev/e1000/e1000_mac.h +++ b/freebsd/sys/dev/e1000/e1000_mac.h @@ -32,8 +32,8 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_MAC_HH_ -#define _E1000_MAC_HH_ +#ifndef _E1000_MAC_H_ +#define _E1000_MAC_H_ /* * Functions that should not be called directly from drivers but can be used diff --git a/freebsd/sys/dev/e1000/e1000_manage.c b/freebsd/sys/dev/e1000/e1000_manage.c index 4198425e..540b8a0c 100644 --- a/freebsd/sys/dev/e1000/e1000_manage.c +++ b/freebsd/sys/dev/e1000/e1000_manage.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -35,9 +35,9 @@ /*$FreeBSD$*/ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif static u8 e1000_calculate_checksum(u8 *buffer, u32 length); diff --git a/freebsd/sys/dev/e1000/e1000_manage.h b/freebsd/sys/dev/e1000/e1000_manage.h index 42f3bf2e..146caeb5 100644 --- a/freebsd/sys/dev/e1000/e1000_manage.h +++ b/freebsd/sys/dev/e1000/e1000_manage.h @@ -32,8 +32,8 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_MANAGE_HH_ -#define _E1000_MANAGE_HH_ +#ifndef _E1000_MANAGE_H_ +#define _E1000_MANAGE_H_ bool e1000_check_mng_mode_generic(struct e1000_hw *hw); bool e1000_enable_tx_pkt_filtering_generic(struct e1000_hw *hw); diff --git a/freebsd/sys/dev/e1000/e1000_mbx.c b/freebsd/sys/dev/e1000/e1000_mbx.c index b30ede51..5236837a 100644 --- a/freebsd/sys/dev/e1000/e1000_mbx.c +++ b/freebsd/sys/dev/e1000/e1000_mbx.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -35,9 +35,9 @@ /*$FreeBSD$*/ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_mbx.h> +#include <dev/e1000/e1000_mbx.h> #else -#include <freebsd/local/e1000_mnx.h> +#include <rtems/bsd/local/e1000_mnx.h> #endif /** diff --git a/freebsd/sys/dev/e1000/e1000_mbx.h b/freebsd/sys/dev/e1000/e1000_mbx.h index 4c705282..0785ee2e 100644 --- a/freebsd/sys/dev/e1000/e1000_mbx.h +++ b/freebsd/sys/dev/e1000/e1000_mbx.h @@ -32,13 +32,13 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_MBX_HH_ -#define _E1000_MBX_HH_ +#ifndef _E1000_MBX_H_ +#define _E1000_MBX_H_ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif /* Define mailbox register bits */ @@ -107,4 +107,4 @@ void e1000_init_mbx_ops_generic(struct e1000_hw *hw); s32 e1000_init_mbx_params_vf(struct e1000_hw *); s32 e1000_init_mbx_params_pf(struct e1000_hw *); -#endif /* _E1000_MBX_HH_ */ +#endif /* _E1000_MBX_H_ */ diff --git a/freebsd/sys/dev/e1000/e1000_nvm.c b/freebsd/sys/dev/e1000/e1000_nvm.c index cc2e9edc..8fefe31c 100644 --- a/freebsd/sys/dev/e1000/e1000_nvm.c +++ b/freebsd/sys/dev/e1000/e1000_nvm.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -35,9 +35,9 @@ /*$FreeBSD$*/ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif static void e1000_reload_nvm_generic(struct e1000_hw *hw); diff --git a/freebsd/sys/dev/e1000/e1000_nvm.h b/freebsd/sys/dev/e1000/e1000_nvm.h index 89b65a0f..36ee4448 100644 --- a/freebsd/sys/dev/e1000/e1000_nvm.h +++ b/freebsd/sys/dev/e1000/e1000_nvm.h @@ -32,8 +32,8 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_NVM_HH_ -#define _E1000_NVM_HH_ +#ifndef _E1000_NVM_H_ +#define _E1000_NVM_H_ void e1000_init_nvm_ops_generic(struct e1000_hw *hw); s32 e1000_null_read_nvm(struct e1000_hw *hw, u16 a, u16 b, u16 *c); diff --git a/freebsd/sys/dev/e1000/e1000_osdep.c b/freebsd/sys/dev/e1000/e1000_osdep.c index bf95d850..e02899ad 100644 --- a/freebsd/sys/dev/e1000/e1000_osdep.c +++ b/freebsd/sys/dev/e1000/e1000_osdep.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -35,9 +35,9 @@ /*$FreeBSD$*/ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif /* diff --git a/freebsd/sys/dev/e1000/e1000_osdep.h b/freebsd/sys/dev/e1000/e1000_osdep.h index 64ea32e1..e3db3ec5 100644 --- a/freebsd/sys/dev/e1000/e1000_osdep.h +++ b/freebsd/sys/dev/e1000/e1000_osdep.h @@ -33,28 +33,28 @@ /*$FreeBSD$*/ -#ifndef _FREEBSD_OS_HH_ -#define _FREEBSD_OS_HH_ - -#include <freebsd/sys/types.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/protosw.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/machine/bus.h> -#include <freebsd/sys/rman.h> -#include <freebsd/machine/resource.h> -#include <freebsd/vm/vm.h> -#include <freebsd/vm/pmap.h> -#include <freebsd/machine/clock.h> -#include <freebsd/dev/pci/pcivar.h> -#include <freebsd/dev/pci/pcireg.h> +#ifndef _FREEBSD_OS_H_ +#define _FREEBSD_OS_H_ + +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/mbuf.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/malloc.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <machine/bus.h> +#include <sys/rman.h> +#include <machine/resource.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <machine/clock.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> #define ASSERT(x) if(!(x)) panic("EM: x") @@ -216,5 +216,5 @@ struct e1000_osdep bus_space_write_2(((struct e1000_osdep *)(hw)->back)->flash_bus_space_tag, \ ((struct e1000_osdep *)(hw)->back)->flash_bus_space_handle, reg, value) -#endif /* _FREEBSD_OS_HH_ */ +#endif /* _FREEBSD_OS_H_ */ diff --git a/freebsd/sys/dev/e1000/e1000_phy.c b/freebsd/sys/dev/e1000/e1000_phy.c index 5b567f45..c5365e51 100644 --- a/freebsd/sys/dev/e1000/e1000_phy.c +++ b/freebsd/sys/dev/e1000/e1000_phy.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -35,9 +35,9 @@ /*$FreeBSD$*/ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif static u32 e1000_get_phy_addr_for_bm_page(u32 page, u32 reg); diff --git a/freebsd/sys/dev/e1000/e1000_phy.h b/freebsd/sys/dev/e1000/e1000_phy.h index 7fd83969..c42ef6c6 100644 --- a/freebsd/sys/dev/e1000/e1000_phy.h +++ b/freebsd/sys/dev/e1000/e1000_phy.h @@ -32,8 +32,8 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_PHY_HH_ -#define _E1000_PHY_HH_ +#ifndef _E1000_PHY_H_ +#define _E1000_PHY_H_ void e1000_init_phy_ops_generic(struct e1000_hw *hw); s32 e1000_null_read_reg(struct e1000_hw *hw, u32 offset, u16 *data); diff --git a/freebsd/sys/dev/e1000/e1000_regs.h b/freebsd/sys/dev/e1000/e1000_regs.h index 536f087f..38ccff32 100644 --- a/freebsd/sys/dev/e1000/e1000_regs.h +++ b/freebsd/sys/dev/e1000/e1000_regs.h @@ -32,8 +32,8 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_REGS_HH_ -#define _E1000_REGS_HH_ +#ifndef _E1000_REGS_H_ +#define _E1000_REGS_H_ #define E1000_CTRL 0x00000 /* Device Control - RW */ #define E1000_CTRL_DUP 0x00004 /* Device Control Duplicate (Shadow) - RW */ diff --git a/freebsd/sys/dev/e1000/e1000_vf.c b/freebsd/sys/dev/e1000/e1000_vf.c index 943b24e7..de6feb6a 100644 --- a/freebsd/sys/dev/e1000/e1000_vf.c +++ b/freebsd/sys/dev/e1000/e1000_vf.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -35,9 +35,9 @@ /*$FreeBSD$*/ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_api.h> #else -#include <freebsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_api.h> #endif static s32 e1000_init_phy_params_vf(struct e1000_hw *hw); diff --git a/freebsd/sys/dev/e1000/e1000_vf.h b/freebsd/sys/dev/e1000/e1000_vf.h index 28bb4fde..8d02eda3 100644 --- a/freebsd/sys/dev/e1000/e1000_vf.h +++ b/freebsd/sys/dev/e1000/e1000_vf.h @@ -32,17 +32,17 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _E1000_VF_HH_ -#define _E1000_VF_HH_ +#ifndef _E1000_VF_H_ +#define _E1000_VF_H_ #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_osdep.h> -#include <freebsd/dev/e1000/e1000_regs.h> -#include <freebsd/dev/e1000/e1000_defines.h> +#include <dev/e1000/e1000_osdep.h> +#include <dev/e1000/e1000_regs.h> +#include <dev/e1000/e1000_defines.h> #else -#include <freebsd/local/e1000_osdep.h> -#include <freebsd/local/e1000_regs.h> -#include <freebsd/local/e1000_defines.h> +#include <rtems/bsd/local/e1000_osdep.h> +#include <rtems/bsd/local/e1000_regs.h> +#include <rtems/bsd/local/e1000_defines.h> #endif struct e1000_hw; @@ -196,9 +196,9 @@ struct e1000_vf_stats { }; #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_mbx.h> +#include <dev/e1000/e1000_mbx.h> #else -#include <freebsd/local/e1000_mbx.h> +#include <rtems/bsd/local/e1000_mbx.h> #endif struct e1000_mac_operations { @@ -298,4 +298,4 @@ s32 e1000_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value); void e1000_vfta_set_vf(struct e1000_hw *, u16, bool); void e1000_rlpml_set_vf(struct e1000_hw *, u16); s32 e1000_promisc_set_vf(struct e1000_hw *, enum e1000_promisc_type); -#endif /* _E1000_VF_HH_ */ +#endif /* _E1000_VF_H_ */ diff --git a/freebsd/sys/dev/e1000/if_em.c b/freebsd/sys/dev/e1000/if_em.c index bc3ac3a3..c0fffc30 100644 --- a/freebsd/sys/dev/e1000/if_em.c +++ b/freebsd/sys/dev/e1000/if_em.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -35,62 +35,62 @@ /*$FreeBSD$*/ #ifdef HAVE_KERNEL_OPTION_HEADERS -#include <freebsd/local/opt_device_polling.h> -#include <freebsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_device_polling.h> +#include <rtems/bsd/local/opt_inet.h> #endif -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> #if __FreeBSD_version >= 800000 -#include <freebsd/sys/buf_ring.h> +#include <sys/buf_ring.h> #endif -#include <freebsd/sys/bus.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/kthread.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/rman.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/taskqueue.h> -#include <freebsd/sys/eventhandler.h> -#include <freebsd/machine/bus.h> -#include <freebsd/machine/resource.h> - -#include <freebsd/net/bpf.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_media.h> - -#include <freebsd/net/if_types.h> -#include <freebsd/net/if_vlan_var.h> - -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/if_ether.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip6.h> -#include <freebsd/netinet/tcp.h> -#include <freebsd/netinet/udp.h> - -#include <freebsd/machine/in_cksum.h> -#include <freebsd/dev/led/led.h> -#include <freebsd/dev/pci/pcivar.h> -#include <freebsd/dev/pci/pcireg.h> +#include <sys/bus.h> +#include <sys/endian.h> +#include <sys/kernel.h> +#include <sys/kthread.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/module.h> +#include <sys/rman.h> +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/sysctl.h> +#include <sys/taskqueue.h> +#include <sys/eventhandler.h> +#include <machine/bus.h> +#include <machine/resource.h> + +#include <net/bpf.h> +#include <net/ethernet.h> +#include <net/if.h> +#include <net/if_arp.h> +#include <net/if_dl.h> +#include <net/if_media.h> + +#include <net/if_types.h> +#include <net/if_vlan_var.h> + +#include <netinet/in_systm.h> +#include <netinet/in.h> +#include <netinet/if_ether.h> +#include <netinet/ip.h> +#include <netinet/ip6.h> +#include <netinet/tcp.h> +#include <netinet/udp.h> + +#include <machine/in_cksum.h> +#include <dev/led/led.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> -#include <freebsd/dev/e1000/e1000_82571.h> -#include <freebsd/dev/e1000/if_em.h> +#include <dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_82571.h> +#include <dev/e1000/if_em.h> #else -#include <freebsd/local/e1000_api.h> -#include <freebsd/local/e1000_82571.h> -#include <freebsd/local/if_em.h> +#include <rtems/bsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_82571.h> +#include <rtems/bsd/local/if_em.h> #endif /********************************************************************* diff --git a/freebsd/sys/dev/e1000/if_igb.c b/freebsd/sys/dev/e1000/if_igb.c index 2653ccbb..27d9c92b 100644 --- a/freebsd/sys/dev/e1000/if_igb.c +++ b/freebsd/sys/dev/e1000/if_igb.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -36,67 +36,67 @@ #ifdef HAVE_KERNEL_OPTION_HEADERS -#include <freebsd/local/opt_device_polling.h> -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_altq.h> +#include <rtems/bsd/local/opt_device_polling.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_altq.h> #endif -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> #if __FreeBSD_version >= 800000 -#include <freebsd/sys/buf_ring.h> +#include <sys/buf_ring.h> #endif -#include <freebsd/sys/bus.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/kthread.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/rman.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/taskqueue.h> -#include <freebsd/sys/eventhandler.h> -#include <freebsd/sys/pcpu.h> -#include <freebsd/sys/smp.h> -#include <freebsd/machine/smp.h> -#include <freebsd/machine/bus.h> -#include <freebsd/machine/resource.h> - -#include <freebsd/net/bpf.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_media.h> - -#include <freebsd/net/if_types.h> -#include <freebsd/net/if_vlan_var.h> - -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/if_ether.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip6.h> -#include <freebsd/netinet/tcp.h> -#include <freebsd/netinet/tcp_lro.h> -#include <freebsd/netinet/udp.h> - -#include <freebsd/machine/in_cksum.h> -#include <freebsd/dev/led/led.h> -#include <freebsd/dev/pci/pcivar.h> -#include <freebsd/dev/pci/pcireg.h> +#include <sys/bus.h> +#include <sys/endian.h> +#include <sys/kernel.h> +#include <sys/kthread.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/module.h> +#include <sys/rman.h> +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/sysctl.h> +#include <sys/taskqueue.h> +#include <sys/eventhandler.h> +#include <sys/pcpu.h> +#include <sys/smp.h> +#include <machine/smp.h> +#include <machine/bus.h> +#include <machine/resource.h> + +#include <net/bpf.h> +#include <net/ethernet.h> +#include <net/if.h> +#include <net/if_arp.h> +#include <net/if_dl.h> +#include <net/if_media.h> + +#include <net/if_types.h> +#include <net/if_vlan_var.h> + +#include <netinet/in_systm.h> +#include <netinet/in.h> +#include <netinet/if_ether.h> +#include <netinet/ip.h> +#include <netinet/ip6.h> +#include <netinet/tcp.h> +#include <netinet/tcp_lro.h> +#include <netinet/udp.h> + +#include <machine/in_cksum.h> +#include <dev/led/led.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> -#include <freebsd/dev/e1000/e1000_82575.h> -#include <freebsd/dev/e1000/if_igb.h> +#include <dev/e1000/e1000_api.h> +#include <dev/e1000/e1000_82575.h> +#include <dev/e1000/if_igb.h> #else -#include <freebsd/local/e1000_api.h> -#include <freebsd/local/e1000_82575.h> -#include <freebsd/local/if_igb.h> +#include <rtems/bsd/local/e1000_api.h> +#include <rtems/bsd/local/e1000_82575.h> +#include <rtems/bsd/local/if_igb.h> #endif /********************************************************************* diff --git a/freebsd/sys/dev/e1000/if_lem.c b/freebsd/sys/dev/e1000/if_lem.c index b0daee16..402a6f48 100644 --- a/freebsd/sys/dev/e1000/if_lem.c +++ b/freebsd/sys/dev/e1000/if_lem.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /****************************************************************************** @@ -35,57 +35,57 @@ /*$FreeBSD$*/ #ifdef HAVE_KERNEL_OPTION_HEADERS -#include <freebsd/local/opt_device_polling.h> -#include <freebsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_device_polling.h> +#include <rtems/bsd/local/opt_inet.h> #endif -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/kthread.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/rman.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/taskqueue.h> -#include <freebsd/sys/eventhandler.h> -#include <freebsd/machine/bus.h> -#include <freebsd/machine/resource.h> - -#include <freebsd/net/bpf.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_media.h> - -#include <freebsd/net/if_types.h> -#include <freebsd/net/if_vlan_var.h> - -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/if_ether.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip6.h> -#include <freebsd/netinet/tcp.h> -#include <freebsd/netinet/udp.h> - -#include <freebsd/machine/in_cksum.h> -#include <freebsd/dev/led/led.h> -#include <freebsd/dev/pci/pcivar.h> -#include <freebsd/dev/pci/pcireg.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/bus.h> +#include <sys/endian.h> +#include <sys/kernel.h> +#include <sys/kthread.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/module.h> +#include <sys/rman.h> +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/sysctl.h> +#include <sys/taskqueue.h> +#include <sys/eventhandler.h> +#include <machine/bus.h> +#include <machine/resource.h> + +#include <net/bpf.h> +#include <net/ethernet.h> +#include <net/if.h> +#include <net/if_arp.h> +#include <net/if_dl.h> +#include <net/if_media.h> + +#include <net/if_types.h> +#include <net/if_vlan_var.h> + +#include <netinet/in_systm.h> +#include <netinet/in.h> +#include <netinet/if_ether.h> +#include <netinet/ip.h> +#include <netinet/ip6.h> +#include <netinet/tcp.h> +#include <netinet/udp.h> + +#include <machine/in_cksum.h> +#include <dev/led/led.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> #ifdef __rtems__ -#include <freebsd/dev/e1000/e1000_api.h> -#include <freebsd/dev/e1000/if_lem.h> +#include <dev/e1000/e1000_api.h> +#include <dev/e1000/if_lem.h> #else -#include <freebsd/local/e1000_api.h> -#include <freebsd/local/if_lem.h> +#include <rtems/bsd/local/e1000_api.h> +#include <rtems/bsd/local/if_lem.h> #endif /********************************************************************* diff --git a/freebsd/sys/dev/fxp/if_fxp.c b/freebsd/sys/dev/fxp/if_fxp.c index 51ee51a9..7bc247dc 100644 --- a/freebsd/sys/dev/fxp/if_fxp.c +++ b/freebsd/sys/dev/fxp/if_fxp.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 1995, David Greenman @@ -29,7 +29,7 @@ * */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* @@ -37,56 +37,56 @@ __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/bus.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/rman.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/net/bpf.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_media.h> -#include <freebsd/net/if_types.h> -#include <freebsd/net/if_vlan_var.h> - -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/tcp.h> -#include <freebsd/netinet/udp.h> - -#include <freebsd/machine/bus.h> -#include <freebsd/machine/in_cksum.h> -#include <freebsd/machine/resource.h> - -#include <freebsd/dev/pci/pcivar.h> -#include <freebsd/dev/pci/pcireg.h> /* for PCIM_CMD_xxx */ - -#include <freebsd/dev/mii/mii.h> -#include <freebsd/dev/mii/miivar.h> - -#include <freebsd/dev/fxp/if_fxpreg.h> -#include <freebsd/dev/fxp/if_fxpvar.h> -#include <freebsd/dev/fxp/rcvbundl.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/bus.h> +#include <sys/endian.h> +#include <sys/kernel.h> +#include <sys/mbuf.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/module.h> +#include <sys/mutex.h> +#include <sys/rman.h> +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/sysctl.h> + +#include <net/bpf.h> +#include <net/ethernet.h> +#include <net/if.h> +#include <net/if_arp.h> +#include <net/if_dl.h> +#include <net/if_media.h> +#include <net/if_types.h> +#include <net/if_vlan_var.h> + +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/tcp.h> +#include <netinet/udp.h> + +#include <machine/bus.h> +#include <machine/in_cksum.h> +#include <machine/resource.h> + +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> /* for PCIM_CMD_xxx */ + +#include <dev/mii/mii.h> +#include <dev/mii/miivar.h> + +#include <dev/fxp/if_fxpreg.h> +#include <dev/fxp/if_fxpvar.h> +#include <dev/fxp/rcvbundl.h> MODULE_DEPEND(fxp, pci, 1, 1, 1); MODULE_DEPEND(fxp, ether, 1, 1, 1); MODULE_DEPEND(fxp, miibus, 1, 1, 1); -#include <freebsd/local/miibus_if.h> +#include <rtems/bsd/local/miibus_if.h> /* * NOTE! On the Alpha, we have an alignment constraint. The diff --git a/freebsd/sys/dev/led/led.c b/freebsd/sys/dev/led/led.c index ae214909..db609a45 100644 --- a/freebsd/sys/dev/led/led.c +++ b/freebsd/sys/dev/led/led.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * ---------------------------------------------------------------------------- @@ -10,21 +10,21 @@ * */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/sys/param.h> -#include <freebsd/sys/conf.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/limits.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/ctype.h> -#include <freebsd/sys/sbuf.h> -#include <freebsd/sys/queue.h> -#include <freebsd/dev/led/led.h> -#include <freebsd/sys/uio.h> -#include <freebsd/sys/sx.h> +#include <rtems/bsd/sys/param.h> +#include <sys/conf.h> +#include <sys/kernel.h> +#include <sys/systm.h> +#include <sys/limits.h> +#include <sys/malloc.h> +#include <sys/ctype.h> +#include <sys/sbuf.h> +#include <sys/queue.h> +#include <dev/led/led.h> +#include <sys/uio.h> +#include <sys/sx.h> struct ledsc { LIST_ENTRY(ledsc) list; diff --git a/freebsd/sys/dev/mii/brgphy.c b/freebsd/sys/dev/mii/brgphy.c index 9b53c83d..5633413c 100644 --- a/freebsd/sys/dev/mii/brgphy.c +++ b/freebsd/sys/dev/mii/brgphy.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2000 @@ -32,38 +32,38 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * Driver for the Broadcom BCM54xx/57xx 1000baseTX PHY. */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/bus.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/module.h> +#include <sys/socket.h> +#include <sys/bus.h> -#include <freebsd/net/if.h> -#include <freebsd/net/ethernet.h> -#include <freebsd/net/if_media.h> +#include <net/if.h> +#include <net/ethernet.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/dev/mii/brgphyreg.h> -#include <freebsd/net/if_arp.h> -#include <freebsd/machine/bus.h> -#include <freebsd/dev/bge/if_bgereg.h> -#include <freebsd/dev/bce/if_bcereg.h> +#include <dev/mii/brgphyreg.h> +#include <net/if_arp.h> +#include <machine/bus.h> +#include <dev/bge/if_bgereg.h> +#include <dev/bce/if_bcereg.h> -#include <freebsd/dev/pci/pcireg.h> -#include <freebsd/dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> -#include <freebsd/local/miibus_if.h> +#include <rtems/bsd/local/miibus_if.h> static int brgphy_probe(device_t); static int brgphy_attach(device_t); diff --git a/freebsd/sys/dev/mii/brgphyreg.h b/freebsd/sys/dev/mii/brgphyreg.h index fb8b65a5..3f5ee5df 100644 --- a/freebsd/sys/dev/mii/brgphyreg.h +++ b/freebsd/sys/dev/mii/brgphyreg.h @@ -32,8 +32,8 @@ * $FreeBSD$ */ -#ifndef _DEV_MII_BRGPHYREG_HH_ -#define _DEV_MII_BRGPHYREG_HH_ +#ifndef _DEV_MII_BRGPHYREG_H_ +#define _DEV_MII_BRGPHYREG_H_ /* * Broadcom BCM5400 registers @@ -417,4 +417,4 @@ #define BRGPHY_INTRS \ ~(BRGPHY_IMR_LNK_CHG|BRGPHY_IMR_LSP_CHG|BRGPHY_IMR_DUP_CHG) -#endif /* _DEV_BRGPHY_MIIREG_HH_ */ +#endif /* _DEV_BRGPHY_MIIREG_H_ */ diff --git a/freebsd/sys/dev/mii/icsphy.c b/freebsd/sys/dev/mii/icsphy.c index a034eb36..e2315bc8 100644 --- a/freebsd/sys/dev/mii/icsphy.c +++ b/freebsd/sys/dev/mii/icsphy.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $NetBSD: icsphy.c,v 1.41 2006/11/16 21:24:07 christos Exp $ */ @@ -56,7 +56,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* @@ -64,23 +64,23 @@ __FBSDID("$FreeBSD$"); * datasheet from www.icst.com */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/bus.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/module.h> +#include <sys/socket.h> +#include <sys/bus.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> +#include <net/if.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/dev/mii/icsphyreg.h> +#include <dev/mii/icsphyreg.h> -#include <freebsd/local/miibus_if.h> +#include <rtems/bsd/local/miibus_if.h> static int icsphy_probe(device_t dev); static int icsphy_attach(device_t dev); diff --git a/freebsd/sys/dev/mii/icsphyreg.h b/freebsd/sys/dev/mii/icsphyreg.h index a5754b7d..d92d0b51 100644 --- a/freebsd/sys/dev/mii/icsphyreg.h +++ b/freebsd/sys/dev/mii/icsphyreg.h @@ -32,8 +32,8 @@ * $FreeBSD$ */ -#ifndef _DEV_MII_ICSPHYREG_HH_ -#define _DEV_MII_ICSPHYREG_HH_ +#ifndef _DEV_MII_ICSPHYREG_H_ +#define _DEV_MII_ICSPHYREG_H_ /* * ICS1890 registers. @@ -126,4 +126,4 @@ #define ECR2_10AUTOPWRDN 0x0002 /* Automatic 10baseT power down */ #define ECR2_100AUTOPWRDN 0x0001 /* Automatic 100baseTX power down */ -#endif /* _DEV_MII_ICSPHYREG_HH_ */ +#endif /* _DEV_MII_ICSPHYREG_H_ */ diff --git a/freebsd/sys/dev/mii/mii.c b/freebsd/sys/dev/mii/mii.c index c5aebad6..5b949156 100644 --- a/freebsd/sys/dev/mii/mii.c +++ b/freebsd/sys/dev/mii/mii.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $NetBSD: mii.c,v 1.12 1999/08/03 19:41:49 drochner Exp $ */ @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* @@ -41,23 +41,23 @@ __FBSDID("$FreeBSD$"); * plus some NetBSD extensions. */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/bus.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/socket.h> +#include <sys/malloc.h> +#include <sys/module.h> +#include <sys/bus.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/route.h> +#include <net/if.h> +#include <net/if_media.h> +#include <net/route.h> -#include <freebsd/dev/mii/mii.h> -#include <freebsd/dev/mii/miivar.h> +#include <dev/mii/mii.h> +#include <dev/mii/miivar.h> MODULE_VERSION(miibus, 1); -#include <freebsd/local/miibus_if.h> +#include <rtems/bsd/local/miibus_if.h> static int miibus_print_child(device_t dev, device_t child); static int miibus_read_ivar(device_t dev, device_t child, int which, diff --git a/freebsd/sys/dev/mii/mii.h b/freebsd/sys/dev/mii/mii.h index 21c6b768..1d887d23 100644 --- a/freebsd/sys/dev/mii/mii.h +++ b/freebsd/sys/dev/mii/mii.h @@ -29,8 +29,8 @@ * $FreeBSD$ */ -#ifndef _DEV_MII_MII_HH_ -#define _DEV_MII_MII_HH_ +#ifndef _DEV_MII_MII_H_ +#define _DEV_MII_MII_H_ /* * Registers common to all PHYs. @@ -209,4 +209,4 @@ #define EXTSR_MEDIAMASK (EXTSR_1000XFDX|EXTSR_1000XHDX| \ EXTSR_1000TFDX|EXTSR_1000THDX) -#endif /* _DEV_MII_MII_HH_ */ +#endif /* _DEV_MII_MII_H_ */ diff --git a/freebsd/sys/dev/mii/mii_physubr.c b/freebsd/sys/dev/mii/mii_physubr.c index f5a278d6..3b6e0042 100644 --- a/freebsd/sys/dev/mii/mii_physubr.c +++ b/freebsd/sys/dev/mii/mii_physubr.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $NetBSD: mii_physubr.c,v 1.5 1999/08/03 19:41:49 drochner Exp $ */ @@ -32,28 +32,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * Subroutines common to all PHYs. */ -#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/module.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 <sys/module.h> +#include <sys/bus.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> +#include <net/if.h> +#include <net/if_media.h> -#include <freebsd/dev/mii/mii.h> -#include <freebsd/dev/mii/miivar.h> +#include <dev/mii/mii.h> +#include <dev/mii/miivar.h> -#include <freebsd/local/miibus_if.h> +#include <rtems/bsd/local/miibus_if.h> /* * Media to register setting conversion table. Order matters. diff --git a/freebsd/sys/dev/mii/miivar.h b/freebsd/sys/dev/mii/miivar.h index e8d467f7..d56ea18d 100644 --- a/freebsd/sys/dev/mii/miivar.h +++ b/freebsd/sys/dev/mii/miivar.h @@ -32,10 +32,10 @@ * $FreeBSD$ */ -#ifndef _DEV_MII_MIIVAR_HH_ -#define _DEV_MII_MIIVAR_HH_ +#ifndef _DEV_MII_MIIVAR_H_ +#define _DEV_MII_MIIVAR_H_ -#include <freebsd/sys/queue.h> +#include <sys/queue.h> /* * Media Independent Interface configuration defintions. @@ -257,4 +257,4 @@ int mii_phy_dev_probe(device_t dev, const struct mii_phydesc *mpd, int mrv); void ukphy_status(struct mii_softc *); #endif /* _KERNEL */ -#endif /* _DEV_MII_MIIVAR_HH_ */ +#endif /* _DEV_MII_MIIVAR_H_ */ diff --git a/freebsd/sys/dev/pci/pci.c b/freebsd/sys/dev/pci/pci.c index ebff0fff..8552fdb7 100644 --- a/freebsd/sys/dev/pci/pci.c +++ b/freebsd/sys/dev/pci/pci.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 1997, Stefan Esser <se@freebsd.org> @@ -28,56 +28,56 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/local/opt_bus.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/linker.h> -#include <freebsd/sys/fcntl.h> -#include <freebsd/sys/conf.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/endian.h> - -#include <freebsd/vm/vm.h> -#include <freebsd/vm/pmap.h> +#include <rtems/bsd/local/opt_bus.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/malloc.h> +#include <sys/module.h> +#include <sys/linker.h> +#include <sys/fcntl.h> +#include <sys/conf.h> +#include <sys/kernel.h> +#include <sys/queue.h> +#include <sys/sysctl.h> +#include <sys/endian.h> + +#include <vm/vm.h> +#include <vm/pmap.h> #ifndef __rtems__ -#include <freebsd/vm/vm_extern.h> +#include <vm/vm_extern.h> #endif /* __rtems__ */ -#include <freebsd/sys/bus.h> -#include <freebsd/machine/bus.h> -#include <freebsd/sys/rman.h> -#include <freebsd/machine/resource.h> -#include <freebsd/machine/stdarg.h> +#include <sys/bus.h> +#include <machine/bus.h> +#include <sys/rman.h> +#include <machine/resource.h> +#include <machine/stdarg.h> #if defined(__i386__) || defined(__amd64__) || defined(__powerpc__) -#include <freebsd/machine/intr_machdep.h> +#include <machine/intr_machdep.h> #endif -#include <freebsd/sys/pciio.h> -#include <freebsd/dev/pci/pcireg.h> -#include <freebsd/dev/pci/pcivar.h> -#include <freebsd/dev/pci/pci_private.h> +#include <sys/pciio.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pci_private.h> -#include <freebsd/dev/usb/controller/ehcireg.h> -#include <freebsd/dev/usb/controller/ohcireg.h> +#include <dev/usb/controller/ehcireg.h> +#include <dev/usb/controller/ohcireg.h> #ifndef __rtems__ -#include <freebsd/dev/usb/controller/uhcireg.h> +#include <dev/usb/controller/uhcireg.h> #endif /* __rtems__ */ -#include <freebsd/local/pcib_if.h> -#include <freebsd/local/pci_if.h> +#include <rtems/bsd/local/pcib_if.h> +#include <rtems/bsd/local/pci_if.h> #ifdef __HAVE_ACPI -#include <freebsd/contrib/dev/acpica/include/acpi.h> -#include <freebsd/local/acpi_if.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <rtems/bsd/local/acpi_if.h> #else #define ACPI_PWR_FOR_SLEEP(x, y, z) #endif @@ -3591,10 +3591,10 @@ pci_write_ivar(device_t dev, device_t child, int which, uintptr_t value) } -#include <freebsd/local/opt_ddb.h> +#include <rtems/bsd/local/opt_ddb.h> #ifdef DDB -#include <freebsd/ddb/ddb.h> -#include <freebsd/sys/cons.h> +#include <ddb/ddb.h> +#include <sys/cons.h> /* * List resources based on pci map registers, used for within ddb diff --git a/freebsd/sys/dev/pci/pci_pci.c b/freebsd/sys/dev/pci/pci_pci.c index c2a829c8..470386a3 100644 --- a/freebsd/sys/dev/pci/pci_pci.c +++ b/freebsd/sys/dev/pci/pci_pci.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier @@ -30,29 +30,29 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * PCI:PCI bridge support. */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/bus.h> -#include <freebsd/machine/bus.h> -#include <freebsd/sys/rman.h> -#include <freebsd/sys/sysctl.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/module.h> +#include <sys/bus.h> +#include <machine/bus.h> +#include <sys/rman.h> +#include <sys/sysctl.h> -#include <freebsd/machine/resource.h> +#include <machine/resource.h> -#include <freebsd/dev/pci/pcivar.h> -#include <freebsd/dev/pci/pcireg.h> -#include <freebsd/dev/pci/pcib_private.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcib_private.h> -#include <freebsd/local/pcib_if.h> +#include <rtems/bsd/local/pcib_if.h> static int pcib_probe(device_t dev); diff --git a/freebsd/sys/dev/pci/pci_private.h b/freebsd/sys/dev/pci/pci_private.h index 93da2538..e45afb7a 100644 --- a/freebsd/sys/dev/pci/pci_private.h +++ b/freebsd/sys/dev/pci/pci_private.h @@ -29,8 +29,8 @@ * */ -#ifndef _PCI_PRIVATE_HH_ -#define _PCI_PRIVATE_HH_ +#ifndef _PCI_PRIVATE_H_ +#define _PCI_PRIVATE_H_ /* * Export definitions of the pci bus so that we can more easily share @@ -113,4 +113,4 @@ void pci_cfg_restore(device_t, struct pci_devinfo *); */ void pci_cfg_save(device_t, struct pci_devinfo *, int); -#endif /* _PCI_PRIVATE_HH_ */ +#endif /* _PCI_PRIVATE_H_ */ diff --git a/freebsd/sys/dev/pci/pci_user.c b/freebsd/sys/dev/pci/pci_user.c index c0b1eda0..e7306476 100644 --- a/freebsd/sys/dev/pci/pci_user.c +++ b/freebsd/sys/dev/pci/pci_user.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 1997, Stefan Esser <se@freebsd.org> @@ -26,41 +26,41 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/local/opt_bus.h> /* XXX trim includes */ -#include <freebsd/local/opt_compat.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/linker.h> -#include <freebsd/sys/fcntl.h> -#include <freebsd/sys/conf.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> - -#include <freebsd/vm/vm.h> -#include <freebsd/vm/pmap.h> +#include <rtems/bsd/local/opt_bus.h> /* XXX trim includes */ +#include <rtems/bsd/local/opt_compat.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/malloc.h> +#include <sys/module.h> +#include <sys/linker.h> +#include <sys/fcntl.h> +#include <sys/conf.h> +#include <sys/kernel.h> +#include <sys/proc.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> + +#include <vm/vm.h> +#include <vm/pmap.h> #ifndef __rtems__ -#include <freebsd/vm/vm_extern.h> +#include <vm/vm_extern.h> #endif /* __rtems__ */ -#include <freebsd/sys/bus.h> -#include <freebsd/machine/bus.h> -#include <freebsd/sys/rman.h> -#include <freebsd/machine/resource.h> +#include <sys/bus.h> +#include <machine/bus.h> +#include <sys/rman.h> +#include <machine/resource.h> -#include <freebsd/sys/pciio.h> -#include <freebsd/dev/pci/pcireg.h> -#include <freebsd/dev/pci/pcivar.h> +#include <sys/pciio.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> -#include <freebsd/local/pcib_if.h> -#include <freebsd/local/pci_if.h> +#include <rtems/bsd/local/pcib_if.h> +#include <rtems/bsd/local/pci_if.h> /* * This is the user interface to PCI configuration space. diff --git a/freebsd/sys/dev/pci/pcivar.h b/freebsd/sys/dev/pci/pcivar.h index a095db6d..8e2da638 100644 --- a/freebsd/sys/dev/pci/pcivar.h +++ b/freebsd/sys/dev/pci/pcivar.h @@ -27,10 +27,10 @@ * */ -#ifndef _PCIVAR_HH_ -#define _PCIVAR_HH_ +#ifndef _PCIVAR_H_ +#define _PCIVAR_H_ -#include <freebsd/sys/queue.h> +#include <sys/queue.h> /* some PCI bus constants */ #define PCI_MAXMAPS_0 6 /* max. no. of memory/port maps */ @@ -198,7 +198,7 @@ typedef struct { extern uint32_t pci_numdevs; /* Only if the prerequisites are present */ -#if defined(_SYS_BUS_HH_) && defined(_SYS_PCIIO_HH_) +#if defined(_SYS_BUS_H_) && defined(_SYS_PCIIO_H_) struct pci_devinfo { STAILQ_ENTRY(pci_devinfo) pci_links; struct resource_list resources; @@ -207,9 +207,9 @@ struct pci_devinfo { }; #endif -#ifdef _SYS_BUS_HH_ +#ifdef _SYS_BUS_H_ -#include <freebsd/local/pci_if.h> +#include <rtems/bsd/local/pci_if.h> enum pci_device_ivars { PCI_IVAR_SUBVENDOR, @@ -460,7 +460,7 @@ void pci_ht_map_msi(device_t dev, uint64_t addr); int pci_get_max_read_req(device_t dev); int pci_set_max_read_req(device_t dev, int size); -#endif /* _SYS_BUS_HH_ */ +#endif /* _SYS_BUS_H_ */ /* * cdev switch for control device, initialised in generic PCI code @@ -475,4 +475,4 @@ STAILQ_HEAD(devlist, pci_devinfo); extern struct devlist pci_devq; extern uint32_t pci_generation; -#endif /* _PCIVAR_HH_ */ +#endif /* _PCIVAR_H_ */ diff --git a/freebsd/sys/dev/random/harvest.c b/freebsd/sys/dev/random/harvest.c index 68c60676..8f6efd22 100644 --- a/freebsd/sys/dev/random/harvest.c +++ b/freebsd/sys/dev/random/harvest.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2000-2004 Mark R V Murray @@ -27,24 +27,24 @@ * */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/sys/param.h> -#include <freebsd/sys/kthread.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/poll.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/random.h> -#include <freebsd/sys/selinfo.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/machine/cpu.h> - -#include <freebsd/dev/random/randomdev_soft.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kthread.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/malloc.h> +#include <sys/mutex.h> +#include <sys/poll.h> +#include <sys/queue.h> +#include <sys/random.h> +#include <sys/selinfo.h> +#include <sys/systm.h> +#include <sys/sysctl.h> + +#include <machine/cpu.h> + +#include <dev/random/randomdev_soft.h> static int read_random_phony(void *, int); diff --git a/freebsd/sys/dev/re/if_re.c b/freebsd/sys/dev/re/if_re.c index 9424f670..2327aa1f 100644 --- a/freebsd/sys/dev/re/if_re.c +++ b/freebsd/sys/dev/re/if_re.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 1997, 1998-2003 @@ -32,7 +32,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* @@ -111,52 +111,52 @@ __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/module.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/taskqueue.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 <freebsd/pci/if_rlreg.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/module.h> +#include <sys/kernel.h> +#include <sys/socket.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/sysctl.h> +#include <sys/taskqueue.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> + +#include <pci/if_rlreg.h> MODULE_DEPEND(re, pci, 1, 1, 1); MODULE_DEPEND(re, ether, 1, 1, 1); MODULE_DEPEND(re, miibus, 1, 1, 1); /* "device miibus" required. See GENERIC if you get errors here. */ -#include <freebsd/local/miibus_if.h> +#include <rtems/bsd/local/miibus_if.h> /* Tunables. */ static int msi_disable = 0; 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_ */ diff --git a/freebsd/sys/dev/usb/controller/ehci.c b/freebsd/sys/dev/usb/controller/ehci.c index 39221b7a..8a98f608 100644 --- a/freebsd/sys/dev/usb/controller/ehci.c +++ b/freebsd/sys/dev/usb/controller/ehci.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. @@ -45,47 +45,47 @@ * 1) command failures are not recovered correctly */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #define USB_DEBUG_VAR ehcidebug -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_busdma.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_transfer.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_hub.h> -#include <freebsd/dev/usb/usb_util.h> - -#include <freebsd/dev/usb/usb_controller.h> -#include <freebsd/dev/usb/usb_bus.h> -#include <freebsd/dev/usb/controller/ehci.h> -#include <freebsd/dev/usb/controller/ehcireg.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/ehci.h> +#include <dev/usb/controller/ehcireg.h> #define EHCI_BUS2SC(bus) \ ((ehci_softc_t *)(((uint8_t *)(bus)) - \ diff --git a/freebsd/sys/dev/usb/controller/ehci.h b/freebsd/sys/dev/usb/controller/ehci.h index 26ba336e..19d32426 100644 --- a/freebsd/sys/dev/usb/controller/ehci.h +++ b/freebsd/sys/dev/usb/controller/ehci.h @@ -35,8 +35,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _EHCI_HH_ -#define _EHCI_HH_ +#ifndef _EHCI_H_ +#define _EHCI_H_ #define EHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128) @@ -483,4 +483,4 @@ void ehci_resume(struct ehci_softc *sc); void ehci_shutdown(ehci_softc_t *sc); void ehci_interrupt(ehci_softc_t *sc); -#endif /* _EHCI_HH_ */ +#endif /* _EHCI_H_ */ diff --git a/freebsd/sys/dev/usb/controller/ehcireg.h b/freebsd/sys/dev/usb/controller/ehcireg.h index 7677dfad..1f5fc5c0 100644 --- a/freebsd/sys/dev/usb/controller/ehcireg.h +++ b/freebsd/sys/dev/usb/controller/ehcireg.h @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _EHCIREG_HH_ -#define _EHCIREG_HH_ +#ifndef _EHCIREG_H_ +#define _EHCIREG_H_ /* PCI config registers */ #define PCI_CBMEM 0x10 /* configuration base MEM */ @@ -168,4 +168,4 @@ #define EHCI_PORT_RESET_COMPLETE 2 /* ms */ -#endif /* _EHCIREG_HH_ */ +#endif /* _EHCIREG_H_ */ diff --git a/freebsd/sys/dev/usb/controller/ohci.c b/freebsd/sys/dev/usb/controller/ohci.c index 28261d80..6390156a 100644 --- a/freebsd/sys/dev/usb/controller/ohci.c +++ b/freebsd/sys/dev/usb/controller/ohci.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* @@ -37,44 +37,44 @@ __FBSDID("$FreeBSD$"); * USB spec: http://www.usb.org/developers/docs/usbspec.zip */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #define USB_DEBUG_VAR ohcidebug -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_busdma.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_transfer.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_hub.h> -#include <freebsd/dev/usb/usb_util.h> - -#include <freebsd/dev/usb/usb_controller.h> -#include <freebsd/dev/usb/usb_bus.h> -#include <freebsd/dev/usb/controller/ohci.h> -#include <freebsd/dev/usb/controller/ohcireg.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/ohci.h> +#include <dev/usb/controller/ohcireg.h> #define OHCI_BUS2SC(bus) \ ((ohci_softc_t *)(((uint8_t *)(bus)) - \ diff --git a/freebsd/sys/dev/usb/controller/ohci.h b/freebsd/sys/dev/usb/controller/ohci.h index 1affa420..c878af07 100644 --- a/freebsd/sys/dev/usb/controller/ohci.h +++ b/freebsd/sys/dev/usb/controller/ohci.h @@ -36,8 +36,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _OHCI_HH_ -#define _OHCI_HH_ +#ifndef _OHCI_H_ +#define _OHCI_H_ #define OHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128) @@ -273,4 +273,4 @@ void ohci_suspend(ohci_softc_t *sc); void ohci_resume(ohci_softc_t *sc); void ohci_interrupt(ohci_softc_t *sc); -#endif /* _OHCI_HH_ */ +#endif /* _OHCI_H_ */ diff --git a/freebsd/sys/dev/usb/controller/ohcireg.h b/freebsd/sys/dev/usb/controller/ohcireg.h index b3acb69b..9127a02a 100644 --- a/freebsd/sys/dev/usb/controller/ohcireg.h +++ b/freebsd/sys/dev/usb/controller/ohcireg.h @@ -36,8 +36,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _OHCIREG_HH_ -#define _OHCIREG_HH_ +#ifndef _OHCIREG_H_ +#define _OHCIREG_H_ /* PCI config registers */ #define PCI_CBMEM 0x10 /* configuration base memory */ @@ -128,4 +128,4 @@ #define OHCI_FSMPS(i) (((i-210)*6/7) << 16) #define OHCI_PERIODIC(i) ((i)*9/10) -#endif /* _OHCIREG_HH_ */ +#endif /* _OHCIREG_H_ */ diff --git a/freebsd/sys/dev/usb/controller/usb_controller.c b/freebsd/sys/dev/usb/controller/usb_controller.c index ee37c265..f4220daf 100644 --- a/freebsd/sys/dev/usb/controller/usb_controller.c +++ b/freebsd/sys/dev/usb/controller/usb_controller.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -26,43 +26,43 @@ * SUCH DAMAGE. */ -#include <freebsd/local/opt_ddb.h> - -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> +#include <rtems/bsd/local/opt_ddb.h> + +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #define USB_DEBUG_VAR usb_ctrl_debug -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_busdma.h> -#include <freebsd/dev/usb/usb_dynamic.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_hub.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_dynamic.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_hub.h> -#include <freebsd/dev/usb/usb_controller.h> -#include <freebsd/dev/usb/usb_bus.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> /* function prototypes */ diff --git a/freebsd/sys/dev/usb/quirk/usb_quirk.c b/freebsd/sys/dev/usb/quirk/usb_quirk.c index 8e597dea..6f50452b 100644 --- a/freebsd/sys/dev/usb/quirk/usb_quirk.c +++ b/freebsd/sys/dev/usb/quirk/usb_quirk.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -28,36 +28,36 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usb_ioctl.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/local/usbdevs.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usb_ioctl.h> +#include <dev/usb/usbdi.h> +#include <rtems/bsd/local/usbdevs.h> #define USB_DEBUG_VAR usb_debug -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_dynamic.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_dynamic.h> -#include <freebsd/dev/usb/quirk/usb_quirk.h> +#include <dev/usb/quirk/usb_quirk.h> MODULE_DEPEND(usb_quirk, usb, 1, 1, 1); MODULE_VERSION(usb_quirk, 1); diff --git a/freebsd/sys/dev/usb/quirk/usb_quirk.h b/freebsd/sys/dev/usb/quirk/usb_quirk.h index e8cc0dbf..522b15a4 100644 --- a/freebsd/sys/dev/usb/quirk/usb_quirk.h +++ b/freebsd/sys/dev/usb/quirk/usb_quirk.h @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB_QUIRK_HH_ -#define _USB_QUIRK_HH_ +#ifndef _USB_QUIRK_H_ +#define _USB_QUIRK_H_ enum { /* @@ -105,4 +105,4 @@ enum { uint8_t usb_test_quirk(const struct usb_attach_arg *uaa, uint16_t quirk); -#endif /* _USB_QUIRK_HH_ */ +#endif /* _USB_QUIRK_H_ */ diff --git a/freebsd/sys/dev/usb/storage/umass.c b/freebsd/sys/dev/usb/storage/umass.c index b1867dc2..f59062d9 100644 --- a/freebsd/sys/dev/usb/storage/umass.c +++ b/freebsd/sys/dev/usb/storage/umass.c @@ -1,6 +1,6 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /*- @@ -104,41 +104,41 @@ __FBSDID("$FreeBSD$"); * umass_cam_cb again to complete the CAM command. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usbdi_util.h> -#include <freebsd/local/usbdevs.h> - -#include <freebsd/dev/usb/quirk/usb_quirk.h> - -#include <freebsd/cam/cam.h> -#include <freebsd/cam/cam_ccb.h> -#include <freebsd/cam/cam_sim.h> -#include <freebsd/cam/cam_xpt_sim.h> -#include <freebsd/cam/scsi/scsi_all.h> -#include <freebsd/cam/scsi/scsi_da.h> - -#include <freebsd/cam/cam_periph.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> +#include <rtems/bsd/local/usbdevs.h> + +#include <dev/usb/quirk/usb_quirk.h> + +#include <cam/cam.h> +#include <cam/cam_ccb.h> +#include <cam/cam_sim.h> +#include <cam/cam_xpt_sim.h> +#include <cam/scsi/scsi_all.h> +#include <cam/scsi/scsi_da.h> + +#include <cam/cam_periph.h> #define UMASS_EXT_BUFFER #ifdef UMASS_EXT_BUFFER diff --git a/freebsd/sys/dev/usb/ufm_ioctl.h b/freebsd/sys/dev/usb/ufm_ioctl.h index 20a0b96e..921b3d4f 100644 --- a/freebsd/sys/dev/usb/ufm_ioctl.h +++ b/freebsd/sys/dev/usb/ufm_ioctl.h @@ -30,7 +30,7 @@ /* $FreeBSD$ */ -#include <freebsd/sys/ioccom.h> +#include <sys/ioccom.h> #define FM_SET_FREQ _IOWR('U', 200, int) #define FM_GET_FREQ _IOWR('U', 201, int) diff --git a/freebsd/sys/dev/usb/usb.h b/freebsd/sys/dev/usb/usb.h index 9a6cb8f7..433a0471 100644 --- a/freebsd/sys/dev/usb/usb.h +++ b/freebsd/sys/dev/usb/usb.h @@ -36,26 +36,26 @@ * USB v3.0 */ -#ifndef _USB_STANDARD_HH_ -#define _USB_STANDARD_HH_ +#ifndef _USB_STANDARD_H_ +#define _USB_STANDARD_H_ #if defined(_KERNEL) -#include <freebsd/local/opt_usb.h> +#include <rtems/bsd/local/opt_usb.h> /* Declare parent SYSCTL USB node. */ #ifdef SYSCTL_DECL SYSCTL_DECL(_hw_usb); #endif -#include <freebsd/sys/malloc.h> +#include <sys/malloc.h> MALLOC_DECLARE(M_USB); MALLOC_DECLARE(M_USBDEV); MALLOC_DECLARE(M_USBHC); #endif /* _KERNEL */ -#include <freebsd/dev/usb/usb_endian.h> -#include <freebsd/dev/usb/usb_freebsd.h> +#include <dev/usb/usb_endian.h> +#include <dev/usb/usb_freebsd.h> #define USB_STACK_VERSION 2000 /* 2.0 */ @@ -752,4 +752,4 @@ enum usb_dev_state { USB_STATE_CONFIGURED, }; #define USB_STATE_MAX (USB_STATE_CONFIGURED+1) -#endif /* _USB_STANDARD_HH_ */ +#endif /* _USB_STANDARD_H_ */ diff --git a/freebsd/sys/dev/usb/usb_bus.h b/freebsd/sys/dev/usb/usb_bus.h index b437fac0..c9840fcb 100644 --- a/freebsd/sys/dev/usb/usb_bus.h +++ b/freebsd/sys/dev/usb/usb_bus.h @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB_BUS_HH_ -#define _USB_BUS_HH_ +#ifndef _USB_BUS_H_ +#define _USB_BUS_H_ /* * The following structure defines the USB explore message sent to the USB @@ -111,4 +111,4 @@ struct usb_bus { } scratch[1]; }; -#endif /* _USB_BUS_HH_ */ +#endif /* _USB_BUS_H_ */ diff --git a/freebsd/sys/dev/usb/usb_busdma.c b/freebsd/sys/dev/usb/usb_busdma.c index 979136b8..e08bcbd3 100644 --- a/freebsd/sys/dev/usb/usb_busdma.c +++ b/freebsd/sys/dev/usb/usb_busdma.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -26,42 +26,42 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usbdi_util.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> #define USB_DEBUG_VAR usb_debug -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_busdma.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_transfer.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_util.h> -#include <freebsd/dev/usb/usb_debug.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_controller.h> -#include <freebsd/dev/usb/usb_bus.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> #if USB_HAVE_BUSDMA static void usb_dma_tag_create(struct usb_dma_tag *, usb_size_t, usb_size_t); diff --git a/freebsd/sys/dev/usb/usb_busdma.h b/freebsd/sys/dev/usb/usb_busdma.h index bd761819..6b6e4039 100644 --- a/freebsd/sys/dev/usb/usb_busdma.h +++ b/freebsd/sys/dev/usb/usb_busdma.h @@ -24,13 +24,13 @@ * SUCH DAMAGE. */ -#ifndef _USB_BUSDMA_HH_ -#define _USB_BUSDMA_HH_ +#ifndef _USB_BUSDMA_H_ +#define _USB_BUSDMA_H_ -#include <freebsd/sys/uio.h> -#include <freebsd/sys/mbuf.h> +#include <sys/uio.h> +#include <sys/mbuf.h> -#include <freebsd/machine/bus.h> +#include <machine/bus.h> /* defines */ @@ -158,4 +158,4 @@ void usb_pc_cpu_invalidate(struct usb_page_cache *pc); void usb_pc_dmamap_destroy(struct usb_page_cache *pc); void usb_pc_free_mem(struct usb_page_cache *pc); -#endif /* _USB_BUSDMA_HH_ */ +#endif /* _USB_BUSDMA_H_ */ diff --git a/freebsd/sys/dev/usb/usb_cdc.h b/freebsd/sys/dev/usb/usb_cdc.h index 632cfe9c..23fd111c 100644 --- a/freebsd/sys/dev/usb/usb_cdc.h +++ b/freebsd/sys/dev/usb/usb_cdc.h @@ -38,8 +38,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _USB_CDC_HH_ -#define _USB_CDC_HH_ +#ifndef _USB_CDC_H_ +#define _USB_CDC_H_ #define UDESCSUB_CDC_HEADER 0 #define UDESCSUB_CDC_CM 1 /* Call Management */ @@ -292,4 +292,4 @@ struct usb_ncm_parameters { #define UCDC_NCM_NOTIF_RESPONSE_AVAILABLE 0x01 #define UCDC_NCM_NOTIF_CONNECTION_SPEED_CHANGE 0x2A -#endif /* _USB_CDC_HH_ */ +#endif /* _USB_CDC_H_ */ diff --git a/freebsd/sys/dev/usb/usb_controller.h b/freebsd/sys/dev/usb/usb_controller.h index 8f3f3de4..6b15dab9 100644 --- a/freebsd/sys/dev/usb/usb_controller.h +++ b/freebsd/sys/dev/usb/usb_controller.h @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB_CONTROLLER_HH_ -#define _USB_CONTROLLER_HH_ +#ifndef _USB_CONTROLLER_H_ +#define _USB_CONTROLLER_H_ /* defines */ @@ -222,4 +222,4 @@ uint16_t usb_isoc_time_expand(struct usb_bus *bus, uint16_t isoc_time_curr); uint16_t usbd_fs_isoc_schedule_isoc_time_expand(struct usb_device *udev, struct usb_fs_isoc_schedule **pp_start, struct usb_fs_isoc_schedule **pp_end, uint16_t isoc_time); uint8_t usbd_fs_isoc_schedule_alloc(struct usb_fs_isoc_schedule *fss, uint8_t *pstart, uint16_t len); -#endif /* _USB_CONTROLLER_HH_ */ +#endif /* _USB_CONTROLLER_H_ */ diff --git a/freebsd/sys/dev/usb/usb_core.c b/freebsd/sys/dev/usb/usb_core.c index 17f9d903..38504363 100644 --- a/freebsd/sys/dev/usb/usb_core.c +++ b/freebsd/sys/dev/usb/usb_core.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -32,28 +32,28 @@ * http://www.usb.org/developers/devclass_docs/ */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> MALLOC_DEFINE(M_USB, "USB", "USB"); MALLOC_DEFINE(M_USBDEV, "USBdev", "USB device"); diff --git a/freebsd/sys/dev/usb/usb_core.h b/freebsd/sys/dev/usb/usb_core.h index 9d724171..3dfd0d1a 100644 --- a/freebsd/sys/dev/usb/usb_core.h +++ b/freebsd/sys/dev/usb/usb_core.h @@ -28,8 +28,8 @@ * Including this file is mandatory for all USB related c-files in the kernel. */ -#ifndef _USB_CORE_HH_ -#define _USB_CORE_HH_ +#ifndef _USB_CORE_H_ +#define _USB_CORE_H_ /* * The following macro will tell if an USB transfer is currently @@ -180,4 +180,4 @@ typedef struct malloc_type *usb_malloc_type; /* prototypes */ -#endif /* _USB_CORE_HH_ */ +#endif /* _USB_CORE_H_ */ diff --git a/freebsd/sys/dev/usb/usb_debug.c b/freebsd/sys/dev/usb/usb_debug.c index 907d31e1..40dafa20 100644 --- a/freebsd/sys/dev/usb/usb_debug.c +++ b/freebsd/sys/dev/usb/usb_debug.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -26,38 +26,38 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> - -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_busdma.h> -#include <freebsd/dev/usb/usb_transfer.h> - -#include <freebsd/ddb/ddb.h> -#include <freebsd/ddb/db_sym.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> + +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_transfer.h> + +#include <ddb/ddb.h> +#include <ddb/db_sym.h> /* * Define this unconditionally in case a kernel module is loaded that diff --git a/freebsd/sys/dev/usb/usb_debug.h b/freebsd/sys/dev/usb/usb_debug.h index aa3a5a49..8718c89b 100644 --- a/freebsd/sys/dev/usb/usb_debug.h +++ b/freebsd/sys/dev/usb/usb_debug.h @@ -26,8 +26,8 @@ /* This file contains various factored out debug macros. */ -#ifndef _USB_DEBUG_HH_ -#define _USB_DEBUG_HH_ +#ifndef _USB_DEBUG_H_ +#define _USB_DEBUG_H_ /* Declare global USB debug variable. */ extern int usb_debug; @@ -59,4 +59,4 @@ void usb_dump_queue(struct usb_endpoint *ep); void usb_dump_endpoint(struct usb_endpoint *ep); void usb_dump_xfer(struct usb_xfer *xfer); -#endif /* _USB_DEBUG_HH_ */ +#endif /* _USB_DEBUG_H_ */ diff --git a/freebsd/sys/dev/usb/usb_dev.c b/freebsd/sys/dev/usb/usb_dev.c index 3517f7cc..eaad5952 100644 --- a/freebsd/sys/dev/usb/usb_dev.c +++ b/freebsd/sys/dev/usb/usb_dev.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -29,57 +29,57 @@ * usb_dev.c - An abstraction layer for creating devices under /dev/... */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> #ifndef __rtems__ -#include <freebsd/sys/vnode.h> +#include <sys/vnode.h> #endif -#include <freebsd/sys/conf.h> -#include <freebsd/sys/fcntl.h> +#include <sys/conf.h> +#include <sys/fcntl.h> -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usb_ioctl.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usbdi_util.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_ioctl.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> #define USB_DEBUG_VAR usb_fifo_debug -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_dev.h> -#include <freebsd/dev/usb/usb_mbuf.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_busdma.h> -#include <freebsd/dev/usb/usb_generic.h> -#include <freebsd/dev/usb/usb_dynamic.h> -#include <freebsd/dev/usb/usb_util.h> - -#include <freebsd/dev/usb/usb_controller.h> -#include <freebsd/dev/usb/usb_bus.h> - -#include <freebsd/sys/filio.h> -#include <freebsd/sys/ttycom.h> -#include <freebsd/sys/syscallsubr.h> - -#include <freebsd/machine/stdarg.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_dev.h> +#include <dev/usb/usb_mbuf.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_generic.h> +#include <dev/usb/usb_dynamic.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> + +#include <sys/filio.h> +#include <sys/ttycom.h> +#include <sys/syscallsubr.h> + +#include <machine/stdarg.h> #if USB_HAVE_UGEN diff --git a/freebsd/sys/dev/usb/usb_dev.h b/freebsd/sys/dev/usb/usb_dev.h index ccf873bd..aa9197f5 100644 --- a/freebsd/sys/dev/usb/usb_dev.h +++ b/freebsd/sys/dev/usb/usb_dev.h @@ -24,14 +24,14 @@ * SUCH DAMAGE. */ -#ifndef _USB_DEV_HH_ -#define _USB_DEV_HH_ +#ifndef _USB_DEV_H_ +#define _USB_DEV_H_ -#include <freebsd/sys/file.h> -#include <freebsd/sys/selinfo.h> -#include <freebsd/sys/poll.h> -#include <freebsd/sys/signalvar.h> -#include <freebsd/sys/proc.h> +#include <sys/file.h> +#include <sys/selinfo.h> +#include <sys/poll.h> +#include <sys/signalvar.h> +#include <sys/proc.h> struct usb_fifo; struct usb_mbuf; @@ -151,4 +151,4 @@ void usb_free_symlink(struct usb_symlink *ps); int usb_read_symlink(uint8_t *user_ptr, uint32_t startentry, uint32_t user_len); -#endif /* _USB_DEV_HH_ */ +#endif /* _USB_DEV_H_ */ diff --git a/freebsd/sys/dev/usb/usb_device.c b/freebsd/sys/dev/usb/usb_device.c index 1d5b5182..a2db2727 100644 --- a/freebsd/sys/dev/usb/usb_device.c +++ b/freebsd/sys/dev/usb/usb_device.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -26,61 +26,61 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> -#include <freebsd/sys/conf.h> -#include <freebsd/sys/fcntl.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usbdi_util.h> -#include <freebsd/dev/usb/usb_ioctl.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> +#include <sys/conf.h> +#include <sys/fcntl.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> +#include <dev/usb/usb_ioctl.h> #if USB_HAVE_UGEN -#include <freebsd/sys/sbuf.h> +#include <sys/sbuf.h> #endif -#include <freebsd/local/usbdevs.h> +#include <rtems/bsd/local/usbdevs.h> #define USB_DEBUG_VAR usb_debug -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_busdma.h> -#include <freebsd/dev/usb/usb_transfer.h> -#include <freebsd/dev/usb/usb_request.h> -#include <freebsd/dev/usb/usb_dynamic.h> -#include <freebsd/dev/usb/usb_hub.h> -#include <freebsd/dev/usb/usb_util.h> -#include <freebsd/dev/usb/usb_msctest.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_dynamic.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_msctest.h> #if USB_HAVE_UGEN -#include <freebsd/dev/usb/usb_dev.h> -#include <freebsd/dev/usb/usb_generic.h> +#include <dev/usb/usb_dev.h> +#include <dev/usb/usb_generic.h> #endif -#include <freebsd/dev/usb/quirk/usb_quirk.h> +#include <dev/usb/quirk/usb_quirk.h> -#include <freebsd/dev/usb/usb_controller.h> -#include <freebsd/dev/usb/usb_bus.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> /* function prototypes */ @@ -2216,8 +2216,8 @@ struct usb_knowndev { #define USB_KNOWNDEV_NOPROD 0x01 /* match on vendor only */ -#include <freebsd/local/usbdevs.h> -#include <freebsd/local/usbdevs_data.h> +#include <rtems/bsd/local/usbdevs.h> +#include <rtems/bsd/local/usbdevs_data.h> #endif /* USB_VERBOSE */ static void diff --git a/freebsd/sys/dev/usb/usb_device.h b/freebsd/sys/dev/usb/usb_device.h index eb6a3fcb..c8bc5eb9 100644 --- a/freebsd/sys/dev/usb/usb_device.h +++ b/freebsd/sys/dev/usb/usb_device.h @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB_DEVICE_HH_ -#define _USB_DEVICE_HH_ +#ifndef _USB_DEVICE_H_ +#define _USB_DEVICE_H_ struct usb_symlink; /* UGEN */ struct usb_device; /* linux compat */ @@ -224,4 +224,4 @@ void usbd_sr_lock(struct usb_device *); void usbd_sr_unlock(struct usb_device *); uint8_t usbd_enum_is_locked(struct usb_device *); -#endif /* _USB_DEVICE_HH_ */ +#endif /* _USB_DEVICE_H_ */ diff --git a/freebsd/sys/dev/usb/usb_dynamic.c b/freebsd/sys/dev/usb/usb_dynamic.c index 7651f97e..cb54d10f 100644 --- a/freebsd/sys/dev/usb/usb_dynamic.c +++ b/freebsd/sys/dev/usb/usb_dynamic.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -26,33 +26,33 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> - -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_dynamic.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> + +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_dynamic.h> /* function prototypes */ static usb_handle_req_t usb_temp_get_desc_w; diff --git a/freebsd/sys/dev/usb/usb_dynamic.h b/freebsd/sys/dev/usb/usb_dynamic.h index 32fc8362..56849420 100644 --- a/freebsd/sys/dev/usb/usb_dynamic.h +++ b/freebsd/sys/dev/usb/usb_dynamic.h @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB_DYNAMIC_HH_ -#define _USB_DYNAMIC_HH_ +#ifndef _USB_DYNAMIC_H_ +#define _USB_DYNAMIC_H_ /* prototypes */ @@ -58,4 +58,4 @@ void usb_temp_unload(void *); void usb_quirk_unload(void *); void usb_bus_unload(void *); -#endif /* _USB_DYNAMIC_HH_ */ +#endif /* _USB_DYNAMIC_H_ */ diff --git a/freebsd/sys/dev/usb/usb_endian.h b/freebsd/sys/dev/usb/usb_endian.h index 54c965d7..29479f13 100644 --- a/freebsd/sys/dev/usb/usb_endian.h +++ b/freebsd/sys/dev/usb/usb_endian.h @@ -24,11 +24,11 @@ * SUCH DAMAGE. */ -#ifndef _USB_ENDIAN_HH_ -#define _USB_ENDIAN_HH_ +#ifndef _USB_ENDIAN_H_ +#define _USB_ENDIAN_H_ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/endian.h> +#include <sys/stdint.h> +#include <sys/endian.h> /* * Declare the basic USB record types. USB records have an alignment @@ -116,4 +116,4 @@ typedef uint8_t uQWord[8]; (w)[7] = (uint8_t)(b7); \ } while (0) -#endif /* _USB_ENDIAN_HH_ */ +#endif /* _USB_ENDIAN_H_ */ diff --git a/freebsd/sys/dev/usb/usb_error.c b/freebsd/sys/dev/usb/usb_error.c index b9798a15..4505490d 100644 --- a/freebsd/sys/dev/usb/usb_error.c +++ b/freebsd/sys/dev/usb/usb_error.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -26,28 +26,28 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> static const char* usb_errstr_table[USB_ERR_MAX] = { [USB_ERR_NORMAL_COMPLETION] = "USB_ERR_NORMAL_COMPLETION", diff --git a/freebsd/sys/dev/usb/usb_freebsd.h b/freebsd/sys/dev/usb/usb_freebsd.h index ed0f0356..3045ec32 100644 --- a/freebsd/sys/dev/usb/usb_freebsd.h +++ b/freebsd/sys/dev/usb/usb_freebsd.h @@ -28,8 +28,8 @@ * Including this file is mandatory for all USB related c-files in the kernel. */ -#ifndef _USB_FREEBSD_HH_ -#define _USB_FREEBSD_HH_ +#ifndef _USB_FREEBSD_H_ +#define _USB_FREEBSD_H_ /* Default USB configuration */ #ifndef __rtems__ @@ -66,4 +66,4 @@ typedef uint32_t usb_size_t; /* bytes */ typedef uint32_t usb_ticks_t; /* system defined */ typedef uint16_t usb_power_mask_t; /* see "USB_HW_POWER_XXX" */ -#endif /* _USB_FREEBSD_HH_ */ +#endif /* _USB_FREEBSD_H_ */ diff --git a/freebsd/sys/dev/usb/usb_generic.c b/freebsd/sys/dev/usb/usb_generic.c index 89217a93..60b24794 100644 --- a/freebsd/sys/dev/usb/usb_generic.c +++ b/freebsd/sys/dev/usb/usb_generic.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -26,50 +26,50 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> -#include <freebsd/sys/conf.h> -#include <freebsd/sys/fcntl.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usb_ioctl.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usbdi_util.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> +#include <sys/conf.h> +#include <sys/fcntl.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usb_ioctl.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> #define USB_DEBUG_VAR ugen_debug -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_dev.h> -#include <freebsd/dev/usb/usb_mbuf.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_request.h> -#include <freebsd/dev/usb/usb_busdma.h> -#include <freebsd/dev/usb/usb_util.h> -#include <freebsd/dev/usb/usb_hub.h> -#include <freebsd/dev/usb/usb_generic.h> -#include <freebsd/dev/usb/usb_transfer.h> - -#include <freebsd/dev/usb/usb_controller.h> -#include <freebsd/dev/usb/usb_bus.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_dev.h> +#include <dev/usb/usb_mbuf.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_generic.h> +#include <dev/usb/usb_transfer.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> #if USB_HAVE_UGEN diff --git a/freebsd/sys/dev/usb/usb_generic.h b/freebsd/sys/dev/usb/usb_generic.h index 17506001..835ec72a 100644 --- a/freebsd/sys/dev/usb/usb_generic.h +++ b/freebsd/sys/dev/usb/usb_generic.h @@ -24,10 +24,10 @@ * SUCH DAMAGE. */ -#ifndef _USB_GENERIC_HH_ -#define _USB_GENERIC_HH_ +#ifndef _USB_GENERIC_H_ +#define _USB_GENERIC_H_ extern struct usb_fifo_methods usb_ugen_methods; int ugen_do_request(struct usb_fifo *f, struct usb_ctl_request *ur); -#endif /* _USB_GENERIC_HH_ */ +#endif /* _USB_GENERIC_H_ */ diff --git a/freebsd/sys/dev/usb/usb_handle_request.c b/freebsd/sys/dev/usb/usb_handle_request.c index 40428d8b..97d30394 100644 --- a/freebsd/sys/dev/usb/usb_handle_request.c +++ b/freebsd/sys/dev/usb/usb_handle_request.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -26,44 +26,44 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usbdi_util.h> -#include <freebsd/local/usb_if.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> +#include <rtems/bsd/local/usb_if.h> #define USB_DEBUG_VAR usb_debug -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_busdma.h> -#include <freebsd/dev/usb/usb_transfer.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_dynamic.h> -#include <freebsd/dev/usb/usb_hub.h> - -#include <freebsd/dev/usb/usb_controller.h> -#include <freebsd/dev/usb/usb_bus.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_dynamic.h> +#include <dev/usb/usb_hub.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> /* function prototypes */ diff --git a/freebsd/sys/dev/usb/usb_hid.c b/freebsd/sys/dev/usb/usb_hid.c index b1780aff..e99cdb0b 100644 --- a/freebsd/sys/dev/usb/usb_hid.c +++ b/freebsd/sys/dev/usb/usb_hid.c @@ -1,9 +1,9 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $NetBSD: hid.c,v 1.17 2001/11/13 06:24:53 lukem Exp $ */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,38 +42,38 @@ __FBSDID("$FreeBSD$"); * POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usbdi_util.h> -#include <freebsd/dev/usb/usbhid.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> +#include <dev/usb/usbhid.h> #define USB_DEBUG_VAR usb_debug -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_request.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_request.h> static void hid_clear_local(struct hid_item *); static uint8_t hid_get_byte(struct hid_data *s, const uint16_t wSize); diff --git a/freebsd/sys/dev/usb/usb_hub.c b/freebsd/sys/dev/usb/usb_hub.c index 4f34f25e..c20bde30 100644 --- a/freebsd/sys/dev/usb/usb_hub.c +++ b/freebsd/sys/dev/usb/usb_hub.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -32,46 +32,46 @@ * USB spec: http://www.usb.org/developers/docs/usbspec.zip */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usb_ioctl.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usbdi_util.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usb_ioctl.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> #define USB_DEBUG_VAR uhub_debug -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_request.h> -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_hub.h> -#include <freebsd/dev/usb/usb_util.h> -#include <freebsd/dev/usb/usb_busdma.h> -#include <freebsd/dev/usb/usb_transfer.h> -#include <freebsd/dev/usb/usb_dynamic.h> - -#include <freebsd/dev/usb/usb_controller.h> -#include <freebsd/dev/usb/usb_bus.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_dynamic.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> #define UHUB_INTR_INTERVAL 250 /* ms */ #define UHUB_N_TRANSFER 1 diff --git a/freebsd/sys/dev/usb/usb_hub.h b/freebsd/sys/dev/usb/usb_hub.h index 6f4637da..0f595997 100644 --- a/freebsd/sys/dev/usb/usb_hub.h +++ b/freebsd/sys/dev/usb/usb_hub.h @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB_HUB_HH_ -#define _USB_HUB_HH_ +#ifndef _USB_HUB_H_ +#define _USB_HUB_H_ /* * The following structure defines an USB port. @@ -80,4 +80,4 @@ void usb_bus_powerd(struct usb_bus *bus); void uhub_root_intr(struct usb_bus *, const uint8_t *, uint8_t); usb_error_t uhub_query_info(struct usb_device *, uint8_t *, uint8_t *); -#endif /* _USB_HUB_HH_ */ +#endif /* _USB_HUB_H_ */ diff --git a/freebsd/sys/dev/usb/usb_ioctl.h b/freebsd/sys/dev/usb/usb_ioctl.h index 99e21f09..f9018e28 100644 --- a/freebsd/sys/dev/usb/usb_ioctl.h +++ b/freebsd/sys/dev/usb/usb_ioctl.h @@ -26,15 +26,15 @@ * SUCH DAMAGE. */ -#ifndef _USB_IOCTL_HH_ -#define _USB_IOCTL_HH_ +#ifndef _USB_IOCTL_H_ +#define _USB_IOCTL_H_ -#include <freebsd/sys/ioccom.h> +#include <sys/ioccom.h> /* Building "kdump" depends on these includes */ -#include <freebsd/dev/usb/usb_endian.h> -#include <freebsd/dev/usb/usb.h> +#include <dev/usb/usb_endian.h> +#include <dev/usb/usb.h> #define USB_DEVICE_NAME "usbctl" #define USB_DEVICE_DIR "usb" @@ -269,4 +269,4 @@ struct usb_gen_quirk { #define USB_DEV_QUIRK_ADD _IOW ('Q', 2, struct usb_gen_quirk) #define USB_DEV_QUIRK_REMOVE _IOW ('Q', 3, struct usb_gen_quirk) -#endif /* _USB_IOCTL_HH_ */ +#endif /* _USB_IOCTL_H_ */ diff --git a/freebsd/sys/dev/usb/usb_lookup.c b/freebsd/sys/dev/usb/usb_lookup.c index c730b6ba..b7ce2522 100644 --- a/freebsd/sys/dev/usb/usb_lookup.c +++ b/freebsd/sys/dev/usb/usb_lookup.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -26,28 +26,28 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> /*------------------------------------------------------------------------* * usbd_lookup_id_by_info diff --git a/freebsd/sys/dev/usb/usb_mbuf.c b/freebsd/sys/dev/usb/usb_mbuf.c index 5aa99df4..f2649679 100644 --- a/freebsd/sys/dev/usb/usb_mbuf.c +++ b/freebsd/sys/dev/usb/usb_mbuf.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -26,30 +26,30 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usb_dev.h> -#include <freebsd/dev/usb/usb_mbuf.h> +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usb_dev.h> +#include <dev/usb/usb_mbuf.h> /*------------------------------------------------------------------------* * usb_alloc_mbufs - allocate mbufs to an usbd interface queue diff --git a/freebsd/sys/dev/usb/usb_mbuf.h b/freebsd/sys/dev/usb/usb_mbuf.h index 44dba71b..3b331ffc 100644 --- a/freebsd/sys/dev/usb/usb_mbuf.h +++ b/freebsd/sys/dev/usb/usb_mbuf.h @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB_MBUF_HH_ -#define _USB_MBUF_HH_ +#ifndef _USB_MBUF_H_ +#define _USB_MBUF_H_ /* * The following structure defines a minimum re-implementation of the @@ -87,4 +87,4 @@ struct usb_mbuf { void *usb_alloc_mbufs(struct malloc_type *type, struct usb_ifqueue *ifq, usb_size_t block_size, uint16_t nblocks); -#endif /* _USB_MBUF_HH_ */ +#endif /* _USB_MBUF_H_ */ diff --git a/freebsd/sys/dev/usb/usb_msctest.c b/freebsd/sys/dev/usb/usb_msctest.c index 0b773e29..77f199be 100644 --- a/freebsd/sys/dev/usb/usb_msctest.c +++ b/freebsd/sys/dev/usb/usb_msctest.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -34,42 +34,42 @@ * mass storage quirks for not supported SCSI commands! */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usbdi_util.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> #define USB_DEBUG_VAR usb_debug -#include <freebsd/dev/usb/usb_busdma.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_transfer.h> -#include <freebsd/dev/usb/usb_msctest.h> -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_busdma.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_request.h> -#include <freebsd/dev/usb/usb_util.h> -#include <freebsd/dev/usb/quirk/usb_quirk.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_msctest.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/quirk/usb_quirk.h> enum { ST_COMMAND, diff --git a/freebsd/sys/dev/usb/usb_msctest.h b/freebsd/sys/dev/usb/usb_msctest.h index 6ba2c3fd..807d5f5d 100644 --- a/freebsd/sys/dev/usb/usb_msctest.h +++ b/freebsd/sys/dev/usb/usb_msctest.h @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB_MSCTEST_HH_ -#define _USB_MSCTEST_HH_ +#ifndef _USB_MSCTEST_H_ +#define _USB_MSCTEST_H_ enum { MSC_EJECT_STOPUNIT, @@ -41,4 +41,4 @@ int usb_iface_is_cdrom(struct usb_device *udev, usb_error_t usb_msc_eject(struct usb_device *udev, uint8_t iface_index, int method); -#endif /* _USB_MSCTEST_HH_ */ +#endif /* _USB_MSCTEST_H_ */ diff --git a/freebsd/sys/dev/usb/usb_parse.c b/freebsd/sys/dev/usb/usb_parse.c index 8681a94a..6b055db7 100644 --- a/freebsd/sys/dev/usb/usb_parse.c +++ b/freebsd/sys/dev/usb/usb_parse.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -26,29 +26,29 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usbdi_util.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> /*------------------------------------------------------------------------* diff --git a/freebsd/sys/dev/usb/usb_process.c b/freebsd/sys/dev/usb/usb_process.c index cfaa5ee6..67ddf693 100644 --- a/freebsd/sys/dev/usb/usb_process.c +++ b/freebsd/sys/dev/usb/usb_process.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -28,36 +28,36 @@ #define USB_DEBUG_VAR usb_proc_debug -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usbdi_util.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_util.h> - -#include <freebsd/sys/proc.h> -#include <freebsd/sys/kthread.h> -#include <freebsd/sys/sched.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_util.h> + +#include <sys/proc.h> +#include <sys/kthread.h> +#include <sys/sched.h> #if (__FreeBSD_version < 700000) #define thread_lock(td) mtx_lock_spin(&sched_lock) diff --git a/freebsd/sys/dev/usb/usb_process.h b/freebsd/sys/dev/usb/usb_process.h index 75c86ece..f9a3c38d 100644 --- a/freebsd/sys/dev/usb/usb_process.h +++ b/freebsd/sys/dev/usb/usb_process.h @@ -24,10 +24,10 @@ * SUCH DAMAGE. */ -#ifndef _USB_PROCESS_HH_ -#define _USB_PROCESS_HH_ +#ifndef _USB_PROCESS_H_ +#define _USB_PROCESS_H_ -#include <freebsd/sys/priority.h> +#include <sys/priority.h> /* defines */ #define USB_PRI_HIGH PI_NET @@ -81,4 +81,4 @@ void usb_proc_free(struct usb_process *up); void *usb_proc_msignal(struct usb_process *up, void *pm0, void *pm1); void usb_proc_rewakeup(struct usb_process *up); -#endif /* _USB_PROCESS_HH_ */ +#endif /* _USB_PROCESS_H_ */ diff --git a/freebsd/sys/dev/usb/usb_request.c b/freebsd/sys/dev/usb/usb_request.c index 61dafd7d..8d17c202 100644 --- a/freebsd/sys/dev/usb/usb_request.c +++ b/freebsd/sys/dev/usb/usb_request.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -28,47 +28,47 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usbdi_util.h> -#include <freebsd/dev/usb/usb_ioctl.h> -#include <freebsd/dev/usb/usbhid.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> +#include <dev/usb/usb_ioctl.h> +#include <dev/usb/usbhid.h> #define USB_DEBUG_VAR usb_debug -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_busdma.h> -#include <freebsd/dev/usb/usb_request.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_transfer.h> -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_util.h> -#include <freebsd/dev/usb/usb_dynamic.h> - -#include <freebsd/dev/usb/usb_controller.h> -#include <freebsd/dev/usb/usb_bus.h> -#include <freebsd/sys/ctype.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_dynamic.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <sys/ctype.h> #ifdef USB_DEBUG static int usb_pr_poll_delay = USB_PORT_RESET_DELAY; diff --git a/freebsd/sys/dev/usb/usb_request.h b/freebsd/sys/dev/usb/usb_request.h index 0cf882dc..12f373d5 100644 --- a/freebsd/sys/dev/usb/usb_request.h +++ b/freebsd/sys/dev/usb/usb_request.h @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB_REQUEST_HH_ -#define _USB_REQUEST_HH_ +#ifndef _USB_REQUEST_H_ +#define _USB_REQUEST_H_ struct usb_process; @@ -86,4 +86,4 @@ usb_error_t usbd_req_set_hub_u2_timeout(struct usb_device *udev, usb_error_t usbd_req_set_hub_depth(struct usb_device *udev, struct mtx *mtx, uint16_t depth); -#endif /* _USB_REQUEST_HH_ */ +#endif /* _USB_REQUEST_H_ */ diff --git a/freebsd/sys/dev/usb/usb_transfer.c b/freebsd/sys/dev/usb/usb_transfer.c index caf3d31b..17a492e5 100644 --- a/freebsd/sys/dev/usb/usb_transfer.c +++ b/freebsd/sys/dev/usb/usb_transfer.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -26,44 +26,44 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usbdi_util.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> #define USB_DEBUG_VAR usb_debug -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_busdma.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_transfer.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_debug.h> -#include <freebsd/dev/usb/usb_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_util.h> -#include <freebsd/dev/usb/usb_controller.h> -#include <freebsd/dev/usb/usb_bus.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> #ifdef __rtems__ -#include <freebsd/machine/rtems-bsd-cache.h> +#include <machine/rtems-bsd-cache.h> #endif /* __rtems__ */ struct usb_std_packet_size { diff --git a/freebsd/sys/dev/usb/usb_transfer.h b/freebsd/sys/dev/usb/usb_transfer.h index eb2abd0c..71157ca7 100644 --- a/freebsd/sys/dev/usb/usb_transfer.h +++ b/freebsd/sys/dev/usb/usb_transfer.h @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB_TRANSFER_HH_ -#define _USB_TRANSFER_HH_ +#ifndef _USB_TRANSFER_H_ +#define _USB_TRANSFER_H_ /* * The following structure defines the messages that is used to signal @@ -137,4 +137,4 @@ void usbd_transfer_timeout_ms(struct usb_xfer *xfer, usb_timeout_t usbd_get_dma_delay(struct usb_device *udev); void usbd_transfer_power_ref(struct usb_xfer *xfer, int val); -#endif /* _USB_TRANSFER_HH_ */ +#endif /* _USB_TRANSFER_H_ */ diff --git a/freebsd/sys/dev/usb/usb_util.c b/freebsd/sys/dev/usb/usb_util.c index 3bd1f8c4..14c0476a 100644 --- a/freebsd/sys/dev/usb/usb_util.c +++ b/freebsd/sys/dev/usb/usb_util.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /*- @@ -26,39 +26,39 @@ * SUCH DAMAGE. */ -#include <freebsd/sys/stdint.h> -#include <freebsd/sys/stddef.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/bus.h> -#include <freebsd/sys/linker_set.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/condvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/sx.h> -#include <freebsd/sys/unistd.h> -#include <freebsd/sys/callout.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/priv.h> - -#include <freebsd/dev/usb/usb.h> -#include <freebsd/dev/usb/usbdi.h> -#include <freebsd/dev/usb/usbdi_util.h> - -#include <freebsd/dev/usb/usb_core.h> -#include <freebsd/dev/usb/usb_util.h> -#include <freebsd/dev/usb/usb_process.h> -#include <freebsd/dev/usb/usb_device.h> -#include <freebsd/dev/usb/usb_request.h> -#include <freebsd/dev/usb/usb_busdma.h> - -#include <freebsd/dev/usb/usb_controller.h> -#include <freebsd/dev/usb/usb_bus.h> +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <rtems/bsd/sys/param.h> +#include <sys/queue.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/linker_set.h> +#include <sys/module.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <rtems/bsd/sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> + +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> /*------------------------------------------------------------------------* * device_delete_all_children - delete all children of a device diff --git a/freebsd/sys/dev/usb/usb_util.h b/freebsd/sys/dev/usb/usb_util.h index 9e001088..35abeddd 100644 --- a/freebsd/sys/dev/usb/usb_util.h +++ b/freebsd/sys/dev/usb/usb_util.h @@ -24,12 +24,12 @@ * SUCH DAMAGE. */ -#ifndef _USB_UTIL_HH_ -#define _USB_UTIL_HH_ +#ifndef _USB_UTIL_H_ +#define _USB_UTIL_H_ int device_delete_all_children(device_t dev); uint8_t usb_make_str_desc(void *ptr, uint16_t max_len, const char *s); void usb_printbcd(char *p, uint16_t p_len, uint16_t bcd); void usb_trim_spaces(char *p); -#endif /* _USB_UTIL_HH_ */ +#endif /* _USB_UTIL_H_ */ diff --git a/freebsd/sys/dev/usb/usbdi.h b/freebsd/sys/dev/usb/usbdi.h index a3f0630f..1c2d412b 100644 --- a/freebsd/sys/dev/usb/usbdi.h +++ b/freebsd/sys/dev/usb/usbdi.h @@ -23,8 +23,8 @@ * * $FreeBSD$ */ -#ifndef _USB_USBDI_HH_ -#define _USB_USBDI_HH_ +#ifndef _USB_USBDI_H_ +#define _USB_USBDI_H_ struct usb_fifo; struct usb_xfer; @@ -101,7 +101,7 @@ typedef void (usb_fifo_filter_t)(struct usb_fifo *fifo, struct usb_mbuf *m); /* USB events */ -#include <freebsd/sys/eventhandler.h> +#include <sys/eventhandler.h> typedef void (*usb_dev_configured_t)(void *, struct usb_device *, struct usb_attach_arg *); EVENTHANDLER_DECLARE(usb_dev_configured, usb_dev_configured_t); @@ -559,4 +559,4 @@ void usb_fifo_set_close_zlp(struct usb_fifo *, uint8_t); void usb_fifo_set_write_defrag(struct usb_fifo *, uint8_t); void usb_fifo_free(struct usb_fifo *f); #endif /* _KERNEL */ -#endif /* _USB_USBDI_HH_ */ +#endif /* _USB_USBDI_H_ */ diff --git a/freebsd/sys/dev/usb/usbdi_util.h b/freebsd/sys/dev/usb/usbdi_util.h index 32931e52..1e450f8f 100644 --- a/freebsd/sys/dev/usb/usbdi_util.h +++ b/freebsd/sys/dev/usb/usbdi_util.h @@ -23,8 +23,8 @@ * * $FreeBSD$ */ -#ifndef _USB_USBDI_UTIL_HH_ -#define _USB_USBDI_UTIL_HH_ +#ifndef _USB_USBDI_UTIL_H_ +#define _USB_USBDI_UTIL_H_ struct cv; @@ -88,4 +88,4 @@ const char *usb_get_manufacturer(struct usb_device *); const char *usb_get_product(struct usb_device *); const char *usb_get_serial(struct usb_device *); -#endif /* _USB_USBDI_UTIL_HH_ */ +#endif /* _USB_USBDI_UTIL_H_ */ diff --git a/freebsd/sys/dev/usb/usbhid.h b/freebsd/sys/dev/usb/usbhid.h index 192a2359..c07454f7 100644 --- a/freebsd/sys/dev/usb/usbhid.h +++ b/freebsd/sys/dev/usb/usbhid.h @@ -26,10 +26,10 @@ * SUCH DAMAGE. */ -#ifndef _USB_HID_HH_ -#define _USB_HID_HH_ +#ifndef _USB_HID_H_ +#define _USB_HID_H_ -#include <freebsd/dev/usb/usb_endian.h> +#include <dev/usb/usb_endian.h> #define UR_GET_HID_DESCRIPTOR 0x06 #define UDESC_HID 0x21 @@ -241,4 +241,4 @@ usb_error_t usbd_req_get_hid_desc(struct usb_device *udev, struct mtx *mtx, void **descp, uint16_t *sizep, struct malloc_type *mem, uint8_t iface_index); #endif /* _KERNEL */ -#endif /* _USB_HID_HH_ */ +#endif /* _USB_HID_H_ */ |