diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-09 22:52:54 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-10 09:08:23 +0200 |
| commit | e599318e912d8836c59d8b5202e3e31a6b8dcae9 (patch) | |
| tree | 1172b8b830a1c3236e45c834c2b80e01325ea144 /freebsd/sys/dev/usb | |
| parent | Move files to match FreeBSD layout (diff) | |
| download | rtems-libbsd-e599318e912d8836c59d8b5202e3e31a6b8dcae9.tar.bz2 | |
Update files to match FreeBSD layout
Add compatibility with Newlib header files. Some FreeBSD header files
are mapped by the translation script:
o rtems/bsd/sys/_types.h
o rtems/bsd/sys/errno.h
o rtems/bsd/sys/lock.h
o rtems/bsd/sys/param.h
o rtems/bsd/sys/resource.h
o rtems/bsd/sys/time.h
o rtems/bsd/sys/timespec.h
o rtems/bsd/sys/types.h
o rtems/bsd/sys/unistd.h
It is now possible to include <sys/socket.h> directly for example.
Generate one Makefile which builds everything including tests.
Diffstat (limited to 'freebsd/sys/dev/usb')
54 files changed, 901 insertions, 901 deletions
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_ */ |