Date: Wed, 25 Feb 2015 08:35:01 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r279270 - head/sys/dev/usb Message-ID: <201502250835.t1P8Z1GV066492@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Wed Feb 25 08:35:00 2015 New Revision: 279270 URL: https://svnweb.freebsd.org/changeset/base/279270 Log: Add ugen keyword to USB pnpinfo. Remove extra space from existing pnpinfo. PR: 198015 PR: 198019 PR: 198026 MFC after: 1 week Modified: head/sys/dev/usb/usb_hub.c Modified: head/sys/dev/usb/usb_hub.c ============================================================================== --- head/sys/dev/usb/usb_hub.c Wed Feb 25 07:49:15 2015 (r279269) +++ head/sys/dev/usb/usb_hub.c Wed Feb 25 08:35:00 2015 (r279270) @@ -1681,11 +1681,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); @@ -1727,7 +1735,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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502250835.t1P8Z1GV066492>