From owner-svn-src-head@FreeBSD.ORG  Sun Jun  2 10:54:48 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 01F0E420;
 Sun,  2 Jun 2013 10:54:47 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E7D4D1EAF;
 Sun,  2 Jun 2013 10:54:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r52Asl0n028899;
 Sun, 2 Jun 2013 10:54:47 GMT (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r52Asltk028898;
 Sun, 2 Jun 2013 10:54:47 GMT (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201306021054.r52Asltk028898@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Sun, 2 Jun 2013 10:54:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251249 - head/sys/dev/usb/controller
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sun, 02 Jun 2013 10:54:48 -0000

Author: hselasky
Date: Sun Jun  2 10:54:47 2013
New Revision: 251249
URL: http://svnweb.freebsd.org/changeset/base/251249

Log:
  Don't set the start ISOC ASAP bit for non-isochronous TRBs.
  
  MFC after:	1 week

Modified:
  head/sys/dev/usb/controller/xhci.c

Modified: head/sys/dev/usb/controller/xhci.c
==============================================================================
--- head/sys/dev/usb/controller/xhci.c	Sun Jun  2 10:35:08 2013	(r251248)
+++ head/sys/dev/usb/controller/xhci.c	Sun Jun  2 10:54:47 2013	(r251249)
@@ -1700,14 +1700,17 @@ restart:
 
 			dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT |
 			  XHCI_TRB_3_TYPE_SET(temp->trb_type) |
-			  (temp->do_isoc_sync ?
-			   XHCI_TRB_3_FRID_SET(temp->isoc_frame / 8) :
-			   XHCI_TRB_3_ISO_SIA_BIT) |
 			  XHCI_TRB_3_TBC_SET(temp->tbc) |
 			  XHCI_TRB_3_TLBPC_SET(temp->tlbpc);
 
-			temp->do_isoc_sync = 0;
-
+			if (temp->trb_type == XHCI_TRB_TYPE_ISOCH) {
+				if (temp->do_isoc_sync != 0) {
+					temp->do_isoc_sync = 0;
+					dword |= XHCI_TRB_3_FRID_SET(temp->isoc_frame / 8);
+				} else {
+					dword |= XHCI_TRB_3_ISO_SIA_BIT;
+				}
+			}
 			if (temp->direction == UE_DIR_IN) {
 				dword |= XHCI_TRB_3_DIR_IN;