diff options
author | thompsa <thompsa@FreeBSD.org> | 2009-03-20 19:04:31 +0000 |
---|---|---|
committer | thompsa <thompsa@FreeBSD.org> | 2009-03-20 19:04:31 +0000 |
commit | 5dee97ce8610e3adf8c9f937bd5fe961ca124c90 (patch) | |
tree | e55d0e93018150bfd685df16415679e20939dc96 | |
parent | d76fe3af70ccca92ac7cc0f189dd01beca3aef5e (diff) | |
download | FreeBSD-src-5dee97ce8610e3adf8c9f937bd5fe961ca124c90.zip FreeBSD-src-5dee97ce8610e3adf8c9f937bd5fe961ca124c90.tar.gz |
MFp4 //depot/projects/usb @159430
- Move tunable defines into usb_core.h and dependancy towards usb_defs.h
- Leave hardcoded defines in "usb_defs.h".
- Allow overriding all tunable defines.
- Add more customisable typedefs.
- Correct maximum device number.
Submitted by: Hans Petter Selasky
46 files changed, 43 insertions, 70 deletions
diff --git a/sys/dev/usb/controller/at91dci.c b/sys/dev/usb/controller/at91dci.c index fec3b27..cfb74a3 100644 --- a/sys/dev/usb/controller/at91dci.c +++ b/sys/dev/usb/controller/at91dci.c @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR at91dcidebug diff --git a/sys/dev/usb/controller/at91dci_atmelarm.c b/sys/dev/usb/controller/at91dci_atmelarm.c index 71d2937..164f9bd 100644 --- a/sys/dev/usb/controller/at91dci_atmelarm.c +++ b/sys/dev/usb/controller/at91dci_atmelarm.c @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb_mfunc.h> -#include <dev/usb/usb_defs.h> #include <dev/usb/usb.h> #include <dev/usb/usb_core.h> diff --git a/sys/dev/usb/controller/atmegadci.c b/sys/dev/usb/controller/atmegadci.c index edaef19..a052385 100644 --- a/sys/dev/usb/controller/atmegadci.c +++ b/sys/dev/usb/controller/atmegadci.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR atmegadci_debug diff --git a/sys/dev/usb/controller/atmegadci_atmelarm.c b/sys/dev/usb/controller/atmegadci_atmelarm.c index 7cf2eb4..1fc929f 100644 --- a/sys/dev/usb/controller/atmegadci_atmelarm.c +++ b/sys/dev/usb/controller/atmegadci_atmelarm.c @@ -26,7 +26,6 @@ __FBSDID("$FreeBSD$"); * SUCH DAMAGE. */ -#include <dev/usb/usb_defs.h> #include <dev/usb/usb.h> #include <dev/usb/usb_core.h> diff --git a/sys/dev/usb/controller/ehci.c b/sys/dev/usb/controller/ehci.c index 7c873d9..42f41ff 100644 --- a/sys/dev/usb/controller/ehci.c +++ b/sys/dev/usb/controller/ehci.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR ehcidebug @@ -3168,7 +3167,7 @@ ehci_root_ctrl_done(struct usb2_xfer *xfer, USETW(sc->sc_hub_desc.stat.wStatus, 0); break; case C(UR_SET_ADDRESS, UT_WRITE_DEVICE): - if (value >= USB_MAX_DEVICES) { + if (value >= EHCI_MAX_DEVICES) { std->err = USB_ERR_IOERROR; goto done; } diff --git a/sys/dev/usb/controller/ehci.h b/sys/dev/usb/controller/ehci.h index 5b54809..ddb2d9c 100644 --- a/sys/dev/usb/controller/ehci.h +++ b/sys/dev/usb/controller/ehci.h @@ -38,7 +38,7 @@ #ifndef _EHCI_H_ #define _EHCI_H_ -#define EHCI_MAX_DEVICES USB_MAX_DEVICES +#define EHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128) /* PCI config registers */ #define PCI_CBMEM 0x10 /* configuration base MEM */ diff --git a/sys/dev/usb/controller/ehci_ixp4xx.c b/sys/dev/usb/controller/ehci_ixp4xx.c index 1e0e253..5ce8e68 100644 --- a/sys/dev/usb/controller/ehci_ixp4xx.c +++ b/sys/dev/usb/controller/ehci_ixp4xx.c @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); #include "opt_bus.h" #include <dev/usb/usb_mfunc.h> -#include <dev/usb/usb_defs.h> #include <dev/usb/usb.h> #include <dev/usb/usb_core.h> diff --git a/sys/dev/usb/controller/ehci_mbus.c b/sys/dev/usb/controller/ehci_mbus.c index 66cf8cc..31431a1 100644 --- a/sys/dev/usb/controller/ehci_mbus.c +++ b/sys/dev/usb/controller/ehci_mbus.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_bus.h" #include <dev/usb/usb_mfunc.h> -#include <dev/usb/usb_defs.h> #include <dev/usb/usb.h> #include <dev/usb/usb_core.h> diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index 2f097fc..f739c3a 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); */ #include <dev/usb/usb_mfunc.h> -#include <dev/usb/usb_defs.h> #include <dev/usb/usb.h> #include <dev/usb/usb_core.h> diff --git a/sys/dev/usb/controller/musb_otg.c b/sys/dev/usb/controller/musb_otg.c index cda1a67..be0af93 100644 --- a/sys/dev/usb/controller/musb_otg.c +++ b/sys/dev/usb/controller/musb_otg.c @@ -39,7 +39,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR musbotgdebug diff --git a/sys/dev/usb/controller/musb_otg_atmelarm.c b/sys/dev/usb/controller/musb_otg_atmelarm.c index 3ee5cfb..38fa304 100644 --- a/sys/dev/usb/controller/musb_otg_atmelarm.c +++ b/sys/dev/usb/controller/musb_otg_atmelarm.c @@ -25,7 +25,6 @@ */ #include <dev/usb/usb_mfunc.h> -#include <dev/usb/usb_defs.h> #include <dev/usb/usb.h> #include <dev/usb/usb_core.h> diff --git a/sys/dev/usb/controller/ohci.c b/sys/dev/usb/controller/ohci.c index ad2b1cc..d453de8 100644 --- a/sys/dev/usb/controller/ohci.c +++ b/sys/dev/usb/controller/ohci.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR ohcidebug @@ -2256,7 +2255,7 @@ ohci_root_ctrl_done(struct usb2_xfer *xfer, USETW(sc->sc_hub_desc.stat.wStatus, 0); break; case C(UR_SET_ADDRESS, UT_WRITE_DEVICE): - if (value >= USB_MAX_DEVICES) { + if (value >= OHCI_MAX_DEVICES) { std->err = USB_ERR_IOERROR; goto done; } diff --git a/sys/dev/usb/controller/ohci.h b/sys/dev/usb/controller/ohci.h index 84a6afd..47d3be3 100644 --- a/sys/dev/usb/controller/ohci.h +++ b/sys/dev/usb/controller/ohci.h @@ -39,7 +39,7 @@ #ifndef _OHCI_H_ #define _OHCI_H_ -#define OHCI_MAX_DEVICES USB_MAX_DEVICES +#define OHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128) /* PCI config registers */ #define PCI_CBMEM 0x10 /* configuration base memory */ diff --git a/sys/dev/usb/controller/ohci_atmelarm.c b/sys/dev/usb/controller/ohci_atmelarm.c index 562cf3d..34826e0 100644 --- a/sys/dev/usb/controller/ohci_atmelarm.c +++ b/sys/dev/usb/controller/ohci_atmelarm.c @@ -26,7 +26,6 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb_mfunc.h> -#include <dev/usb/usb_defs.h> #include <dev/usb/usb.h> #include <dev/usb/usb_core.h> diff --git a/sys/dev/usb/controller/ohci_pci.c b/sys/dev/usb/controller/ohci_pci.c index c9f586d..fec8acd 100644 --- a/sys/dev/usb/controller/ohci_pci.c +++ b/sys/dev/usb/controller/ohci_pci.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> -#include <dev/usb/usb_defs.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_busdma.h> diff --git a/sys/dev/usb/controller/uhci.c b/sys/dev/usb/controller/uhci.c index 82a9623..de4026d 100644 --- a/sys/dev/usb/controller/uhci.c +++ b/sys/dev/usb/controller/uhci.c @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR uhcidebug @@ -2626,7 +2625,7 @@ uhci_root_ctrl_done(struct usb2_xfer *xfer, USETW(sc->sc_hub_desc.stat.wStatus, 0); break; case C(UR_SET_ADDRESS, UT_WRITE_DEVICE): - if (value >= USB_MAX_DEVICES) { + if (value >= UHCI_MAX_DEVICES) { std->err = USB_ERR_IOERROR; goto done; } diff --git a/sys/dev/usb/controller/uhci.h b/sys/dev/usb/controller/uhci.h index 9365a4c..c652dd8 100644 --- a/sys/dev/usb/controller/uhci.h +++ b/sys/dev/usb/controller/uhci.h @@ -39,7 +39,7 @@ #ifndef _UHCI_H_ #define _UHCI_H_ -#define UHCI_MAX_DEVICES USB_MAX_DEVICES +#define UHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128) /* PCI config registers */ #define PCI_USBREV 0x60 /* USB protocol revision */ diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c index a61693b..379841b 100644 --- a/sys/dev/usb/controller/uhci_pci.c +++ b/sys/dev/usb/controller/uhci_pci.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); */ #include <dev/usb/usb_mfunc.h> -#include <dev/usb/usb_defs.h> #include <dev/usb/usb.h> #include <dev/usb/usb_core.h> diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c index f835ec1..70099ef 100644 --- a/sys/dev/usb/controller/usb_controller.c +++ b/sys/dev/usb/controller/usb_controller.c @@ -25,7 +25,6 @@ */ #include <dev/usb/usb_mfunc.h> -#include <dev/usb/usb_defs.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/controller/uss820dci.c b/sys/dev/usb/controller/uss820dci.c index 5fc8e98..8e1e2bc 100644 --- a/sys/dev/usb/controller/uss820dci.c +++ b/sys/dev/usb/controller/uss820dci.c @@ -36,7 +36,6 @@ #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_revision.h> #include <dev/usb/usb_error.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR uss820dcidebug diff --git a/sys/dev/usb/controller/uss820dci_atmelarm.c b/sys/dev/usb/controller/uss820dci_atmelarm.c index 5691d4b..4cd0862 100644 --- a/sys/dev/usb/controller/uss820dci_atmelarm.c +++ b/sys/dev/usb/controller/uss820dci_atmelarm.c @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); */ #include <dev/usb/usb_mfunc.h> -#include <dev/usb/usb_defs.h> #include <dev/usb/usb.h> #include <dev/usb/usb_core.h> diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c index a54ddc0..8e7aae4 100644 --- a/sys/dev/usb/net/if_cdce.c +++ b/sys/dev/usb/net/if_cdce.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb_cdc.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR cdce_debug diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c index 4b79aae..19d3d50 100644 --- a/sys/dev/usb/serial/u3g.c +++ b/sys/dev/usb/serial/u3g.c @@ -34,7 +34,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR u3g_debug diff --git a/sys/dev/usb/serial/ubser.c b/sys/dev/usb/serial/ubser.c index 266af1d..08d5e14 100644 --- a/sys/dev/usb/serial/ubser.c +++ b/sys/dev/usb/serial/ubser.c @@ -80,7 +80,6 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb_cdc.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR ubser_debug diff --git a/sys/dev/usb/serial/ugensa.c b/sys/dev/usb/serial/ugensa.c index c85e57d..6174f17 100644 --- a/sys/dev/usb/serial/ugensa.c +++ b/sys/dev/usb/serial/ugensa.c @@ -47,7 +47,6 @@ #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb_cdc.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR usb2_debug diff --git a/sys/dev/usb/serial/umct.c b/sys/dev/usb/serial/umct.c index dba38d2..9e49440 100644 --- a/sys/dev/usb/serial/umct.c +++ b/sys/dev/usb/serial/umct.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb_cdc.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR usb2_debug diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c index 9c53c88..dedea15 100644 --- a/sys/dev/usb/serial/umodem.c +++ b/sys/dev/usb/serial/umodem.c @@ -86,7 +86,6 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb_error.h> #include <dev/usb/usb_cdc.h> #include <dev/usb/usb_ioctl.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR umodem_debug diff --git a/sys/dev/usb/storage/ustorage_fs.c b/sys/dev/usb/storage/ustorage_fs.c index e6b71fb..bcb63a5 100644 --- a/sys/dev/usb/storage/ustorage_fs.c +++ b/sys/dev/usb/storage/ustorage_fs.c @@ -39,7 +39,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR ustorage_fs_debug diff --git a/sys/dev/usb/template/usb_template.c b/sys/dev/usb/template/usb_template.c index 31c853a..dd1a536 100644 --- a/sys/dev/usb/template/usb_template.c +++ b/sys/dev/usb/template/usb_template.c @@ -32,7 +32,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usb_cdc.h> #include <dev/usb/usb_mfunc.h> -#include <dev/usb/usb_defs.h> #include <dev/usb/usb_error.h> #define USB_DEBUG_VAR usb2_debug diff --git a/sys/dev/usb/usb_busdma.c b/sys/dev/usb/usb_busdma.c index 809c3bf..86b6921 100644 --- a/sys/dev/usb/usb_busdma.c +++ b/sys/dev/usb/usb_busdma.c @@ -27,7 +27,6 @@ #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR usb2_debug diff --git a/sys/dev/usb/usb_compat_linux.c b/sys/dev/usb/usb_compat_linux.c index 6d6c857..b422df1 100644 --- a/sys/dev/usb/usb_compat_linux.c +++ b/sys/dev/usb/usb_compat_linux.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include <dev/usb/usb_defs.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb.h> #include <dev/usb/usb_error.h> diff --git a/sys/dev/usb/usb_core.h b/sys/dev/usb/usb_core.h index 6067815..f760642 100644 --- a/sys/dev/usb/usb_core.h +++ b/sys/dev/usb/usb_core.h @@ -157,10 +157,40 @@ struct usb2_xfer_root; /* typedefs */ -typedef uint8_t usb2_error_t; - typedef void (usb2_callback_t)(struct usb2_xfer *); +#ifndef USB_HAVE_USB_ERROR_T +typedef uint8_t usb2_error_t; /* see "USB_ERR_XXX" */ +#endif + +#ifndef USB_HAVE_TIMEOUT_T +typedef uint32_t usb2_timeout_t; /* milliseconds */ +#endif + +#ifndef USB_HAVE_LENGTH_T +typedef uint32_t usb2_length_t; /* bytes */ +#endif + +#ifndef USB_HAVE_FRAMES_T +typedef uint32_t usb2_frames_t; /* units */ +#endif + +#ifndef USB_HAVE_INTERVAL_T +typedef uint32_t usb2_interval_t; /* milliseconds */ +#endif + +#ifndef USB_HAVE_SIZE_T +typedef uint32_t usb2_size_t; /* bytes */ +#endif + +#ifndef USB_HAVE_REFS_T +typedef uint32_t usb2_refs_t; /* units */ +#endif + +#ifndef USB_HAVE_TICKS_T +typedef uint32_t usb2_ticks_t; /* system defined */ +#endif + /* structures */ /* diff --git a/sys/dev/usb/usb_debug.c b/sys/dev/usb/usb_debug.c index b7eeea7..da317fe 100644 --- a/sys/dev/usb/usb_debug.c +++ b/sys/dev/usb/usb_debug.c @@ -25,7 +25,6 @@ */ #include <dev/usb/usb.h> -#include <dev/usb/usb_defs.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_debug.h> diff --git a/sys/dev/usb/usb_defs.h b/sys/dev/usb/usb_defs.h index 64caf39..4f72ea5 100644 --- a/sys/dev/usb/usb_defs.h +++ b/sys/dev/usb/usb_defs.h @@ -27,22 +27,16 @@ #ifndef _USB2_DEFS_H_ #define _USB2_DEFS_H_ -/* Definition of some USB constants */ +/* Definition of some hardcoded USB constants. */ + +#define USB_MAX_IPACKET 8 /* initial USB packet size */ -#define USB_BUS_MAX 256 /* units */ -#define USB_DEV_MAX 128 /* units */ -#define USB_IFACE_MAX 32 /* units */ #define USB_EP_MAX (2*16) /* hardcoded */ -#define USB_FIFO_MAX (4 * USB_EP_MAX) #define USB_ROOT_HUB_ADDR 1 /* index */ #define USB_MIN_DEVICES 2 /* unused + root HUB */ -#define USB_MAX_DEVICES USB_DEV_MAX /* including virtual root HUB and - * address zero */ -#define USB_MAX_ENDPOINTS USB_EP_MAX /* 2 directions on 16 endpoints */ - #define USB_UNCONFIG_INDEX 0xFF /* internal use only */ #define USB_IFACE_INDEX_ANY 0xFF /* internal use only */ @@ -57,20 +51,10 @@ #define USB_FS_BYTES_PER_HS_UFRAME 188 /* bytes */ #define USB_HS_MICRO_FRAMES_MAX 8 /* units */ +#define USB_ISOC_TIME_MAX 128 /* ms */ + /* sanity checks */ -#if (USB_FIFO_MAX < USB_EP_MAX) -#error "There cannot be less FIFOs than USB endpoints." -#endif -#if (USB_FIFO_MAX & 1) -#error "Number of FIFOs must be odd." -#endif -#if (USB_EP_MAX < (2*16)) -#error "Number of hardware USB endpoints cannot be less than 32." -#endif -#if (USB_MAX_DEVICES < USB_MIN_DEVICES) -#error "Minimum number of devices is greater than maximum number of devices." -#endif #if (USB_ROOT_HUB_ADDR >= USB_MIN_DEVICES) #error "The root hub address must be less than USB_MIN_DEVICES." #endif diff --git a/sys/dev/usb/usb_dev.c b/sys/dev/usb/usb_dev.c index d3d98ff..6dbc6ae 100644 --- a/sys/dev/usb/usb_dev.c +++ b/sys/dev/usb/usb_dev.c @@ -29,7 +29,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usb_ioctl.h> -#include <dev/usb/usb_defs.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c index 8bd7326..c667eac 100644 --- a/sys/dev/usb/usb_device.c +++ b/sys/dev/usb/usb_device.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include <dev/usb/usb_defs.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/usb_dynamic.c b/sys/dev/usb/usb_dynamic.c index 6983f64..8c0a644 100644 --- a/sys/dev/usb/usb_dynamic.c +++ b/sys/dev/usb/usb_dynamic.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include <dev/usb/usb_defs.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/usb_generic.c b/sys/dev/usb/usb_generic.c index c7cf056..d799589 100644 --- a/sys/dev/usb/usb_generic.c +++ b/sys/dev/usb/usb_generic.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include <dev/usb/usb_defs.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb.h> #include <dev/usb/usb_ioctl.h> diff --git a/sys/dev/usb/usb_handle_request.c b/sys/dev/usb/usb_handle_request.c index 3d2425a..0df5d87 100644 --- a/sys/dev/usb/usb_handle_request.c +++ b/sys/dev/usb/usb_handle_request.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include <dev/usb/usb_defs.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/usb_hid.c b/sys/dev/usb/usb_hid.c index f79414a..21c32d6 100644 --- a/sys/dev/usb/usb_hid.c +++ b/sys/dev/usb/usb_hid.c @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> -#include <dev/usb/usb_defs.h> #include <dev/usb/usbhid.h> #define USB_DEBUG_VAR usb2_debug diff --git a/sys/dev/usb/usb_hub.c b/sys/dev/usb/usb_hub.c index 67190ed..596edeb 100644 --- a/sys/dev/usb/usb_hub.c +++ b/sys/dev/usb/usb_hub.c @@ -30,7 +30,6 @@ * USB spec: http://www.usb.org/developers/docs/usbspec.zip */ -#include <dev/usb/usb_defs.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/usb_msctest.c b/sys/dev/usb/usb_msctest.c index 35b71ec..d41d8c9 100644 --- a/sys/dev/usb/usb_msctest.c +++ b/sys/dev/usb/usb_msctest.c @@ -32,7 +32,6 @@ * mass storage quirks for not supported SCSI commands! */ -#include <dev/usb/usb_defs.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/usb_request.c b/sys/dev/usb/usb_request.c index 47f7ec7..0c66942 100644 --- a/sys/dev/usb/usb_request.c +++ b/sys/dev/usb/usb_request.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include <dev/usb/usb_defs.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/usb_sw_transfer.c b/sys/dev/usb/usb_sw_transfer.c index 984c233..439ed9c 100644 --- a/sys/dev/usb/usb_sw_transfer.c +++ b/sys/dev/usb/usb_sw_transfer.c @@ -27,7 +27,6 @@ #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb.h> #include <dev/usb/usb_error.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR usb2_debug diff --git a/sys/dev/usb/usb_transfer.c b/sys/dev/usb/usb_transfer.c index 71bbb08..097931e 100644 --- a/sys/dev/usb/usb_transfer.c +++ b/sys/dev/usb/usb_transfer.c @@ -27,7 +27,6 @@ #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb.h> -#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR usb2_debug diff --git a/sys/dev/usb/usb_util.c b/sys/dev/usb/usb_util.c index 541cd55..b22e35b 100644 --- a/sys/dev/usb/usb_util.c +++ b/sys/dev/usb/usb_util.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include <dev/usb/usb_defs.h> #include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> #include <dev/usb/usb.h> |