diff options
Diffstat (limited to 'sys/dev/usb/controller/at91dci.c')
| -rw-r--r-- | sys/dev/usb/controller/at91dci.c | 130 |
1 files changed, 65 insertions, 65 deletions
diff --git a/sys/dev/usb/controller/at91dci.c b/sys/dev/usb/controller/at91dci.c index 63a589a..e50d8f9 100644 --- a/sys/dev/usb/controller/at91dci.c +++ b/sys/dev/usb/controller/at91dci.c @@ -82,19 +82,19 @@ SYSCTL_INT(_hw_usb_at91dci, OID_AUTO, debug, CTLFLAG_RW, /* prototypes */ -struct usb2_bus_methods at91dci_bus_methods; -struct usb2_pipe_methods at91dci_device_bulk_methods; -struct usb2_pipe_methods at91dci_device_ctrl_methods; -struct usb2_pipe_methods at91dci_device_intr_methods; -struct usb2_pipe_methods at91dci_device_isoc_fs_methods; +struct usb_bus_methods at91dci_bus_methods; +struct usb_pipe_methods at91dci_device_bulk_methods; +struct usb_pipe_methods at91dci_device_ctrl_methods; +struct usb_pipe_methods at91dci_device_intr_methods; +struct usb_pipe_methods at91dci_device_isoc_fs_methods; static at91dci_cmd_t at91dci_setup_rx; static at91dci_cmd_t at91dci_data_rx; static at91dci_cmd_t at91dci_data_tx; static at91dci_cmd_t at91dci_data_tx_sync; -static void at91dci_device_done(struct usb2_xfer *, usb2_error_t); -static void at91dci_do_poll(struct usb2_bus *); -static void at91dci_standard_done(struct usb2_xfer *); +static void at91dci_device_done(struct usb_xfer *, usb2_error_t); +static void at91dci_do_poll(struct usb_bus *); +static void at91dci_standard_done(struct usb_xfer *); static void at91dci_root_intr(struct at91dci_softc *sc); /* @@ -116,7 +116,7 @@ static void at91dci_root_intr(struct at91dci_softc *sc); * Here is a list of what the chip supports. * Probably it supports more than listed here! */ -static const struct usb2_hw_ep_profile +static const struct usb_hw_ep_profile at91dci_ep_profile[AT91_UDP_EP_MAX] = { [0] = { @@ -181,8 +181,8 @@ static const struct usb2_hw_ep_profile }; static void -at91dci_get_hw_ep_profile(struct usb2_device *udev, - const struct usb2_hw_ep_profile **ppf, uint8_t ep_addr) +at91dci_get_hw_ep_profile(struct usb_device *udev, + const struct usb_hw_ep_profile **ppf, uint8_t ep_addr) { if (ep_addr < AT91_UDP_EP_MAX) { *ppf = (at91dci_ep_profile + ep_addr); @@ -278,7 +278,7 @@ static uint8_t at91dci_setup_rx(struct at91dci_td *td) { struct at91dci_softc *sc; - struct usb2_device_request req; + struct usb_device_request req; uint32_t csr; uint32_t temp; uint16_t count; @@ -372,7 +372,7 @@ not_complete: static uint8_t at91dci_data_rx(struct at91dci_td *td) { - struct usb2_page_search buf_res; + struct usb_page_search buf_res; uint32_t csr; uint32_t temp; uint16_t count; @@ -499,7 +499,7 @@ repeat: static uint8_t at91dci_data_tx(struct at91dci_td *td) { - struct usb2_page_search buf_res; + struct usb_page_search buf_res; uint32_t csr; uint32_t temp; uint16_t count; @@ -643,7 +643,7 @@ not_complete: } static uint8_t -at91dci_xfer_do_fifo(struct usb2_xfer *xfer) +at91dci_xfer_do_fifo(struct usb_xfer *xfer) { struct at91dci_softc *sc; struct at91dci_td *td; @@ -706,7 +706,7 @@ done: static void at91dci_interrupt_poll(struct at91dci_softc *sc) { - struct usb2_xfer *xfer; + struct usb_xfer *xfer; repeat: TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { @@ -854,7 +854,7 @@ at91dci_setup_standard_chain_sub(struct at91dci_std_temp *temp) } static void -at91dci_setup_standard_chain(struct usb2_xfer *xfer) +at91dci_setup_standard_chain(struct usb_xfer *xfer) { struct at91dci_std_temp temp; struct at91dci_softc *sc; @@ -1015,7 +1015,7 @@ at91dci_setup_standard_chain(struct usb2_xfer *xfer) static void at91dci_timeout(void *arg) { - struct usb2_xfer *xfer = arg; + struct usb_xfer *xfer = arg; DPRINTF("xfer=%p\n", xfer); @@ -1026,7 +1026,7 @@ at91dci_timeout(void *arg) } static void -at91dci_start_standard_chain(struct usb2_xfer *xfer) +at91dci_start_standard_chain(struct usb_xfer *xfer) { DPRINTFN(9, "\n"); @@ -1071,7 +1071,7 @@ at91dci_root_intr(struct at91dci_softc *sc) } static usb2_error_t -at91dci_standard_done_sub(struct usb2_xfer *xfer) +at91dci_standard_done_sub(struct usb_xfer *xfer) { struct at91dci_td *td; uint32_t len; @@ -1135,7 +1135,7 @@ at91dci_standard_done_sub(struct usb2_xfer *xfer) } static void -at91dci_standard_done(struct usb2_xfer *xfer) +at91dci_standard_done(struct usb_xfer *xfer) { usb2_error_t err = 0; @@ -1184,7 +1184,7 @@ done: * same USB transfer! *------------------------------------------------------------------------*/ static void -at91dci_device_done(struct usb2_xfer *xfer, usb2_error_t error) +at91dci_device_done(struct usb_xfer *xfer, usb2_error_t error) { struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); uint8_t ep_no; @@ -1207,8 +1207,8 @@ at91dci_device_done(struct usb2_xfer *xfer, usb2_error_t error) } static void -at91dci_set_stall(struct usb2_device *udev, struct usb2_xfer *xfer, - struct usb2_pipe *pipe) +at91dci_set_stall(struct usb_device *udev, struct usb_xfer *xfer, + struct usb_pipe *pipe) { struct at91dci_softc *sc; uint32_t csr_val; @@ -1235,7 +1235,7 @@ static void at91dci_clear_stall_sub(struct at91dci_softc *sc, uint8_t ep_no, uint8_t ep_type, uint8_t ep_dir) { - const struct usb2_hw_ep_profile *pf; + const struct usb_hw_ep_profile *pf; uint32_t csr_val; uint32_t temp; uint8_t csr_reg; @@ -1328,10 +1328,10 @@ at91dci_clear_stall_sub(struct at91dci_softc *sc, uint8_t ep_no, } static void -at91dci_clear_stall(struct usb2_device *udev, struct usb2_pipe *pipe) +at91dci_clear_stall(struct usb_device *udev, struct usb_pipe *pipe) { struct at91dci_softc *sc; - struct usb2_endpoint_descriptor *ed; + struct usb_endpoint_descriptor *ed; DPRINTFN(5, "pipe=%p\n", pipe); @@ -1455,7 +1455,7 @@ at91dci_resume(struct at91dci_softc *sc) } static void -at91dci_do_poll(struct usb2_bus *bus) +at91dci_do_poll(struct usb_bus *bus) { struct at91dci_softc *sc = AT9100_DCI_BUS2SC(bus); @@ -1468,32 +1468,32 @@ at91dci_do_poll(struct usb2_bus *bus) * at91dci bulk support *------------------------------------------------------------------------*/ static void -at91dci_device_bulk_open(struct usb2_xfer *xfer) +at91dci_device_bulk_open(struct usb_xfer *xfer) { return; } static void -at91dci_device_bulk_close(struct usb2_xfer *xfer) +at91dci_device_bulk_close(struct usb_xfer *xfer) { at91dci_device_done(xfer, USB_ERR_CANCELLED); } static void -at91dci_device_bulk_enter(struct usb2_xfer *xfer) +at91dci_device_bulk_enter(struct usb_xfer *xfer) { return; } static void -at91dci_device_bulk_start(struct usb2_xfer *xfer) +at91dci_device_bulk_start(struct usb_xfer *xfer) { /* setup TDs */ at91dci_setup_standard_chain(xfer); at91dci_start_standard_chain(xfer); } -struct usb2_pipe_methods at91dci_device_bulk_methods = +struct usb_pipe_methods at91dci_device_bulk_methods = { .open = at91dci_device_bulk_open, .close = at91dci_device_bulk_close, @@ -1505,32 +1505,32 @@ struct usb2_pipe_methods at91dci_device_bulk_methods = * at91dci control support *------------------------------------------------------------------------*/ static void -at91dci_device_ctrl_open(struct usb2_xfer *xfer) +at91dci_device_ctrl_open(struct usb_xfer *xfer) { return; } static void -at91dci_device_ctrl_close(struct usb2_xfer *xfer) +at91dci_device_ctrl_close(struct usb_xfer *xfer) { at91dci_device_done(xfer, USB_ERR_CANCELLED); } static void -at91dci_device_ctrl_enter(struct usb2_xfer *xfer) +at91dci_device_ctrl_enter(struct usb_xfer *xfer) { return; } static void -at91dci_device_ctrl_start(struct usb2_xfer *xfer) +at91dci_device_ctrl_start(struct usb_xfer *xfer) { /* setup TDs */ at91dci_setup_standard_chain(xfer); at91dci_start_standard_chain(xfer); } -struct usb2_pipe_methods at91dci_device_ctrl_methods = +struct usb_pipe_methods at91dci_device_ctrl_methods = { .open = at91dci_device_ctrl_open, .close = at91dci_device_ctrl_close, @@ -1542,32 +1542,32 @@ struct usb2_pipe_methods at91dci_device_ctrl_methods = * at91dci interrupt support *------------------------------------------------------------------------*/ static void -at91dci_device_intr_open(struct usb2_xfer *xfer) +at91dci_device_intr_open(struct usb_xfer *xfer) { return; } static void -at91dci_device_intr_close(struct usb2_xfer *xfer) +at91dci_device_intr_close(struct usb_xfer *xfer) { at91dci_device_done(xfer, USB_ERR_CANCELLED); } static void -at91dci_device_intr_enter(struct usb2_xfer *xfer) +at91dci_device_intr_enter(struct usb_xfer *xfer) { return; } static void -at91dci_device_intr_start(struct usb2_xfer *xfer) +at91dci_device_intr_start(struct usb_xfer *xfer) { /* setup TDs */ at91dci_setup_standard_chain(xfer); at91dci_start_standard_chain(xfer); } -struct usb2_pipe_methods at91dci_device_intr_methods = +struct usb_pipe_methods at91dci_device_intr_methods = { .open = at91dci_device_intr_open, .close = at91dci_device_intr_close, @@ -1579,19 +1579,19 @@ struct usb2_pipe_methods at91dci_device_intr_methods = * at91dci full speed isochronous support *------------------------------------------------------------------------*/ static void -at91dci_device_isoc_fs_open(struct usb2_xfer *xfer) +at91dci_device_isoc_fs_open(struct usb_xfer *xfer) { return; } static void -at91dci_device_isoc_fs_close(struct usb2_xfer *xfer) +at91dci_device_isoc_fs_close(struct usb_xfer *xfer) { at91dci_device_done(xfer, USB_ERR_CANCELLED); } static void -at91dci_device_isoc_fs_enter(struct usb2_xfer *xfer) +at91dci_device_isoc_fs_enter(struct usb_xfer *xfer) { struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); uint32_t temp; @@ -1643,13 +1643,13 @@ at91dci_device_isoc_fs_enter(struct usb2_xfer *xfer) } static void -at91dci_device_isoc_fs_start(struct usb2_xfer *xfer) +at91dci_device_isoc_fs_start(struct usb_xfer *xfer) { /* start TD chain */ at91dci_start_standard_chain(xfer); } -struct usb2_pipe_methods at91dci_device_isoc_fs_methods = +struct usb_pipe_methods at91dci_device_isoc_fs_methods = { .open = at91dci_device_isoc_fs_open, .close = at91dci_device_isoc_fs_close, @@ -1663,8 +1663,8 @@ struct usb2_pipe_methods at91dci_device_isoc_fs_methods = * Simulate a hardware HUB by handling all the necessary requests. *------------------------------------------------------------------------*/ -static const struct usb2_device_descriptor at91dci_devd = { - .bLength = sizeof(struct usb2_device_descriptor), +static const struct usb_device_descriptor at91dci_devd = { + .bLength = sizeof(struct usb_device_descriptor), .bDescriptorType = UDESC_DEVICE, .bcdUSB = {0x00, 0x02}, .bDeviceClass = UDCLASS_HUB, @@ -1677,8 +1677,8 @@ static const struct usb2_device_descriptor at91dci_devd = { .bNumConfigurations = 1, }; -static const struct usb2_device_qualifier at91dci_odevd = { - .bLength = sizeof(struct usb2_device_qualifier), +static const struct usb_device_qualifier at91dci_odevd = { + .bLength = sizeof(struct usb_device_qualifier), .bDescriptorType = UDESC_DEVICE_QUALIFIER, .bcdUSB = {0x00, 0x02}, .bDeviceClass = UDCLASS_HUB, @@ -1690,7 +1690,7 @@ static const struct usb2_device_qualifier at91dci_odevd = { static const struct at91dci_config_desc at91dci_confd = { .confd = { - .bLength = sizeof(struct usb2_config_descriptor), + .bLength = sizeof(struct usb_config_descriptor), .bDescriptorType = UDESC_CONFIG, .wTotalLength[0] = sizeof(at91dci_confd), .bNumInterface = 1, @@ -1700,7 +1700,7 @@ static const struct at91dci_config_desc at91dci_confd = { .bMaxPower = 0, }, .ifcd = { - .bLength = sizeof(struct usb2_interface_descriptor), + .bLength = sizeof(struct usb_interface_descriptor), .bDescriptorType = UDESC_INTERFACE, .bNumEndpoints = 1, .bInterfaceClass = UICLASS_HUB, @@ -1708,7 +1708,7 @@ static const struct at91dci_config_desc at91dci_confd = { .bInterfaceProtocol = UIPROTO_HSHUBSTT, }, .endpd = { - .bLength = sizeof(struct usb2_endpoint_descriptor), + .bLength = sizeof(struct usb_endpoint_descriptor), .bDescriptorType = UDESC_ENDPOINT, .bEndpointAddress = (UE_DIR_IN | AT9100_DCI_INTR_ENDPT), .bmAttributes = UE_INTERRUPT, @@ -1717,7 +1717,7 @@ static const struct at91dci_config_desc at91dci_confd = { }, }; -static const struct usb2_hub_descriptor_min at91dci_hubd = { +static const struct usb_hub_descriptor_min at91dci_hubd = { .bDescLength = sizeof(at91dci_hubd), .bDescriptorType = UDESC_HUB, .bNbrPorts = 1, @@ -1746,8 +1746,8 @@ USB_MAKE_STRING_DESC(STRING_VENDOR, at91dci_vendor); USB_MAKE_STRING_DESC(STRING_PRODUCT, at91dci_product); static usb2_error_t -at91dci_roothub_exec(struct usb2_device *udev, - struct usb2_device_request *req, const void **pptr, uint16_t *plength) +at91dci_roothub_exec(struct usb_device *udev, + struct usb_device_request *req, const void **pptr, uint16_t *plength) { struct at91dci_softc *sc = AT9100_DCI_BUS2SC(udev->bus); const void *ptr; @@ -2143,11 +2143,11 @@ done: } static void -at91dci_xfer_setup(struct usb2_setup_params *parm) +at91dci_xfer_setup(struct usb_setup_params *parm) { - const struct usb2_hw_ep_profile *pf; + const struct usb_hw_ep_profile *pf; struct at91dci_softc *sc; - struct usb2_xfer *xfer; + struct usb_xfer *xfer; void *last_obj; uint32_t ntd; uint32_t n; @@ -2252,14 +2252,14 @@ at91dci_xfer_setup(struct usb2_setup_params *parm) } static void -at91dci_xfer_unsetup(struct usb2_xfer *xfer) +at91dci_xfer_unsetup(struct usb_xfer *xfer) { return; } static void -at91dci_pipe_init(struct usb2_device *udev, struct usb2_endpoint_descriptor *edesc, - struct usb2_pipe *pipe) +at91dci_pipe_init(struct usb_device *udev, struct usb_endpoint_descriptor *edesc, + struct usb_pipe *pipe) { struct at91dci_softc *sc = AT9100_DCI_BUS2SC(udev->bus); @@ -2298,7 +2298,7 @@ at91dci_pipe_init(struct usb2_device *udev, struct usb2_endpoint_descriptor *ede } } -struct usb2_bus_methods at91dci_bus_methods = +struct usb_bus_methods at91dci_bus_methods = { .pipe_init = &at91dci_pipe_init, .xfer_setup = &at91dci_xfer_setup, |
