Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Mar 2015 09:37:28 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r279638 - stable/8/sys/dev/usb
Message-ID:  <201503050937.t259bSXI041419@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hselasky
Date: Thu Mar  5 09:37:27 2015
New Revision: 279638
URL: https://svnweb.freebsd.org/changeset/base/279638

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

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

Modified: stable/8/sys/dev/usb/usb_hub.c
==============================================================================
--- stable/8/sys/dev/usb/usb_hub.c	Thu Mar  5 09:35:15 2015	(r279637)
+++ stable/8/sys/dev/usb/usb_hub.c	Thu Mar  5 09:37:27 2015	(r279638)
@@ -1610,10 +1610,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);
 
@@ -1655,7 +1656,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?201503050937.t259bSXI041419>