Index: uspace/drv/uhci-hcd/Makefile =================================================================== --- uspace/drv/uhci-hcd/Makefile (revision 1e7015755f65dfcb9f747089dadc580b8ddd0952) +++ uspace/drv/uhci-hcd/Makefile (revision 8dc762e047944f4eeb1b533176031bd8bfe58813) @@ -37,5 +37,4 @@ transfer_list.c \ uhci.c \ - endpoint.c \ hc.c \ root_hub.c \ Index: uspace/drv/uhci-hcd/batch.h =================================================================== --- uspace/drv/uhci-hcd/batch.h (revision 1e7015755f65dfcb9f747089dadc580b8ddd0952) +++ uspace/drv/uhci-hcd/batch.h (revision 8dc762e047944f4eeb1b533176031bd8bfe58813) @@ -35,9 +35,8 @@ #define DRV_UHCI_BATCH_H -#include - #include #include #include +#include #include Index: uspace/drv/uhci-hcd/endpoint.c =================================================================== --- uspace/drv/uhci-hcd/endpoint.c (revision 1e7015755f65dfcb9f747089dadc580b8ddd0952) +++ (revision ) @@ -1,74 +1,0 @@ -/* - * 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 - -#include "endpoint.h" -#include "utils/malloc32.h" - -int 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; - instance->qh = malloc32(sizeof(qh_t)); - if (instance->qh == NULL) - return ENOMEM; - return EOK; -} -/*----------------------------------------------------------------------------*/ -void endpoint_destroy(void *ep) -{ - endpoint_t *instance = ep; - assert(instance); - list_remove(&instance->same_device_eps); - free32(instance->qh); - free(instance); -} -/*----------------------------------------------------------------------------*/ -void endpoint_toggle_reset(link_t *ep) -{ - endpoint_t *instance = - list_get_instance(ep, endpoint_t, same_device_eps); - assert(instance); - instance->toggle = 0; -} -/** - * @} - */ Index: uspace/drv/uhci-hcd/endpoint.h =================================================================== --- uspace/drv/uhci-hcd/endpoint.h (revision 1e7015755f65dfcb9f747089dadc580b8ddd0952) +++ (revision ) @@ -1,65 +1,0 @@ -/* - * 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 - -#include "hw_struct/queue_head.h" - -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; - qh_t *qh; -} endpoint_t; - -int endpoint_init(endpoint_t *instance, usb_transfer_type_t transfer_type, - usb_speed_t speed, size_t max_packet_size); - -void endpoint_destroy(void *ep); - -void endpoint_toggle_reset(link_t *ep); - -#endif -/** - * @} - */ Index: uspace/drv/uhci-hcd/iface.c =================================================================== --- uspace/drv/uhci-hcd/iface.c (revision 1e7015755f65dfcb9f747089dadc580b8ddd0952) +++ uspace/drv/uhci-hcd/iface.c (revision 8dc762e047944f4eeb1b533176031bd8bfe58813) @@ -36,6 +36,6 @@ #include - -#include "endpoint.h" +#include + #include "iface.h" #include "hc.h" @@ -159,5 +159,8 @@ const usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, address); - const size_t size = max_packet_size; + const size_t size = + (transfer_type == USB_TRANSFER_INTERRUPT + || transfer_type == USB_TRANSFER_ISOCHRONOUS) ? + max_packet_size : 0; int ret; @@ -175,12 +178,6 @@ usb_str_speed(speed), direction, size, max_packet_size, interval); - const size_t bw = - (transfer_type == USB_TRANSFER_INTERRUPT - || transfer_type == USB_TRANSFER_ISOCHRONOUS) ? - bandwidth_count_usb11(speed, transfer_type, size, max_packet_size) : - 0; - ret = usb_endpoint_manager_register_ep(&hc->ep_manager, - address, endpoint, direction, ep, endpoint_destroy, bw); + address, endpoint, direction, ep, size); if (ret != EOK) { endpoint_destroy(ep); @@ -226,5 +223,5 @@ size_t res_bw; - endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager, + endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager, target.address, target.endpoint, USB_DIRECTION_OUT, &res_bw); if (ep == NULL) { @@ -283,5 +280,5 @@ size_t res_bw; - endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager, + endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager, target.address, target.endpoint, USB_DIRECTION_IN, &res_bw); if (ep == NULL) { @@ -340,5 +337,5 @@ target.address, target.endpoint, size, max_packet_size); - endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager, + endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager, target.address, target.endpoint, USB_DIRECTION_OUT, NULL); if (ep == NULL) { @@ -387,5 +384,5 @@ target.address, target.endpoint, size, max_packet_size); - endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager, + endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager, target.address, target.endpoint, USB_DIRECTION_IN, NULL); if (ep == NULL) { @@ -438,5 +435,5 @@ 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, + endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager, target.address, target.endpoint, USB_DIRECTION_BOTH, NULL); if (ep == NULL) { @@ -489,5 +486,5 @@ 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, + endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager, target.address, target.endpoint, USB_DIRECTION_BOTH, NULL); if (ep == NULL) {