diff options
Diffstat (limited to 'sys/dev/usb/controller/uss820dci.c')
| -rw-r--r-- | sys/dev/usb/controller/uss820dci.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/usb/controller/uss820dci.c b/sys/dev/usb/controller/uss820dci.c index f3078d3..9f29bbf 100644 --- a/sys/dev/usb/controller/uss820dci.c +++ b/sys/dev/usb/controller/uss820dci.c @@ -303,7 +303,7 @@ uss820dci_setup_rx(struct uss820dci_td *td) USS820_RXCON, temp); /* copy data into real buffer */ - usb2_copy_in(td->pc, 0, &req, sizeof(req)); + usbd_copy_in(td->pc, 0, &req, sizeof(req)); td->offset = sizeof(req); td->remainder = 0; @@ -446,7 +446,7 @@ repeat: return (0); /* we are complete */ } while (count > 0) { - usb2_get_page(td->pc, td->offset, &buf_res); + usbd_get_page(td->pc, td->offset, &buf_res); /* get correct length */ if (buf_res.length > count) { @@ -545,7 +545,7 @@ repeat: count_copy = count; while (count > 0) { - usb2_get_page(td->pc, td->offset, &buf_res); + usbd_get_page(td->pc, td->offset, &buf_res); /* get correct length */ if (buf_res.length > count) { @@ -830,7 +830,7 @@ uss820dci_setup_standard_chain(struct usb_xfer *xfer) DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpointno), - xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); + xfer->sumlen, usbd_get_speed(xfer->xroot->udev)); temp.max_frame_size = xfer->max_frame_size; @@ -1030,11 +1030,11 @@ uss820dci_start_standard_chain(struct usb_xfer *xfer) uss820dci_intr_set(xfer, 1); /* put transfer on interrupt queue */ - usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); + usbd_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); /* start timeout, if any */ if (xfer->timeout != 0) { - usb2_transfer_timeout_ms(xfer, + usbd_transfer_timeout_ms(xfer, &uss820dci_timeout, xfer->timeout); } } @@ -1179,7 +1179,7 @@ uss820dci_device_done(struct usb_xfer *xfer, usb_error_t error) uss820dci_intr_set(xfer, 0); } /* dequeue transfer and start next transfer */ - usb2_transfer_done(xfer, error); + usbd_transfer_done(xfer, error); } static void @@ -1341,7 +1341,7 @@ uss820dci_init(struct uss820dci_softc *sc) uss820dci_pull_down(sc); /* wait 10ms for pulldown to stabilise */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100); /* check hardware revision */ temp = USS820_READ_1(sc, USS820_REV); @@ -1676,7 +1676,7 @@ uss820dci_device_isoc_fs_enter(struct usb_xfer *xfer) * pre-compute when the isochronous transfer will be finished: */ xfer->isoc_time_complete = - usb2_isoc_time_expand(&sc->sc_bus, nframes) + temp + + usb_isoc_time_expand(&sc->sc_bus, nframes) + temp + xfer->nframes; /* compute frame number for next insertion */ @@ -2201,7 +2201,7 @@ uss820dci_xfer_setup(struct usb_setup_params *parm) parm->hc_max_packet_count = 1; parm->hc_max_frame_size = 0x500; - usb2_transfer_setup_sub(parm); + usbd_transfer_setup_sub(parm); /* * compute maximum number of TDs @@ -2228,7 +2228,7 @@ uss820dci_xfer_setup(struct usb_setup_params *parm) } /* - * check if "usb2_transfer_setup_sub" set an error + * check if "usbd_transfer_setup_sub" set an error */ if (parm->err) { return; |
