Date: Fri, 5 Jun 2009 00:26:14 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 163535 for review Message-ID: <200906050026.n550QEQ5065806@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=163535 Change 163535 by thompsa@thompsa_burger on 2009/06/05 00:25:18 Reorganise includes. Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_mbus.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_pci.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci_atmelarm.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci_pci.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci_pci.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/quirk/usb_quirk.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb.h#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#12 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_defs.h#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dynamic.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_error.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#10 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_mbuf.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_parse.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_process.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_revision.h#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_util.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usbdi.h#2 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#7 (text+ko) ==== @@ -44,9 +44,30 @@ * endpoints, Function-address and more. */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> +#include <dev/usb/usbdi.h> #define USB_DEBUG_VAR at91dcidebug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 (text+ko) ==== @@ -26,9 +26,30 @@ * SUCH DAMAGE. */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_busdma.h> ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#7 (text+ko) ==== @@ -36,9 +36,30 @@ * endpoints, Function-address and more. */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> +#include <dev/usb/usbdi.h> #define USB_DEBUG_VAR atmegadci_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 (text+ko) ==== @@ -26,7 +26,28 @@ * SUCH DAMAGE. */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <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_busdma.h> ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#7 (text+ko) ==== @@ -36,9 +36,30 @@ * endpoints, Function-address and more. */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> +#include <dev/usb/usbdi.h> #define USB_DEBUG_VAR avr32dci_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#9 (text+ko) ==== @@ -46,9 +46,30 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci.c,v 1.22 2009/05/29 18:46:57 thompsa Exp $"); +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> +#include <dev/usb/usbdi.h> #define USB_DEBUG_VAR ehcidebug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 (text+ko) ==== @@ -31,8 +31,29 @@ #include "opt_bus.h" +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_busdma.h> ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_mbus.c#2 (text+ko) ==== @@ -38,8 +38,29 @@ #include "opt_bus.h" +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_busdma.h> ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_pci.c#2 (text+ko) ==== @@ -52,8 +52,29 @@ * sharing of code between *BSD's */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_busdma.h> ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#7 (text+ko) ==== @@ -36,9 +36,30 @@ * NOTE: The current implementation only supports Device Side Mode! */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> +#include <dev/usb/usbdi.h> #define USB_DEBUG_VAR musbotgdebug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 (text+ko) ==== @@ -24,8 +24,29 @@ * SUCH DAMAGE. */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_busdma.h> ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#7 (text+ko) ==== @@ -35,9 +35,30 @@ * USB spec: http://www.usb.org/developers/docs/usbspec.zip */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> +#include <dev/usb/usbdi.h> #define USB_DEBUG_VAR ohcidebug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci_atmelarm.c#2 (text+ko) ==== @@ -25,8 +25,29 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci_atmelarm.c,v 1.4 2009/04/06 00:32:54 thompsa Exp $"); +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_busdma.h> ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci_pci.c#2 (text+ko) ==== @@ -49,9 +49,30 @@ * sharing of code between *BSD's */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> +#include <dev/usb/usbdi.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_busdma.h> ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#7 (text+ko) ==== @@ -38,9 +38,30 @@ * ftp://download.intel.com/design/intarch/datashts/29056201.pdf */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> +#include <dev/usb/usbdi.h> #define USB_DEBUG_VAR uhcidebug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci_pci.c#2 (text+ko) ==== @@ -48,8 +48,29 @@ * sharing of code between *BSD's */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_busdma.h> ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#6 (text+ko) ==== @@ -24,9 +24,30 @@ * SUCH DAMAGE. */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #define USB_DEBUG_VAR usb2_ctrl_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#7 (text+ko) ==== @@ -32,10 +32,31 @@ * NOTE: The datasheet does not document everything. */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_revision.h> #include <dev/usb/usb_error.h> +#include <dev/usb/usbdi.h> #define USB_DEBUG_VAR uss820dcidebug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 (text+ko) ==== @@ -27,8 +27,29 @@ * SUCH DAMAGE. */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_busdma.h> ==== //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.c#4 (text+ko) ==== @@ -26,7 +26,6 @@ #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> -#include <dev/usb/usb_endian.h> #include <dev/usb/usb.h> #include <dev/usb/usb_core.h> ==== //depot/projects/usb_buf/src/sys/dev/usb/quirk/usb_quirk.c#3 (text+ko) ==== @@ -26,9 +26,30 @@ * SUCH DAMAGE. */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <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/usb_mfunc.h> +#include <dev/usb/usbdi.h> #include "usbdevs.h" #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/usb.h#4 (text+ko) ==== @@ -39,8 +39,40 @@ #ifndef _USB2_STANDARD_H_ #define _USB2_STANDARD_H_ +#if defined(_KERNEL) +#include "opt_usb.h" + +#include <sys/malloc.h> + +MALLOC_DECLARE(M_USB); +MALLOC_DECLARE(M_USBDEV); +MALLOC_DECLARE(M_USBHC); +#endif /* _KERNEL */ + #include <dev/usb/usb_endian.h> +#define USB_STACK_VERSION 2000 /* 2.0 */ + +/* Definition of some hardcoded USB constants. */ + +#define USB_MAX_IPACKET 8 /* initial USB packet size */ +#define USB_EP_MAX (2*16) /* hardcoded */ +#define USB_ROOT_HUB_ADDR 1 /* index */ +#define USB_MIN_DEVICES 2 /* unused + root HUB */ +#define USB_UNCONFIG_INDEX 0xFF /* internal use only */ +#define USB_IFACE_INDEX_ANY 0xFF /* internal use only */ +#define USB_START_ADDR 0 /* default USB device BUS address + * after USB bus reset */ +#define USB_CONTROL_ENDPOINT 0 /* default control endpoint */ + +#define USB_FRAMES_PER_SECOND_FS 1000 /* full speed */ +#define USB_FRAMES_PER_SECOND_HS 8000 /* high speed */ + +#define USB_FS_BYTES_PER_HS_UFRAME 188 /* bytes */ +#define USB_HS_MICRO_FRAMES_MAX 8 /* units */ + +#define USB_ISOC_TIME_MAX 128 /* ms */ + /* * Minimum time a device needs to be powered down to go through a * power cycle. These values are not in the USB specification. @@ -642,4 +674,51 @@ } __packed; typedef struct usb_port_status usb_port_status_t; +/* + * The "USB_SPEED" macros defines all the supported USB speeds. + */ +enum usb_dev_speed { + USB_SPEED_VARIABLE, + USB_SPEED_LOW, + USB_SPEED_FULL, + USB_SPEED_HIGH, + USB_SPEED_SUPER, +}; +#define USB_SPEED_MAX (USB_SPEED_SUPER+1) + +/* + * The "USB_REV" macros defines all the supported USB revisions. + */ +enum usb_revision { + USB_REV_UNKNOWN, + USB_REV_PRE_1_0, + USB_REV_1_0, + USB_REV_1_1, + USB_REV_2_0, + USB_REV_2_5, + USB_REV_3_0 +}; +#define USB_REV_MAX (USB_REV_3_0+1) + +/* + * Supported host contoller modes. + */ +enum usb_hc_mode { + USB_MODE_HOST, /* initiates transfers */ + USB_MODE_DEVICE, /* bus transfer target */ + USB_MODE_DUAL /* can be host or device */ +}; +#define USB_MODE_MAX (USB_MODE_DUAL+1) + +/* + * The "USB_MODE" macros defines all the supported device states. + */ +enum usb_dev_state { + USB_STATE_DETACHED, + USB_STATE_ATTACHED, + USB_STATE_POWERED, + USB_STATE_ADDRESSED, + USB_STATE_CONFIGURED, +}; +#define USB_STATE_MAX (USB_STATE_CONFIGURED+1) #endif /* _USB2_STANDARD_H_ */ ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.c#8 (text+ko) ==== @@ -24,9 +24,30 @@ * SUCH DAMAGE. */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#9 (text+ko) ==== @@ -25,10 +25,31 @@ * SUCH DAMAGE. */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <sys/unistd.h> +#include <sys/callout.h> +#include <sys/malloc.h> +#include <sys/priv.h> + #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb_ioctl.h> +#include <dev/usb/usbdi.h> #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_core.c#2 (text+ko) ==== @@ -30,6 +30,28 @@ * http://www.usb.org/developers/devclass_docs/ */ +#include <sys/stdint.h> +#include <sys/stddef.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <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 <sys/lock.h> +#include <sys/mutex.h> +#include <sys/condvar.h> +#include <sys/sysctl.h> +#include <sys/sx.h> +#include <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_mbuf.h> ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#12 (text+ko) ==== @@ -31,8 +31,6 @@ #ifndef _USB2_CORE_H_ #define _USB2_CORE_H_ -#define USB_STACK_VERSION 2000 /* 2.0 */ - /* Allow defines in "opt_usb.h" to override configuration */ #include "opt_usb.h" @@ -135,31 +133,6 @@ #define USB_PROC_GET_GID(td) (td)->p_pgid #endif -/* Include files */ - -#include <sys/stdint.h> -#include <sys/stddef.h> -#include <sys/param.h> -#include <sys/queue.h> -#include <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 <sys/lock.h> -#include <sys/mutex.h> -#include <sys/condvar.h> -#include <sys/sysctl.h> -#include <sys/sx.h> -#include <sys/unistd.h> -#include <sys/callout.h> -#include <sys/malloc.h> -#include <sys/priv.h> - -#include <dev/usb/usb_defs.h> -#include <dev/usb/usb_revision.h> - #include "usb_if.h" #ifndef USB_HOST_ALIGN @@ -229,12 +202,6 @@ /* macros */ -#define usb2_callout_init_mtx(c,m,f) callout_init_mtx(&(c)->co,m,f) -#define usb2_callout_reset(c,t,f,d) callout_reset(&(c)->co,t,f,d) -#define usb2_callout_stop(c) callout_stop(&(c)->co) -#define usb2_callout_drain(c) callout_drain(&(c)->co) -#define usb2_callout_pending(c) callout_pending(&(c)->co) - #define USB_BUS_LOCK(_b) mtx_lock(&(_b)->bus_mtx) #define USB_BUS_UNLOCK(_b) mtx_unlock(&(_b)->bus_mtx) #define USB_BUS_LOCK_ASSERT(_b, _t) mtx_assert(&(_b)->bus_mtx, _t) @@ -254,39 +221,6 @@ /* typedefs */ -#ifndef USB_HAVE_USB_ERROR_T -typedef uint8_t usb_error_t; /* see "USB_ERR_XXX" */ -#endif - -#ifndef USB_HAVE_TIMEOUT_T >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906050026.n550QEQ5065806>