svn commit: r216072 - head/sys/dev/usb

[Hans Petter Selasky]

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),