svn commit: r279637 - stable/9/sys/dev/usb

[Hans Petter Selasky]

Author: hselasky
Date: Thu Mar  5 09:35:15 2015
New Revision: 279637
URL: https://svnweb.freebsd.org/changeset/base/279637

Log:
  MFC r279270:
  Add ugen keyword to USB pnpinfo. Remove extra space from existing pnpinfo.
  
  PR:		198015
  PR:		198019
  PR:		198026

Modified:
  stable/9/sys/dev/usb/usb_hub.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/usb_hub.c
==============================================================================
--- stable/9/sys/dev/usb/usb_hub.c	Thu Mar  5 09:31:36 2015	(r279636)
+++ stable/9/sys/dev/usb/usb_hub.c	Thu Mar  5 09:35:15 2015	(r279637)
@@ -1611,10 +1611,11 @@ uhub_child_location_string(device_t pare
 		}
 		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 interface=%u"
+	    " ugen=%s",
 	    (res.udev->parent_hub != NULL) ? res.udev->parent_hub->device_index : 0,
 	    res.portno, device_get_unit(res.udev->bus->bdev),
-	    res.udev->device_index, res.iface_index);
+	    res.udev->device_index, res.iface_index, res.udev->ugen_name);
 done:
 	mtx_unlock(&Giant);
 
@@ -1656,7 +1657,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,