Index: uspace/drv/uhci-hcd/Makefile =================================================================== --- uspace/drv/uhci-hcd/Makefile (revision 90b9ab59915b8412b6df99e7df7d8b57a5ced41c) +++ uspace/drv/uhci-hcd/Makefile (revision 6ce42e857a2a753d985fc766bbc215a49cc34f89) @@ -37,4 +37,5 @@ transfer_list.c \ uhci.c \ + endpoint.c \ hc.c \ root_hub.c \ Index: uspace/drv/uhci-hcd/endpoint.c =================================================================== --- uspace/drv/uhci-hcd/endpoint.c (revision 6ce42e857a2a753d985fc766bbc215a49cc34f89) +++ uspace/drv/uhci-hcd/endpoint.c (revision 6ce42e857a2a753d985fc766bbc215a49cc34f89) @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2011 Jan Vesely + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup drvusbuhcihc + * @{ + */ +/** @file + * @brief UHCI host controller driver structure + */ + +#include "endpoint.h" + +void endpoint_init(endpoint_t *instance, usb_transfer_type_t transfer_type, + usb_speed_t speed, size_t max_packet_size) +{ + assert(instance); + link_initialize(&instance->same_device_eps); + instance->transfer_type = transfer_type; + instance->speed = speed; + instance->max_packet_size = max_packet_size; + instance->toggle = 0; +} +/*----------------------------------------------------------------------------*/ +void endpoint_destroy(void *instance) +{ + assert(instance); + free(instance); +} +/** + * @} + */ Index: uspace/drv/uhci-hcd/endpoint.h =================================================================== --- uspace/drv/uhci-hcd/endpoint.h (revision 6ce42e857a2a753d985fc766bbc215a49cc34f89) +++ uspace/drv/uhci-hcd/endpoint.h (revision 6ce42e857a2a753d985fc766bbc215a49cc34f89) @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2011 Jan Vesely + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup drvusbuhcihc + * @{ + */ +/** @file + * @brief UHCI host controller driver structure + */ +#ifndef DRV_UHCI_UHCI_ENDPOINT_H +#define DRV_UHCI_UHCI_ENDPOINT_H + +#include +#include +#include +#include + +typedef struct endpoint { + link_t same_device_eps; + usb_transfer_type_t transfer_type; + usb_speed_t speed; + size_t max_packet_size; + bool active; + int toggle:1; +} endpoint_t; + +void endpoint_init(endpoint_t *instance, usb_transfer_type_t transfer_type, + usb_speed_t speed, size_t max_packet_size); + +void endpoint_destroy(void *instance); + +#endif +/** + * @} + */ Index: uspace/drv/uhci-hcd/hc.c =================================================================== --- uspace/drv/uhci-hcd/hc.c (revision 90b9ab59915b8412b6df99e7df7d8b57a5ced41c) +++ uspace/drv/uhci-hcd/hc.c (revision 6ce42e857a2a753d985fc766bbc215a49cc34f89) @@ -239,6 +239,7 @@ usb_log_debug("Initialized device manager.\n"); - ret = bandwidth_init(&instance->bandwidth, BANDWIDTH_AVAILABLE_USB11, - bandwidth_count_usb11); + ret = + usb_endpoint_manager_init(&instance->ep_manager, + BANDWIDTH_AVAILABLE_USB11); assert(ret == EOK); @@ -335,9 +336,11 @@ } /* Check available bandwidth */ +/* if (batch->transfer_type == USB_TRANSFER_INTERRUPT || batch->transfer_type == USB_TRANSFER_ISOCHRONOUS) { - size_t bw = bandwidth_count_usb11(batch->speed, + const size_t bw = bandwidth_count_usb11(batch->speed, batch->transfer_type, batch->buffer_size, batch->max_packet_size); + int ret = bandwidth_use(&instance->bandwidth, batch->target.address, @@ -349,4 +352,5 @@ } } +*/ transfer_list_t *list = @@ -402,4 +406,5 @@ case USB_TRANSFER_INTERRUPT: case USB_TRANSFER_ISOCHRONOUS: { +/* int ret = bandwidth_free(&instance->bandwidth, batch->target.address, @@ -410,4 +415,5 @@ "reserved bw: %s.\n", ret, str_error(ret)); +*/ } default: Index: uspace/drv/uhci-hcd/hc.h =================================================================== --- uspace/drv/uhci-hcd/hc.h (revision 90b9ab59915b8412b6df99e7df7d8b57a5ced41c) +++ uspace/drv/uhci-hcd/hc.h (revision 6ce42e857a2a753d985fc766bbc215a49cc34f89) @@ -43,5 +43,5 @@ #include #include -#include +#include #include "batch.h" @@ -85,5 +85,5 @@ typedef struct hc { usb_device_keeper_t manager; - bandwidth_t bandwidth; + usb_endpoint_manager_t ep_manager; regs_t *registers; Index: uspace/drv/uhci-hcd/iface.c =================================================================== --- uspace/drv/uhci-hcd/iface.c (revision 90b9ab59915b8412b6df99e7df7d8b57a5ced41c) +++ uspace/drv/uhci-hcd/iface.c (revision 6ce42e857a2a753d985fc766bbc215a49cc34f89) @@ -37,4 +37,5 @@ #include +#include "endpoint.h" #include "iface.h" #include "hc.h" @@ -137,11 +138,24 @@ const usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, address); - size_t size = max_packet_size; + const size_t size = max_packet_size; + + endpoint_t *ep = malloc(sizeof(endpoint_t)); + if (ep == NULL) + return ENOMEM; + endpoint_init(ep, transfer_type, speed, max_packet_size); usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n", address, endpoint, usb_str_transfer_type(transfer_type), usb_str_speed(speed), direction, size, max_packet_size, interval); - return bandwidth_reserve(&hc->bandwidth, address, endpoint, direction, - speed, transfer_type, max_packet_size, size, interval); + + const size_t bw = bandwidth_count_usb11(speed, transfer_type, size, + max_packet_size); + int ret = usb_endpoint_manager_register_ep(&hc->ep_manager, + address, endpoint, direction, ep, endpoint_destroy, bw); + if (ret != EOK) { + endpoint_destroy(ep); + } + + return ret; } /*----------------------------------------------------------------------------*/ @@ -154,5 +168,6 @@ usb_log_debug("Unregister endpoint %d:%d %d.\n", address, endpoint, direction); - return bandwidth_release(&hc->bandwidth, address, endpoint, direction); + return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address, + endpoint, direction); } /*----------------------------------------------------------------------------*/ @@ -175,13 +190,23 @@ hc_t *hc = fun_to_hc(fun); assert(hc); - usb_speed_t speed = - usb_device_keeper_get_speed(&hc->manager, target.address); usb_log_debug("Interrupt OUT %d:%d %zu(%zu).\n", target.address, target.endpoint, size, max_packet_size); - usb_transfer_batch_t *batch = - batch_get(fun, target, USB_TRANSFER_INTERRUPT, max_packet_size, - speed, data, size, NULL, 0, NULL, callback, arg, &hc->manager); + endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager, + target.address, target.endpoint, USB_DIRECTION_OUT, NULL); + if (ep == NULL) { + usb_log_error("Endpoint(%d:%d) not registered for INT OUT.\n", + target.address, target.endpoint); + return ENOENT; + } + assert(ep->speed == + usb_device_keeper_get_speed(&hc->manager, target.address)); + assert(ep->max_packet_size == max_packet_size); + assert(ep->transfer_type == USB_TRANSFER_INTERRUPT); + + usb_transfer_batch_t *batch = + batch_get(fun, target, ep->transfer_type, ep->max_packet_size, + ep->speed, data, size, NULL, 0, NULL, callback, arg, &hc->manager); if (!batch) return ENOMEM; @@ -212,12 +237,23 @@ hc_t *hc = fun_to_hc(fun); assert(hc); - usb_speed_t speed = - usb_device_keeper_get_speed(&hc->manager, target.address); + usb_log_debug("Interrupt IN %d:%d %zu(%zu).\n", target.address, target.endpoint, size, max_packet_size); - usb_transfer_batch_t *batch = - batch_get(fun, target, USB_TRANSFER_INTERRUPT, max_packet_size, - speed, data, size, NULL, 0, callback, NULL, arg, &hc->manager); + endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager, + target.address, target.endpoint, USB_DIRECTION_IN, NULL); + if (ep == NULL) { + usb_log_error("Endpoint(%d:%d) not registered for INT IN.\n", + target.address, target.endpoint); + return ENOENT; + } + assert(ep->speed == + usb_device_keeper_get_speed(&hc->manager, target.address)); + assert(ep->max_packet_size == max_packet_size); + assert(ep->transfer_type == USB_TRANSFER_INTERRUPT); + + usb_transfer_batch_t *batch = + batch_get(fun, target, ep->transfer_type, ep->max_packet_size, + ep->speed, data, size, NULL, 0, callback, NULL, arg, &hc->manager); if (!batch) return ENOMEM; @@ -248,13 +284,25 @@ hc_t *hc = fun_to_hc(fun); assert(hc); - usb_speed_t speed = - usb_device_keeper_get_speed(&hc->manager, target.address); usb_log_debug("Bulk OUT %d:%d %zu(%zu).\n", target.address, target.endpoint, size, max_packet_size); - usb_transfer_batch_t *batch = - batch_get(fun, target, USB_TRANSFER_BULK, max_packet_size, speed, - data, size, NULL, 0, NULL, callback, arg, &hc->manager); + endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager, + target.address, target.endpoint, USB_DIRECTION_OUT, NULL); + if (ep == NULL) { + usb_log_error("Endpoint(%d:%d) not registered for BULK OUT.\n", + target.address, target.endpoint); + return ENOENT; + } + assert(ep->speed == + usb_device_keeper_get_speed(&hc->manager, target.address)); + assert(ep->max_packet_size == max_packet_size); + assert(ep->transfer_type == USB_TRANSFER_BULK); + + + usb_transfer_batch_t *batch = + batch_get(fun, target, ep->transfer_type, ep->max_packet_size, + ep->speed, data, size, NULL, 0, NULL, callback, arg, + &hc->manager); if (!batch) return ENOMEM; @@ -285,11 +333,21 @@ hc_t *hc = fun_to_hc(fun); assert(hc); - usb_speed_t speed = - usb_device_keeper_get_speed(&hc->manager, target.address); usb_log_debug("Bulk IN %d:%d %zu(%zu).\n", target.address, target.endpoint, size, max_packet_size); - usb_transfer_batch_t *batch = - batch_get(fun, target, USB_TRANSFER_BULK, max_packet_size, speed, + endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager, + target.address, target.endpoint, USB_DIRECTION_IN, NULL); + if (ep == NULL) { + usb_log_error("Endpoint(%d:%d) not registered for BULK IN.\n", + target.address, target.endpoint); + return ENOENT; + } + assert(ep->speed == + usb_device_keeper_get_speed(&hc->manager, target.address)); + assert(ep->max_packet_size == max_packet_size); + assert(ep->transfer_type == USB_TRANSFER_BULK); + + usb_transfer_batch_t *batch = + batch_get(fun, target, ep->transfer_type, ep->max_packet_size, ep->speed, data, size, NULL, 0, callback, NULL, arg, &hc->manager); if (!batch) @@ -328,4 +386,10 @@ usb_log_debug("Control WRITE (%d) %d:%d %zu(%zu).\n", speed, target.address, target.endpoint, size, max_packet_size); + endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager, + target.address, target.endpoint, USB_DIRECTION_BOTH, NULL); + if (ep == NULL) { + usb_log_warning("Endpoint(%d:%d) not registered for CONTROL.\n", + target.address, target.endpoint); + } if (setup_size != 8) @@ -373,4 +437,10 @@ usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n", speed, target.address, target.endpoint, size, max_packet_size); + endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager, + target.address, target.endpoint, USB_DIRECTION_BOTH, NULL); + if (ep == NULL) { + usb_log_warning("Endpoint(%d:%d) not registered for CONTROL.\n", + target.address, target.endpoint); + } usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL, max_packet_size, speed,