Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Mar 2009 10:11:43 GMT
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 159430 for review
Message-ID:  <200903191011.n2JABhTg033116@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=159430

Change 159430 by hselasky@hselasky_laptop001 on 2009/03/19 10:11:01

	
	USB CORE:
	
	usb_core.h + usb_defs.h:
	- Move tunable defines into "usb_core.h".
	- Leave hardcoded defines in "usb_defs.h".
	- Allow overriding all tunable defines.
	- Add more customisable typedefs.
	
	Other files:
	- Remove dependancy towards "usb_defs.h".
	- Correct maximum device number.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#3 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#6 edit
.. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_core.h#6 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_debug.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_defs.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#6 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#3 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_request.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_sw_transfer.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#130 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_util.c#3 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#3 (text+ko) ====

@@ -47,7 +47,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 at91dcidebug
 

==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 (text+ko) ====

@@ -28,7 +28,6 @@
 
 
 #include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_defs.h>
 #include <dev/usb/usb.h>
 
 #include <dev/usb/usb_core.h>

==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#7 (text+ko) ====

@@ -40,7 +40,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 atmegadci_debug
 

==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#4 (text+ko) ====

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <dev/usb/usb_defs.h>
 #include <dev/usb/usb.h>
 
 #include <dev/usb/usb_core.h>

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#5 (text+ko) ====

@@ -49,7 +49,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 ehcidebug
 
@@ -3168,7 +3167,7 @@
 		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;
 		}

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#3 (text+ko) ====

@@ -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 */

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 (text+ko) ====

@@ -32,7 +32,6 @@
 #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>

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#2 (text+ko) ====

@@ -39,7 +39,6 @@
 #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>

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#3 (text+ko) ====

@@ -53,7 +53,6 @@
  */
 
 #include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_defs.h>
 #include <dev/usb/usb.h>
 
 #include <dev/usb/usb_core.h>

==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#3 (text+ko) ====

@@ -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
 

==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#4 (text+ko) ====

@@ -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>

==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#2 (text+ko) ====

@@ -38,7 +38,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 ohcidebug
 
@@ -2256,7 +2255,7 @@
 		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;
 		}

==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#2 (text+ko) ====

@@ -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 */

==== //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#2 (text+ko) ====

@@ -26,7 +26,6 @@
 __FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci_atmelarm.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $");
 
 #include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_defs.h>
 #include <dev/usb/usb.h>
 
 #include <dev/usb/usb_core.h>

==== //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#3 (text+ko) ====

@@ -52,7 +52,6 @@
 #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>

==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#2 (text+ko) ====

@@ -41,7 +41,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 uhcidebug
 
@@ -2626,7 +2625,7 @@
 		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;
 		}

==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#2 (text+ko) ====

@@ -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 */

==== //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#3 (text+ko) ====

@@ -49,7 +49,6 @@
  */
 
 #include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_defs.h>
 #include <dev/usb/usb.h>
 
 #include <dev/usb/usb_core.h>

==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#5 (text+ko) ====

@@ -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>
 

==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#3 (text+ko) ====

@@ -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
 

==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#2 (text+ko) ====

@@ -28,7 +28,6 @@
  */
 
 #include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_defs.h>
 #include <dev/usb/usb.h>
 
 #include <dev/usb/usb_core.h>

==== //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#4 (text+ko) ====

@@ -48,7 +48,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 cdce_debug
 

==== //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#5 (text+ko) ====

@@ -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
 

==== //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#4 (text+ko) ====

@@ -80,7 +80,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 ubser_debug
 

==== //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#3 (text+ko) ====

@@ -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
 

==== //depot/projects/usb/src/sys/dev/usb/serial/umct.c#3 (text+ko) ====

@@ -49,7 +49,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
 

==== //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#6 (text+ko) ====

@@ -86,7 +86,6 @@
 #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
 

==== //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#4 (text+ko) ====

@@ -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
 

==== //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#2 (text+ko) ====

@@ -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

==== //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#3 (text+ko) ====

@@ -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
 

==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#30 (text+ko) ====

@@ -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>

