diff options
| author | thompsa <thompsa@FreeBSD.org> | 2010-01-29 01:30:13 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2010-01-29 01:30:13 +0000 |
| commit | 57e5f62185c51cff7059636afebeacfa2786ad46 (patch) | |
| tree | 3ee5cde713c95165a9a8071af72990e35bc2db64 | |
| parent | 2847cf1bd53a46947489b7a742ebb7f8ac2b3182 (diff) | |
| download | FreeBSD-src-57e5f62185c51cff7059636afebeacfa2786ad46.zip FreeBSD-src-57e5f62185c51cff7059636afebeacfa2786ad46.tar.gz | |
Optimise EHCI ISOC HS done check.
Submitted by: Hans Petter Selasky
| -rw-r--r-- | sys/dev/usb/controller/ehci.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sys/dev/usb/controller/ehci.c b/sys/dev/usb/controller/ehci.c index 952dd98..03ecc37 100644 --- a/sys/dev/usb/controller/ehci.c +++ b/sys/dev/usb/controller/ehci.c @@ -1340,25 +1340,22 @@ ehci_check_transfer(struct usb_xfer *xfer) } } 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))) { |
