From owner-svn-src-head@FreeBSD.ORG  Fri Nov  5 19:26:55 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 86F691065672;
	Fri,  5 Nov 2010 19:26:55 +0000 (UTC)
	(envelope-from nick@van-laarhoven.org)
Received: from cpsmtpb-ews10.kpnxchange.com (cpsmtpb-ews10.kpnxchange.com
	[213.75.39.15])
	by mx1.freebsd.org (Postfix) with ESMTP id 01CC18FC0C;
	Fri,  5 Nov 2010 19:26:54 +0000 (UTC)
Received: from cpbrm-ews33.kpnxchange.com ([10.94.84.164]) by
	cpsmtpb-ews10.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.4675); 
	Fri, 5 Nov 2010 20:14:49 +0100
Received: from CPSMTPM-EML109.kpnxchange.com ([195.121.3.13]) by
	cpbrm-ews33.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.4675); 
	Fri, 5 Nov 2010 20:14:48 +0100
Received: from uitsmijter.van-laarhoven.org ([81.207.207.222]) by
	CPSMTPM-EML109.kpnxchange.com with Microsoft
	SMTPSVC(7.0.6002.18222); Fri, 5 Nov 2010 20:14:47 +0100
Received: from hillary.van-laarhoven.org (Hillary.van-laarhoven.org
	[10.66.0.100]) (using TLSv1 with cipher AES128-SHA (128/128 bits))
	(No client certificate requested)
	by uitsmijter.van-laarhoven.org (Postfix) with ESMTPSA id 691D64567;
	Fri,  5 Nov 2010 20:14:34 +0100 (CET)
Mime-Version: 1.0 (Apple Message framework v1081)
Content-Type: text/plain; charset=us-ascii
From: Nick Hibma <nick@van-laarhoven.org>
In-Reply-To: <201011051912.oA5JCmJ2006473@svn.freebsd.org>
Date: Fri, 5 Nov 2010 20:14:33 +0100
Content-Transfer-Encoding: quoted-printable
Message-Id: <EE361DBB-B00A-42A1-A1CD-C6AAA7F87953@van-laarhoven.org>
References: <201011051912.oA5JCmJ2006473@svn.freebsd.org>
To: Nick Hibma <n_hibma@freebsd.org>
X-Mailer: Apple Mail (2.1081)
X-Spam-Status: No, score=-15.4 required=5.0 tests=J_CHICKENPOX_83,
	UNPARSEABLE_RELAY,USER_IN_WHITELIST,USER_IN_WHITELIST_TO autolearn=no
	version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	uitsmijter.van-laarhoven.org
X-OriginalArrivalTime: 05 Nov 2010 19:14:48.0077 (UTC)
	FILETIME=[B69283D0:01CB7D1D]
X-RcptDomain: freebsd.org
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r214843 - in head/sys/dev/usb: net serial
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Nov 2010 19:26:55 -0000

Forgot to mention:

MFC:	2 weeks

On 5 Nov 2010, at 20:12, Nick Hibma wrote:

