From owner-svn-src-head@FreeBSD.ORG  Sat Jan 22 13:52:24 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 01D2D106564A;
	Sat, 22 Jan 2011 13:52:24 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E47BA8FC08;
	Sat, 22 Jan 2011 13:52:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0MDqNDY093633;
	Sat, 22 Jan 2011 13:52:23 GMT
	(envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0MDqNt3093630;
	Sat, 22 Jan 2011 13:52:23 GMT
	(envelope-from hselasky@svn.freebsd.org)
Message-Id: <201101221352.p0MDqNt3093630@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Sat, 22 Jan 2011 13:52:23 +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: r217718 - in head/sys: conf dev/usb
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Jan 2011 13:52:24 -0000

Author: hselasky
Date: Sat Jan 22 13:52:23 2011
New Revision: 217718
URL: http://svn.freebsd.org/changeset/base/217718

Log:
  Allow USB_HOST_ALIGN to be configured at compile time. This patch is
  necessary for MIPS based RouterStation Pro board and maybe other MIPS
  based boards as well.
  
  Submitted by:	Milan Obuch
  Approved by:	thompsa (mentor)

Modified:
  head/sys/conf/options
  head/sys/dev/usb/usb_freebsd.h

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Sat Jan 22 13:18:28 2011	(r217717)
+++ head/sys/conf/options	Sat Jan 22 13:52:23 2011	(r217718)
@@ -642,6 +642,7 @@ BUS_DEBUG		opt_bus.h
 
 # options for USB support
 USB_DEBUG		opt_usb.h
+USB_HOST_ALIGN		opt_usb.h
 USB_REQ_DEBUG		opt_usb.h
 USB_VERBOSE		opt_usb.h
 USB_EHCI_BIG_ENDIAN_DESC	opt_usb.h

Modified: head/sys/dev/usb/usb_freebsd.h
==============================================================================
--- head/sys/dev/usb/usb_freebsd.h	Sat Jan 22 13:18:28 2011	(r217717)
+++ head/sys/dev/usb/usb_freebsd.h	Sat Jan 22 13:52:23 2011	(r217718)
@@ -46,7 +46,12 @@
 #define	USB_TD_GET_PROC(td) (td)->td_proc
 #define	USB_PROC_GET_GID(td) (td)->p_pgid
 
+#if defined(USB_HOST_ALIGN) && (USB_HOST_ALIGN != 0)
+/* USB_HOST_ALIGN is already defined and valid */
+#else
+#undef USB_HOST_ALIGN
 #define	USB_HOST_ALIGN    8		/* bytes, must be power of two */
+#endif
 #define	USB_FS_ISOC_UFRAME_MAX 4	/* exclusive unit */
 #define	USB_BUS_MAX 256			/* units */
 #define	USB_MAX_DEVICES 128		/* units */