svn commit: r208223 - stable/8/sys/dev/usb

[Andrew Thompson]

Author: thompsa
Date: Mon May 17 23:46:45 2010
New Revision: 208223
URL: http://svn.freebsd.org/changeset/base/208223

Log:
  MFC r208010
  
   Provide more information about the device location in the USB system.

Modified:
  stable/8/sys/dev/usb/usb_hub.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/dev/usb/usb_hub.c
==============================================================================
--- stable/8/sys/dev/usb/usb_hub.c	Mon May 17 23:46:08 2010	(r208222)
+++ stable/8/sys/dev/usb/usb_hub.c	Mon May 17 23:46:45 2010	(r208223)
@@ -1010,8 +1010,10 @@ uhub_child_location_string(device_t pare
 		}
 		goto done;
 	}
-	snprintf(buf, buflen, "port=%u interface=%u",
-	    res.portno, res.iface_index);
+	snprintf(buf, buflen, "bus=%u hubaddr=%u port=%u devaddr=%u interface=%u",
+	    (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);
 done:
 	mtx_unlock(&Giant);