d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ugen keyword to USB pnpinfo. Remove extra space from existing pnpinfo.

Browse Source 
PR:		198015
PR:		198019
PR:		198026
MFC after:	1 week
This commit is contained in:
hselasky 2015-02-25 08:35:00 +00:00
parent 7f661e0eb8
commit a3e7eefea3
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/usb/usb_hub.c
View File

@ -1681,11 +1681,19 @@ uhub_child_location_string(device_t parent, device_t child,
} }
goto done; goto done;
} }
snprintf(buf, buflen, "bus=%u hubaddr=%u port=%u devaddr=%u interface=%u", snprintf(buf, buflen, "bus=%u hubaddr=%u port=%u devaddr=%u"
device_get_unit(res.udev->bus->bdev), " interface=%u"
(res.udev->parent_hub != NULL) ? res.udev->parent_hub->device_index : 0, #if USB_HAVE_UGEN
res.portno, " ugen=%s"
res.udev->device_index, res.iface_index); #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: done:
mtx_unlock(&Giant); mtx_unlock(&Giant);
@ -1727,7 +1735,7 @@ uhub_child_pnpinfo_string(device_t parent, device_t child,
"release=0x%04x " "release=0x%04x "
"mode=%s " "mode=%s "
"intclass=0x%02x intsubclass=0x%02x " "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.idVendor),
UGETW(res.udev->ddesc.idProduct), UGETW(res.udev->ddesc.idProduct),
res.udev->ddesc.bDeviceClass, res.udev->ddesc.bDeviceClass,