From owner-svn-src-head@FreeBSD.ORG  Wed Apr 21 23:03:27 2010
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 09F0C106566C;
	Wed, 21 Apr 2010 23:03:27 +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 EE65E8FC1D;
	Wed, 21 Apr 2010 23:03:26 +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 o3LN3Qvs094695;
	Wed, 21 Apr 2010 23:03:26 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3LN3QsF094693;
	Wed, 21 Apr 2010 23:03:26 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <201004212303.o3LN3QsF094693@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Wed, 21 Apr 2010 23:03:26 +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: r207027 - head/sys/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: Wed, 21 Apr 2010 23:03:27 -0000

Author: thompsa
Date: Wed Apr 21 23:03:26 2010
New Revision: 207027
URL: http://svn.freebsd.org/changeset/base/207027

Log:
  Also add the usb mode to the devd string as the usb controller can work in both
  host or device (gadget) modes.
  
  Suggested by:	HPS

Modified:
  head/sys/dev/usb/usb_device.c

Modified: head/sys/dev/usb/usb_device.c
==============================================================================
--- head/sys/dev/usb/usb_device.c	Wed Apr 21 22:34:49 2010	(r207026)
+++ head/sys/dev/usb/usb_device.c	Wed Apr 21 23:03:26 2010	(r207027)
@@ -2427,6 +2427,7 @@ usb_notify_addq(const char *type, struct
 	    "devsubclass=0x%02x "
 	    "sernum=\"%s\" "
 	    "release=0x%04x "
+	    "mode=%s "
 	    "port=%u "
 	    "parent=%s\n",
 	    udev->ugen_name,
@@ -2436,6 +2437,7 @@ usb_notify_addq(const char *type, struct
 	    udev->ddesc.bDeviceSubClass,
 	    udev->serial,
 	    UGETW(udev->ddesc.bcdDevice),
+	    (udev->flags.usb_mode == USB_MODE_HOST) ? "host" : "device",
 	    udev->port_no,
 	    udev->parent_hub != NULL ?
 	    udev->parent_hub->ugen_name :
@@ -2461,6 +2463,7 @@ usb_notify_addq(const char *type, struct
 		    "devsubclass=0x%02x "
 		    "sernum=\"%s\" "
 		    "release=0x%04x "
+		    "mode=%s "
 		    "interface=%d "
 		    "endpoints=%d "
 		    "intclass=0x%02x "
@@ -2473,6 +2476,7 @@ usb_notify_addq(const char *type, struct
 		    udev->ddesc.bDeviceSubClass,
 		    udev->serial,
 		    UGETW(udev->ddesc.bcdDevice),
+		    (udev->flags.usb_mode == USB_MODE_HOST) ? "host" : "device",
 		    iface->idesc->bInterfaceNumber,
 		    iface->idesc->bNumEndpoints,
 		    iface->idesc->bInterfaceClass,