Index: uspace/drv/bus/usb/vhc/Makefile =================================================================== --- uspace/drv/bus/usb/vhc/Makefile (revision 01eeaaf85eb7046c2ec99330000b8aa116e605b9) +++ uspace/drv/bus/usb/vhc/Makefile (revision f6577d9a0f34fa9e3b2839f6f69457ff37b6bb3d) @@ -49,7 +49,5 @@ hub/virthubops.c \ conndev.c \ - connhost.c \ devconn.c \ - hub.c \ main.c \ transfer.c Index: pace/drv/bus/usb/vhc/conn.h =================================================================== --- uspace/drv/bus/usb/vhc/conn.h (revision 01eeaaf85eb7046c2ec99330000b8aa116e605b9) +++ (revision ) @@ -1,54 +1,0 @@ -/* - * Copyright (c) 2010 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 drvusbvhc - * @{ - */ -/** @file - * @brief Connection handling of incoming calls. - */ -#ifndef VHCD_CONN_H_ -#define VHCD_CONN_H_ - -#include -#include -#include -#include "vhcd.h" - -extern usbhc_iface_t vhc_iface; -extern usb_iface_t vhc_usb_iface; -extern usb_iface_t rh_usb_iface; - -void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *); -void on_client_close(ddf_fun_t *); - - -#endif -/** - * @} - */ Index: uspace/drv/bus/usb/vhc/conndev.c =================================================================== --- uspace/drv/bus/usb/vhc/conndev.c (revision 01eeaaf85eb7046c2ec99330000b8aa116e605b9) +++ uspace/drv/bus/usb/vhc/conndev.c (revision f6577d9a0f34fa9e3b2839f6f69457ff37b6bb3d) @@ -38,6 +38,8 @@ #include #include +#include #include -#include "conn.h" + +#include "vhcd.h" static fibril_local uintptr_t plugged_device_handle = 0; Index: pace/drv/bus/usb/vhc/connhost.c =================================================================== --- uspace/drv/bus/usb/vhc/connhost.c (revision 01eeaaf85eb7046c2ec99330000b8aa116e605b9) +++ (revision ) @@ -1,303 +1,0 @@ -/* - * 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 drvusbvhc - * @{ - */ -/** @file - * Host controller interface implementation. - */ -#include -#include -#include -#include -#include -#include -#include "vhcd.h" - -#define GET_VHC_DATA(fun) \ - ((vhc_data_t *)ddf_dev_data_get(ddf_fun_get_dev(fun))) -#define VHC_DATA(vhc, fun) \ - vhc_data_t *vhc = GET_VHC_DATA(fun); assert(vhc->magic == 0xdeadbeef) - -#define UNSUPPORTED(methodname) \ - usb_log_warning("Unsupported interface method `%s()' in %s:%d.\n", \ - methodname, __FILE__, __LINE__) - -/** Found free USB address. - * - * @param[in] fun Device function the action was invoked on. - * @param[in] speed Speed of the device that will get this address. - * @param[out] address Non-null pointer where to store the free address. - * @return Error code. - */ -static int request_address(ddf_fun_t *fun, usb_address_t *address, bool strict, - usb_speed_t speed) -{ - VHC_DATA(vhc, fun); - - assert(address); - return usb_device_manager_request_address( - &vhc->dev_manager, address, strict, speed); -} - -/** Bind USB address with device devman handle. - * - * @param[in] fun Device function the action was invoked on. - * @param[in] address USB address of the device. - * @param[in] handle Devman handle of the device. - * @return Error code. - */ -static int bind_address(ddf_fun_t *fun, - usb_address_t address, devman_handle_t handle) -{ - VHC_DATA(vhc, fun); - usb_log_debug("Binding handle %" PRIun " to address %d.\n", - handle, address); - usb_device_manager_bind_address(&vhc->dev_manager, address, handle); - - return EOK; -} - -/** Find device handle by address interface function. - * - * @param[in] fun DDF function that was called. - * @param[in] address Address in question. - * @param[out] handle Where to store device handle if found. - * @return Error code. - */ -static int find_by_address(ddf_fun_t *fun, usb_address_t address, - devman_handle_t *handle) -{ - VHC_DATA(vhc, fun); - return usb_device_manager_get_info_by_address( - &vhc->dev_manager, address, handle, NULL); -} - -/** Release previously requested address. - * - * @param[in] fun Device function the action was invoked on. - * @param[in] address USB address to be released. - * @return Error code. - */ -static int release_address(ddf_fun_t *fun, usb_address_t address) -{ - VHC_DATA(vhc, fun); - usb_log_debug("Releasing address %d...\n", address); - usb_device_manager_release_address(&vhc->dev_manager, address); - - return ENOTSUP; -} - -/** Register endpoint for bandwidth reservation. - * - * @param[in] fun Device function the action was invoked on. - * @param[in] address USB address of the device. - * @param[in] speed Endpoint speed (invalid means to use device one). - * @param[in] endpoint Endpoint number. - * @param[in] transfer_type USB transfer type. - * @param[in] direction Endpoint data direction. - * @param[in] max_packet_size Max packet size of the endpoint. - * @param[in] interval Polling interval. - * @return Error code. - */ -static int register_endpoint(ddf_fun_t *fun, - usb_address_t address, usb_endpoint_t endpoint, - usb_transfer_type_t transfer_type, usb_direction_t direction, - size_t max_packet_size, unsigned int interval) -{ - VHC_DATA(vhc, fun); - - return usb_endpoint_manager_add_ep(&vhc->ep_manager, - address, endpoint, direction, transfer_type, USB_SPEED_FULL, 1, 0, - NULL, NULL); - -} - -/** Unregister endpoint (free some bandwidth reservation). - * - * @param[in] fun Device function the action was invoked on. - * @param[in] address USB address of the device. - * @param[in] endpoint Endpoint number. - * @param[in] direction Endpoint data direction. - * @return Error code. - */ -static int unregister_endpoint(ddf_fun_t *fun, usb_address_t address, - usb_endpoint_t endpoint, usb_direction_t direction) -{ - VHC_DATA(vhc, fun); - - int rc = usb_endpoint_manager_remove_ep(&vhc->ep_manager, - address, endpoint, direction, NULL, NULL); - - return rc; -} - -static int usb_read(ddf_fun_t *fun, usb_target_t target, uint64_t setup_buffer, - uint8_t *data_buffer, size_t data_buffer_size, - usbhc_iface_transfer_in_callback_t callback, void *arg) -{ - VHC_DATA(vhc, fun); - - endpoint_t *ep = usb_endpoint_manager_find_ep(&vhc->ep_manager, - target.address, target.endpoint, USB_DIRECTION_IN); - if (ep == NULL) { - return ENOENT; - } - const usb_transfer_type_t transfer_type = ep->transfer_type; - - - vhc_transfer_t *transfer = vhc_transfer_create(target.address, - target.endpoint, USB_DIRECTION_IN, transfer_type, - fun, arg); - if (transfer == NULL) { - return ENOMEM; - } - if (transfer_type == USB_TRANSFER_CONTROL) { - transfer->setup_buffer = malloc(sizeof(uint64_t)); - assert(transfer->setup_buffer); - memcpy(transfer->setup_buffer, &setup_buffer, sizeof(uint64_t)); - transfer->setup_buffer_size = sizeof(uint64_t); - } - transfer->data_buffer = data_buffer; - transfer->data_buffer_size = data_buffer_size; - transfer->callback_in = callback; - - int rc = vhc_virtdev_add_transfer(vhc, transfer); - if (rc != EOK) { - if (transfer->setup_buffer != NULL) { - free(transfer->setup_buffer); - } - free(transfer); - return rc; - } - - return EOK; -} - -static int usb_write(ddf_fun_t *fun, usb_target_t target, uint64_t setup_buffer, - const uint8_t *data_buffer, size_t data_buffer_size, - usbhc_iface_transfer_out_callback_t callback, void *arg) -{ - VHC_DATA(vhc, fun); - - endpoint_t *ep = usb_endpoint_manager_find_ep(&vhc->ep_manager, - target.address, target.endpoint, USB_DIRECTION_OUT); - if (ep == NULL) { - return ENOENT; - } - const usb_transfer_type_t transfer_type = ep->transfer_type; - - - vhc_transfer_t *transfer = vhc_transfer_create(target.address, - target.endpoint, USB_DIRECTION_OUT, transfer_type, - fun, arg); - if (transfer == NULL) { - return ENOMEM; - } - if (transfer_type == USB_TRANSFER_CONTROL) { - transfer->setup_buffer = malloc(sizeof(uint64_t)); - assert(transfer->setup_buffer); - memcpy(transfer->setup_buffer, &setup_buffer, sizeof(uint64_t)); - transfer->setup_buffer_size = sizeof(uint64_t); - } - transfer->data_buffer = (void*)data_buffer; - transfer->data_buffer_size = data_buffer_size; - transfer->callback_out = callback; - - int rc = vhc_virtdev_add_transfer(vhc, transfer); - if (rc != EOK) { - free(transfer->setup_buffer); - free(transfer); - return rc; - } - - return EOK; -} - -static int tell_address(ddf_fun_t *fun, usb_address_t *address) -{ - UNSUPPORTED("tell_address"); - - return ENOTSUP; -} - -static int usb_iface_get_hc_handle_rh_impl(ddf_fun_t *root_hub_fun, - devman_handle_t *handle) -{ - VHC_DATA(vhc, root_hub_fun); - - *handle = ddf_fun_get_handle(vhc->hc_fun); - - return EOK; -} - -static int tell_address_rh(ddf_fun_t *root_hub_fun, usb_address_t *address) -{ - VHC_DATA(vhc, root_hub_fun); - - devman_handle_t handle = ddf_fun_get_handle(root_hub_fun); - - usb_log_debug("tell_address_rh(handle=%" PRIun ")\n", handle); - const usb_address_t addr = - usb_device_manager_find_address(&vhc->dev_manager, handle); - if (addr < 0) { - return addr; - } else { - *address = addr; - return EOK; - } -} - -usbhc_iface_t vhc_iface = { - .request_address = request_address, - .bind_address = bind_address, - .get_handle = find_by_address, - .release_address = release_address, - - .register_endpoint = register_endpoint, - .unregister_endpoint = unregister_endpoint, - - .write = usb_write, - .read = usb_read, -}; - -usb_iface_t vhc_usb_iface = { - .get_hc_handle = usb_iface_get_hc_handle_hc_impl, - .get_my_address = tell_address -}; - -usb_iface_t rh_usb_iface = { - .get_hc_handle = usb_iface_get_hc_handle_rh_impl, - .get_my_address = tell_address_rh -}; - - -/** - * @} - */ Index: pace/drv/bus/usb/vhc/hub.c =================================================================== --- uspace/drv/bus/usb/vhc/hub.c (revision 01eeaaf85eb7046c2ec99330000b8aa116e605b9) +++ (revision ) @@ -1,133 +1,0 @@ -/* - * Copyright (c) 2010 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 drvusbvhc - * @{ - */ -/** @file - * @brief Virtual USB hub. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "hub.h" -#include "vhcd.h" -#include "conn.h" - -usbvirt_device_t virtual_hub_device = { - .name = "root hub", - .ops = &hub_ops, - .address = 0 -}; - -static ddf_dev_ops_t rh_ops = { - .interfaces[USB_DEV_IFACE] = &rh_usb_iface, -}; - -static int hub_register_in_devman_fibril(void *arg); - -void virtual_hub_device_init(ddf_fun_t *hc_dev) -{ - virthub_init(&virtual_hub_device); - - /* - * We need to register the root hub. - * This must be done in separate fibril because the device - * we are connecting to are ourselves and we cannot connect - * before leaving the add_device() function. - */ - fid_t root_hub_registration - = fibril_create(hub_register_in_devman_fibril, hc_dev); - if (root_hub_registration == 0) { - usb_log_fatal("Failed to create hub registration fibril.\n"); - return; - } - - fibril_add_ready(root_hub_registration); -} - -static int pretend_port_rest(void *unused2) -{ - return EOK; -} - -/** Register root hub in devman. - * - * @param arg Host controller device (type device_t *). - * @return Error code. - */ -int hub_register_in_devman_fibril(void *arg) -{ - ddf_fun_t *hc_dev = (ddf_fun_t *) arg; - - /* - * Wait until parent device is properly initialized. - */ - async_sess_t *sess; - do { - sess = devman_device_connect(EXCHANGE_SERIALIZE, - ddf_fun_get_handle(hc_dev), 0); - } while (!sess); - async_hangup(sess); - - int rc; - - usb_hc_connection_t hc_conn; - usb_hc_connection_initialize(&hc_conn, ddf_fun_get_handle(hc_dev)); - - rc = usb_hc_connection_open(&hc_conn); - assert(rc == EOK); - - ddf_fun_t *hub_dev; - rc = usb_hc_new_device_wrapper(ddf_fun_get_dev(hc_dev), &hc_conn, USB_SPEED_FULL, - pretend_port_rest, NULL, NULL, &rh_ops, hc_dev, &hub_dev); - if (rc != EOK) { - usb_log_fatal("Failed to create root hub: %s.\n", - str_error(rc)); - } - - usb_hc_connection_close(&hc_conn); - - usb_log_info("Created root hub function (handle %zu).\n", - (size_t) ddf_fun_get_handle(hub_dev)); - - return 0; -} - -/** - * @} - */ Index: pace/drv/bus/usb/vhc/hub.h =================================================================== --- uspace/drv/bus/usb/vhc/hub.h (revision 01eeaaf85eb7046c2ec99330000b8aa116e605b9) +++ (revision ) @@ -1,52 +1,0 @@ -/* - * Copyright (c) 2010 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 drvusbvhc - * @{ - */ -/** @file - * @brief Virtual USB hub. - */ - -#ifndef VHCD_HUB_H_ -#define VHCD_HUB_H_ - -#include -#include - -#include "hub/hub.h" -#include "hub/virthub.h" - -extern usbvirt_device_t virtual_hub_device; - -void virtual_hub_device_init(ddf_fun_t *); - -#endif -/** - * @} - */ Index: uspace/drv/bus/usb/vhc/hub/virthub.c =================================================================== --- uspace/drv/bus/usb/vhc/hub/virthub.c (revision 01eeaaf85eb7046c2ec99330000b8aa116e605b9) +++ uspace/drv/bus/usb/vhc/hub/virthub.c (revision f6577d9a0f34fa9e3b2839f6f69457ff37b6bb3d) @@ -38,4 +38,5 @@ #include #include +#include #include #include Index: uspace/drv/bus/usb/vhc/main.c =================================================================== --- uspace/drv/bus/usb/vhc/main.c (revision 01eeaaf85eb7046c2ec99330000b8aa116e605b9) +++ uspace/drv/bus/usb/vhc/main.c (revision f6577d9a0f34fa9e3b2839f6f69457ff37b6bb3d) @@ -34,9 +34,4 @@ */ -#include -#include -#include -#include -#include #include #include @@ -46,16 +41,17 @@ #include -#include #include -#include +#include #include "vhcd.h" -#include "hub.h" -#include "conn.h" +#include "hub/hub.h" +#include "hub/virthub.h" + +static usbvirt_device_t virtual_hub_device = { + .name = "root hub", + .ops = &hub_ops, + .address = 0 +}; static ddf_dev_ops_t vhc_ops = { -#if 0 - .interfaces[USBHC_DEV_IFACE] = &vhc_iface, - .interfaces[USB_DEV_IFACE] = &vhc_usb_iface, -#endif .close = on_client_close, .default_handler = default_connection_handler @@ -131,70 +127,4 @@ return ret; -#if 0 - static int vhc_count = 0; - int rc; - - if (vhc_count > 0) { - return ELIMIT; - } - - vhc_data_t *data = ddf_dev_data_alloc(dev, sizeof(vhc_data_t)); - if (data == NULL) { - usb_log_fatal("Failed to allocate memory.\n"); - return ENOMEM; - } - data->magic = 0xDEADBEEF; - rc = usb_endpoint_manager_init(&data->ep_manager, (size_t) -1, - bandwidth_count_usb11); - if (rc != EOK) { - usb_log_fatal("Failed to initialize endpoint manager.\n"); - free(data); - return rc; - } - usb_device_manager_init(&data->dev_manager, USB_SPEED_MAX); - - ddf_fun_t *hc = ddf_fun_create(dev, fun_exposed, "hc"); - if (hc == NULL) { - usb_log_fatal("Failed to create device function.\n"); - free(data); - return ENOMEM; - } - - ddf_fun_set_ops(hc, &vhc_ops); - list_initialize(&data->devices); - fibril_mutex_initialize(&data->guard); - data->hub = &virtual_hub_device; - data->hc_fun = hc; - - rc = ddf_fun_bind(hc); - if (rc != EOK) { - usb_log_fatal("Failed to bind HC function: %s.\n", - str_error(rc)); - free(data); - return rc; - } - - rc = ddf_fun_add_to_category(hc, USB_HC_CATEGORY); - if (rc != EOK) { - usb_log_fatal("Failed to add function to HC class: %s.\n", - str_error(rc)); - free(data); - return rc; - } - - virtual_hub_device_init(hc); - - usb_log_info("Virtual USB host controller ready (dev %zu, hc %zu).\n", - (size_t) ddf_dev_get_handle(dev), (size_t) ddf_fun_get_handle(hc)); - - rc = vhc_virtdev_plug_hub(data, data->hub, NULL); - if (rc != EOK) { - usb_log_fatal("Failed to plug root hub: %s.\n", str_error(rc)); - free(data); - return rc; - } - - return EOK; -#endif } @@ -208,9 +138,7 @@ }; - int main(int argc, char * argv[]) { log_init(NAME); - printf(NAME ": virtual USB host controller driver.\n"); Index: uspace/drv/bus/usb/vhc/transfer.c =================================================================== --- uspace/drv/bus/usb/vhc/transfer.c (revision 01eeaaf85eb7046c2ec99330000b8aa116e605b9) +++ uspace/drv/bus/usb/vhc/transfer.c (revision f6577d9a0f34fa9e3b2839f6f69457ff37b6bb3d) @@ -29,59 +29,8 @@ #include #include +#include #include #include #include "vhcd.h" - -vhc_transfer_t *vhc_transfer_create(usb_address_t address, usb_endpoint_t ep, - usb_direction_t dir, usb_transfer_type_t tr_type, - ddf_fun_t *fun, void *callback_arg) -{ - vhc_transfer_t *result = malloc(sizeof(vhc_transfer_t)); - if (result == NULL) { - return NULL; - } - link_initialize(&result->link); - result->address = address; - result->endpoint = ep; - result->direction = dir; - result->transfer_type = tr_type; - result->setup_buffer = NULL; - result->setup_buffer_size = 0; - result->data_buffer = NULL; - result->data_buffer_size = 0; - result->ddf_fun = fun; - result->callback_arg = callback_arg; - result->callback_in = NULL; - result->callback_out = NULL; - - usb_log_debug2("Created transfer %p (%d.%d %s %s)\n", result, - address, ep, usb_str_transfer_type_short(tr_type), - dir == USB_DIRECTION_IN ? "in" : "out"); - - return result; -} - -static bool is_set_address_transfer(vhc_transfer_t *transfer) -{ - if (transfer->batch->ep->endpoint != 0) { - return false; - } - if (transfer->batch->ep->transfer_type != USB_TRANSFER_CONTROL) { - return false; - } - if (usb_transfer_batch_direction(transfer->batch) != USB_DIRECTION_OUT) { - return false; - } - const usb_device_request_setup_packet_t *setup = - (void*)transfer->batch->setup_buffer; - if (setup->request_type != 0) { - return false; - } - if (setup->request != USB_DEVREQ_SET_ADDRESS) { - return false; - } - - return true; -} int vhc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch) @@ -122,31 +71,25 @@ } -int vhc_virtdev_add_transfer(vhc_data_t *vhc, vhc_transfer_t *transfer) -{ - fibril_mutex_lock(&vhc->guard); - - bool target_found = false; - list_foreach(vhc->devices, pos) { - vhc_virtdev_t *dev = list_get_instance(pos, vhc_virtdev_t, link); - fibril_mutex_lock(&dev->guard); - if (dev->address == transfer->address) { - if (target_found) { - usb_log_warning("Transfer would be accepted by more devices!\n"); - goto next; - } - target_found = true; - list_append(&transfer->link, &dev->transfer_queue); - } -next: - fibril_mutex_unlock(&dev->guard); - } - - fibril_mutex_unlock(&vhc->guard); - - if (target_found) { - return EOK; - } else { - return ENOENT; - } +static bool is_set_address_transfer(vhc_transfer_t *transfer) +{ + if (transfer->batch->ep->endpoint != 0) { + return false; + } + if (transfer->batch->ep->transfer_type != USB_TRANSFER_CONTROL) { + return false; + } + if (usb_transfer_batch_direction(transfer->batch) != USB_DIRECTION_OUT) { + return false; + } + const usb_device_request_setup_packet_t *setup = + (void*)transfer->batch->setup_buffer; + if (setup->request_type != 0) { + return false; + } + if (setup->request != USB_DEVREQ_SET_ADDRESS) { + return false; + } + + return true; } @@ -234,5 +177,4 @@ return transfer; } - static void execute_transfer_callback_and_free(vhc_transfer_t *transfer, @@ -246,20 +188,4 @@ usb_transfer_batch_destroy(transfer->batch); free(transfer); -#if 0 - assert(outcome != ENAK); - - usb_log_debug2("Transfer %p ended: %s.\n", - transfer, str_error(outcome)); - - if (transfer->direction == USB_DIRECTION_IN) { - transfer->callback_in(outcome, - data_transfer_size, transfer->callback_arg); - } else { - assert(transfer->direction == USB_DIRECTION_OUT); - transfer->callback_out(outcome, transfer->callback_arg); - } - - free(transfer); -#endif } @@ -332,3 +258,2 @@ return EOK; } - Index: uspace/drv/bus/usb/vhc/vhcd.h =================================================================== --- uspace/drv/bus/usb/vhc/vhcd.h (revision 01eeaaf85eb7046c2ec99330000b8aa116e605b9) +++ uspace/drv/bus/usb/vhc/vhcd.h (revision f6577d9a0f34fa9e3b2839f6f69457ff37b6bb3d) @@ -36,8 +36,5 @@ #define VHCD_VHCD_H_ -#include #include -#include -#include #include #include @@ -62,6 +59,4 @@ list_t devices; fibril_mutex_t guard; - usb_endpoint_manager_t ep_manager; - usb_device_manager_t dev_manager; usbvirt_device_t *hub; ddf_fun_t *hc_fun; @@ -70,19 +65,5 @@ typedef struct { link_t link; - usb_transfer_batch_t *batch; - - usb_address_t address; - usb_endpoint_t endpoint; - usb_direction_t direction; - usb_transfer_type_t transfer_type; - void *setup_buffer; - size_t setup_buffer_size; - void *data_buffer; - size_t data_buffer_size; - ddf_fun_t *ddf_fun; - void *callback_arg; - usbhc_iface_transfer_in_callback_t callback_in; - usbhc_iface_transfer_out_callback_t callback_out; } vhc_transfer_t; @@ -95,17 +76,16 @@ } +void on_client_close(ddf_fun_t *fun); +void default_connection_handler(ddf_fun_t *fun, ipc_callid_t icallid, + ipc_call_t *icall); -vhc_transfer_t *vhc_transfer_create(usb_address_t, usb_endpoint_t, - usb_direction_t, usb_transfer_type_t, ddf_fun_t *, void *); int vhc_virtdev_plug(vhc_data_t *, async_sess_t *, uintptr_t *); int vhc_virtdev_plug_local(vhc_data_t *, usbvirt_device_t *, uintptr_t *); int vhc_virtdev_plug_hub(vhc_data_t *, usbvirt_device_t *, uintptr_t *, usb_address_t address); void vhc_virtdev_unplug(vhc_data_t *, uintptr_t); -int vhc_virtdev_add_transfer(vhc_data_t *, vhc_transfer_t *); - -int vhc_transfer_queue_processor(void *arg); int vhc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch); +int vhc_transfer_queue_processor(void *arg); #endif