Author: hselasky
Date: Thu Mar 5 09:31:36 2015
New Revision: 279636
URL: https://svnweb.freebsd.org/changeset/base/279636
Log:
MFC r279270:
Add ugen keyword to USB pnpinfo. Remove extra space from existing pnpinfo.
PR: 198015
PR: 198019
PR: 198026
Modified:
stable/10/sys/dev/usb/usb_hub.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/usb/usb_hub.c
==============================================================================
--- stable/10/sys/dev/usb/usb_hub.c Thu Mar 5 09:29:05 2015
(r279635)
+++ stable/10/sys/dev/usb/usb_hub.c Thu Mar 5 09:31:36 2015
(r279636)
@@ -1694,11 +1694,19 @@ uhub_child_location_string(device_t pare
}
goto done;
}
- snprintf(buf, buflen, "bus=%u hubaddr=%u port=%u devaddr=%u
interface=%u",
- device_get_unit(res.udev->bus->bdev),
- (res.udev->parent_hub != NULL) ? res.udev->parent_hub->device_index
: 0,
- res.portno,
- res.udev->device_index, res.iface_index);
+ snprintf(buf, buflen, "bus=%u hubaddr=%u port=%u devaddr=%u"
+ " interface=%u"
+#if USB_HAVE_UGEN
+ " ugen=%s"
+#endif
+ , device_get_unit(res.udev->bus->bdev)
+ , (res.udev->parent_hub != NULL) ?
+ res.udev->parent_hub->device_index : 0
+ , res.portno, res.udev->device_index, res.iface_index
+#if USB_HAVE_UGEN
+ , res.udev->ugen_name
+#endif
+ );
done:
mtx_unlock(&Giant);
@@ -1740,7 +1748,7 @@ uhub_child_pnpinfo_string(device_t paren
"release=0x%04x "
"mode=%s "
"intclass=0x%02x intsubclass=0x%02x "
- "intprotocol=0x%02x " "%s%s",
+ "intprotocol=0x%02x" "%s%s",
UGETW(res.udev->ddesc.idVendor),
UGETW(res.udev->ddesc.idProduct),
res.udev->ddesc.bDeviceClass,
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
