Index: uspace/drv/uhci-hcd/Makefile =================================================================== --- uspace/drv/uhci-hcd/Makefile (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/uhci-hcd/Makefile (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -40,5 +40,5 @@ uhci_struct/transfer_descriptor.c \ pci.c \ - tracker.c + batch.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/uhci-hcd/batch.c =================================================================== --- uspace/drv/uhci-hcd/batch.c (revision 50ba203e98ce570f05993da83249a116cfffceab) +++ uspace/drv/uhci-hcd/batch.c (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -0,0 +1,383 @@ +/* + * 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 usb + * @{ + */ +/** @file + * @brief UHCI driver + */ +#include + +#include + +#include "batch.h" +#include "transfer_list.h" +#include "uhci.h" +#include "utils/malloc32.h" + +#define DEFAULT_ERROR_COUNT 3 + +static int batch_schedule(batch_t *instance); + +static void batch_call_in(batch_t *instance); +static void batch_call_out(batch_t *instance); +static void batch_call_in_and_dispose(batch_t *instance); +static void batch_call_out_and_dispose(batch_t *instance); + + +batch_t * batch_get(device_t *dev, usb_target_t target, + usb_transfer_type_t transfer_type, size_t max_packet_size, + dev_speed_t speed, char *buffer, size_t size, + char* setup_buffer, size_t setup_size, + usbhc_iface_transfer_in_callback_t func_in, + usbhc_iface_transfer_out_callback_t func_out, void *arg) +{ + assert(func_in == NULL || func_out == NULL); + assert(func_in != NULL || func_out != NULL); + + batch_t *instance = malloc(sizeof(batch_t)); + if (instance == NULL) { + usb_log_error("Failed to allocate batch instance.\n"); + return NULL; + } + + instance->qh = queue_head_get(); + if (instance->qh == NULL) { + usb_log_error("Failed to allocate queue head.\n"); + free(instance); + return NULL; + } + + instance->packets = (size + max_packet_size - 1) / max_packet_size; + if (transfer_type == USB_TRANSFER_CONTROL) { + instance->packets += 2; + } + + instance->tds = malloc32(sizeof(transfer_descriptor_t) * instance->packets); + if (instance->tds == NULL) { + usb_log_error("Failed to allocate transfer descriptors.\n"); + queue_head_dispose(instance->qh); + free(instance); + return NULL; + } + bzero(instance->tds, sizeof(transfer_descriptor_t) * instance->packets); + + const size_t transport_size = max_packet_size * instance->packets; + + instance->transport_buffer = + (size > 0) ? malloc32(transport_size) : NULL; + if ((size > 0) && (instance->transport_buffer == NULL)) { + usb_log_error("Failed to allocate device accessible buffer.\n"); + queue_head_dispose(instance->qh); + free32(instance->tds); + free(instance); + return NULL; + } + + instance->setup_buffer = setup_buffer ? malloc32(setup_size) : NULL; + if ((setup_size > 0) && (instance->setup_buffer == NULL)) { + usb_log_error("Failed to allocate device accessible setup buffer.\n"); + queue_head_dispose(instance->qh); + free32(instance->tds); + free32(instance->transport_buffer); + free(instance); + return NULL; + } + if (instance->setup_buffer) { + memcpy(instance->setup_buffer, setup_buffer, setup_size); + } + + instance->max_packet_size = max_packet_size; + + link_initialize(&instance->link); + + instance->target = target; + instance->transfer_type = transfer_type; + + if (func_out) + instance->callback_out = func_out; + if (func_in) + instance->callback_in = func_in; + + instance->buffer = buffer; + instance->buffer_size = size; + instance->setup_size = setup_size; + instance->dev = dev; + instance->arg = arg; + instance->speed = speed; + + queue_head_element_td(instance->qh, addr_to_phys(instance->tds)); + return instance; +} +/*----------------------------------------------------------------------------*/ +bool batch_is_complete(batch_t *instance) +{ + assert(instance); + usb_log_debug("Checking(%p) %d packet for completion.\n", + instance, instance->packets); + /* This is just an ugly trick to support the old API */ + instance->transfered_size = 0; + size_t i = 0; + for (;i < instance->packets; ++i) { + if (transfer_descriptor_is_active(&instance->tds[i])) { + return false; + } + instance->error = transfer_descriptor_status(&instance->tds[i]); + if (instance->error != EOK) { + if (i > 0) + instance->transfered_size -= instance->setup_size; + return true; + } + instance->transfered_size += + transfer_descriptor_actual_size(&instance->tds[i]); + } + instance->transfered_size -= instance->setup_size; + return true; +} +/*----------------------------------------------------------------------------*/ +void batch_control_write(batch_t *instance) +{ + assert(instance); + + /* we are data out, we are supposed to provide data */ + memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size); + + int toggle = 0; + /* setup stage */ + transfer_descriptor_init(instance->tds, DEFAULT_ERROR_COUNT, + instance->setup_size, toggle, false, instance->target, + USB_PID_SETUP, instance->setup_buffer, &instance->tds[1]); + + /* data stage */ + size_t i = 1; + for (;i < instance->packets - 1; ++i) { + char *data = + instance->transport_buffer + ((i - 1) * instance->max_packet_size); + toggle = 1 - toggle; + + transfer_descriptor_init(&instance->tds[i], DEFAULT_ERROR_COUNT, + instance->max_packet_size, toggle++, false, instance->target, + USB_PID_OUT, data, &instance->tds[i + 1]); + } + + /* status stage */ + i = instance->packets - 1; + transfer_descriptor_init(&instance->tds[i], DEFAULT_ERROR_COUNT, + 0, 1, false, instance->target, USB_PID_IN, NULL, NULL); + + instance->next_step = batch_call_out_and_dispose; + batch_schedule(instance); +} +/*----------------------------------------------------------------------------*/ +void batch_control_read(batch_t *instance) +{ + assert(instance); + + int toggle = 0; + /* setup stage */ + transfer_descriptor_init(instance->tds, DEFAULT_ERROR_COUNT, + instance->setup_size, toggle, false, instance->target, + USB_PID_SETUP, instance->setup_buffer, &instance->tds[1]); + + /* data stage */ + size_t i = 1; + for (;i < instance->packets - 1; ++i) { + char *data = + instance->transport_buffer + ((i - 1) * instance->max_packet_size); + toggle = 1 - toggle; + + transfer_descriptor_init(&instance->tds[i], DEFAULT_ERROR_COUNT, + instance->max_packet_size, toggle, false, instance->target, + USB_PID_IN, data, &instance->tds[i + 1]); + } + + /* status stage */ + i = instance->packets - 1; + transfer_descriptor_init(&instance->tds[i], DEFAULT_ERROR_COUNT, + 0, 1, false, instance->target, USB_PID_OUT, NULL, NULL); + + instance->next_step = batch_call_in_and_dispose; + batch_schedule(instance); +} +/*----------------------------------------------------------------------------*/ +void batch_interrupt_in(batch_t *instance) +{ + assert(instance); + + int toggle = 1; + size_t i = 0; + for (;i < instance->packets; ++i) { + char *data = + instance->transport_buffer + (i * instance->max_packet_size); + transfer_descriptor_t *next = (i + 1) < instance->packets ? + &instance->tds[i + 1] : NULL; + toggle = 1 - toggle; + + transfer_descriptor_init(&instance->tds[i], DEFAULT_ERROR_COUNT, + instance->max_packet_size, toggle, false, instance->target, + USB_PID_IN, data, next); + } + + instance->next_step = batch_call_in_and_dispose; + batch_schedule(instance); +} +/*----------------------------------------------------------------------------*/ +void batch_interrupt_out(batch_t *instance) +{ + assert(instance); + + memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size); + + int toggle = 1; + size_t i = 0; + for (;i < instance->packets; ++i) { + char *data = + instance->transport_buffer + (i * instance->max_packet_size); + transfer_descriptor_t *next = (i + 1) < instance->packets ? + &instance->tds[i + 1] : NULL; + toggle = 1 - toggle; + + transfer_descriptor_init(&instance->tds[i], DEFAULT_ERROR_COUNT, + instance->max_packet_size, toggle++, false, instance->target, + USB_PID_OUT, data, next); + } + + instance->next_step = batch_call_out_and_dispose; + batch_schedule(instance); +} +/*----------------------------------------------------------------------------*/ +void batch_call_in(batch_t *instance) +{ + assert(instance); + assert(instance->callback_in); + + memcpy(instance->buffer, instance->transport_buffer, instance->buffer_size); + + int err = instance->error; + usb_log_info("Callback IN(%d): %d, %zu.\n", instance->transfer_type, + err, instance->transfered_size); + + instance->callback_in(instance->dev, + err, instance->transfered_size, + instance->arg); +} +/*----------------------------------------------------------------------------*/ +void batch_call_out(batch_t *instance) +{ + assert(instance); + assert(instance->callback_out); + + int err = instance->error; + usb_log_info("Callback OUT(%d): %d.\n", instance->transfer_type, err); + instance->callback_out(instance->dev, + err, instance->arg); +} +/*----------------------------------------------------------------------------*/ +void batch_call_in_and_dispose(batch_t *instance) +{ + assert(instance); + batch_call_in(instance); + usb_log_debug("Disposing batch: %p.\n", instance); + free32(instance->tds); + free32(instance->qh); + free32(instance->setup_buffer); + free32(instance->transport_buffer); + free(instance); +} +/*----------------------------------------------------------------------------*/ +void batch_call_out_and_dispose(batch_t *instance) +{ + assert(instance); + batch_call_out(instance); + usb_log_debug("Disposing batch: %p.\n", instance); + free32(instance->tds); + free32(instance->qh); + free32(instance->setup_buffer); + free32(instance->transport_buffer); + free(instance); +} +/*----------------------------------------------------------------------------*/ +int batch_schedule(batch_t *instance) +{ + assert(instance); + uhci_t *hc = dev_to_uhci(instance->dev); + assert(hc); + return uhci_schedule(hc, instance); +} +/*----------------------------------------------------------------------------*/ +/* DEPRECATED FUNCTIONS NEEDED BY THE OLD API */ +void batch_control_setup_old(batch_t *instance) +{ + assert(instance); + instance->packets = 1; + + /* setup stage */ + transfer_descriptor_init(instance->tds, DEFAULT_ERROR_COUNT, + instance->setup_size, 0, false, instance->target, + USB_PID_SETUP, instance->setup_buffer, NULL); + + instance->next_step = batch_call_out_and_dispose; + batch_schedule(instance); +} +/*----------------------------------------------------------------------------*/ +void batch_control_write_data_old(batch_t *instance) +{ + assert(instance); + instance->packets -= 2; + batch_interrupt_out(instance); +} +/*----------------------------------------------------------------------------*/ +void batch_control_read_data_old(batch_t *instance) +{ + assert(instance); + instance->packets -= 2; + batch_interrupt_in(instance); +} +/*----------------------------------------------------------------------------*/ +void batch_control_write_status_old(batch_t *instance) +{ + assert(instance); + instance->packets = 1; + transfer_descriptor_init(instance->tds, DEFAULT_ERROR_COUNT, + 0, 1, false, instance->target, USB_PID_IN, NULL, NULL); + instance->next_step = batch_call_in_and_dispose; + batch_schedule(instance); +} +/*----------------------------------------------------------------------------*/ +void batch_control_read_status_old(batch_t *instance) +{ + assert(instance); + instance->packets = 1; + transfer_descriptor_init(instance->tds, DEFAULT_ERROR_COUNT, + 0, 1, false, instance->target, USB_PID_OUT, NULL, NULL); + instance->next_step = batch_call_out_and_dispose; + batch_schedule(instance); +} +/** + * @} + */ Index: uspace/drv/uhci-hcd/batch.h =================================================================== --- uspace/drv/uhci-hcd/batch.h (revision 50ba203e98ce570f05993da83249a116cfffceab) +++ uspace/drv/uhci-hcd/batch.h (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -0,0 +1,106 @@ +/* + * 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 usb + * @{ + */ +/** @file + * @brief UHCI driver + */ +#ifndef DRV_UHCI_BATCH_H +#define DRV_UHCI_BATCH_H + +#include + +#include +#include + +#include "uhci_struct/transfer_descriptor.h" +#include "uhci_struct/queue_head.h" + +typedef enum { + LOW_SPEED, + FULL_SPEED, +} dev_speed_t; + +typedef struct batch +{ + link_t link; + dev_speed_t speed; + usb_target_t target; + usb_transfer_type_t transfer_type; + union { + usbhc_iface_transfer_in_callback_t callback_in; + usbhc_iface_transfer_out_callback_t callback_out; + }; + void *arg; + char *transport_buffer; + char *setup_buffer; + size_t setup_size; + char *buffer; + size_t buffer_size; + size_t max_packet_size; + size_t packets; + size_t transfered_size; + int error; + device_t *dev; + queue_head_t *qh; + transfer_descriptor_t *tds; + void (*next_step)(struct batch*); +} batch_t; + +batch_t * batch_get(device_t *dev, usb_target_t target, + usb_transfer_type_t transfer_type, size_t max_packet_size, + dev_speed_t speed, char *buffer, size_t size, + char *setup_buffer, size_t setup_size, + usbhc_iface_transfer_in_callback_t func_in, + usbhc_iface_transfer_out_callback_t func_out, void *arg); + +bool batch_is_complete(batch_t *instance); + +void batch_control_write(batch_t *instance); + +void batch_control_read(batch_t *instance); + +void batch_interrupt_in(batch_t *instance); + +void batch_interrupt_out(batch_t *instance); + +/* DEPRECATED FUNCTIONS NEEDED BY THE OLD API */ +void batch_control_setup_old(batch_t *instance); + +void batch_control_write_data_old(batch_t *instance); + +void batch_control_read_data_old(batch_t *instance); + +void batch_control_write_status_old(batch_t *instance); + +void batch_control_read_status_old(batch_t *instance); +#endif +/** + * @} + */ Index: uspace/drv/uhci-hcd/iface.c =================================================================== --- uspace/drv/uhci-hcd/iface.c (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/uhci-hcd/iface.c (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -54,5 +54,5 @@ } /*----------------------------------------------------------------------------*/ -static int reserve_default_address(device_t *dev) +static int reserve_default_address(device_t *dev, bool full_speed) { assert(dev); @@ -72,5 +72,6 @@ } /*----------------------------------------------------------------------------*/ -static int request_address(device_t *dev, usb_address_t *address) +static int request_address(device_t *dev, bool full_speed, + usb_address_t *address) { assert(dev); @@ -103,35 +104,145 @@ /*----------------------------------------------------------------------------*/ static int interrupt_out(device_t *dev, usb_target_t target, - void *data, size_t size, - usbhc_iface_transfer_out_callback_t callback, void *arg) + size_t max_packet_size, + void *data, size_t size, + usbhc_iface_transfer_out_callback_t callback, void *arg) +{ + dev_speed_t speed = FULL_SPEED; + + batch_t *batch = batch_get(dev, target, USB_TRANSFER_INTERRUPT, + max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg); + if (!batch) + return ENOMEM; + batch_interrupt_out(batch); + return EOK; +} +/*----------------------------------------------------------------------------*/ +static int interrupt_in(device_t *dev, usb_target_t target, + size_t max_packet_size, + void *data, size_t size, + usbhc_iface_transfer_in_callback_t callback, void *arg) +{ + dev_speed_t speed = FULL_SPEED; + + batch_t *batch = batch_get(dev, target, USB_TRANSFER_INTERRUPT, + max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg); + if (!batch) + return ENOMEM; + batch_interrupt_in(batch); + return EOK; +} +/*----------------------------------------------------------------------------*/ +static int control_write(device_t *dev, usb_target_t target, + size_t max_packet_size, + void *setup_data, size_t setup_size, void *data, size_t size, + usbhc_iface_transfer_out_callback_t callback, void *arg) +{ + dev_speed_t speed = FULL_SPEED; + + batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, + max_packet_size, speed, data, size, setup_data, setup_size, + NULL, callback, arg); + if (!batch) + return ENOMEM; + batch_control_write(batch); + return EOK; +} +/*----------------------------------------------------------------------------*/ +static int control_read(device_t *dev, usb_target_t target, + size_t max_packet_size, + void *setup_data, size_t setup_size, void *data, size_t size, + usbhc_iface_transfer_in_callback_t callback, void *arg) +{ + dev_speed_t speed = FULL_SPEED; + + batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, + max_packet_size, speed, data, size, setup_data, setup_size, callback, + NULL, arg); + if (!batch) + return ENOMEM; + batch_control_read(batch); + return EOK; +} +/*----------------------------------------------------------------------------*/ +static int control_write_setup(device_t *dev, usb_target_t target, + size_t max_packet_size, + void *data, size_t size, + usbhc_iface_transfer_out_callback_t callback, void *arg) +{ + dev_speed_t speed = FULL_SPEED; + + usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); + batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, + max_packet_size, speed, NULL, 0, data, size, NULL, callback, arg); + if (!batch) + return ENOMEM; + batch_control_setup_old(batch); + return EOK; +} +/*----------------------------------------------------------------------------*/ +static int control_write_data(device_t *dev, usb_target_t target, + size_t max_packet_size, + void *data, size_t size, + usbhc_iface_transfer_out_callback_t callback, void *arg) +{ + dev_speed_t speed = FULL_SPEED; + + usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); + batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, + max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg); + if (!batch) + return ENOMEM; + batch_control_write_data_old(batch); + return EOK; +} +/*----------------------------------------------------------------------------*/ +static int control_write_status(device_t *dev, usb_target_t target, + usbhc_iface_transfer_in_callback_t callback, void *arg) { size_t max_packet_size = 8; dev_speed_t speed = FULL_SPEED; - tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_INTERRUPT, - max_packet_size, speed, data, size, NULL, callback, arg); - if (!tracker) - return ENOMEM; - tracker_interrupt_out(tracker); - return EOK; -} -/*----------------------------------------------------------------------------*/ -static int interrupt_in(device_t *dev, usb_target_t target, - void *data, size_t size, - usbhc_iface_transfer_in_callback_t callback, void *arg) -{ - size_t max_packet_size = 4; - dev_speed_t speed = FULL_SPEED; - - tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_INTERRUPT, - max_packet_size, speed, data, size, callback, NULL, arg); - if (!tracker) - return ENOMEM; - tracker_interrupt_in(tracker); - return EOK; -} -/*----------------------------------------------------------------------------*/ -static int control_write(device_t *dev, usb_target_t target, - void *setup_data, size_t setup_size, void *data, size_t size, + usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); + batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, + max_packet_size, speed, NULL, 0, NULL, 0, callback, NULL, arg); + if (!batch) + return ENOMEM; + batch_control_write_status_old(batch); + return EOK; +} +/*----------------------------------------------------------------------------*/ +static int control_read_setup(device_t *dev, usb_target_t target, + size_t max_packet_size, + void *data, size_t size, + usbhc_iface_transfer_out_callback_t callback, void *arg) +{ + dev_speed_t speed = FULL_SPEED; + + usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); + batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, + max_packet_size, speed, NULL, 0, data, size, NULL, callback, arg); + if (!batch) + return ENOMEM; + batch_control_setup_old(batch); + return EOK; +} +/*----------------------------------------------------------------------------*/ +static int control_read_data(device_t *dev, usb_target_t target, + size_t max_packet_size, + void *data, size_t size, + usbhc_iface_transfer_in_callback_t callback, void *arg) +{ + dev_speed_t speed = FULL_SPEED; + + usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); + batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, + max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg); + if (!batch) + return ENOMEM; + batch_control_read_data_old(batch); + return EOK; +} +/*----------------------------------------------------------------------------*/ +static int control_read_status(device_t *dev, usb_target_t target, usbhc_iface_transfer_out_callback_t callback, void *arg) { @@ -139,96 +250,10 @@ dev_speed_t speed = FULL_SPEED; - tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, - max_packet_size, speed, data, size, NULL, callback, arg); - if (!tracker) - return ENOMEM; - tracker_control_write(tracker, setup_data, setup_size); - return EOK; -} -/*----------------------------------------------------------------------------*/ -static int control_read(device_t *dev, usb_target_t target, - void *setup_data, size_t setup_size, void *data, size_t size, - usbhc_iface_transfer_in_callback_t callback, void *arg) -{ - size_t max_packet_size = 8; - dev_speed_t speed = FULL_SPEED; - - tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, - max_packet_size, speed, data, size, callback, NULL, arg); - if (!tracker) - return ENOMEM; - tracker_control_read(tracker, setup_data, setup_size); - return EOK; -} -/*----------------------------------------------------------------------------*/ -static int control_write_setup(device_t *dev, usb_target_t target, - void *data, size_t size, - usbhc_iface_transfer_out_callback_t callback, void *arg) -{ - usb_log_warning("Using deprecated API control write setup.\n"); - tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, - 8, FULL_SPEED, data, size, NULL, callback, arg); - if (!tracker) - return ENOMEM; - tracker_control_setup_old(tracker); - return EOK; -} -/*----------------------------------------------------------------------------*/ -static int control_write_data(device_t *dev, usb_target_t target, - void *data, size_t size, - usbhc_iface_transfer_out_callback_t callback, void *arg) -{ - tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, - size, FULL_SPEED, data, size, NULL, callback, arg); - if (!tracker) - return ENOMEM; - tracker_control_write_data_old(tracker); - return EOK; -} -/*----------------------------------------------------------------------------*/ -static int control_write_status(device_t *dev, usb_target_t target, - usbhc_iface_transfer_in_callback_t callback, void *arg) -{ - tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, - 0, FULL_SPEED, NULL, 0, callback, NULL, arg); - if (!tracker) - return ENOMEM; - tracker_control_write_status_old(tracker); - return EOK; -} -/*----------------------------------------------------------------------------*/ -static int control_read_setup(device_t *dev, usb_target_t target, - void *data, size_t size, - usbhc_iface_transfer_out_callback_t callback, void *arg) -{ - usb_log_warning("Using deprecated API control read setup.\n"); - tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, - 8, FULL_SPEED, data, size, NULL, callback, arg); - if (!tracker) - return ENOMEM; - tracker_control_setup_old(tracker); - return EOK; -} -/*----------------------------------------------------------------------------*/ -static int control_read_data(device_t *dev, usb_target_t target, - void *data, size_t size, - usbhc_iface_transfer_in_callback_t callback, void *arg) -{ - tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, - size, FULL_SPEED, data, size, callback, NULL, arg); - if (!tracker) - return ENOMEM; - tracker_control_read_data_old(tracker); - return EOK; -} -/*----------------------------------------------------------------------------*/ -static int control_read_status(device_t *dev, usb_target_t target, - usbhc_iface_transfer_out_callback_t callback, void *arg) -{ - tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, - 0, FULL_SPEED, NULL, 0, NULL, callback, arg); - if (!tracker) - return ENOMEM; - tracker_control_read_status_old(tracker); + usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); + batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, + max_packet_size, speed, NULL, 0, NULL, 0, NULL, callback, arg); + if (!batch) + return ENOMEM; + batch_control_read_status_old(batch); return EOK; } Index: uspace/drv/uhci-hcd/root_hub.c =================================================================== --- uspace/drv/uhci-hcd/root_hub.c (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/uhci-hcd/root_hub.c (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -35,39 +35,11 @@ #include #include - #include - #include #include "root_hub.h" + +extern device_ops_t child_ops; /*----------------------------------------------------------------------------*/ -static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle) -{ - assert(dev); - assert(dev->parent != NULL); - - device_t *parent = dev->parent; - - if (parent->ops && parent->ops->interfaces[USB_DEV_IFACE]) { - usb_iface_t *usb_iface - = (usb_iface_t *) parent->ops->interfaces[USB_DEV_IFACE]; - assert(usb_iface != NULL); - if (usb_iface->get_hc_handle) { - int rc = usb_iface->get_hc_handle(parent, handle); - return rc; - } - } - - return ENOTSUP; -} -/*----------------------------------------------------------------------------*/ -static usb_iface_t usb_iface = { - .get_hc_handle = usb_iface_get_hc_handle -}; - -static device_ops_t rh_ops = { - .interfaces[USB_DEV_IFACE] = &usb_iface -}; - int setup_root_hub(device_t **device, device_t *hc) { @@ -108,5 +80,5 @@ hub->name = name; hub->parent = hc; - hub->ops = &rh_ops; + hub->ops = &child_ops; *device = hub; Index: uspace/drv/uhci-hcd/tracker.c =================================================================== --- uspace/drv/uhci-hcd/tracker.c (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ (revision ) @@ -1,497 +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 usb - * @{ - */ -/** @file - * @brief UHCI driver - */ -#include - -#include - -#include "tracker.h" -#include "uhci.h" -#include "utils/malloc32.h" - -#define SETUP_PACKET_DATA_SIZE 8 -#define DEFAULT_ERROR_COUNT 3 -#define MAX(a,b) ((a > b) ? a : b) -#define MIN(a,b) ((a < b) ? a : b) - -static int tracker_schedule(tracker_t *instance); - -static void tracker_control_read_data(tracker_t *instance); -static void tracker_control_write_data(tracker_t *instance); -static void tracker_control_read_status(tracker_t *instance); -static void tracker_control_write_status(tracker_t *instance); - -static void tracker_call_in(tracker_t *instance); -static void tracker_call_out(tracker_t *instance); -static void tracker_call_in_and_dispose(tracker_t *instance); -static void tracker_call_out_and_dispose(tracker_t *instance); - - -tracker_t * tracker_get(device_t *dev, usb_target_t target, - usb_transfer_type_t transfer_type, size_t max_packet_size, - dev_speed_t speed, char *buffer, size_t size, - usbhc_iface_transfer_in_callback_t func_in, - usbhc_iface_transfer_out_callback_t func_out, void *arg) -{ - assert(func_in == NULL || func_out == NULL); - assert(func_in != NULL || func_out != NULL); - - tracker_t *instance = malloc(sizeof(tracker_t)); - if (!instance) { - usb_log_error("Failed to allocate tracker isntance.\n"); - return NULL; - } - - instance->td = malloc32(sizeof(transfer_descriptor_t)); - if (!instance->td) { - usb_log_error("Failed to allocate transfer descriptor.\n"); - free(instance); - return NULL; - } - bzero(instance->td, sizeof(transfer_descriptor_t)); - - instance->packet = max_packet_size ? malloc32(max_packet_size) : NULL; - if (max_packet_size && !instance->packet) { - usb_log_error("Failed to allocate device acessible buffer.\n"); - free32(instance->td); - free(instance); - return NULL; - } - instance->max_packet_size = max_packet_size; - instance->packet_size = 0; - instance->buffer_offset = 0; - - link_initialize(&instance->link); - instance->target = target; - instance->transfer_type = transfer_type; - - if (func_out) - instance->callback_out = func_out; - if (func_in) - instance->callback_in = func_in; - instance->buffer = buffer; - instance->buffer_size = size; - instance->dev = dev; - instance->arg = arg; - instance->toggle = 0; - instance->speed = speed; - - return instance; -} -/*----------------------------------------------------------------------------*/ -void tracker_control_write( - tracker_t *instance, char* setup_buffer, size_t setup_size) -{ - assert(instance); - assert(instance->buffer_offset == 0); - assert(setup_size == 8); - - instance->packet_size = 0; - memcpy(instance->packet, setup_buffer, setup_size); - - transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT, - setup_size, instance->toggle++, false, instance->target, - USB_PID_SETUP, instance->packet); - - instance->next_step = tracker_control_write_data; - - tracker_schedule(instance); -} -/*----------------------------------------------------------------------------*/ -void tracker_control_read( - tracker_t *instance, char* setup_buffer, size_t setup_size) -{ - assert(instance); - assert(instance->buffer_offset == 0); - assert(setup_size == 8); - - memcpy(instance->packet, setup_buffer, setup_size); - - transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT, - setup_size, instance->toggle++, false, instance->target, - USB_PID_SETUP, instance->packet); - - instance->next_step = tracker_control_read_data; - - tracker_schedule(instance); -} -/*----------------------------------------------------------------------------*/ -void tracker_control_read_data(tracker_t *instance) -{ - assert(instance); - - /* check for errors */ - int err = transfer_descriptor_status(instance->td); - if (err != EOK) { - tracker_call_in_and_dispose(instance); - return; - } - - /* we are data in, we want data from our device */ - if (instance->packet_size) { - memcpy(instance->buffer + instance->buffer_offset, instance->packet, - instance->packet_size); - } - instance->buffer_offset += instance->packet_size; - - /* prepare next packet, no copy, we are receiving data */ - instance->packet_size = MIN(instance->max_packet_size, - instance->buffer_size - instance->buffer_offset); - - transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT, - instance->packet_size, instance->toggle++, false, instance->target, - USB_PID_IN, instance->packet); - - tracker_schedule(instance); - - /* set next step */ - if ((instance->buffer_offset + instance->packet_size) - >= instance->buffer_size) { - /* that's all, end coomunication */ - instance->next_step = tracker_control_read_status; - } -} -/*----------------------------------------------------------------------------*/ -void tracker_control_write_data(tracker_t *instance) -{ - assert(instance); - - /* check for errors */ - int err = transfer_descriptor_status(instance->td); - if (err != EOK) { - tracker_call_out_and_dispose(instance); - return; - } - - /* we are data out, we don't want data from our device */ - instance->buffer_offset += instance->packet_size; - - /* prepare next packet, copy data to packet */ - instance->packet_size = MIN(instance->max_packet_size, - instance->buffer_size - instance->buffer_offset); - memcpy(instance->packet, instance->buffer + instance->buffer_offset, - instance->packet_size); - - transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT, - instance->packet_size, instance->toggle++, false, instance->target, - USB_PID_OUT, instance->packet); - - tracker_schedule(instance); - - /* set next step */ - if ((instance->buffer_offset + instance->packet_size) - >= instance->buffer_size) { - /* that's all, end coomunication */ - instance->next_step = tracker_control_write_status; - } -} -/*----------------------------------------------------------------------------*/ -void tracker_control_read_status(tracker_t *instance) -{ - assert(instance); - - /* check for errors */ - int err = transfer_descriptor_status(instance->td); - if (err != EOK) { - tracker_call_in_and_dispose(instance); - return; - } - - /* we are data in, we want data from our device */ - memcpy(instance->buffer + instance->buffer_offset, instance->packet, - instance->packet_size); - instance->buffer_offset += instance->packet_size; - assert(instance->buffer_offset = instance->buffer_size); - - /* prepare next packet, no nothing, just an empty packet */ - instance->packet_size = 0; - transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT, - instance->packet_size, 1, false, instance->target, USB_PID_OUT, NULL); - - tracker_schedule(instance); - - /* set next step, callback and cleanup */ - instance->next_step = tracker_call_in_and_dispose; -} -/*----------------------------------------------------------------------------*/ -void tracker_control_write_status(tracker_t *instance) -{ - assert(instance); - - /* check for errors */ - int err = transfer_descriptor_status(instance->td); - if (err != EOK) { - tracker_call_out_and_dispose(instance); - return; - } - - /* we are data in, we want data from our device */ - assert( - instance->buffer_offset + instance->packet_size <= instance->buffer_size); - memcpy(instance->buffer + instance->buffer_offset, instance->packet, - instance->packet_size); - instance->buffer_offset += instance->packet_size; - assert(instance->buffer_offset = instance->buffer_size); - - /* prepare next packet, no nothing, just an empty packet */ - instance->packet_size = 0; - transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT, - instance->packet_size, 1, false, instance->target, USB_PID_IN, NULL); - - tracker_schedule(instance); - - /* set next step, callback and cleanup */ - instance->next_step = tracker_call_out_and_dispose; -} -/*----------------------------------------------------------------------------*/ -void tracker_interrupt_in(tracker_t *instance) -{ - assert(instance); - - /* check for errors */ - int err = transfer_descriptor_status(instance->td); - if (err != EOK) { - tracker_call_in_and_dispose(instance); - return; - } - - assert(instance->packet_size <= instance->max_packet_size); - if (instance->packet_size) { - /* we are data in, we want data from our device. if there is data */ - memcpy(instance->buffer + instance->buffer_offset, instance->packet, - instance->packet_size); - instance->buffer_offset += instance->packet_size; - } - - /* prepare next packet, no copy, we are receiving data */ - instance->packet_size = MIN(instance->max_packet_size, - instance->buffer_size - instance->buffer_offset); - assert(instance->packet_size <= instance->max_packet_size); - - transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT, - instance->packet_size, instance->toggle++, false, instance->target, - USB_PID_IN, instance->packet); - - tracker_schedule(instance); - - /* set next step */ - if ((instance->buffer_offset + instance->packet_size) - >= instance->buffer_size) { - /* that's all, end coomunication */ - instance->next_step = tracker_call_in_and_dispose; - } else { - instance->next_step = tracker_interrupt_in; - } -} -/*----------------------------------------------------------------------------*/ -void tracker_interrupt_out(tracker_t *instance) -{ - assert(instance); - - /* check for errors */ - int err = transfer_descriptor_status(instance->td); - if (err != EOK) { - tracker_call_out_and_dispose(instance); - return; - } - - /* we are data out, we don't want data from our device */ - instance->buffer_offset += instance->packet_size; - - /* prepare next packet, copy data to packet */ - instance->packet_size = MIN(instance->max_packet_size, - instance->buffer_size - instance->buffer_offset); - memcpy(instance->packet, instance->buffer + instance->buffer_offset, - instance->packet_size); - - transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT, - instance->packet_size, instance->toggle++, false, instance->target, - USB_PID_OUT, instance->packet); - - tracker_schedule(instance); - - /* set next step */ - if ((instance->buffer_offset + instance->packet_size) - >= instance->buffer_size) { - /* that's all, end coomunication */ - instance->next_step = tracker_call_out_and_dispose; - } else { - instance->next_step = tracker_interrupt_out; - } -} -/*----------------------------------------------------------------------------*/ -void tracker_call_in(tracker_t *instance) -{ - assert(instance); - assert(instance->callback_in); - - /* check for errors */ - int err = transfer_descriptor_status(instance->td); - if (err == EOK && instance->packet_size) { - memcpy(instance->buffer + instance->buffer_offset, instance->packet, - instance->packet_size); - instance->buffer_offset += instance->packet_size; - } - usb_log_debug("Callback IN(%d): %d, %zu.\n", instance->transfer_type, - err, instance->buffer_offset); - instance->callback_in(instance->dev, - err ? USB_OUTCOME_CRCERROR : USB_OUTCOME_OK, instance->buffer_offset, - instance->arg); -} -/*----------------------------------------------------------------------------*/ -void tracker_call_out(tracker_t *instance) -{ - assert(instance); - assert(instance->callback_out); - - /* check for errors */ - int err = transfer_descriptor_status(instance->td); - usb_log_debug("Callback OUT(%d): %d, %zu.\n", instance->transfer_type, - err, instance->buffer_offset); - instance->callback_out(instance->dev, - err ? USB_OUTCOME_CRCERROR : USB_OUTCOME_OK, instance->arg); -} -/*----------------------------------------------------------------------------*/ -void tracker_call_in_and_dispose(tracker_t *instance) -{ - assert(instance); - tracker_call_in(instance); - free32(instance->td); - free32(instance->packet); - free(instance); -} -/*----------------------------------------------------------------------------*/ -void tracker_call_out_and_dispose(tracker_t *instance) -{ - assert(instance); - tracker_call_out(instance); - free32(instance->td); - free32(instance->packet); - free(instance); -} -/*----------------------------------------------------------------------------*/ -int tracker_schedule(tracker_t *instance) -{ - assert(instance); - uhci_t *hc = dev_to_uhci(instance->dev); - assert(hc); - return uhci_schedule(hc, instance); -} -/*----------------------------------------------------------------------------*/ -/* DEPRECATED FUNCTIONS NEEDED BY THE OLD API */ -void tracker_control_setup_old(tracker_t *instance) -{ - assert(instance); - assert(instance->buffer_offset == 0); - - instance->packet_size = SETUP_PACKET_DATA_SIZE; - memcpy(instance->packet, instance->buffer, SETUP_PACKET_DATA_SIZE); - - transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT, - SETUP_PACKET_DATA_SIZE, 0, false, instance->target, USB_PID_SETUP, - instance->packet); - - instance->buffer_offset += SETUP_PACKET_DATA_SIZE; - instance->next_step = tracker_call_out_and_dispose; - - tracker_schedule(instance); -} - -void tracker_control_write_data_old(tracker_t *instance) -{ - assert(instance); - assert(instance->max_packet_size == instance->buffer_size); - - memcpy(instance->packet, instance->buffer, instance->max_packet_size); - instance->packet_size = instance->max_packet_size; - - transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT, - instance->packet_size, 1, false, instance->target, USB_PID_OUT, - instance->packet); - instance->next_step = tracker_call_out_and_dispose; - - tracker_schedule(instance); -} - -void tracker_control_read_data_old(tracker_t *instance) -{ - assert(instance); - assert(instance->max_packet_size == instance->buffer_size); - - instance->packet_size = instance->max_packet_size; - - transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT, - instance->packet_size, 1, false, instance->target, USB_PID_IN, - instance->packet); - - instance->next_step = tracker_call_in_and_dispose; - - tracker_schedule(instance); -} - -void tracker_control_write_status_old(tracker_t *instance) -{ - assert(instance); - assert(instance->max_packet_size == 0); - assert(instance->buffer_size == 0); - assert(instance->packet == NULL); - - instance->packet_size = instance->max_packet_size; - instance->next_step = tracker_call_in_and_dispose; - - transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT, - instance->packet_size, 1, false, instance->target, USB_PID_IN, - instance->packet); - - tracker_schedule(instance); -} - -void tracker_control_read_status_old(tracker_t *instance) -{ - assert(instance); - assert(instance->max_packet_size == 0); - assert(instance->buffer_size == 0); - assert(instance->packet == NULL); - - instance->packet_size = instance->max_packet_size; - instance->next_step = tracker_call_out_and_dispose; - - transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT, - instance->packet_size, 1, false, instance->target, USB_PID_OUT, - instance->packet); - - tracker_schedule(instance); -} -/** - * @} - */ Index: uspace/drv/uhci-hcd/tracker.h =================================================================== --- uspace/drv/uhci-hcd/tracker.h (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ (revision ) @@ -1,102 +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 usb - * @{ - */ -/** @file - * @brief UHCI driver - */ -#ifndef DRV_UHCI_TRACKER_H -#define DRV_UHCI_TRACKER_H - -#include - -#include -#include - -#include "uhci_struct/transfer_descriptor.h" - -typedef enum { - LOW_SPEED, - FULL_SPEED, -} dev_speed_t; - -typedef struct tracker -{ - link_t link; - usb_target_t target; - usb_transfer_type_t transfer_type; - union { - usbhc_iface_transfer_in_callback_t callback_in; - usbhc_iface_transfer_out_callback_t callback_out; - }; - void *arg; - char *buffer; - char *packet; - size_t buffer_size; - size_t max_packet_size; - size_t packet_size; - size_t buffer_offset; - dev_speed_t speed; - device_t *dev; - transfer_descriptor_t *td; - void (*next_step)(struct tracker*); - unsigned toggle:1; -} tracker_t; - - -tracker_t * tracker_get(device_t *dev, usb_target_t target, - usb_transfer_type_t transfer_type, size_t max_packet_size, - dev_speed_t speed, char *buffer, size_t size, - usbhc_iface_transfer_in_callback_t func_in, - usbhc_iface_transfer_out_callback_t func_out, void *arg); - -void tracker_control_write( - tracker_t *instance, char* setup_buffer, size_t setup_size); - -void tracker_control_read( - tracker_t *instance, char* setup_buffer, size_t setup_size); - -void tracker_interrupt_in(tracker_t *instance); - -void tracker_interrupt_out(tracker_t *instance); - -/* DEPRECATED FUNCTIONS NEEDED BY THE OLD API */ -void tracker_control_setup_old(tracker_t *instance); - -void tracker_control_write_data_old(tracker_t *instance); - -void tracker_control_read_data_old(tracker_t *instance); - -void tracker_control_write_status_old(tracker_t *instance); - -void tracker_control_read_status_old(tracker_t *instance); -#endif -/** - * @} - */ Index: uspace/drv/uhci-hcd/transfer_list.c =================================================================== --- uspace/drv/uhci-hcd/transfer_list.c (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/uhci-hcd/transfer_list.c (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -51,4 +51,6 @@ queue_head_init(instance->queue_head); + list_initialize(&instance->batch_list); + fibril_mutex_initialize(&instance->guard); return EOK; } @@ -58,45 +60,83 @@ assert(instance); assert(next); - instance->next = next; if (!instance->queue_head) return; - queue_head_add_next(instance->queue_head, next->queue_head_pa); + queue_head_append_qh(instance->queue_head, next->queue_head_pa); + instance->queue_head->element = instance->queue_head->next_queue; } /*----------------------------------------------------------------------------*/ -void transfer_list_add_tracker(transfer_list_t *instance, tracker_t *tracker) +void transfer_list_add_batch(transfer_list_t *instance, batch_t *batch) { assert(instance); - assert(tracker); + assert(batch); - uint32_t pa = (uintptr_t)addr_to_phys(tracker->td); + uint32_t pa = (uintptr_t)addr_to_phys(batch->qh); assert((pa & LINK_POINTER_ADDRESS_MASK) == pa); + pa |= LINK_POINTER_QUEUE_HEAD_FLAG; + batch->qh->next_queue = instance->queue_head->next_queue; - if (instance->queue_head->element & LINK_POINTER_TERMINATE_FLAG) { - usb_log_debug2("Adding td(%X:%X) to queue %s first.\n", - tracker->td->status, tracker->td->device, instance->name); + fibril_mutex_lock(&instance->guard); + + if (instance->queue_head->element == instance->queue_head->next_queue) { /* there is nothing scheduled */ - instance->last_tracker = tracker; + list_append(&batch->link, &instance->batch_list); instance->queue_head->element = pa; - usb_log_debug2("Added td(%X:%X) to queue %s first.\n", - tracker->td->status, tracker->td->device, instance->name); + usb_log_debug2("Added batch(%p) to queue %s first.\n", + batch, instance->name); + fibril_mutex_unlock(&instance->guard); return; } - usb_log_debug2("Adding td(%X:%X) to queue %s last.%p\n", - tracker->td->status, tracker->td->device, instance->name, - instance->last_tracker); - /* now we can be sure that last_tracker is a valid pointer */ - instance->last_tracker->td->next = pa; - instance->last_tracker = tracker; + /* now we can be sure that there is someting scheduled */ + assert(!list_empty(&instance->batch_list)); + batch_t *first = list_get_instance( + instance->batch_list.next, batch_t, link); + batch_t *last = list_get_instance( + instance->batch_list.prev, batch_t, link); + queue_head_append_qh(last->qh, pa); + list_append(&batch->link, &instance->batch_list); + usb_log_debug2("Added batch(%p) to queue %s last, first is %p.\n", + batch, instance->name, first ); + fibril_mutex_unlock(&instance->guard); +} +/*----------------------------------------------------------------------------*/ +static void transfer_list_remove_batch( + transfer_list_t *instance, batch_t *batch) +{ + assert(instance); + assert(batch); + assert(instance->queue_head); + assert(batch->qh); - usb_log_debug2("Added td(%X:%X) to queue %s last.\n", - tracker->td->status, tracker->td->device, instance->name); + /* I'm the first one here */ + if (batch->link.prev == &instance->batch_list) { + usb_log_debug("Removing tracer %p was first, next element %x.\n", + batch, batch->qh->next_queue); + instance->queue_head->element = batch->qh->next_queue; + } else { + usb_log_debug("Removing tracer %p was NOT first, next element %x.\n", + batch, batch->qh->next_queue); + batch_t *prev = list_get_instance(batch->link.prev, batch_t, link); + prev->qh->next_queue = batch->qh->next_queue; + } + list_remove(&batch->link); +} +/*----------------------------------------------------------------------------*/ +void transfer_list_check(transfer_list_t *instance) +{ + assert(instance); + fibril_mutex_lock(&instance->guard); + link_t *current = instance->batch_list.next; + while (current != &instance->batch_list) { + link_t *next = current->next; + batch_t *batch = list_get_instance(current, batch_t, link); - /* check again, may be use atomic compare and swap */ - if (instance->queue_head->element & LINK_POINTER_TERMINATE_FLAG) { - instance->queue_head->element = pa; - usb_log_debug2("Added td(%X:%X) to queue first2 %s.\n", - tracker->td->status, tracker->td->device, instance->name); + if (batch_is_complete(batch)) { + transfer_list_remove_batch(instance, batch); + batch->next_step(batch); + } + current = next; } + fibril_mutex_unlock(&instance->guard); } /** Index: uspace/drv/uhci-hcd/transfer_list.h =================================================================== --- uspace/drv/uhci-hcd/transfer_list.h (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/uhci-hcd/transfer_list.h (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -35,15 +35,18 @@ #define DRV_UHCI_TRANSFER_LIST_H +#include + #include "uhci_struct/queue_head.h" -#include "tracker.h" + +#include "batch.h" typedef struct transfer_list { - tracker_t *last_tracker; - + fibril_mutex_t guard; queue_head_t *queue_head; uint32_t queue_head_pa; struct transfer_list *next; const char *name; + link_t batch_list; } transfer_list_t; @@ -57,8 +60,7 @@ queue_head_dispose(instance->queue_head); } +void transfer_list_check(transfer_list_t *instance); - -void transfer_list_add_tracker(transfer_list_t *instance, tracker_t *tracker); - +void transfer_list_add_batch(transfer_list_t *instance, batch_t *batch); #endif /** Index: uspace/drv/uhci-hcd/uhci.c =================================================================== --- uspace/drv/uhci-hcd/uhci.c (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/uhci-hcd/uhci.c (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -89,6 +89,6 @@ pio_write_32(&instance->registers->flbaseadd, (uint32_t)pa); - list_initialize(&instance->tracker_list); - fibril_mutex_initialize(&instance->tracker_list_mutex); + list_initialize(&instance->batch_list); + fibril_mutex_initialize(&instance->batch_list_mutex); instance->cleaner = fibril_create(uhci_clean_finished, instance); @@ -152,35 +152,22 @@ } /*----------------------------------------------------------------------------*/ -int uhci_schedule(uhci_t *instance, tracker_t *tracker) -{ - assert(instance); - assert(tracker); - const int low_speed = (tracker->speed == LOW_SPEED); +int uhci_schedule(uhci_t *instance, batch_t *batch) +{ + assert(instance); + assert(batch); + const int low_speed = (batch->speed == LOW_SPEED); if (!allowed_usb_packet( - low_speed, tracker->transfer_type, tracker->packet_size)) { + low_speed, batch->transfer_type, batch->max_packet_size)) { usb_log_warning("Invalid USB packet specified %s SPEED %d %zu.\n", - low_speed ? "LOW" : "FULL" , tracker->transfer_type, - tracker->packet_size); + low_speed ? "LOW" : "FULL" , batch->transfer_type, + batch->max_packet_size); return ENOTSUP; } /* TODO: check available bandwith here */ - usb_log_debug2("Scheduler(%d) acquiring tracker list mutex.\n", - fibril_get_id()); - fibril_mutex_lock(&instance->tracker_list_mutex); - usb_log_debug2("Scheduler(%d) acquired tracker list mutex.\n", - fibril_get_id()); - transfer_list_t *list = - instance->transfers[low_speed][tracker->transfer_type]; + instance->transfers[low_speed][batch->transfer_type]; assert(list); - transfer_list_add_tracker(list, tracker); - list_append(&tracker->link, &instance->tracker_list); - - usb_log_debug2("Scheduler(%d) releasing tracker list mutex.\n", - fibril_get_id()); - fibril_mutex_unlock(&instance->tracker_list_mutex); - usb_log_debug2("Scheduler(%d) released tracker list mutex.\n", - fibril_get_id()); + transfer_list_add_batch(list, batch); return EOK; @@ -194,46 +181,8 @@ while(1) { - LIST_INITIALIZE(done_trackers); - /* tracker iteration */ - - usb_log_debug2("Cleaner(%d) acquiring tracker list mutex.\n", - fibril_get_id()); - fibril_mutex_lock(&instance->tracker_list_mutex); - usb_log_debug2("Cleaner(%d) acquired tracker list mutex.\n", - fibril_get_id()); - - link_t *current = instance->tracker_list.next; - while (current != &instance->tracker_list) - { - - link_t *next = current->next; - tracker_t *tracker = list_get_instance(current, tracker_t, link); - - assert(current == &tracker->link); - assert(tracker); - assert(tracker->next_step); - assert(tracker->td); - - if (!transfer_descriptor_is_active(tracker->td)) { - usb_log_info("Found inactive tracker with status: %x:%x.\n", - tracker->td->status, tracker->td->device); - list_remove(current); - list_append(current, &done_trackers); - } - current = next; - } - - usb_log_debug2("Cleaner(%d) releasing tracker list mutex.\n", - fibril_get_id()); - fibril_mutex_unlock(&instance->tracker_list_mutex); - usb_log_debug2("Cleaner(%d) released tracker list mutex.\n", - fibril_get_id()); - - while (!list_empty(&done_trackers)) { - tracker_t *tracker = list_get_instance( - done_trackers.next, tracker_t, link); - list_remove(&tracker->link); - tracker->next_step(tracker); - } + transfer_list_check(&instance->transfers_interrupt); + transfer_list_check(&instance->transfers_control_slow); + transfer_list_check(&instance->transfers_control_full); + transfer_list_check(&instance->transfers_bulk_full); async_usleep(UHCI_CLEANER_TIMEOUT); } Index: uspace/drv/uhci-hcd/uhci.h =================================================================== --- uspace/drv/uhci-hcd/uhci.h (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/uhci-hcd/uhci.h (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -44,5 +44,5 @@ #include "transfer_list.h" -#include "tracker.h" +#include "batch.h" typedef struct uhci_regs { @@ -81,6 +81,6 @@ link_pointer_t *frame_list; - link_t tracker_list; - fibril_mutex_t tracker_list_mutex; + link_t batch_list; + fibril_mutex_t batch_list_mutex; transfer_list_t transfers_bulk_full; @@ -113,5 +113,5 @@ void *arg ); -int uhci_schedule(uhci_t *instance, tracker_t *tracker); +int uhci_schedule(uhci_t *instance, batch_t *batch); static inline uhci_t * dev_to_uhci(device_t *dev) Index: uspace/drv/uhci-hcd/uhci_struct/queue_head.h =================================================================== --- uspace/drv/uhci-hcd/uhci_struct/queue_head.h (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/uhci-hcd/uhci_struct/queue_head.h (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -55,14 +55,33 @@ } -static inline void queue_head_add_next(queue_head_t *instance, uint32_t next_queue_pa) +static inline void queue_head_append_qh(queue_head_t *instance, uint32_t pa) { - if (next_queue_pa) { - instance->next_queue = (next_queue_pa & LINK_POINTER_ADDRESS_MASK) - | LINK_POINTER_QUEUE_HEAD_FLAG; + if (pa) { + instance->next_queue = (pa & LINK_POINTER_ADDRESS_MASK) + | LINK_POINTER_QUEUE_HEAD_FLAG; } } -static inline queue_head_t * queue_head_get() - { return malloc32(sizeof(queue_head_t)); } +static inline void queue_head_element_qh(queue_head_t *instance, uint32_t pa) +{ + if (pa) { + instance->next_queue = (pa & LINK_POINTER_ADDRESS_MASK) + | LINK_POINTER_QUEUE_HEAD_FLAG; + } +} + +static inline void queue_head_element_td(queue_head_t *instance, uint32_t pa) +{ + if (pa) { + instance->element = (pa & LINK_POINTER_ADDRESS_MASK); + } +} + +static inline queue_head_t * queue_head_get() { + queue_head_t *ret = malloc32(sizeof(queue_head_t)); + if (ret) + queue_head_init(ret); + return ret; +} static inline void queue_head_dispose(queue_head_t *head) Index: uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c =================================================================== --- uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -40,9 +40,11 @@ void transfer_descriptor_init(transfer_descriptor_t *instance, int error_count, size_t size, bool toggle, bool isochronous, - usb_target_t target, int pid, void *buffer) + usb_target_t target, int pid, void *buffer, transfer_descriptor_t *next) { assert(instance); - instance->next = 0 | LINK_POINTER_TERMINATE_FLAG; + instance->next = 0 + | LINK_POINTER_VERTICAL_FLAG + | ((next != NULL) ? addr_to_phys(next) : LINK_POINTER_TERMINATE_FLAG); instance->status = 0 @@ -80,38 +82,27 @@ #endif } - -static inline usb_transaction_outcome_t convert_outcome(uint32_t status) -{ - /*TODO: refactor into something sane */ - /*TODO: add additional usb_errors to usb_outcome_t */ - - if (status & TD_STATUS_ERROR_STALLED) - return USB_OUTCOME_CRCERROR; - - if (status & TD_STATUS_ERROR_BUFFER) - return USB_OUTCOME_CRCERROR; - - if (status & TD_STATUS_ERROR_BABBLE) - return USB_OUTCOME_BABBLE; - - if (status & TD_STATUS_ERROR_NAK) - return USB_OUTCOME_CRCERROR; - - if (status & TD_STATUS_ERROR_CRC) - return USB_OUTCOME_CRCERROR; - - if (status & TD_STATUS_ERROR_BIT_STUFF) - return USB_OUTCOME_CRCERROR; - -// assert((((status >> TD_STATUS_ERROR_POS) & TD_STATUS_ERROR_MASK) -// | TD_STATUS_ERROR_RESERVED) == TD_STATUS_ERROR_RESERVED); - return USB_OUTCOME_OK; -} /*----------------------------------------------------------------------------*/ int transfer_descriptor_status(transfer_descriptor_t *instance) { assert(instance); - if (convert_outcome(instance->status)) - return EINVAL; //TODO: use sane error value here + + if ((instance->status & TD_STATUS_ERROR_STALLED) != 0) + return EIO; + + if ((instance->status & TD_STATUS_ERROR_CRC) != 0) + return EAGAIN; + + if ((instance->status & TD_STATUS_ERROR_BUFFER) != 0) + return EAGAIN; + + if ((instance->status & TD_STATUS_ERROR_BABBLE) != 0) + return EIO; + + if ((instance->status & TD_STATUS_ERROR_NAK) != 0) + return EAGAIN; + + if ((instance->status & TD_STATUS_ERROR_BIT_STUFF) != 0) + return EAGAIN; + return EOK; } Index: uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h =================================================================== --- uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -93,7 +93,15 @@ void transfer_descriptor_init(transfer_descriptor_t *instance, int error_count, size_t size, bool toggle, bool isochronous, - usb_target_t target, int pid, void *buffer); + usb_target_t target, int pid, void *buffer, transfer_descriptor_t * next); int transfer_descriptor_status(transfer_descriptor_t *instance); + +static inline size_t transfer_descriptor_actual_size( + transfer_descriptor_t *instance) +{ + assert(instance); + return + ((instance->status >> TD_STATUS_ACTLEN_POS) + 1) & TD_STATUS_ACTLEN_MASK; +} static inline bool transfer_descriptor_is_active( Index: uspace/drv/uhci-hcd/utils/malloc32.h =================================================================== --- uspace/drv/uhci-hcd/utils/malloc32.h (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/uhci-hcd/utils/malloc32.h (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -45,5 +45,5 @@ #define UHCI_REQUIRED_PAGE_SIZE 4096 -static inline void * addr_to_phys(void *addr) +static inline uintptr_t addr_to_phys(void *addr) { uintptr_t result; @@ -51,5 +51,5 @@ assert(ret == 0); - return (void*)(result | ((uintptr_t)addr & 0xfff)); + return (result | ((uintptr_t)addr & 0xfff)); } Index: uspace/drv/uhci-rhd/port.c =================================================================== --- uspace/drv/uhci-rhd/port.c (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/uhci-rhd/port.c (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -33,8 +33,12 @@ */ #include +#include #include /* usb_address_t */ -#include /* usb_drv_* */ +#include +#include +#include #include +#include #include "port.h" @@ -56,5 +60,10 @@ port->attached_device = 0; port->rh = rh; - port->hc_phone = parent_phone; + int rc = usb_hc_connection_initialize_from_device( + &port->hc_connection, rh); + if (rc != EOK) { + usb_log_error("Failed to initialize connection to HC."); + return rc; + } port->checker = fibril_create(uhci_port_check, port); @@ -96,4 +105,11 @@ if (port_status & STATUS_CONNECTED_CHANGED) { + int rc = usb_hc_connection_open( + &port_instance->hc_connection); + if (rc != EOK) { + usb_log_error("Failed to connect to HC."); + goto next; + } + if (port_status & STATUS_CONNECTED) { /* new device */ @@ -102,5 +118,13 @@ uhci_port_remove_device(port_instance); } + + rc = usb_hc_connection_close( + &port_instance->hc_connection); + if (rc != EOK) { + usb_log_error("Failed to disconnect from HC."); + goto next; + } } + next: async_usleep(port_instance->wait_period_usec); } @@ -111,10 +135,11 @@ { assert(port); - assert(port->hc_phone); + assert(usb_hc_connection_is_opened(&port->hc_connection)); usb_log_info("Adding new device on port %d.\n", port->number); /* get address of the future device */ - const usb_address_t usb_address = usb_drv_request_address(port->hc_phone); + const usb_address_t usb_address = usb_hc_request_address( + &port->hc_connection, true); if (usb_address <= 0) { @@ -126,10 +151,10 @@ /* get default address */ - int ret = usb_drv_reserve_default_address(port->hc_phone); + int ret = usb_hc_reserve_default_address(&port->hc_connection, true); if (ret != EOK) { usb_log_error("Failed to reserve default address on port %d.\n", port->number); - int ret2 = - usb_drv_release_address(port->hc_phone, usb_address); + int ret2 = usb_hc_unregister_device(&port->hc_connection, + usb_address); if (ret2 != EOK) { usb_log_fatal("Failed to return requested address on port %d.\n", @@ -172,11 +197,28 @@ } - /* assign address to device */ - ret = usb_drv_req_set_address(port->hc_phone, 0, usb_address); + /* + * Initialize connection to the device. + */ + /* FIXME: check for errors. */ + usb_device_connection_t new_dev_connection; + usb_endpoint_pipe_t new_dev_ctrl_pipe; + usb_device_connection_initialize_on_default_address( + &new_dev_connection, &port->hc_connection); + usb_endpoint_pipe_initialize_default_control(&new_dev_ctrl_pipe, + &new_dev_connection); + + /* + * Assign new address to the device. This function updates + * the backing connection to still point to the same device. + */ + /* FIXME: check for errors. */ + usb_endpoint_pipe_start_session(&new_dev_ctrl_pipe); + ret = usb_request_set_address(&new_dev_ctrl_pipe, usb_address); + usb_endpoint_pipe_end_session(&new_dev_ctrl_pipe); if (ret != EOK) { /* address assigning went wrong */ usb_log_error("Failed(%d) to assign address to the device.\n", ret); uhci_port_set_enabled(port, false); - int release = usb_drv_release_default_address(port->hc_phone); + int release = usb_hc_release_default_address(&port->hc_connection); if (release != EOK) { usb_log_error("Failed to release default address on port %d.\n", @@ -192,5 +234,5 @@ /* release default address */ - ret = usb_drv_release_default_address(port->hc_phone); + ret = usb_hc_release_default_address(&port->hc_connection); if (ret != EOK) { usb_log_error("Failed to release default address on port %d.\n", @@ -204,6 +246,6 @@ assert(port->attached_device == 0); - ret = usb_drv_register_child_in_devman(port->hc_phone, port->rh, - usb_address, &port->attached_device); + ret = usb_device_register_child_in_devman(new_dev_connection.address, + new_dev_connection.hc_handle, port->rh, &port->attached_device); if (ret != EOK) { /* something went wrong */ @@ -215,6 +257,13 @@ port->number, usb_address, port->attached_device); - ret = - usb_drv_bind_address(port->hc_phone, usb_address, port->attached_device); + /* + * Register the device in the host controller. + */ + usb_hc_attached_device_t new_device = { + .address = new_dev_connection.address, + .handle = port->attached_device + }; + + ret = usb_hc_register_device(&port->hc_connection, &new_device); // TODO: proper error check here assert(ret == EOK); Index: uspace/drv/uhci-rhd/port.h =================================================================== --- uspace/drv/uhci-rhd/port.h (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/uhci-rhd/port.h (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -38,4 +38,5 @@ #include /* device_t */ #include +#include #include "port_status.h" @@ -46,5 +47,5 @@ unsigned number; unsigned wait_period_usec; - int hc_phone; + usb_hc_connection_t hc_connection; device_t *rh; devman_handle_t attached_device; Index: uspace/drv/usbhid/hid.h =================================================================== --- uspace/drv/usbhid/hid.h (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/usbhid/hid.h (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -69,8 +69,8 @@ device_t *device; usb_hid_configuration_t *conf; - usb_address_t address; usb_hid_report_parser_t *parser; usb_device_connection_t wire; + usb_endpoint_pipe_t ctrl_pipe; usb_endpoint_pipe_t poll_pipe; } usb_hid_dev_kbd_t; Index: uspace/drv/usbhid/main.c =================================================================== --- uspace/drv/usbhid/main.c (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/usbhid/main.c (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -45,7 +45,9 @@ #include #include +#include +#include #include #include -#include +#include #include #include @@ -60,4 +62,14 @@ #define GUESSED_POLL_ENDPOINT 1 + +/** Keyboard polling endpoint description for boot protocol class. */ +static usb_endpoint_description_t poll_endpoint_description = { + .transfer_type = USB_TRANSFER_INTERRUPT, + .direction = USB_DIRECTION_IN, + .interface_class = USB_CLASS_HID, + .interface_subclass = USB_HID_SUBCLASS_BOOT, + .interface_protocol = USB_HID_PROTOCOL_KEYBOARD, + .flags = 0 +}; static void default_connection_handler(device_t *, ipc_callid_t, ipc_call_t *); @@ -262,5 +274,4 @@ } -# if 0 /* * Kbd functions @@ -281,7 +292,8 @@ // get the descriptor from the device - int rc = usb_drv_req_get_descriptor(kbd_dev->device->parent_phone, - kbd_dev->address, USB_REQUEST_TYPE_CLASS, USB_DESCTYPE_HID_REPORT, - 0, i, kbd_dev->conf->interfaces[i].report_desc, length, + int rc = usb_request_get_descriptor(&kbd_dev->ctrl_pipe, + USB_REQUEST_TYPE_CLASS, USB_DESCTYPE_HID_REPORT, + i, 0, + kbd_dev->conf->interfaces[i].report_desc, length, &actual_size); @@ -303,6 +315,7 @@ usb_standard_configuration_descriptor_t config_desc; - int rc = usb_drv_req_get_bare_configuration_descriptor( - kbd_dev->device->parent_phone, kbd_dev->address, 0, &config_desc); + int rc; + rc = usb_request_get_bare_configuration_descriptor(&kbd_dev->ctrl_pipe, + 0, &config_desc); if (rc != EOK) { @@ -318,6 +331,6 @@ size_t transferred = 0; // get full configuration descriptor - rc = usb_drv_req_get_full_configuration_descriptor( - kbd_dev->device->parent_phone, kbd_dev->address, 0, descriptors, + rc = usb_request_get_full_configuration_descriptor(&kbd_dev->ctrl_pipe, + 0, descriptors, config_desc.total_length, &transferred); @@ -329,4 +342,31 @@ } + /* + * Initialize the interrupt in endpoint. + */ + usb_endpoint_mapping_t endpoint_mapping[1] = { + { + .pipe = &kbd_dev->poll_pipe, + .description = &poll_endpoint_description + } + }; + rc = usb_endpoint_pipe_initialize_from_configuration( + endpoint_mapping, 1, + descriptors, config_desc.total_length, + &kbd_dev->wire); + if (rc != EOK) { + usb_log_error("Failed to initialize poll pipe: %s.\n", + str_error(rc)); + return rc; + } + if (!endpoint_mapping[0].present) { + usb_log_warning("Not accepting device, " \ + "not boot-protocol keyboard.\n"); + return EREFUSED; + } + + + + kbd_dev->conf = (usb_hid_configuration_t *)calloc(1, sizeof(usb_hid_configuration_t)); @@ -336,5 +376,5 @@ } - rc = usbkbd_parse_descriptors(descriptors, transferred, kbd_dev->conf); + /*rc = usbkbd_parse_descriptors(descriptors, transferred, kbd_dev->conf); free(descriptors); if (rc != EOK) { @@ -343,5 +383,5 @@ } - // get and report descriptors + // get and report descriptors*/ rc = usbkbd_get_report_descriptor(kbd_dev); if (rc != EOK) { @@ -360,10 +400,12 @@ * as the endpoint for polling */ - + return EOK; } -#endif + static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev) { + int rc; + usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)calloc(1, sizeof(usb_hid_dev_kbd_t)); @@ -376,40 +418,4 @@ kbd_dev->device = dev; - // get phone to my HC and save it as my parent's phone - // TODO: maybe not a good idea if DDF will use parent_phone - int rc = kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0); - if (rc < 0) { - printf("Problem setting phone to HC.\n"); - goto error_leave; - } - - rc = kbd_dev->address = usb_drv_get_my_address(dev->parent_phone, dev); - if (rc < 0) { - printf("Problem getting address of the device.\n"); - goto error_leave; - } - - // doesn't matter now that we have no address -// if (kbd_dev->address < 0) { -// fprintf(stderr, NAME ": No device address!\n"); -// free(kbd_dev); -// return NULL; -// } - - /* - * will need all descriptors: - * 1) choose one configuration from configuration descriptors - * (set it to the device) - * 2) set endpoints from endpoint descriptors - */ - - - // TODO: get descriptors, parse descriptors and save endpoints - //usbkbd_process_descriptors(kbd_dev); - usb_drv_req_set_configuration( - kbd_dev->device->parent_phone, kbd_dev->address, 1); - - - /* * Initialize the backing connection to the host controller. @@ -425,12 +431,27 @@ * Initialize device pipes. */ - rc = usb_endpoint_pipe_initialize(&kbd_dev->poll_pipe, &kbd_dev->wire, - GUESSED_POLL_ENDPOINT, USB_TRANSFER_INTERRUPT, USB_DIRECTION_IN); - if (rc != EOK) { - printf("Failed to initialize interrupt in pipe: %s.\n", + rc = usb_endpoint_pipe_initialize_default_control(&kbd_dev->ctrl_pipe, + &kbd_dev->wire); + if (rc != EOK) { + printf("Failed to initialize default control pipe: %s.\n", str_error(rc)); goto error_leave; } + /* + * will need all descriptors: + * 1) choose one configuration from configuration descriptors + * (set it to the device) + * 2) set endpoints from endpoint descriptors + */ + + // TODO: get descriptors, parse descriptors and save endpoints + usb_endpoint_pipe_start_session(&kbd_dev->ctrl_pipe); + //usb_request_set_configuration(&kbd_dev->ctrl_pipe, 1); + rc = usbkbd_process_descriptors(kbd_dev); + usb_endpoint_pipe_end_session(&kbd_dev->ctrl_pipe); + if (rc != EOK) { + goto error_leave; + } return kbd_dev; @@ -590,4 +611,5 @@ int main(int argc, char *argv[]) { + usb_log_enable(USB_LOG_LEVEL_INFO, "usbhid"); return driver_main(&kbd_driver); } Index: uspace/drv/usbhub/usbhub.c =================================================================== --- uspace/drv/usbhub/usbhub.c (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/usbhub/usbhub.c (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -36,8 +36,10 @@ #include #include +#include #include #include #include +#include #include #include @@ -76,6 +78,24 @@ result->device = device; +<<<<<<< TREE result->usb_device = usb_new(usb_hcd_attached_device_info_t); +======= + + dprintf(USB_LOG_LEVEL_DEBUG, "phone to hc = %d", hc); + if (hc < 0) { + return result; + } + //get some hub info + usb_address_t addr = usb_drv_get_my_address(hc, device); + dprintf(USB_LOG_LEVEL_DEBUG, "address of newly created hub = %d", addr); + /*if(addr<0){ + //return result; + + }*/ + + result->address = addr; + +>>>>>>> MERGE-SOURCE // get hub descriptor @@ -148,7 +168,13 @@ int port; int opResult; +<<<<<<< TREE //usb_target_t target; //target.address = hub_info->usb_device->address; //target.endpoint = 0; +======= + usb_target_t target; + target.address = hub_info->address; + target.endpoint = 0; +>>>>>>> MERGE-SOURCE //get configuration descriptor @@ -212,5 +238,5 @@ dprintf(USB_LOG_LEVEL_INFO, "hub dev added"); dprintf(USB_LOG_LEVEL_DEBUG, "\taddress %d, has %d ports ", - hub_info->usb_device->address, + hub_info->address, hub_info->port_count); dprintf(USB_LOG_LEVEL_DEBUG, "\tused configuration %d",config_descriptor.configuration_number); @@ -317,7 +343,15 @@ } + devman_handle_t hc_handle; + opResult = usb_drv_find_hc(hub->device, &hc_handle); + if (opResult != EOK) { + usb_log_error("Failed to get handle of host controller: %s.\n", + str_error(opResult)); + return; + } + devman_handle_t child_handle; - opResult = usb_drv_register_child_in_devman(hc, hub->device, - new_device_address, &child_handle); + opResult = usb_device_register_child_in_devman(new_device_address, + hc_handle, hub->device, &child_handle); if (opResult != EOK) { dprintf(USB_LOG_LEVEL_ERROR, "could not start driver for new device"); @@ -472,5 +506,5 @@ /* usb_target_t target; - target.address = hub_info->usb_device->address; + target.address = hub_info->address; target.endpoint = 1;/// \TODO get from endpoint descriptor dprintf(USB_LOG_LEVEL_INFO, "checking changes for hub at addr %d", @@ -515,5 +549,9 @@ if (interrupt) { usb_hub_process_interrupt( +<<<<<<< TREE hub_info, port); +======= + hub_info, hc, port, hub_info->address); +>>>>>>> MERGE-SOURCE } } Index: uspace/drv/usbhub/usbhub.h =================================================================== --- uspace/drv/usbhub/usbhub.h (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/usbhub/usbhub.h (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -36,10 +36,17 @@ #define DRV_USBHUB_USBHUB_H +#include +#include +#include + #define NAME "usbhub" +<<<<<<< TREE #include "usb/hcdhubd.h" #include +======= +>>>>>>> MERGE-SOURCE /** basic information about device attached to hub */ typedef struct{ @@ -62,8 +69,9 @@ /** attached device handles, for each port one */ usb_hub_attached_device_t * attached_devs; - /** General usb device info. */ - usb_hcd_attached_device_info_t * usb_device; + /** USB address of the hub. */ + usb_address_t address; /** General device info*/ device_t * device; +<<<<<<< TREE /** connection to hcd */ usb_device_connection_t connection; @@ -71,4 +79,6 @@ usb_hub_endpoints_t endpoints; +======= +>>>>>>> MERGE-SOURCE } usb_hub_info_t; Index: uspace/drv/vhc/conn.h =================================================================== --- uspace/drv/vhc/conn.h (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/vhc/conn.h (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -37,5 +37,4 @@ #include -#include #include #include "vhcd.h" @@ -44,5 +43,4 @@ void connection_handler_host(sysarg_t); -usb_hcd_transfer_ops_t vhc_transfer_ops; usbhc_iface_t vhc_iface; Index: uspace/drv/vhc/connhost.c =================================================================== --- uspace/drv/vhc/connhost.c (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/vhc/connhost.c (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -36,5 +36,5 @@ #include #include -#include +#include #include "vhcd.h" @@ -64,5 +64,5 @@ static void universal_callback(void *buffer, size_t size, - usb_transaction_outcome_t outcome, void *arg) + int outcome, void *arg) { transfer_info_t *transfer = (transfer_info_t *) arg; @@ -107,5 +107,5 @@ static void control_abort_prematurely(control_transfer_info_t *transfer, - size_t size, usb_transaction_outcome_t outcome) + size_t size, int outcome) { switch (transfer->direction) { @@ -127,9 +127,9 @@ static void control_callback_two(void *buffer, size_t size, - usb_transaction_outcome_t outcome, void *arg) + int outcome, void *arg) { control_transfer_info_t *ctrl_transfer = (control_transfer_info_t *) arg; - if (outcome != USB_OUTCOME_OK) { + if (outcome != EOK) { control_abort_prematurely(ctrl_transfer, outcome, size); free(ctrl_transfer); @@ -165,9 +165,9 @@ static void control_callback_one(void *buffer, size_t size, - usb_transaction_outcome_t outcome, void *arg) + int outcome, void *arg) { control_transfer_info_t *transfer = (control_transfer_info_t *) arg; - if (outcome != USB_OUTCOME_OK) { + if (outcome != EOK) { control_abort_prematurely(transfer, outcome, size); free(transfer); @@ -276,4 +276,5 @@ static int interrupt_out(device_t *dev, usb_target_t target, + size_t max_packet_size, void *data, size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg) @@ -285,4 +286,5 @@ static int interrupt_in(device_t *dev, usb_target_t target, + size_t max_packet_size, void *data, size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg) @@ -294,4 +296,5 @@ static int control_write_setup(device_t *dev, usb_target_t target, + size_t max_packet_size, void *data, size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg) @@ -303,4 +306,5 @@ static int control_write_data(device_t *dev, usb_target_t target, + size_t max_packet_size, void *data, size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg) @@ -320,4 +324,5 @@ static int control_write(device_t *dev, usb_target_t target, + size_t max_packet_size, void *setup_packet, size_t setup_packet_size, void *data, size_t data_size, @@ -337,4 +342,5 @@ static int control_read_setup(device_t *dev, usb_target_t target, + size_t max_packet_size, void *data, size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg) @@ -346,4 +352,5 @@ static int control_read_data(device_t *dev, usb_target_t target, + size_t max_packet_size, void *data, size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg) @@ -363,4 +370,5 @@ static int control_read(device_t *dev, usb_target_t target, + size_t max_packet_size, void *setup_packet, size_t setup_packet_size, void *data, size_t data_size, @@ -382,5 +390,5 @@ -static int reserve_default_address(device_t *dev) +static int reserve_default_address(device_t *dev, bool ignored) { usb_address_keeping_reserve_default(&addresses); @@ -394,5 +402,5 @@ } -static int request_address(device_t *dev, usb_address_t *address) +static int request_address(device_t *dev, bool ignored, usb_address_t *address) { usb_address_t addr = usb_address_keeping_request(&addresses); Index: uspace/drv/vhc/devices.c =================================================================== --- uspace/drv/vhc/devices.c (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/vhc/devices.c (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -112,5 +112,5 @@ * @param transaction Transaction to be sent over the bus. */ -usb_transaction_outcome_t virtdev_send_to_all(transaction_t *transaction) +int virtdev_send_to_all(transaction_t *transaction) { /* For easier debugging. */ @@ -126,5 +126,5 @@ assert(false && "unreachable branch in switch()"); } - usb_transaction_outcome_t outcome = USB_OUTCOME_BABBLE; + int outcome = EBADCHECKSUM; link_t *pos; @@ -185,5 +185,5 @@ */ if (rc == EOK) { - outcome = USB_OUTCOME_OK; + outcome = EOK; } } @@ -221,5 +221,5 @@ break; } - outcome = USB_OUTCOME_OK; + outcome = EOK; } Index: uspace/drv/vhc/devices.h =================================================================== --- uspace/drv/vhc/devices.h (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/vhc/devices.h (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -54,5 +54,5 @@ virtdev_connection_t *virtdev_find(sysarg_t); void virtdev_destroy_device(virtdev_connection_t *); -usb_transaction_outcome_t virtdev_send_to_all(transaction_t *); +int virtdev_send_to_all(transaction_t *); #endif Index: uspace/drv/vhc/hc.c =================================================================== --- uspace/drv/vhc/hc.c (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/vhc/hc.c (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -89,9 +89,9 @@ */ static void process_transaction_with_outcome(transaction_t * transaction, - usb_transaction_outcome_t outcome) + int outcome) { usb_log_debug2("Transaction " TRANSACTION_FORMAT " done: %s.\n", TRANSACTION_PRINTF(*transaction), - usb_str_transaction_outcome(outcome)); + str_error(outcome)); transaction->callback(transaction->buffer, transaction->actual_len, @@ -127,5 +127,5 @@ TRANSACTION_PRINTF(*transaction), ports); - usb_transaction_outcome_t outcome; + int outcome; outcome = virtdev_send_to_all(transaction); Index: uspace/drv/vhc/hc.h =================================================================== --- uspace/drv/vhc/hc.h (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/vhc/hc.h (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -47,5 +47,5 @@ */ typedef void (*hc_transaction_done_callback_t)(void *buffer, size_t size, - usb_transaction_outcome_t outcome, void *arg); + int outcome, void *arg); /** Pending transaction details. */ Index: uspace/drv/vhc/hub.c =================================================================== --- uspace/drv/vhc/hub.c (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) +++ uspace/drv/vhc/hub.c (revision 50ba203e98ce570f05993da83249a116cfffceab) @@ -41,4 +41,5 @@ #include #include +#include #include "hub.h" @@ -93,5 +94,7 @@ devman_handle_t hub_handle; - usb_drv_register_child_in_devman(hc, hc_dev, hub_address, &hub_handle); + usb_device_register_child_in_devman(hub_address, hc_dev->handle, + hc_dev, &hub_handle); + //usb_drv_register_child_in_devman(hc, hc_dev, hub_address, &hub_handle); usb_drv_bind_address(hc, hub_address, hub_handle);