> Author: n_hibma
> Date: Fri Nov  5 19:12:48 2010
> New Revision: 214843
> URL: http://svn.freebsd.org/changeset/base/214843
>=20
> Log:
>  Implement ucom_set_pnpinfo_usb() providing ttyname and port number
>  information through devd. My E220 now produces the notification (1 =
line):
>=20
>  	+u3g0 at bus=3D1 hubaddr=3D1 port=3D0 devaddr=3D2 interface=3D0 =
\
>  	vendor=3D0x12d1 product=3D0x1003 devclass=3D0x00 =
devsubclass=3D0x00 \
>  	sernum=3D"" release=3D0x0000 intclass=3D0xff intsubclass=3D0xff =
\
>  	ttyname=3DU0 ttyports=3D2 on uhub0
>=20
>  Note: serial/ufoma and net/uhso still provide port number and tty =
name
>  (uhso only) information through sysctls, which should now be removed.
>=20
>  Reviewed by:	hpselasky
>=20
> Modified:
>  head/sys/dev/usb/net/uhso.c
>  head/sys/dev/usb/serial/u3g.c
>  head/sys/dev/usb/serial/uark.c
>  head/sys/dev/usb/serial/ubsa.c
>  head/sys/dev/usb/serial/ubser.c
>  head/sys/dev/usb/serial/uchcom.c
>  head/sys/dev/usb/serial/ucycom.c
>  head/sys/dev/usb/serial/ufoma.c
>  head/sys/dev/usb/serial/uftdi.c
>  head/sys/dev/usb/serial/ugensa.c
>  head/sys/dev/usb/serial/uipaq.c
>  head/sys/dev/usb/serial/umct.c
>  head/sys/dev/usb/serial/umodem.c
>  head/sys/dev/usb/serial/umoscom.c
>  head/sys/dev/usb/serial/uplcom.c
>  head/sys/dev/usb/serial/usb_serial.c
>  head/sys/dev/usb/serial/usb_serial.h
>  head/sys/dev/usb/serial/uslcom.c
>  head/sys/dev/usb/serial/uvisor.c
>  head/sys/dev/usb/serial/uvscom.c
>=20
> Modified: head/sys/dev/usb/net/uhso.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/net/uhso.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/net/uhso.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -902,6 +902,7 @@ uhso_probe_iface(struct uhso_softc *sc,=20
> 				device_printf(sc->sc_dev, "ucom_attach =
failed\n");
> 				return (ENXIO);
> 			}
> +			ucom_set_pnpinfo_usb(&sc->sc_super_ucom, =
sc->sc_dev);
>=20
> 			mtx_lock(&sc->sc_mtx);
> 			=
usbd_transfer_start(sc->sc_xfer[UHSO_MUX_ENDPT_INTR]);
> @@ -920,6 +921,7 @@ uhso_probe_iface(struct uhso_softc *sc,=20
> 			device_printf(sc->sc_dev, "ucom_attach =
failed\n");
> 			return (ENXIO);
> 		}
> +		ucom_set_pnpinfo_usb(&sc->sc_super_ucom, sc->sc_dev);
> 	}
> 	else {
> 		UHSO_DPRINTF(0, "Unknown type %x\n", type);
>=20
> Modified: head/sys/dev/usb/serial/u3g.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/u3g.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/u3g.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -818,8 +818,10 @@ u3g_attach(device_t dev)
> 		DPRINTF("ucom_attach failed\n");
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> 	device_printf(dev, "Found %u port%s.\n", sc->sc_numports,
> 	    sc->sc_numports > 1 ? "s":"");
> +
> 	return (0);
>=20
> detach:
>=20
> Modified: head/sys/dev/usb/serial/uark.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/uark.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/uark.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -227,6 +227,8 @@ uark_attach(device_t dev)
> 		DPRINTF("ucom_attach failed\n");
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	return (0);			/* success */
>=20
> detach:
>=20
> Modified: head/sys/dev/usb/serial/ubsa.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/ubsa.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/ubsa.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -331,6 +331,8 @@ ubsa_attach(device_t dev)
> 		DPRINTF("ucom_attach failed\n");
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	return (0);
>=20
> detach:
>=20
> Modified: head/sys/dev/usb/serial/ubser.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/ubser.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/ubser.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -296,6 +296,7 @@ ubser_attach(device_t dev)
> 	if (error) {
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
>=20
> 	mtx_lock(&sc->sc_mtx);
> 	usbd_xfer_set_stall(sc->sc_xfer[UBSER_BULK_DT_WR]);
>=20
> Modified: head/sys/dev/usb/serial/uchcom.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/uchcom.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/uchcom.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -354,6 +354,8 @@ uchcom_attach(device_t dev)
> 	if (error) {
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	return (0);
>=20
> detach:
>=20
> Modified: head/sys/dev/usb/serial/ucycom.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/ucycom.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/ucycom.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -272,13 +272,15 @@ ucycom_attach(device_t dev)
> 	}
> 	error =3D ucom_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc,
> 	    &ucycom_callback, &sc->sc_mtx);
> -
> 	if (error) {
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	if (urd_ptr) {
> 		free(urd_ptr, M_USBDEV);
> 	}
> +
> 	return (0);			/* success */
>=20
> detach:
>=20
> Modified: head/sys/dev/usb/serial/ufoma.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/ufoma.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/ufoma.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -450,6 +450,8 @@ ufoma_attach(device_t dev)
> 		DPRINTF("ucom_attach failed\n");
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	/*Sysctls*/
> 	sctx =3D device_get_sysctl_ctx(dev);
> 	soid =3D device_get_sysctl_tree(dev);
>=20
> Modified: head/sys/dev/usb/serial/uftdi.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/uftdi.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/uftdi.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -332,6 +332,8 @@ uftdi_attach(device_t dev)
> 	if (error) {
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	return (0);			/* success */
>=20
> detach:
>=20
> Modified: head/sys/dev/usb/serial/ugensa.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/ugensa.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/ugensa.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -247,6 +247,8 @@ ugensa_attach(device_t dev)
> 		DPRINTF("attach failed\n");
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	return (0);			/* success */
>=20
> detach:
>=20
> Modified: head/sys/dev/usb/serial/uipaq.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/uipaq.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/uipaq.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -1161,6 +1161,8 @@ uipaq_attach(device_t dev)
> 	if (error) {
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	return (0);
>=20
> detach:
>=20
> Modified: head/sys/dev/usb/serial/umct.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/umct.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/umct.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -297,6 +297,8 @@ umct_attach(device_t dev)
> 	if (error) {
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	return (0);			/* success */
>=20
> detach:
>=20
> Modified: head/sys/dev/usb/serial/umodem.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/umodem.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/umodem.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -389,6 +389,8 @@ umodem_attach(device_t dev)
> 	if (error) {
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	return (0);
>=20
> detach:
>=20
> Modified: head/sys/dev/usb/serial/umoscom.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/umoscom.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/umoscom.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -338,6 +338,8 @@ umoscom_attach(device_t dev)
> 	if (error) {
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	return (0);
>=20
> detach:
>=20
> Modified: head/sys/dev/usb/serial/uplcom.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/uplcom.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/uplcom.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -445,6 +445,8 @@ uplcom_attach(device_t dev)
> 		device_printf(dev, "init failed\n");
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	return (0);
>=20
> detach:
>=20
> Modified: head/sys/dev/usb/serial/usb_serial.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/usb_serial.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/usb_serial.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -185,6 +185,8 @@ static uint8_t ucom_bitmap[(UCOM_UNIT_MA
> static struct mtx ucom_bitmap_mtx;
> MTX_SYSINIT(ucom_bitmap_mtx, &ucom_bitmap_mtx, "ucom bitmap", =
MTX_DEF);
>=20
> +#define UCOM_TTY_PREFIX		"U"
> +
> /*
>  * Mark a unit number (the X in cuaUX) as in use.
>  *
> @@ -320,11 +322,12 @@ ucom_attach_tty(struct ucom_super_softc=20
> 		/* Use default TTY name */
> 		if (ssc->sc_subunits > 1) {
> 			/* multiple modems in one */
> -			snprintf(buf, sizeof(buf), "U%u.%u",
> +			snprintf(buf, sizeof(buf), UCOM_TTY_PREFIX =
"%u.%u",
> 			    ssc->sc_unit, sc->sc_subunit);
> 		} else {
> 			/* single modem */
> -			snprintf(buf, sizeof(buf), "U%u", ssc->sc_unit);
> +			snprintf(buf, sizeof(buf), UCOM_TTY_PREFIX "%u",
> +			    ssc->sc_unit);
> 		}
> 	}
> 	tty_makedev(tp, NULL, "%s", buf);
> @@ -409,6 +412,24 @@ ucom_detach_tty(struct ucom_softc *sc)
> 	cv_destroy(&sc->sc_cv);
> }
>=20
> +void
> +ucom_set_pnpinfo_usb(struct ucom_super_softc *ssc, device_t dev)
> +{
> +    char buf[64];
> +    uint8_t iface_index;
> +    struct usb_attach_arg *uaa;
> +
> +    snprintf(buf, sizeof(buf), "ttyname=3D%s%d ttyports=3D%d",
> +	     UCOM_TTY_PREFIX, ssc->sc_unit, ssc->sc_subunits);
> +
> +    /* Store the PNP info in the first interface for the dev */
> +    uaa =3D device_get_ivars(dev);
> +    iface_index =3D uaa->info.bIfaceIndex;
> +   =20
> +    if (usbd_set_pnpinfo(uaa->device, iface_index, buf) !=3D 0)
> +	device_printf(dev, "Could not set PNP info\n");
> +}
> +
> static void
> ucom_queue_command(struct ucom_softc *sc,
>     usb_proc_callback_t *fn, struct termios *pt,
>=20
> Modified: head/sys/dev/usb/serial/usb_serial.h
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/usb_serial.h	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/usb_serial.h	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -193,6 +193,7 @@ int	ucom_attach(struct ucom_super_softc=20
> 	    struct ucom_softc *, uint32_t, void *,
> 	    const struct ucom_callback *callback, struct mtx *);
> void	ucom_detach(struct ucom_super_softc *, struct ucom_softc *);
> +void	ucom_set_pnpinfo_usb(struct ucom_super_softc *, device_t);
> void	ucom_status_change(struct ucom_softc *);
> uint8_t	ucom_get_data(struct ucom_softc *, struct usb_page_cache =
*,
> 	    uint32_t, uint32_t, uint32_t *);
>=20
> Modified: head/sys/dev/usb/serial/uslcom.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/uslcom.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/uslcom.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -324,6 +324,8 @@ uslcom_attach(device_t dev)
> 	if (error) {
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	return (0);
>=20
> detach:
>=20
> Modified: head/sys/dev/usb/serial/uvisor.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/uvisor.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/uvisor.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -347,6 +347,8 @@ uvisor_attach(device_t dev)
> 		DPRINTF("ucom_attach failed\n");
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	return (0);
>=20
> detach:
>=20
> Modified: head/sys/dev/usb/serial/uvscom.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/usb/serial/uvscom.c	Fri Nov  5 18:24:50 2010	=
(r214842)
> +++ head/sys/dev/usb/serial/uvscom.c	Fri Nov  5 19:12:48 2010	=
(r214843)
> @@ -321,6 +321,8 @@ uvscom_attach(device_t dev)
> 	if (error) {
> 		goto detach;
> 	}
> +	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
> +
> 	/* start interrupt pipe */
> 	mtx_lock(&sc->sc_mtx);
> 	usbd_transfer_start(sc->sc_xfer[UVSCOM_INTR_DT_RD]);
> _______________________________________________
> svn-src-all@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-all
> To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"