diff options
Diffstat (limited to 'sys/dev/usb/uhci.c')
| -rw-r--r-- | sys/dev/usb/uhci.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 68a8070..4bb24a1 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -149,6 +149,7 @@ struct uhci_pipe { /* Interrupt pipe */ struct { int npoll; + int isread; uhci_soft_qh_t **qhs; } intr; /* Bulk pipe */ @@ -2032,6 +2033,7 @@ uhci_device_intr_start(usbd_xfer_handle xfer) uhci_soft_td_t *data, *dataend; uhci_soft_qh_t *sqh; usbd_status err; + int isread, endpt; int i, s; if (sc->sc_dying) @@ -2045,8 +2047,15 @@ uhci_device_intr_start(usbd_xfer_handle xfer) panic("uhci_device_intr_transfer: a request\n"); #endif - err = uhci_alloc_std_chain(upipe, sc, xfer->length, 1, xfer->flags, - &xfer->dmabuf, &data, &dataend); + endpt = upipe->pipe.endpoint->edesc->bEndpointAddress; + isread = UE_GET_DIR(endpt) == UE_DIR_IN; + sqh = upipe->u.bulk.sqh; + + upipe->u.intr.isread = isread; + + err = uhci_alloc_std_chain(upipe, sc, xfer->length, isread, + xfer->flags, &xfer->dmabuf, &data, + &dataend); if (err) return (err); dataend->td.td_status |= htole32(UHCI_TD_IOC); @@ -2637,7 +2646,8 @@ uhci_device_intr_done(usbd_xfer_handle xfer) DPRINTFN(5,("uhci_device_intr_done: requeing\n")); /* This alloc cannot fail since we freed the chain above. */ - uhci_alloc_std_chain(upipe, sc, xfer->length, 1, xfer->flags, + uhci_alloc_std_chain(upipe, sc, xfer->length, + upipe->u.intr.isread, xfer->flags, &xfer->dmabuf, &data, &dataend); dataend->td.td_status |= htole32(UHCI_TD_IOC); |
