From owner-svn-src-all@FreeBSD.ORG  Tue Nov 30 08:25:58 2010
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 000EF1065674;
	Tue, 30 Nov 2010 08:25:57 +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 A7A108FC1A;
	Tue, 30 Nov 2010 08:25:57 +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 oAU8Pvdn058758;
	Tue, 30 Nov 2010 08:25:57 GMT
	(envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAU8Pv1O058756;
	Tue, 30 Nov 2010 08:25:57 GMT
	(envelope-from hselasky@svn.freebsd.org)
Message-Id: <201011300825.oAU8Pv1O058756@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Tue, 30 Nov 2010 08:25:57 +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: r216072 - 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: Tue, 30 Nov 2010 08:25:58 -0000

Author: hselasky
Date: Tue Nov 30 08:25:57 2010
New Revision: 216072
URL: http://svn.freebsd.org/changeset/base/216072

Log:
  We need to define a cdev variable associated with each USB device,
  hence existing applications like webcamd are expecting that.
  This problem was introduced by SVN change 214221 where cdev=
  was replaced by ugen= by accident. Solve this problem by
  redefining cdev= in devd notifications.
  
  MFC after 3 days.
  
  Approved by:	thompsa (mentor)

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

Modified: head/sys/dev/usb/usb_device.c
==============================================================================
--- head/sys/dev/usb/usb_device.c	Tue Nov 30 07:14:05 2010	(r216071)
+++ head/sys/dev/usb/usb_device.c	Tue Nov 30 08:25:57 2010	(r216072)
@@ -2475,6 +2475,7 @@ usb_notify_addq(const char *type, struct
 	sbuf_printf(sb,
 #if USB_HAVE_UGEN
 	    "ugen=%s "
+	    "cdev=%s "
 #endif
 	    "vendor=0x%04x "
 	    "product=0x%04x "
@@ -2490,6 +2491,7 @@ usb_notify_addq(const char *type, struct
 	    "",
 #if USB_HAVE_UGEN
 	    udev->ugen_name,
+	    udev->ugen_name,
 #endif
 	    UGETW(udev->ddesc.idVendor),
 	    UGETW(udev->ddesc.idProduct),
@@ -2521,6 +2523,7 @@ usb_notify_addq(const char *type, struct
 		sbuf_printf(sb,
 #if USB_HAVE_UGEN
 		    "ugen=%s "
+		    "cdev=%s "
 #endif
 		    "vendor=0x%04x "
 		    "product=0x%04x "
@@ -2536,6 +2539,7 @@ usb_notify_addq(const char *type, struct
 		    "intprotocol=0x%02x",
 #if USB_HAVE_UGEN
 		    udev->ugen_name,
+		    udev->ugen_name,
 #endif
 		    UGETW(udev->ddesc.idVendor),
 		    UGETW(udev->ddesc.idProduct),