From owner-p4-projects@FreeBSD.ORG  Wed Dec 12 21:40:09 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7B92B16A419; Wed, 12 Dec 2007 21:40:09 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1C52416A417
	for <perforce@FreeBSD.org>; Wed, 12 Dec 2007 21:40:09 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 185B013C45B
	for <perforce@FreeBSD.org>; Wed, 12 Dec 2007 21:40:09 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCLe8hI067020
	for <perforce@FreeBSD.org>; Wed, 12 Dec 2007 21:40:08 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCLe8xu067017
	for perforce@freebsd.org; Wed, 12 Dec 2007 21:40:08 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 12 Dec 2007 21:40:08 GMT
Message-Id: <200712122140.lBCLe8xu067017@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 130737 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2007 21:40:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=130737

Change 130737 by hselasky@hselasky_laptop001 on 2007/12/12 21:39:39

	
	This commit is USB device side related.
	
	o This commit introduces a new port status bit, 
	  "UPS_PORT_MODE_DEVICE", which tells the mode of the
	  HUB Port: Device or Host Mode. According the USB2.0
	  specification this bit should always read 0 which
	  translates to USB_MODE_HOST.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb.h#24 edit

Differences ...

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

@@ -56,6 +56,7 @@
 
 #define	USB_MAX_DEVICES 128
 #define	USB_START_ADDR 0
+#define	USB_ROOT_HUB_ADDR 1
 
 #define	USB_ISOC_TIME_MAX 128		/* ms */
 #define	USB_FS_ISOC_UFRAME_MAX 4	/* exclusive unit */
@@ -68,6 +69,7 @@
 
 #define	USB_CONTROL_ENDPOINT 0
 #define	USB_MAX_ENDPOINTS (2*16)
+#define	USB_MAX_INTERFACES USB_MAX_ENDPOINTS
 
 #define	USB_FRAMES_PER_SECOND_FS 1000	/* full speed */
 #define	USB_FRAMES_PER_SECOND_HS 8000	/* high speed */
@@ -395,6 +397,7 @@
 #define	UPS_SUSPEND			0x0004
 #define	UPS_OVERCURRENT_INDICATOR	0x0008
 #define	UPS_RESET			0x0010
+#define	UPS_PORT_MODE_DEVICE		0x0020 /* currently FreeBSD specific */
 #define	UPS_PORT_POWER			0x0100
 #define	UPS_LOW_SPEED			0x0200
 #define	UPS_HIGH_SPEED			0x0400
@@ -550,6 +553,7 @@
 
 #define	USB_UNCONFIG_NO 0
 #define	USB_UNCONFIG_INDEX 0xFF
+#define	USB_IFACE_INDEX_ANY 0xFF
 
 /*------------------------------------------------------------------------*
  * ioctl() related stuff