diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-11-07 10:15:16 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-11-07 10:15:16 +0000 |
| commit | 463293b9cd00e820476fd0bba5e1fa0e3955d518 (patch) | |
| tree | 3a5925bcff1e651aa63c8a5650722100af4ca623 /sys/dev/usb | |
| parent | a6fe25baa0cef725bebbc70df96b4fb9cce53049 (diff) | |
Remove isoc_len from the transfer descriptor, it is assigned once but
never read.
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/ehci.c | 9 | ||||
| -rw-r--r-- | sys/dev/usb/ehcivar.h | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index e69ebb9abe5..e69afb60dfe 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.135 2013/11/01 12:00:53 mpi Exp $ */ +/* $OpenBSD: ehci.c,v 1.136 2013/11/07 10:15:15 mpi Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -3595,14 +3595,13 @@ ehci_device_isoc_start(struct usbd_xfer *xfer) struct ehci_soft_itd *itd, *prev, *start, *stop; struct usb_dma *dma_buf; int i, j, k, frames, uframes, ufrperframe; - int s, trans_count, offs, total_length; + int s, trans_count, offs; int frindex; start = NULL; prev = NULL; itd = NULL; trans_count = 0; - total_length = 0; exfer = (struct ehci_xfer *) xfer; sc = (struct ehci_softc *)xfer->pipe->device->bus; epipe = (struct ehci_pipe *)xfer->pipe; @@ -3716,7 +3715,6 @@ ehci_device_isoc_start(struct usbd_xfer *xfer) EHCI_ITD_SET_OFFS(EHCI_PAGE_OFFSET(DMAADDR(dma_buf, offs)))); - total_length += xfer->frlengths[trans_count]; offs += xfer->frlengths[trans_count]; trans_count++; @@ -3724,7 +3722,7 @@ ehci_device_isoc_start(struct usbd_xfer *xfer) itd->itd.itd_ctl[j] |= htole32(EHCI_ITD_IOC); break; } - } + } /* Step 1.75, set buffer pointers. To simplify matters, all * pointers are filled out for the next 7 hardware pages in @@ -3774,7 +3772,6 @@ ehci_device_isoc_start(struct usbd_xfer *xfer) stop = itd; stop->xfer_next = NULL; - exfer->isoc_len = total_length; /* * Part 2: Transfer descriptors have now been set up, now they must diff --git a/sys/dev/usb/ehcivar.h b/sys/dev/usb/ehcivar.h index 3e9d2c716de..ce4d9124d31 100644 --- a/sys/dev/usb/ehcivar.h +++ b/sys/dev/usb/ehcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ehcivar.h,v 1.27 2013/11/01 12:00:54 mpi Exp $ */ +/* $OpenBSD: ehcivar.h,v 1.28 2013/11/07 10:15:15 mpi Exp $ */ /* $NetBSD: ehcivar.h,v 1.19 2005/04/29 15:04:29 augustss Exp $ */ /* @@ -83,7 +83,6 @@ struct ehci_xfer { struct ehci_soft_qtd *sqtdend; struct ehci_soft_itd *itdstart; struct ehci_soft_itd *itdend; - u_int isoc_len; u_int32_t ehci_xfer_flags; #ifdef DIAGNOSTIC int isdone; |