Index: uspace/app/usbinfo/info.c =================================================================== --- uspace/app/usbinfo/info.c (revision 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/app/usbinfo/info.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -39,4 +39,5 @@ #include #include +#include #include #include "usbinfo.h" @@ -47,27 +48,4 @@ usb_device_connection_t wire; usb_endpoint_pipe_t ctrl_pipe; - ctrl_pipe.hc_phone = -1; - - int hc_phone = devman_device_connect(hc_handle, 0); - if (hc_phone < 0) { - fprintf(stderr, - NAME ": failed to connect to host controller (%zu): %s.\n", - (size_t) hc_handle, str_error(hc_phone)); - return hc_phone; - } - - /* - * Dump information about possible match ids. - */ - match_id_list_t match_id_list; - init_match_ids(&match_id_list); - rc = usb_drv_create_device_match_ids(hc_phone, &match_id_list, address); - if (rc != EOK) { - fprintf(stderr, - NAME ": failed to fetch match ids of the device: %s.\n", - str_error(rc)); - goto leave; - } - dump_match_ids(&match_id_list); /* @@ -95,4 +73,18 @@ goto leave; } + + /* + * Dump information about possible match ids. + */ + match_id_list_t match_id_list; + init_match_ids(&match_id_list); + rc = usb_device_create_match_ids(&ctrl_pipe, &match_id_list); + if (rc != EOK) { + fprintf(stderr, + NAME ": failed to fetch match ids of the device: %s.\n", + str_error(rc)); + goto leave; + } + dump_match_ids(&match_id_list); /* @@ -141,5 +133,4 @@ leave: /* Ignoring errors here. */ - async_hangup(hc_phone); usb_endpoint_pipe_end_session(&ctrl_pipe); Index: uspace/app/usbinfo/main.c =================================================================== --- uspace/app/usbinfo/main.c (revision 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/app/usbinfo/main.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -81,4 +81,8 @@ { int rc; + + if (str_cmp(path, "uhci") == 0) { + path = "/hw/pci0/00:01.2"; + } devman_handle_t handle; Index: uspace/drv/uhci-hcd/Makefile =================================================================== --- uspace/drv/uhci-hcd/Makefile (revision 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/uhci-hcd/Makefile (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -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 d15809b4e19527baeaa89740f7e55aa76f993db9) +++ uspace/drv/uhci-hcd/batch.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -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 d15809b4e19527baeaa89740f7e55aa76f993db9) +++ uspace/drv/uhci-hcd/batch.h (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -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 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/uhci-hcd/iface.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -109,9 +109,9 @@ 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); + 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; } @@ -124,9 +124,9 @@ 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); + 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; } @@ -139,9 +139,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); + 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; } @@ -154,9 +155,10 @@ 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); + 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; } @@ -166,10 +168,13 @@ 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); + size_t max_packet_size = 8; + 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; } @@ -179,9 +184,13 @@ 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); + size_t max_packet_size = 8; + 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; } @@ -190,9 +199,13 @@ 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); + size_t max_packet_size = 8; + 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, NULL, 0, callback, NULL, arg); + if (!batch) + return ENOMEM; + batch_control_write_status_old(batch); return EOK; } @@ -202,10 +215,13 @@ 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); + size_t max_packet_size = 8; + 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; } @@ -215,9 +231,13 @@ 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); + size_t max_packet_size = 8; + 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; } @@ -226,9 +246,13 @@ 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); + size_t max_packet_size = 8; + 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, 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 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/uhci-hcd/root_hub.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -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: pace/drv/uhci-hcd/tracker.c =================================================================== --- uspace/drv/uhci-hcd/tracker.c (revision 0d36c205a51a44219fa40419d6549b441154ef88) +++ (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: pace/drv/uhci-hcd/tracker.h =================================================================== --- uspace/drv/uhci-hcd/tracker.h (revision 0d36c205a51a44219fa40419d6549b441154ef88) +++ (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 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/uhci-hcd/transfer_list.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -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 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/uhci-hcd/transfer_list.h (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -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 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/uhci-hcd/uhci.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -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 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/uhci-hcd/uhci.h (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -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 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/uhci-hcd/uhci_struct/queue_head.h (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -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 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -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 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -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 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/uhci-hcd/utils/malloc32.h (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -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 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/uhci-rhd/port.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -33,8 +33,10 @@ */ #include +#include #include /* usb_address_t */ #include /* usb_drv_* */ #include +#include #include "port.h" @@ -204,7 +206,15 @@ assert(port->attached_device == 0); - ret = usb_drv_register_child_in_devman(port->hc_phone, port->rh, - usb_address, &port->attached_device); - + devman_handle_t hc_handle; + ret = usb_drv_find_hc(port->rh, &hc_handle); + if (ret != EOK) { + usb_log_error("Failed to get handle of host controller: %s.\n", + str_error(ret)); + uhci_port_set_enabled(port, false); + return ENOMEM; + } + + ret = usb_device_register_child_in_devman(usb_address, hc_handle, + port->rh, &port->attached_device); if (ret != EOK) { /* something went wrong */ usb_log_error("Failed(%d) in usb_drv_register_child.\n", ret); Index: uspace/drv/usbhid/main.c =================================================================== --- uspace/drv/usbhid/main.c (revision 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/usbhid/main.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -45,4 +45,6 @@ #include #include +#include +#include #include #include @@ -61,4 +63,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 *); static device_ops_t keyboard_ops = { @@ -330,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)); @@ -337,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) { @@ -344,5 +383,5 @@ } - // get and report descriptors + // get and report descriptors*/ rc = usbkbd_get_report_descriptor(kbd_dev); if (rc != EOK) { @@ -361,5 +400,5 @@ * as the endpoint for polling */ - + return EOK; } @@ -396,12 +435,4 @@ if (rc != EOK) { printf("Failed to initialize default control pipe: %s.\n", - str_error(rc)); - goto error_leave; - } - - 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", str_error(rc)); goto error_leave; @@ -418,6 +449,9 @@ usb_endpoint_pipe_start_session(&kbd_dev->ctrl_pipe); //usb_request_set_configuration(&kbd_dev->ctrl_pipe, 1); - usbkbd_process_descriptors(kbd_dev); + rc = usbkbd_process_descriptors(kbd_dev); usb_endpoint_pipe_end_session(&kbd_dev->ctrl_pipe); + if (rc != EOK) { + goto error_leave; + } return kbd_dev; @@ -577,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 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/usbhub/usbhub.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -36,8 +36,10 @@ #include #include +#include #include #include #include +#include #include #include @@ -317,7 +319,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"); Index: uspace/drv/vhc/hub.c =================================================================== --- uspace/drv/vhc/hub.c (revision 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/drv/vhc/hub.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -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); Index: uspace/lib/usb/Makefile =================================================================== --- uspace/lib/usb/Makefile (revision 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/lib/usb/Makefile (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -44,4 +44,5 @@ src/localdrv.c \ src/pipes.c \ + src/pipesinit.c \ src/recognise.c \ src/remotedrv.c \ Index: uspace/lib/usb/include/usb/classes/hid.h =================================================================== --- uspace/lib/usb/include/usb/classes/hid.h (revision 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/lib/usb/include/usb/classes/hid.h (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -50,4 +50,10 @@ USB_HIDREQ_SET_PROTOCOL = 11 } usb_hid_request_t; + +/** USB/HID subclass constants. */ +typedef enum { + USB_HID_SUBCLASS_NONE = 0, + USB_HID_SUBCLASS_BOOT = 1 +} usb_hid_subclass_t; /** USB/HID interface protocols. */ Index: uspace/lib/usb/include/usb/pipes.h =================================================================== --- uspace/lib/usb/include/usb/pipes.h (revision 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/lib/usb/include/usb/pipes.h (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -38,4 +38,5 @@ #include #include +#include #include #include @@ -73,4 +74,7 @@ usb_direction_t direction; + /** Maximum packet size for the endpoint. */ + size_t max_packet_size; + /** Phone to the host controller. * Negative when no session is active. @@ -79,4 +83,34 @@ } usb_endpoint_pipe_t; + +/** Description of endpoint characteristics. */ +typedef struct { + /** Transfer type (e.g. control or interrupt). */ + usb_transfer_type_t transfer_type; + /** Transfer direction (to or from a device). */ + usb_direction_t direction; + /** Interface class this endpoint belongs to (-1 for any). */ + int interface_class; + /** Interface subclass this endpoint belongs to (-1 for any). */ + int interface_subclass; + /** Interface protocol this endpoint belongs to (-1 for any). */ + int interface_protocol; + /** Extra endpoint flags. */ + unsigned int flags; +} usb_endpoint_description_t; + +/** Mapping of endpoint pipes and endpoint descriptions. */ +typedef struct { + /** Endpoint pipe. */ + usb_endpoint_pipe_t *pipe; + /** Endpoint description. */ + const usb_endpoint_description_t *description; + /** Found descriptor fitting the description. */ + usb_standard_endpoint_descriptor_t *descriptor; + /** Interface the endpoint belongs to. */ + usb_standard_interface_descriptor_t *interface; + /** Whether the endpoint was actually found. */ + bool present; +} usb_endpoint_mapping_t; int usb_device_connection_initialize_from_device(usb_device_connection_t *, @@ -87,7 +121,9 @@ int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *, usb_device_connection_t *, - usb_endpoint_t, usb_transfer_type_t, usb_direction_t); + usb_endpoint_t, usb_transfer_type_t, size_t, usb_direction_t); int usb_endpoint_pipe_initialize_default_control(usb_endpoint_pipe_t *, usb_device_connection_t *); +int usb_endpoint_pipe_initialize_from_configuration(usb_endpoint_mapping_t *, + size_t, uint8_t *, size_t, usb_device_connection_t *); Index: uspace/lib/usb/include/usb/recognise.h =================================================================== --- uspace/lib/usb/include/usb/recognise.h (revision d15809b4e19527baeaa89740f7e55aa76f993db9) +++ uspace/lib/usb/include/usb/recognise.h (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * 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 libusb + * @{ + */ +/** @file + * USB device recognition. + */ +#ifndef LIBUSB_RECOGNISE_H_ +#define LIBUSB_RECOGNISE_H_ + +#include +#include +#include + +int usb_device_create_match_ids(usb_endpoint_pipe_t *, match_id_list_t *); + +int usb_device_register_child_in_devman(usb_address_t address, devman_handle_t hc_handle, + device_t *parent, devman_handle_t *child_handle); + +#endif +/** + * @} + */ Index: uspace/lib/usb/include/usb/usbdrv.h =================================================================== --- uspace/lib/usb/include/usb/usbdrv.h (revision 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/lib/usb/include/usb/usbdrv.h (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -106,8 +106,4 @@ const void *, size_t); -int usb_drv_create_device_match_ids(int, match_id_list_t *, usb_address_t); -int usb_drv_register_child_in_devman(int, device_t *, usb_address_t, - devman_handle_t *); - #endif Index: uspace/lib/usb/src/pipes.c =================================================================== --- uspace/lib/usb/src/pipes.c (revision 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/lib/usb/src/pipes.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -123,4 +123,5 @@ * @param endpoint_no Endpoint number (in USB 1.1 in range 0 to 15). * @param transfer_type Transfer type (e.g. interrupt or bulk). + * @param max_packet_size Maximum packet size in bytes. * @param direction Endpoint direction (in/out). * @return Error code. @@ -128,5 +129,6 @@ int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *pipe, usb_device_connection_t *connection, usb_endpoint_t endpoint_no, - usb_transfer_type_t transfer_type, usb_direction_t direction) + usb_transfer_type_t transfer_type, size_t max_packet_size, + usb_direction_t direction) { assert(pipe); @@ -137,4 +139,5 @@ pipe->endpoint_no = endpoint_no; pipe->transfer_type = transfer_type; + pipe->max_packet_size = max_packet_size; pipe->direction = direction; @@ -156,5 +159,5 @@ int rc = usb_endpoint_pipe_initialize(pipe, connection, - 0, USB_TRANSFER_CONTROL, USB_DIRECTION_BOTH); + 0, USB_TRANSFER_CONTROL, 8, USB_DIRECTION_BOTH); return rc; Index: uspace/lib/usb/src/pipesinit.c =================================================================== --- uspace/lib/usb/src/pipesinit.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) +++ uspace/lib/usb/src/pipesinit.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -0,0 +1,324 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * 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 libusb + * @{ + */ +/** @file + * Initialization of endpoint pipes. + * + */ +#include +#include +#include +#include +#include + + +#define NESTING(parentname, childname) \ + { \ + .child = USB_DESCTYPE_##childname, \ + .parent = USB_DESCTYPE_##parentname, \ + } +#define LAST_NESTING { -1, -1 } + +/** Nesting pairs of standard descriptors. */ +static usb_dp_descriptor_nesting_t descriptor_nesting[] = { + NESTING(CONFIGURATION, INTERFACE), + NESTING(INTERFACE, ENDPOINT), + NESTING(INTERFACE, HUB), + NESTING(INTERFACE, HID), + NESTING(HID, HID_REPORT), + LAST_NESTING +}; + +/** Tells whether given descriptor is of endpoint type. + * + * @param descriptor Descriptor in question. + * @return Whether the given descriptor is endpoint descriptor. + */ +static inline bool is_endpoint_descriptor(uint8_t *descriptor) +{ + return descriptor[1] == USB_DESCTYPE_ENDPOINT; +} + +/** Tells whether found endpoint corresponds to endpoint described by user. + * + * @param wanted Endpoint description as entered by driver author. + * @param found Endpoint description obtained from endpoint descriptor. + * @return Whether the @p found descriptor fits the @p wanted descriptor. + */ +static bool endpoint_fits_description(const usb_endpoint_description_t *wanted, + usb_endpoint_description_t *found) +{ +#define _SAME(fieldname) ((wanted->fieldname) == (found->fieldname)) + + if (!_SAME(direction)) { + return false; + } + + if (!_SAME(transfer_type)) { + return false; + } + + if ((wanted->interface_class >= 0) && !_SAME(interface_class)) { + return false; + } + + if ((wanted->interface_subclass >= 0) && !_SAME(interface_subclass)) { + return false; + } + + if ((wanted->interface_protocol >= 0) && !_SAME(interface_protocol)) { + return false; + } + +#undef _SAME + + return true; +} + +/** Find endpoint mapping for a found endpoint. + * + * @param mapping Endpoint mapping list. + * @param mapping_count Number of endpoint mappings in @p mapping. + * @param found_endpoint Description of found endpoint. + * @return Endpoint mapping corresponding to @p found_endpoint. + * @retval NULL No corresponding endpoint found. + */ +static usb_endpoint_mapping_t *find_endpoint_mapping( + usb_endpoint_mapping_t *mapping, size_t mapping_count, + usb_endpoint_description_t *found_endpoint) +{ + while (mapping_count > 0) { + if (endpoint_fits_description(mapping->description, + found_endpoint)) { + return mapping; + } + + mapping++; + mapping_count--; + } + return NULL; +} + +/** Process endpoint descriptor. + * + * @param mapping Endpoint mapping list. + * @param mapping_count Number of endpoint mappings in @p mapping. + * @param interface Interface descriptor under which belongs the @p endpoint. + * @param endpoint Endpoint descriptor. + * @param wire Connection backing the endpoint pipes. + * @return Error code. + */ +static int process_endpoint( + usb_endpoint_mapping_t *mapping, size_t mapping_count, + usb_standard_interface_descriptor_t *interface, + usb_standard_endpoint_descriptor_t *endpoint, + usb_device_connection_t *wire) +{ + usb_endpoint_description_t description; + + /* + * Get endpoint characteristics. + */ + + /* Actual endpoint number is in bits 0..3 */ + usb_endpoint_t ep_no = endpoint->endpoint_address & 0x0F; + + /* Endpoint direction is set by bit 7 */ + description.direction = (endpoint->endpoint_address & 128) + ? USB_DIRECTION_IN : USB_DIRECTION_OUT; + /* Transfer type is in bits 0..2 and the enum values corresponds 1:1 */ + description.transfer_type = endpoint->attributes & 3; + + /* + * Get interface characteristics. + */ + description.interface_class = interface->interface_class; + description.interface_subclass = interface->interface_subclass; + description.interface_protocol = interface->interface_protocol; + + /* + * Find the most fitting mapping and initialize the pipe. + */ + usb_endpoint_mapping_t *ep_mapping = find_endpoint_mapping(mapping, + mapping_count, &description); + if (ep_mapping == NULL) { + return ENOENT; + } + + if (ep_mapping->pipe == NULL) { + return EBADMEM; + } + if (ep_mapping->present) { + return EEXISTS; + } + + int rc = usb_endpoint_pipe_initialize(ep_mapping->pipe, wire, + ep_no, description.transfer_type, endpoint->max_packet_size, + description.direction); + if (rc != EOK) { + return rc; + } + + ep_mapping->present = true; + ep_mapping->descriptor = endpoint; + ep_mapping->interface = interface; + + return EOK; +} + +/** Process whole USB interface. + * + * @param mapping Endpoint mapping list. + * @param mapping_count Number of endpoint mappings in @p mapping. + * @param parser Descriptor parser. + * @param parser_data Descriptor parser data. + * @param interface_descriptor Interface descriptor. + * @return Error code. + */ +static int process_interface( + usb_endpoint_mapping_t *mapping, size_t mapping_count, + usb_dp_parser_t *parser, usb_dp_parser_data_t *parser_data, + uint8_t *interface_descriptor) +{ + uint8_t *descriptor = usb_dp_get_nested_descriptor(parser, + parser_data, interface_descriptor); + + if (descriptor == NULL) { + return ENOENT; + } + + do { + if (is_endpoint_descriptor(descriptor)) { + (void) process_endpoint(mapping, mapping_count, + (usb_standard_interface_descriptor_t *) + interface_descriptor, + (usb_standard_endpoint_descriptor_t *) + descriptor, + (usb_device_connection_t *) parser_data->arg); + } + + descriptor = usb_dp_get_sibling_descriptor(parser, parser_data, + interface_descriptor, descriptor); + } while (descriptor != NULL); + + return EOK; +} + +/** Initialize endpoint pipes from configuration descriptor. + * + * The mapping array is expected to conform to following rules: + * - @c pipe must point to already allocated structure with uninitialized pipe + * - @c description must point to prepared endpoint description + * - @c descriptor does not need to be initialized (will be overwritten) + * - @c interface does not need to be initialized (will be overwritten) + * - @c present does not need to be initialized (will be overwritten) + * + * After processing the configuration descriptor, the mapping is updated + * in the following fashion: + * - @c present will be set to @c true when the endpoint was found in the + * configuration + * - @c descriptor will point inside the configuration descriptor to endpoint + * corresponding to given description (or NULL for not found descriptor) + * - @c interface will point inside the configuration descriptor to interface + * descriptor the endpoint @c descriptor belongs to (or NULL for not found + * descriptor) + * - @c pipe will be initialized when found, otherwise left untouched + * - @c description will be untouched under all circumstances + * + * @param mapping Endpoint mapping list. + * @param mapping_count Number of endpoint mappings in @p mapping. + * @param configuration_descriptor Full configuration descriptor (is expected + * to be in USB endianness: i.e. as-is after being retrieved from + * the device). + * @param configuration_descriptor_size Size of @p configuration_descriptor + * in bytes. + * @param connection Connection backing the endpoint pipes. + * @return Error code. + */ +int usb_endpoint_pipe_initialize_from_configuration( + usb_endpoint_mapping_t *mapping, size_t mapping_count, + uint8_t *configuration_descriptor, size_t configuration_descriptor_size, + usb_device_connection_t *connection) +{ + assert(connection); + + if (configuration_descriptor == NULL) { + return EBADMEM; + } + if (configuration_descriptor_size + < sizeof(usb_standard_configuration_descriptor_t)) { + return ERANGE; + } + + /* + * Go through the mapping and set all endpoints to not present. + */ + size_t i; + for (i = 0; i < mapping_count; i++) { + mapping[i].present = false; + mapping[i].descriptor = NULL; + mapping[i].interface = NULL; + } + + /* + * Prepare the descriptor parser. + */ + usb_dp_parser_t dp_parser = { + .nesting = descriptor_nesting + }; + usb_dp_parser_data_t dp_data = { + .data = configuration_descriptor, + .size = configuration_descriptor_size, + .arg = connection + }; + + /* + * Iterate through all interfaces. + */ + uint8_t *interface = usb_dp_get_nested_descriptor(&dp_parser, + &dp_data, configuration_descriptor); + if (interface == NULL) { + return ENOENT; + } + do { + (void) process_interface(mapping, mapping_count, + &dp_parser, &dp_data, + interface); + interface = usb_dp_get_sibling_descriptor(&dp_parser, &dp_data, + configuration_descriptor, interface); + } while (interface != NULL); + + return EOK; +} + +/** + * @} + */ Index: uspace/lib/usb/src/recognise.c =================================================================== --- uspace/lib/usb/src/recognise.c (revision 0d36c205a51a44219fa40419d6549b441154ef88) +++ uspace/lib/usb/src/recognise.c (revision d15809b4e19527baeaa89740f7e55aa76f993db9) @@ -36,7 +36,13 @@ #include #include +#include +#include +#include #include #include #include + +static size_t device_name_index = 0; +static FIBRIL_MUTEX_INITIALIZE(device_name_index_mutex); /** Callback for getting host controller handle. @@ -70,5 +76,5 @@ }; -static device_ops_t child_ops = { +device_ops_t child_ops = { .interfaces[USB_DEV_IFACE] = &usb_iface }; @@ -155,5 +161,5 @@ /* First, with release number. */ rc = usb_add_match_id(matches, 100, - "usb&vendor=%d&product=%d&release=" BCD_FMT, + "usb&vendor=0x%04x&product=0x%04x&release=" BCD_FMT, (int) device_descriptor->vendor_id, (int) device_descriptor->product_id, @@ -164,5 +170,6 @@ /* Next, without release number. */ - rc = usb_add_match_id(matches, 90, "usb&vendor=%d&product=%d", + rc = usb_add_match_id(matches, 90, + "usb&vendor=0x%04x&product=0x%04x", (int) device_descriptor->vendor_id, (int) device_descriptor->product_id); @@ -241,13 +248,11 @@ /** Add match ids based on configuration descriptor. * - * @param hc Open phone to host controller. + * @param pipe Control pipe to the device. * @param matches Match ids list to add matches to. - * @param address USB address of the attached device. * @param config_count Number of configurations the device has. * @return Error code. */ -static int usb_add_config_descriptor_match_ids(int hc, - match_id_list_t *matches, usb_address_t address, - int config_count) +static int usb_add_config_descriptor_match_ids(usb_endpoint_pipe_t *pipe, + match_id_list_t *matches, int config_count) { int final_rc = EOK; @@ -257,6 +262,6 @@ int rc; usb_standard_configuration_descriptor_t config_descriptor; - rc = usb_drv_req_get_bare_configuration_descriptor(hc, - address, config_index, &config_descriptor); + rc = usb_request_get_bare_configuration_descriptor(pipe, + config_index, &config_descriptor); if (rc != EOK) { final_rc = rc; @@ -267,6 +272,6 @@ void *full_config_descriptor = malloc(config_descriptor.total_length); - rc = usb_drv_req_get_full_configuration_descriptor(hc, - address, config_index, + rc = usb_request_get_full_configuration_descriptor(pipe, + config_index, full_config_descriptor, config_descriptor.total_length, &full_config_descriptor_size); @@ -299,14 +304,13 @@ * function exits with error. * - * @param hc Open phone to host controller. + * @param ctrl_pipe Control pipe to given device (session must be already + * started). * @param matches Initialized list of match ids. - * @param address USB address of the attached device. - * @return Error code. - */ -int usb_drv_create_device_match_ids(int hc, match_id_list_t *matches, - usb_address_t address) + * @return Error code. + */ +int usb_device_create_match_ids(usb_endpoint_pipe_t *ctrl_pipe, + match_id_list_t *matches) { int rc; - /* * Retrieve device descriptor and add matches from it. @@ -314,10 +318,9 @@ usb_standard_device_descriptor_t device_descriptor; - rc = usb_drv_req_get_device_descriptor(hc, address, - &device_descriptor); + rc = usb_request_get_device_descriptor(ctrl_pipe, &device_descriptor); if (rc != EOK) { return rc; } - + rc = usb_drv_create_match_ids_from_device_descriptor(matches, &device_descriptor); @@ -325,11 +328,11 @@ return rc; } - + /* * Go through all configurations and add matches * based on interface class. */ - rc = usb_add_config_descriptor_match_ids(hc, matches, - address, device_descriptor.configuration_count); + rc = usb_add_config_descriptor_match_ids(ctrl_pipe, matches, + device_descriptor.configuration_count); if (rc != EOK) { return rc; @@ -347,19 +350,16 @@ } - /** Probe for device kind and register it in devman. * - * @param[in] hc Open phone to the host controller. + * @param[in] address Address of the (unknown) attached device. + * @param[in] hc_handle Handle of the host controller. * @param[in] parent Parent device. - * @param[in] address Address of the (unknown) attached device. * @param[out] child_handle Handle of the child device. * @return Error code. */ -int usb_drv_register_child_in_devman(int hc, device_t *parent, - usb_address_t address, devman_handle_t *child_handle) -{ - static size_t device_name_index = 0; - static FIBRIL_MUTEX_INITIALIZE(device_name_index_mutex); - +int usb_device_register_child_in_devman(usb_address_t address, + devman_handle_t hc_handle, + device_t *parent, devman_handle_t *child_handle) +{ size_t this_device_name_index; @@ -369,8 +369,20 @@ fibril_mutex_unlock(&device_name_index_mutex); - device_t *child = NULL; char *child_name = NULL; int rc; + usb_device_connection_t dev_connection; + usb_endpoint_pipe_t ctrl_pipe; + + rc = usb_device_connection_initialize(&dev_connection, hc_handle, address); + if (rc != EOK) { + goto failure; + } + + rc = usb_endpoint_pipe_initialize_default_control(&ctrl_pipe, + &dev_connection); + if (rc != EOK) { + goto failure; + } child = create_device(); @@ -391,6 +403,16 @@ child->name = child_name; child->ops = &child_ops; - - rc = usb_drv_create_device_match_ids(hc, &child->match_ids, address); + + rc = usb_endpoint_pipe_start_session(&ctrl_pipe); + if (rc != EOK) { + goto failure; + } + + rc = usb_device_create_match_ids(&ctrl_pipe, &child->match_ids); + if (rc != EOK) { + goto failure; + } + + rc = usb_endpoint_pipe_end_session(&ctrl_pipe); if (rc != EOK) { goto failure; @@ -405,5 +427,5 @@ *child_handle = child->handle; } - + return EOK; @@ -419,5 +441,4 @@ return rc; - }