conf/73799: Move the last stuff out of usbd.conf

[Kris Kennaway]

The following reply was made to PR conf/73799; it has been noted by GNATS.

From: Kris Kennaway <kris at obsecurity.org>
To: freebsd-gnats-submit at FreeBSD.org
Cc:  
Subject: Re: conf/73799: Move the last stuff out of usbd.conf
Date: Sat, 30 Jul 2005 01:49:56 -0400

 Adding to audit trail
 
 ----- Forwarded message from Anish Mistry <amistry at am-productions.biz> -----
 
 X-Original-To: kkenn at localhost
 Delivered-To: kkenn at localhost.obsecurity.org
 X-Original-To: kris at FreeBSD.org
 Delivered-To: kris at FreeBSD.org
 From: Anish Mistry <amistry at am-productions.biz>
 Organization: AM Productions
 To: Kris Kennaway <kris at FreeBSD.org>, Ian Dowse <iedowse at maths.tcd.ie>
 Subject: Re: conf/73799: Move the last stuff out of usbd.conf
 Date: Sat, 30 Jul 2005 00:16:31 -0400
 User-Agent: KMail/1.8
 Cc: freebsd-bugs at FreeBSD.org
 In-Reply-To: <200507300132.j6U1WZ9u003703 at freefall.freebsd.org>
 X-Spam-Status: No, hits=-1.5 required=5.0 tests=BAYES_99,MYFREEBSD2 
 	autolearn=no version=2.64
 X-Spam-Checker-Version: SpamAssassin 2.64 (2004-01-11) on 
 	crumpet.united-ware.com
 X-Virus-Scanned: ClamAV version 0.86, clamav-milter version 0.86 on crumpet.united-ware.com
 X-Virus-Status: Clean
 X-UIDL: ]'e!!5>@"!:p:!!!TV"!
 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=0.94.14
 
 On Friday 29 July 2005 09:32 pm, Kris Kennaway wrote:
 > Synopsis: Move the last stuff out of usbd.conf
 >
 > State-Changed-From-To: feedback->closed
 > State-Changed-By: kris
 > State-Changed-When: Sat Jul 30 01:32:28 GMT 2005
 > State-Changed-Why:
 > Feedback timeout
 >
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=73799
 Patch attached.  It applies to 5-STABLE and 7.0-CURRENT.  It makes usb 
 tell devd about the "release" field.
 I tested it with my Handspring Visor and Kensington Mouse and the 
 release value was honored.  We should be able to kill off usbd and 
 transfer everything since devd now know about release.
 
 -- 
 Anish Mistry
 amistry at am-productions.biz
 AM Productions http://am-productions.biz/
 
 
 
 
 
 ----- End forwarded message -----
 
 --- uhub.c.orig	Fri Jul 29 23:34:28 2005
 +++ uhub.c	Fri Jul 29 23:46:09 2005
 @@ -691,19 +691,18 @@
  	if (dev->ifacenums == NULL) {
  		snprintf(buf, buflen, "vendor=0x%04x product=0x%04x "
  		    "devclass=0x%02x devsubclass=0x%02x "
 -		    "sernum=\"%s\"",
 +		    "release=0x%04x sernum=\"%s\"",
  		    UGETW(dev->ddesc.idVendor), UGETW(dev->ddesc.idProduct),
 -		    dev->ddesc.bDeviceClass, dev->ddesc.bDeviceSubClass,
 -		    serial);
 +		    dev->ddesc.bDeviceClass, dev->ddesc.bDeviceSubClass, UGETW(dev->ddesc.bcdDevice), serial);
  	} else {
  		iface = &dev->ifaces[dev->ifacenums[i]];
  		snprintf(buf, buflen, "vendor=0x%04x product=0x%04x "
  		    "devclass=0x%02x devsubclass=0x%02x "
 -		    "sernum=\"%s\" "
 +		    "release=0x%04x sernum=\"%s\" "
  		    "intclass=0x%02x intsubclass=0x%02x",
  		    UGETW(dev->ddesc.idVendor), UGETW(dev->ddesc.idProduct),
  		    dev->ddesc.bDeviceClass, dev->ddesc.bDeviceSubClass,
 -		    serial,
 +		    UGETW(dev->ddesc.bcdDevice), serial,
  		    iface->idesc->bInterfaceClass,
  		    iface->idesc->bInterfaceSubClass);
  	}