From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 13:53:25 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 00FC01065715; Tue, 31 Mar 2009 13:53:25 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B40DA10656D2
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 13:53:24 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A1FF38FC1B
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 13:53:24 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VDrOve007726
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 13:53:24 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VDrOnP007724
	for perforce@freebsd.org; Tue, 31 Mar 2009 13:53:24 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 31 Mar 2009 13:53:24 GMT
Message-Id: <200903311353.n2VDrOnP007724@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160052 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Mar 2009 13:53:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=160052

Change 160052 by hselasky@hselasky_laptop001 on 2009/03/31 13:52:52

	
	USB serial:
	
	  - wait until line configuration is complete
	    before starting data transfers.
	
	Reported by Bernd Walter & more.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.h#2 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#2 (text+ko) ====

@@ -412,6 +412,12 @@
 	if (fn == usb2_com_cfg_close)
 		usb2_proc_mwait(&ssc->sc_tq, t0, t1);
 
+	/*
+	 * In case of multiple configure requests,
+	 * keep track of the last one!
+	 */
+	if (fn == usb2_com_cfg_start_transfers)
+		sc->sc_last_start_xfer = &task->hdr;
 }
 
 static void
@@ -458,7 +464,9 @@
 		/* TTY device closed */
 		return;
 	}
-	sc->sc_flag |= UCOM_FLAG_GP_DATA;
+
+	if (_task == sc->sc_last_start_xfer)
+		sc->sc_flag |= UCOM_FLAG_GP_DATA;
 
 	if (sc->sc_callback->usb2_com_start_read) {
 		(sc->sc_callback->usb2_com_start_read) (sc);

==== //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.h#2 (text+ko) ====

@@ -152,6 +152,8 @@
 	struct usb2_com_cfg_task	sc_status_task[2];
 	struct usb2_com_param_task	sc_param_task[2];
 	struct cv sc_cv;
+	/* Used to set "UCOM_FLAG_GP_DATA" flag: */
+	struct usb2_proc_msg	*sc_last_start_xfer;
 	const struct usb2_com_callback *sc_callback;
 	struct usb2_com_super_softc *sc_super;
 	struct tty *sc_tty;