diff options
Diffstat (limited to 'sys/dev/usb/controller/ehci.c')
| -rw-r--r-- | sys/dev/usb/controller/ehci.c | 170 |
1 files changed, 85 insertions, 85 deletions
diff --git a/sys/dev/usb/controller/ehci.c b/sys/dev/usb/controller/ehci.c index c3b7ba4..69889e7 100644 --- a/sys/dev/usb/controller/ehci.c +++ b/sys/dev/usb/controller/ehci.c @@ -86,22 +86,22 @@ static void ehci_dump_sqh(ehci_softc_t *sc, ehci_qh_t *sqh); #define EHCI_INTR_ENDPT 1 -extern struct usb2_bus_methods ehci_bus_methods; -extern struct usb2_pipe_methods ehci_device_bulk_methods; -extern struct usb2_pipe_methods ehci_device_ctrl_methods; -extern struct usb2_pipe_methods ehci_device_intr_methods; -extern struct usb2_pipe_methods ehci_device_isoc_fs_methods; -extern struct usb2_pipe_methods ehci_device_isoc_hs_methods; - -static void ehci_do_poll(struct usb2_bus *bus); -static void ehci_device_done(struct usb2_xfer *xfer, usb2_error_t error); -static uint8_t ehci_check_transfer(struct usb2_xfer *xfer); +extern struct usb_bus_methods ehci_bus_methods; +extern struct usb_pipe_methods ehci_device_bulk_methods; +extern struct usb_pipe_methods ehci_device_ctrl_methods; +extern struct usb_pipe_methods ehci_device_intr_methods; +extern struct usb_pipe_methods ehci_device_isoc_fs_methods; +extern struct usb_pipe_methods ehci_device_isoc_hs_methods; + +static void ehci_do_poll(struct usb_bus *bus); +static void ehci_device_done(struct usb_xfer *xfer, usb2_error_t error); +static uint8_t ehci_check_transfer(struct usb_xfer *xfer); static void ehci_timeout(void *arg); static void ehci_root_intr(ehci_softc_t *sc); struct ehci_std_temp { ehci_softc_t *sc; - struct usb2_page_cache *pc; + struct usb_page_cache *pc; ehci_qtd_t *td; ehci_qtd_t *td_next; uint32_t average; @@ -115,7 +115,7 @@ struct ehci_std_temp { }; void -ehci_iterate_hw_softc(struct usb2_bus *bus, usb2_bus_mem_sub_cb_t *cb) +ehci_iterate_hw_softc(struct usb_bus *bus, usb2_bus_mem_sub_cb_t *cb) { ehci_softc_t *sc = EHCI_BUS2SC(bus); uint32_t i; @@ -208,7 +208,7 @@ ehci_hcreset(ehci_softc_t *sc) usb2_error_t ehci_init(ehci_softc_t *sc) { - struct usb2_page_search buf_res; + struct usb_page_search buf_res; uint32_t version; uint32_t sparams; uint32_t cparams; @@ -570,7 +570,7 @@ ehci_suspend(ehci_softc_t *sc) void ehci_resume(ehci_softc_t *sc) { - struct usb2_page_search buf_res; + struct usb_page_search buf_res; uint32_t cmd; uint32_t hcr; uint8_t i; @@ -952,7 +952,7 @@ ehci_dump_isoc(ehci_softc_t *sc) #endif static void -ehci_transfer_intr_enqueue(struct usb2_xfer *xfer) +ehci_transfer_intr_enqueue(struct usb_xfer *xfer) { /* check for early completion */ if (ehci_check_transfer(xfer)) { @@ -1121,7 +1121,7 @@ _ehci_remove_qh(ehci_qh_t *sqh, ehci_qh_t *last) } static usb2_error_t -ehci_non_isoc_done_sub(struct usb2_xfer *xfer) +ehci_non_isoc_done_sub(struct usb_xfer *xfer) { ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); ehci_qtd_t *td; @@ -1214,7 +1214,7 @@ ehci_non_isoc_done_sub(struct usb2_xfer *xfer) } static void -ehci_non_isoc_done(struct usb2_xfer *xfer) +ehci_non_isoc_done(struct usb_xfer *xfer) { usb2_error_t err = 0; @@ -1272,9 +1272,9 @@ done: * Else: USB transfer is finished *------------------------------------------------------------------------*/ static uint8_t -ehci_check_transfer(struct usb2_xfer *xfer) +ehci_check_transfer(struct usb_xfer *xfer) { - struct usb2_pipe_methods *methods = xfer->pipe->methods; + struct usb_pipe_methods *methods = xfer->pipe->methods; ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); uint32_t status; @@ -1408,7 +1408,7 @@ ehci_pcd_enable(ehci_softc_t *sc) static void ehci_interrupt_poll(ehci_softc_t *sc) { - struct usb2_xfer *xfer; + struct usb_xfer *xfer; repeat: TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { @@ -1499,7 +1499,7 @@ done: static void ehci_timeout(void *arg) { - struct usb2_xfer *xfer = arg; + struct usb_xfer *xfer = arg; DPRINTF("xfer=%p\n", xfer); @@ -1510,7 +1510,7 @@ ehci_timeout(void *arg) } static void -ehci_do_poll(struct usb2_bus *bus) +ehci_do_poll(struct usb_bus *bus) { ehci_softc_t *sc = EHCI_BUS2SC(bus); @@ -1522,7 +1522,7 @@ ehci_do_poll(struct usb2_bus *bus) static void ehci_setup_standard_chain_sub(struct ehci_std_temp *temp) { - struct usb2_page_search buf_res; + struct usb_page_search buf_res; ehci_qtd_t *td; ehci_qtd_t *td_next; ehci_qtd_t *td_alt_next; @@ -1705,10 +1705,10 @@ restart: } static void -ehci_setup_standard_chain(struct usb2_xfer *xfer, ehci_qh_t **qh_last) +ehci_setup_standard_chain(struct usb_xfer *xfer, ehci_qh_t **qh_last) { struct ehci_std_temp temp; - struct usb2_pipe_methods *methods; + struct usb_pipe_methods *methods; ehci_qh_t *qh; ehci_qtd_t *td; uint32_t qh_endp; @@ -1990,7 +1990,7 @@ ehci_root_intr(ehci_softc_t *sc) } static void -ehci_isoc_fs_done(ehci_softc_t *sc, struct usb2_xfer *xfer) +ehci_isoc_fs_done(ehci_softc_t *sc, struct usb_xfer *xfer) { uint32_t nframes = xfer->nframes; uint32_t status; @@ -2043,7 +2043,7 @@ ehci_isoc_fs_done(ehci_softc_t *sc, struct usb2_xfer *xfer) } static void -ehci_isoc_hs_done(ehci_softc_t *sc, struct usb2_xfer *xfer) +ehci_isoc_hs_done(ehci_softc_t *sc, struct usb_xfer *xfer) { uint32_t nframes = xfer->nframes; uint32_t status; @@ -2111,9 +2111,9 @@ ehci_isoc_hs_done(ehci_softc_t *sc, struct usb2_xfer *xfer) * from close and from interrupt */ static void -ehci_device_done(struct usb2_xfer *xfer, usb2_error_t error) +ehci_device_done(struct usb_xfer *xfer, usb2_error_t error) { - struct usb2_pipe_methods *methods = xfer->pipe->methods; + struct usb_pipe_methods *methods = xfer->pipe->methods; ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); @@ -2162,25 +2162,25 @@ ehci_device_done(struct usb2_xfer *xfer, usb2_error_t error) * ehci bulk support *------------------------------------------------------------------------*/ static void -ehci_device_bulk_open(struct usb2_xfer *xfer) +ehci_device_bulk_open(struct usb_xfer *xfer) { return; } static void -ehci_device_bulk_close(struct usb2_xfer *xfer) +ehci_device_bulk_close(struct usb_xfer *xfer) { ehci_device_done(xfer, USB_ERR_CANCELLED); } static void -ehci_device_bulk_enter(struct usb2_xfer *xfer) +ehci_device_bulk_enter(struct usb_xfer *xfer) { return; } static void -ehci_device_bulk_start(struct usb2_xfer *xfer) +ehci_device_bulk_start(struct usb_xfer *xfer) { ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); uint32_t temp; @@ -2200,7 +2200,7 @@ ehci_device_bulk_start(struct usb2_xfer *xfer) EOWRITE4(sc, EHCI_USBCMD, temp | EHCI_CMD_IAAD); } -struct usb2_pipe_methods ehci_device_bulk_methods = +struct usb_pipe_methods ehci_device_bulk_methods = { .open = ehci_device_bulk_open, .close = ehci_device_bulk_close, @@ -2212,25 +2212,25 @@ struct usb2_pipe_methods ehci_device_bulk_methods = * ehci control support *------------------------------------------------------------------------*/ static void -ehci_device_ctrl_open(struct usb2_xfer *xfer) +ehci_device_ctrl_open(struct usb_xfer *xfer) { return; } static void -ehci_device_ctrl_close(struct usb2_xfer *xfer) +ehci_device_ctrl_close(struct usb_xfer *xfer) { ehci_device_done(xfer, USB_ERR_CANCELLED); } static void -ehci_device_ctrl_enter(struct usb2_xfer *xfer) +ehci_device_ctrl_enter(struct usb_xfer *xfer) { return; } static void -ehci_device_ctrl_start(struct usb2_xfer *xfer) +ehci_device_ctrl_start(struct usb_xfer *xfer) { ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); @@ -2241,7 +2241,7 @@ ehci_device_ctrl_start(struct usb2_xfer *xfer) ehci_transfer_intr_enqueue(xfer); } -struct usb2_pipe_methods ehci_device_ctrl_methods = +struct usb_pipe_methods ehci_device_ctrl_methods = { .open = ehci_device_ctrl_open, .close = ehci_device_ctrl_close, @@ -2253,7 +2253,7 @@ struct usb2_pipe_methods ehci_device_ctrl_methods = * ehci interrupt support *------------------------------------------------------------------------*/ static void -ehci_device_intr_open(struct usb2_xfer *xfer) +ehci_device_intr_open(struct usb_xfer *xfer) { ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); uint16_t best; @@ -2306,7 +2306,7 @@ ehci_device_intr_open(struct usb2_xfer *xfer) } static void -ehci_device_intr_close(struct usb2_xfer *xfer) +ehci_device_intr_close(struct usb_xfer *xfer) { ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); uint8_t slot; @@ -2320,13 +2320,13 @@ ehci_device_intr_close(struct usb2_xfer *xfer) } static void -ehci_device_intr_enter(struct usb2_xfer *xfer) +ehci_device_intr_enter(struct usb_xfer *xfer) { return; } static void -ehci_device_intr_start(struct usb2_xfer *xfer) +ehci_device_intr_start(struct usb_xfer *xfer) { ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); @@ -2337,7 +2337,7 @@ ehci_device_intr_start(struct usb2_xfer *xfer) ehci_transfer_intr_enqueue(xfer); } -struct usb2_pipe_methods ehci_device_intr_methods = +struct usb_pipe_methods ehci_device_intr_methods = { .open = ehci_device_intr_open, .close = ehci_device_intr_close, @@ -2349,7 +2349,7 @@ struct usb2_pipe_methods ehci_device_intr_methods = * ehci full speed isochronous support *------------------------------------------------------------------------*/ static void -ehci_device_isoc_fs_open(struct usb2_xfer *xfer) +ehci_device_isoc_fs_open(struct usb_xfer *xfer) { ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); ehci_sitd_t *td; @@ -2390,19 +2390,19 @@ ehci_device_isoc_fs_open(struct usb2_xfer *xfer) } static void -ehci_device_isoc_fs_close(struct usb2_xfer *xfer) +ehci_device_isoc_fs_close(struct usb_xfer *xfer) { ehci_device_done(xfer, USB_ERR_CANCELLED); } static void -ehci_device_isoc_fs_enter(struct usb2_xfer *xfer) +ehci_device_isoc_fs_enter(struct usb_xfer *xfer) { - struct usb2_page_search buf_res; + struct usb_page_search buf_res; ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); - struct usb2_fs_isoc_schedule *fss_start; - struct usb2_fs_isoc_schedule *fss_end; - struct usb2_fs_isoc_schedule *fss; + struct usb_fs_isoc_schedule *fss_start; + struct usb_fs_isoc_schedule *fss_end; + struct usb_fs_isoc_schedule *fss; ehci_sitd_t *td; ehci_sitd_t *td_last = NULL; ehci_sitd_t **pp_last; @@ -2614,13 +2614,13 @@ ehci_device_isoc_fs_enter(struct usb2_xfer *xfer) } static void -ehci_device_isoc_fs_start(struct usb2_xfer *xfer) +ehci_device_isoc_fs_start(struct usb_xfer *xfer) { /* put transfer on interrupt queue */ ehci_transfer_intr_enqueue(xfer); } -struct usb2_pipe_methods ehci_device_isoc_fs_methods = +struct usb_pipe_methods ehci_device_isoc_fs_methods = { .open = ehci_device_isoc_fs_open, .close = ehci_device_isoc_fs_close, @@ -2632,7 +2632,7 @@ struct usb2_pipe_methods ehci_device_isoc_fs_methods = * ehci high speed isochronous support *------------------------------------------------------------------------*/ static void -ehci_device_isoc_hs_open(struct usb2_xfer *xfer) +ehci_device_isoc_hs_open(struct usb_xfer *xfer) { ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); ehci_itd_t *td; @@ -2679,15 +2679,15 @@ ehci_device_isoc_hs_open(struct usb2_xfer *xfer) } static void -ehci_device_isoc_hs_close(struct usb2_xfer *xfer) +ehci_device_isoc_hs_close(struct usb_xfer *xfer) { ehci_device_done(xfer, USB_ERR_CANCELLED); } static void -ehci_device_isoc_hs_enter(struct usb2_xfer *xfer) +ehci_device_isoc_hs_enter(struct usb_xfer *xfer) { - struct usb2_page_search buf_res; + struct usb_page_search buf_res; ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); ehci_itd_t *td; ehci_itd_t *td_last = NULL; @@ -2880,13 +2880,13 @@ ehci_device_isoc_hs_enter(struct usb2_xfer *xfer) } static void -ehci_device_isoc_hs_start(struct usb2_xfer *xfer) +ehci_device_isoc_hs_start(struct usb_xfer *xfer) { /* put transfer on interrupt queue */ ehci_transfer_intr_enqueue(xfer); } -struct usb2_pipe_methods ehci_device_isoc_hs_methods = +struct usb_pipe_methods ehci_device_isoc_hs_methods = { .open = ehci_device_isoc_hs_open, .close = ehci_device_isoc_hs_close, @@ -2901,9 +2901,9 @@ struct usb2_pipe_methods ehci_device_isoc_hs_methods = *------------------------------------------------------------------------*/ static const -struct usb2_device_descriptor ehci_devd = +struct usb_device_descriptor ehci_devd = { - sizeof(struct usb2_device_descriptor), + sizeof(struct usb_device_descriptor), UDESC_DEVICE, /* type */ {0x00, 0x02}, /* USB version */ UDCLASS_HUB, /* class */ @@ -2916,9 +2916,9 @@ struct usb2_device_descriptor ehci_devd = }; static const -struct usb2_device_qualifier ehci_odevd = +struct usb_device_qualifier ehci_odevd = { - sizeof(struct usb2_device_qualifier), + sizeof(struct usb_device_qualifier), UDESC_DEVICE_QUALIFIER, /* type */ {0x00, 0x02}, /* USB version */ UDCLASS_HUB, /* class */ @@ -2931,7 +2931,7 @@ struct usb2_device_qualifier ehci_odevd = static const struct ehci_config_desc ehci_confd = { .confd = { - .bLength = sizeof(struct usb2_config_descriptor), + .bLength = sizeof(struct usb_config_descriptor), .bDescriptorType = UDESC_CONFIG, .wTotalLength[0] = sizeof(ehci_confd), .bNumInterface = 1, @@ -2941,7 +2941,7 @@ static const struct ehci_config_desc ehci_confd = { .bMaxPower = 0 /* max power */ }, .ifcd = { - .bLength = sizeof(struct usb2_interface_descriptor), + .bLength = sizeof(struct usb_interface_descriptor), .bDescriptorType = UDESC_INTERFACE, .bNumEndpoints = 1, .bInterfaceClass = UICLASS_HUB, @@ -2950,7 +2950,7 @@ static const struct ehci_config_desc ehci_confd = { 0 }, .endpd = { - .bLength = sizeof(struct usb2_endpoint_descriptor), + .bLength = sizeof(struct usb_endpoint_descriptor), .bDescriptorType = UDESC_ENDPOINT, .bEndpointAddress = UE_DIR_IN | EHCI_INTR_ENDPT, .bmAttributes = UE_INTERRUPT, @@ -2960,7 +2960,7 @@ static const struct ehci_config_desc ehci_confd = { }; static const -struct usb2_hub_descriptor ehci_hubd = +struct usb_hub_descriptor ehci_hubd = { 0, /* dynamic length */ UDESC_HUB, @@ -2985,8 +2985,8 @@ ehci_disown(ehci_softc_t *sc, uint16_t index, uint8_t lowspeed) } static usb2_error_t -ehci_roothub_exec(struct usb2_device *udev, - struct usb2_device_request *req, const void **pptr, uint16_t *plength) +ehci_roothub_exec(struct usb_device *udev, + struct usb_device_request *req, const void **pptr, uint16_t *plength) { ehci_softc_t *sc = EHCI_BUS2SC(udev->bus); const char *str_ptr; @@ -3378,12 +3378,12 @@ done: } static void -ehci_xfer_setup(struct usb2_setup_params *parm) +ehci_xfer_setup(struct usb_setup_params *parm) { - struct usb2_page_search page_info; - struct usb2_page_cache *pc; + struct usb_page_search page_info; + struct usb_page_cache *pc; ehci_softc_t *sc; - struct usb2_xfer *xfer; + struct usb_xfer *xfer; void *last_obj; uint32_t nqtd; uint32_t nqh; @@ -3629,14 +3629,14 @@ alloc_dma_set: } static void -ehci_xfer_unsetup(struct usb2_xfer *xfer) +ehci_xfer_unsetup(struct usb_xfer *xfer) { return; } static void -ehci_pipe_init(struct usb2_device *udev, struct usb2_endpoint_descriptor *edesc, - struct usb2_pipe *pipe) +ehci_pipe_init(struct usb_device *udev, struct usb_endpoint_descriptor *edesc, + struct usb_pipe *pipe) { ehci_softc_t *sc = EHCI_BUS2SC(udev->bus); @@ -3688,7 +3688,7 @@ done: } static void -ehci_get_dma_delay(struct usb2_bus *bus, uint32_t *pus) +ehci_get_dma_delay(struct usb_bus *bus, uint32_t *pus) { /* * Wait until the hardware has finished any possible use of @@ -3698,11 +3698,11 @@ ehci_get_dma_delay(struct usb2_bus *bus, uint32_t *pus) } static void -ehci_device_resume(struct usb2_device *udev) +ehci_device_resume(struct usb_device *udev) { ehci_softc_t *sc = EHCI_BUS2SC(udev->bus); - struct usb2_xfer *xfer; - struct usb2_pipe_methods *methods; + struct usb_xfer *xfer; + struct usb_pipe_methods *methods; DPRINTF("\n"); @@ -3732,11 +3732,11 @@ ehci_device_resume(struct usb2_device *udev) } static void -ehci_device_suspend(struct usb2_device *udev) +ehci_device_suspend(struct usb_device *udev) { ehci_softc_t *sc = EHCI_BUS2SC(udev->bus); - struct usb2_xfer *xfer; - struct usb2_pipe_methods *methods; + struct usb_xfer *xfer; + struct usb_pipe_methods *methods; DPRINTF("\n"); @@ -3766,7 +3766,7 @@ ehci_device_suspend(struct usb2_device *udev) } static void -ehci_set_hw_power(struct usb2_bus *bus) +ehci_set_hw_power(struct usb_bus *bus) { ehci_softc_t *sc = EHCI_BUS2SC(bus); uint32_t temp; @@ -3799,7 +3799,7 @@ ehci_set_hw_power(struct usb2_bus *bus) return; } -struct usb2_bus_methods ehci_bus_methods = +struct usb_bus_methods ehci_bus_methods = { .pipe_init = ehci_pipe_init, .xfer_setup = ehci_xfer_setup, |
