From owner-svn-src-all@FreeBSD.ORG  Fri Mar 20 22:04:34 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D6EA31065676;
	Fri, 20 Mar 2009 22:04:34 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6325D8FC17;
	Fri, 20 Mar 2009 22:04:33 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2KM4XgF015173;
	Fri, 20 Mar 2009 22:04:33 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2KM4Xj7015172;
	Fri, 20 Mar 2009 22:04:33 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200903202204.n2KM4Xj7015172@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Fri, 20 Mar 2009 22:04:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190185 - head/sys/dev/usb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Mar 2009 22:04:35 -0000

Author: thompsa
Date: Fri Mar 20 22:04:33 2009
New Revision: 190185
URL: http://svn.freebsd.org/changeset/base/190185

Log:
  MFp4 //depot/projects/usb
  
  Sync usb_core.h after header changes.
  
  Submitted by:	Hans Petter Selasky

Modified:
  head/sys/dev/usb/usb_core.h

Modified: head/sys/dev/usb/usb_core.h
==============================================================================
--- head/sys/dev/usb/usb_core.h	Fri Mar 20 22:01:45 2009	(r190184)
+++ head/sys/dev/usb/usb_core.h	Fri Mar 20 22:04:33 2009	(r190185)
@@ -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
 
 #ifndef USB_EP0_BUFSIZE
 #define	USB_EP0_BUFSIZE		1024	/* bytes */