==== //depot/projects/usb/src/sys/dev/usb/usb_core.h#6 (text+ko) ====

@@ -32,6 +32,8 @@
 #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"
@@ -140,28 +142,53 @@
 #include <sys/malloc.h>
 #include <sys/priv.h>
 
-#include <dev/usb/usb_mfunc.h>
+#include <dev/usb/usb_defs.h>
 #include <dev/usb/usb_revision.h>
 
 #include "usb_if.h"
 
-#define	USB_STACK_VERSION 2000		/* 2.0 */
-
+#ifndef USB_HOST_ALIGN
 #define	USB_HOST_ALIGN    8		/* bytes, must be power of two */
+#endif
 
-#define	USB_ISOC_TIME_MAX 128		/* ms */
+#ifndef USB_FS_ISOC_UFRAME_MAX
 #define	USB_FS_ISOC_UFRAME_MAX 4	/* exclusive unit */
+#endif
 
 #if (USB_FS_ISOC_UFRAME_MAX > 6)
 #error "USB_FS_ISOC_UFRAME_MAX cannot be set higher than 6"
 #endif
 
+#ifndef USB_BUS_MAX
+#define	USB_BUS_MAX 256			/* units */
+#endif
+
+#ifndef USB_MAX_DEVICES
+#define	USB_MAX_DEVICES 128		/* units */
+#endif
+
+#if (USB_MAX_DEVICES < USB_MIN_DEVICES)
+#error "Minimum number of devices is greater than maximum number of devices."
+#endif
+
+#ifndef USB_IFACE_MAX
+#define	USB_IFACE_MAX 32		/* units */
+#endif
+
+#ifndef USB_FIFO_MAX
+#define	USB_FIFO_MAX 128		/* units */
+#endif
+
+#if (USB_FIFO_MAX & 1)
+#error "Number of FIFOs must be odd."
+#endif
+
 #define	USB_MAX_FS_ISOC_FRAMES_PER_XFER (120)	/* units */
 #define	USB_MAX_HS_ISOC_FRAMES_PER_XFER (8*120)	/* units */
 
-#define	USB_MAX_IPACKET		8	/* maximum size of the initial USB
-					 * data packet */
-#define	USB_HUB_MAX_DEPTH 5
+#ifndef USB_HUB_MAX_DEPTH
+#define	USB_HUB_MAX_DEPTH	5
+#endif
 
 /* USB transfer states */
 
@@ -219,9 +246,39 @@
 
 /* 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
 
-typedef void (usb2_callback_t)(struct usb2_xfer *);
+#ifndef USB_HAVE_TICKS_T
+typedef uint32_t usb2_ticks_t;		/* system defined */
+#endif
 
 /* structures */
 

==== //depot/projects/usb/src/sys/dev/usb/usb_debug.c#2 (text+ko) ====

@@ -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>

==== //depot/projects/usb/src/sys/dev/usb/usb_defs.h#2 (text+ko) ====

@@ -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

==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#11 (text+ko) ====

@@ -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>
 

==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#8 (text+ko) ====

@@ -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>

==== //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#2 (text+ko) ====

@@ -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>

==== //depot/projects/usb/src/sys/dev/usb/usb_generic.c#6 (text+ko) ====

@@ -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>

==== //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#2 (text+ko) ====

@@ -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>

==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#26 (text+ko) ====

@@ -43,7 +43,6 @@
 #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

==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#5 (text+ko) ====

@@ -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>

==== //depot/projects/usb/src/sys/dev/usb/usb_hub.h#3 (text+ko) ====


==== //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#2 (text+ko) ====

@@ -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>

==== //depot/projects/usb/src/sys/dev/usb/usb_request.c#3 (text+ko) ====

@@ -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>

==== //depot/projects/usb/src/sys/dev/usb/usb_sw_transfer.c#2 (text+ko) ====

@@ -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
 

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#130 (text+ko) ====

@@ -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
 

==== //depot/projects/usb/src/sys/dev/usb/usb_util.c#3 (text+ko) ====

@@ -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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903191011.n2JABhTg033116>