From owner-svn-src-all@FreeBSD.ORG Sun Apr 5 18:22:03 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7532D1065BC6; Sun, 5 Apr 2009 18:22:03 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 63B168FC1E; Sun, 5 Apr 2009 18:22:03 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n35IM3m6028295; Sun, 5 Apr 2009 18:22:03 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n35IM3ti028293; Sun, 5 Apr 2009 18:22:03 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200904051822.n35IM3ti028293@svn.freebsd.org> From: Andrew Thompson Date: Sun, 5 Apr 2009 18:22:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190742 - head/sys/dev/usb/serial X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Apr 2009 18:22:04 -0000 Author: thompsa Date: Sun Apr 5 18:22:03 2009 New Revision: 190742 URL: http://svn.freebsd.org/changeset/base/190742 Log: MFp4 //depot/projects/usb@160052 Wait until line configuration is complete before starting data transfers. Submitted by: Hans Petter Selasky Modified: head/sys/dev/usb/serial/usb_serial.c head/sys/dev/usb/serial/usb_serial.h Modified: head/sys/dev/usb/serial/usb_serial.c ============================================================================== --- head/sys/dev/usb/serial/usb_serial.c Sun Apr 5 18:21:51 2009 (r190741) +++ head/sys/dev/usb/serial/usb_serial.c Sun Apr 5 18:22:03 2009 (r190742) @@ -412,6 +412,12 @@ usb2_com_queue_command(struct usb2_com_s 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 @@ usb2_com_cfg_start_transfers(struct usb2 /* 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); Modified: head/sys/dev/usb/serial/usb_serial.h ============================================================================== --- head/sys/dev/usb/serial/usb_serial.h Sun Apr 5 18:21:51 2009 (r190741) +++ head/sys/dev/usb/serial/usb_serial.h Sun Apr 5 18:22:03 2009 (r190742) @@ -152,6 +152,8 @@ struct usb2_com_softc { 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;