From 41ee608d23f9a41a9ab3161db36a249f55da780f Mon Sep 17 00:00:00 2001 From: iedowse Date: Tue, 23 Aug 2005 21:32:49 +0000 Subject: Provide the USB device release number along with other parameters so that devd can match on it. This field was already available to usbd and is used by a number of usbd.conf entries, so now it is possible to transfer those entries to devd.conf. Submitted by: Anish Mistry --- sys/dev/usb/uhub.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/dev/usb/uhub.c') diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c index da10744..17b9332 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -697,19 +697,19 @@ found_dev: 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); + 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); } -- cgit v1.1