From owner-svn-src-user@FreeBSD.ORG  Sun Jun 20 22:37:24 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CD97D106566B;
	Sun, 20 Jun 2010 22:37:24 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BD7AF8FC16;
	Sun, 20 Jun 2010 22:37:24 +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 o5KMbOgm037203;
	Sun, 20 Jun 2010 22:37:24 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5KMbOGf037201;
	Sun, 20 Jun 2010 22:37:24 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201006202237.o5KMbOGf037201@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sun, 20 Jun 2010 22:37:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209372 - user/jmallett/octeon/sys/mips/cavium/usb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Jun 2010 22:37:24 -0000

Author: jmallett
Date: Sun Jun 20 22:37:24 2010
New Revision: 209372
URL: http://svn.freebsd.org/changeset/base/209372

Log:
  Actually, the maximum number of USB ports is 2.  Clamp that down to 1 for now
  because we only support the first interrupt.

Modified:
  user/jmallett/octeon/sys/mips/cavium/usb/octusb.h

Modified: user/jmallett/octeon/sys/mips/cavium/usb/octusb.h
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/usb/octusb.h	Sun Jun 20 21:33:29 2010	(r209371)
+++ user/jmallett/octeon/sys/mips/cavium/usb/octusb.h	Sun Jun 20 22:37:24 2010	(r209372)
@@ -29,7 +29,14 @@
 #define	_OCTUSB_H_
 
 #define	OCTUSB_MAX_DEVICES MIN(USB_MAX_DEVICES, 64)
-#define	OCTUSB_MAX_PORTS	7	/* hardcoded */
+/*
+ * The second port is on a different IRQ and so we disable it for now.
+ */
+#if 1
+#define	OCTUSB_MAX_PORTS	1	/* hardcoded */
+#else
+#define	OCTUSB_MAX_PORTS	2	/* hardcoded */
+#endif
 #define	OCTUSB_MAX_FIXUP	4096	/* bytes */
 #define	OCTUSB_INTR_ENDPT	0x01