svn commit: r206293 - stable/8/sys/dev/usb/controller
Andrew Thompson
thompsa at FreeBSD.org
Tue Apr 6 23:16:40 UTC 2010
Author: thompsa
Date: Tue Apr 6 23:16:40 2010
New Revision: 206293
URL: http://svn.freebsd.org/changeset/base/206293
Log:
MFC r203140
Optimise EHCI ISOC HS done check.
Submitted by: Hans Petter Selasky
Modified:
stable/8/sys/dev/usb/controller/ehci.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/usb/controller/ehci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/ehci.c Tue Apr 6 23:16:09 2010 (r206292)
+++ stable/8/sys/dev/usb/controller/ehci.c Tue Apr 6 23:16:40 2010 (r206293)
@@ -1340,25 +1340,22 @@ ehci_check_transfer(struct usb_xfer *xfe
}
} else if (methods == &ehci_device_isoc_hs_methods) {
ehci_itd_t *td;
+ uint8_t n = (xfer->nframes & 7);
/* isochronous high speed transfer */
+ /* check last transfer */
td = xfer->td_transfer_last;
usb_pc_cpu_invalidate(td->page_cache);
- status =
- td->itd_status[0] | td->itd_status[1] |
- td->itd_status[2] | td->itd_status[3] |
- td->itd_status[4] | td->itd_status[5] |
- td->itd_status[6] | td->itd_status[7];
+ if (n == 0)
+ status = td->itd_status[7];
+ else
+ status = td->itd_status[n-1];
/* also check first transfer */
td = xfer->td_transfer_first;
usb_pc_cpu_invalidate(td->page_cache);
- status |=
- td->itd_status[0] | td->itd_status[1] |
- td->itd_status[2] | td->itd_status[3] |
- td->itd_status[4] | td->itd_status[5] |
- td->itd_status[6] | td->itd_status[7];
+ status |= td->itd_status[0];
/* if no transactions are active we continue */
if (!(status & htohc32(sc, EHCI_ITD_ACTIVE))) {
More information about the svn-src-stable
mailing list