From owner-svn-src-head@FreeBSD.ORG  Sat Mar  7 18:08:59 2009
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 78806106566B;
	Sat,  7 Mar 2009 18:08:59 +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 66EBB8FC0C;
	Sat,  7 Mar 2009 18:08:59 +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 n27I8xYA059128;
	Sat, 7 Mar 2009 18:08:59 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n27I8xIG059127;
	Sat, 7 Mar 2009 18:08:59 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200903071808.n27I8xIG059127@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Sat, 7 Mar 2009 18:08:59 +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: r189491 - head/sys/dev/usb/controller
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: Sat, 07 Mar 2009 18:09:00 -0000

Author: thompsa
Date: Sat Mar  7 18:08:59 2009
New Revision: 189491
URL: http://svn.freebsd.org/changeset/base/189491

Log:
  Fix some missed htole32 conversions to htoehci32.
  
  Reviewed by:	hps

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

Modified: head/sys/dev/usb/controller/ehci.c
==============================================================================
--- head/sys/dev/usb/controller/ehci.c	Sat Mar  7 17:07:29 2009	(r189490)
+++ head/sys/dev/usb/controller/ehci.c	Sat Mar  7 18:08:59 2009	(r189491)
@@ -1776,8 +1776,8 @@ ehci_setup_standard_chain(struct usb2_xf
 
 			temp.qtd_status &=
 			    htoehci32(temp.sc, EHCI_QTD_SET_CERR(3));
-			temp.qtd_status |= htole32
-			    (EHCI_QTD_ACTIVE |
+			temp.qtd_status |= htoehci32(temp.sc,
+			    EHCI_QTD_ACTIVE |
 			    EHCI_QTD_SET_PID(EHCI_QTD_PID_SETUP) |
 			    EHCI_QTD_SET_TOGGLE(0));
 
@@ -2591,13 +2591,13 @@ ehci_device_isoc_fs_enter(struct usb2_xf
 		td->sitd_mask = htoehci32(sc, sitd_mask);
 
 		if (nframes == 0) {
-			td->sitd_status = htole32
-			    (EHCI_SITD_IOC |
+			td->sitd_status = htoehci32(sc,
+			    EHCI_SITD_IOC |
 			    EHCI_SITD_ACTIVE |
 			    EHCI_SITD_SET_LEN(*plen));
 		} else {
-			td->sitd_status = htole32
-			    (EHCI_SITD_ACTIVE |
+			td->sitd_status = htoehci32(sc,
+			    EHCI_SITD_ACTIVE |
 			    EHCI_SITD_SET_LEN(*plen));
 		}
 		usb2_pc_cpu_flush(td->page_cache);
@@ -2670,8 +2670,8 @@ ehci_device_isoc_hs_open(struct usb2_xfe
 			td->itd_status[7] = 0;
 
 			/* set endpoint and address */
-			td->itd_bp[0] = htole32
-			    (EHCI_ITD_SET_ADDR(xfer->address) |
+			td->itd_bp[0] = htoehci32(sc,
+			    EHCI_ITD_SET_ADDR(xfer->address) |
 			    EHCI_ITD_SET_ENDPT(UE_GET_ADDR(xfer->endpoint)));
 
 			temp =