Index: uspace/drv/bus/usb/ohci/Makefile =================================================================== --- uspace/drv/bus/usb/ohci/Makefile (revision cc34f5f07a9c1f150a83050a986595ea7f21f3d5) +++ uspace/drv/bus/usb/ohci/Makefile (revision 09ace19264532b52287b4ee10cb23e6d9c1dcff8) @@ -47,5 +47,4 @@ endpoint_list.c \ hc.c \ - iface.c \ main.c \ ohci.c \ Index: uspace/drv/bus/usb/ohci/batch.c =================================================================== --- uspace/drv/bus/usb/ohci/batch.c (revision cc34f5f07a9c1f150a83050a986595ea7f21f3d5) +++ uspace/drv/bus/usb/ohci/batch.c (revision 09ace19264532b52287b4ee10cb23e6d9c1dcff8) @@ -43,5 +43,5 @@ #include "hw_struct/endpoint_descriptor.h" #include "hw_struct/transfer_descriptor.h" -/* + static void batch_control_write(usb_transfer_batch_t *instance); static void batch_control_read(usb_transfer_batch_t *instance); @@ -52,5 +52,5 @@ static void batch_bulk_in(usb_transfer_batch_t *instance); static void batch_bulk_out(usb_transfer_batch_t *instance); -*/ + static void batch_setup_control(usb_transfer_batch_t *batch) { @@ -173,89 +173,4 @@ return EOK; #undef CHECK_NULL_DISPOSE_RETURN -} -/*----------------------------------------------------------------------------*/ -/** Allocate memory initialize internal structures - * - * @param[in] fun DDF function to pass to callback. - * @param[in] ep Communication target - * @param[in] buffer Data source/destination. - * @param[in] buffer_size Size of the buffer. - * @param[in] setup_buffer Setup data source (if not NULL) - * @param[in] setup_size Size of setup_buffer (should be always 8) - * @param[in] func_in function to call on inbound transfer completion - * @param[in] func_out function to call on outbound transfer completion - * @param[in] arg additional parameter to func_in or func_out - * @return Valid pointer if all structures were successfully created, - * NULL otherwise. - * - * Allocates and initializes structures needed by the OHCI hw for the transfer. - */ -usb_transfer_batch_t * batch_get(ddf_fun_t *fun, endpoint_t *ep, - char *buffer, size_t buffer_size, - const 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) -{ -#define CHECK_NULL_DISPOSE_RETURN(ptr, message...) \ - if (ptr == NULL) { \ - usb_log_error(message); \ - if (instance) { \ - usb_transfer_batch_dispose(instance); \ - } \ - return NULL; \ - } else (void)0 - - usb_transfer_batch_t *instance = malloc(sizeof(usb_transfer_batch_t)); - CHECK_NULL_DISPOSE_RETURN(instance, - "Failed to allocate batch instance.\n"); - usb_transfer_batch_init(instance, ep, buffer, NULL, buffer_size, - NULL, setup_size, func_in, func_out, arg, fun, NULL, - ohci_batch_dispose); - - const ohci_endpoint_t *ohci_ep = ohci_endpoint_get(ep); - assert(ohci_ep); - - ohci_transfer_batch_t *data = calloc(sizeof(ohci_transfer_batch_t), 1); - CHECK_NULL_DISPOSE_RETURN(data, "Failed to allocate batch data.\n"); - instance->private_data = data; - - data->td_count = - ((buffer_size + OHCI_TD_MAX_TRANSFER - 1) / OHCI_TD_MAX_TRANSFER); - /* Control transfer need Setup and Status stage */ - if (ep->transfer_type == USB_TRANSFER_CONTROL) { - data->td_count += 2; - } - - /* We need an extra place for TD that is currently assigned to hcd_ep*/ - data->tds = calloc(sizeof(td_t*), data->td_count + 1); - CHECK_NULL_DISPOSE_RETURN(data->tds, - "Failed to allocate transfer descriptors.\n"); - - /* Add TD left over by the previous transfer */ - data->tds[0] = ohci_ep->td; - data->leave_td = 0; - unsigned i = 1; - for (; i <= data->td_count; ++i) { - data->tds[i] = malloc32(sizeof(td_t)); - CHECK_NULL_DISPOSE_RETURN(data->tds[i], - "Failed to allocate TD %d.\n", i ); - } - - data->ed = ohci_ep->ed; - - /* NOTE: OHCI is capable of handling buffer that crosses page boundaries - * it is, however, not capable of handling buffer that occupies more - * than two pages (the first page is computed using start pointer, the - * other using the end pointer) */ - if (setup_size + buffer_size > 0) { - data->device_buffer = malloc32(setup_size + buffer_size); - CHECK_NULL_DISPOSE_RETURN(data->device_buffer, - "Failed to allocate device accessible buffer.\n"); - instance->setup_buffer = data->device_buffer; - instance->data_buffer = data->device_buffer + setup_size; - memcpy(instance->setup_buffer, setup_buffer, setup_size); - } - - return instance; } /*----------------------------------------------------------------------------*/ Index: uspace/drv/bus/usb/ohci/batch.h =================================================================== --- uspace/drv/bus/usb/ohci/batch.h (revision cc34f5f07a9c1f150a83050a986595ea7f21f3d5) +++ uspace/drv/bus/usb/ohci/batch.h (revision 09ace19264532b52287b4ee10cb23e6d9c1dcff8) @@ -41,28 +41,7 @@ #include -usb_transfer_batch_t * batch_get( - ddf_fun_t *fun, endpoint_t *ep, char *buffer, size_t size, - const 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); - int batch_init_ohci(usb_transfer_batch_t *batch); - bool batch_is_complete(usb_transfer_batch_t *batch); - -void batch_commit(usb_transfer_batch_t *instance); - -void batch_control_write(usb_transfer_batch_t *instance); - -void batch_control_read(usb_transfer_batch_t *instance); - -void batch_interrupt_in(usb_transfer_batch_t *instance); - -void batch_interrupt_out(usb_transfer_batch_t *instance); - -void batch_bulk_in(usb_transfer_batch_t *instance); - -void batch_bulk_out(usb_transfer_batch_t *instance); +void batch_commit(usb_transfer_batch_t *batch); #endif /** Index: uspace/drv/bus/usb/ohci/hc.c =================================================================== --- uspace/drv/bus/usb/ohci/hc.c (revision cc34f5f07a9c1f150a83050a986595ea7f21f3d5) +++ uspace/drv/bus/usb/ohci/hc.c (revision 09ace19264532b52287b4ee10cb23e6d9c1dcff8) @@ -61,11 +61,5 @@ static int hc_init_memory(hc_t *instance); static int interrupt_emulator(hc_t *instance); -/*----------------------------------------------------------------------------*/ -static int schedule(hcd_t *hcd, usb_transfer_batch_t *batch) -{ - assert(hcd); - batch_init_ohci(batch); - return hc_schedule(hcd->private_data, batch); -} +static int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch); /*----------------------------------------------------------------------------*/ /** Get number of commands used in IRQ code. @@ -211,10 +205,4 @@ list_initialize(&instance->pending_batches); - usb_device_keeper_init(&instance->manager); - - ret = usb_endpoint_manager_init(&instance->ep_manager, - BANDWIDTH_AVAILABLE_USB11); - CHECK_RET_RETURN(ret, "Failed to initialize endpoint manager: %s.\n", - str_error(ret)); ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11); @@ -222,5 +210,5 @@ str_error(ret)); instance->generic.private_data = instance; - instance->generic.schedule = schedule; + instance->generic.schedule = hc_schedule; instance->generic.ep_add_hook = ohci_endpoint_init; @@ -302,96 +290,4 @@ } /*----------------------------------------------------------------------------*/ -/** Create and register endpoint structures. - * - * @param[in] instance OHCI driver structure. - * @param[in] address USB address of the device. - * @param[in] endpoint USB endpoint number. - * @param[in] speed Communication speeed of the device. - * @param[in] type Endpoint's transfer type. - * @param[in] direction Endpoint's direction. - * @param[in] mps Maximum packet size the endpoint accepts. - * @param[in] size Maximum allowed buffer size. - * @param[in] interval Time between transfers(interrupt transfers only). - * @return Error code - */ -int hc_add_endpoint( - hc_t *instance, usb_address_t address, usb_endpoint_t endpoint, - usb_speed_t speed, usb_transfer_type_t type, usb_direction_t direction, - size_t mps, size_t size, unsigned interval) -{ - endpoint_t *ep = - endpoint_get(address, endpoint, direction, type, speed, mps); - if (ep == NULL) - return ENOMEM; - - int ret = ohci_endpoint_init(&instance->generic, ep); - if (ret != EOK) { - endpoint_destroy(ep); - return ret; - } - - ret = usb_endpoint_manager_register_ep(&instance->ep_manager, ep, size); - if (ret != EOK) { - endpoint_destroy(ep); - return ret; - } - hc_enqueue_endpoint(instance, ep); - - return EOK; -} -/*----------------------------------------------------------------------------*/ -/** Dequeue and delete endpoint structures - * - * @param[in] instance OHCI hc driver structure. - * @param[in] address USB address of the device. - * @param[in] endpoint USB endpoint number. - * @param[in] direction Direction of the endpoint. - * @return Error code - */ -int hc_remove_endpoint(hc_t *instance, usb_address_t address, - usb_endpoint_t endpoint, usb_direction_t direction) -{ - assert(instance); - fibril_mutex_lock(&instance->guard); - endpoint_t *ep = usb_endpoint_manager_get_ep(&instance->ep_manager, - address, endpoint, direction, NULL); - if (ep == NULL) { - usb_log_error("Endpoint unregister failed: No such EP.\n"); - fibril_mutex_unlock(&instance->guard); - return ENOENT; - } - - ohci_endpoint_t *ohci_ep = ohci_endpoint_get(ep); - if (ohci_ep) { - hc_dequeue_endpoint(instance, ep); - } else { - usb_log_warning("Endpoint without hcd equivalent structure.\n"); - } - int ret = usb_endpoint_manager_unregister_ep(&instance->ep_manager, - address, endpoint, direction); - fibril_mutex_unlock(&instance->guard); - return ret; -} -/*----------------------------------------------------------------------------*/ -/** Get access to endpoint structures - * - * @param[in] instance OHCI hc driver structure. - * @param[in] address USB address of the device. - * @param[in] endpoint USB endpoint number. - * @param[in] direction Direction of the endpoint. - * @param[out] bw Reserved bandwidth. - * @return Error code - */ -endpoint_t * hc_get_endpoint(hc_t *instance, usb_address_t address, - usb_endpoint_t endpoint, usb_direction_t direction, size_t *bw) -{ - assert(instance); - fibril_mutex_lock(&instance->guard); - endpoint_t *ep = usb_endpoint_manager_get_ep(&instance->ep_manager, - address, endpoint, direction, bw); - fibril_mutex_unlock(&instance->guard); - return ep; -} -/*----------------------------------------------------------------------------*/ /** Add USB transfer to the schedule. * @@ -400,9 +296,10 @@ * @return Error code. */ -int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch) -{ - assert(instance); - assert(batch); - assert(batch->ep); +int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch) +{ + assert(hcd); + batch_init_ohci(batch); + hc_t *instance = hcd->private_data; + assert(instance); /* Check for root hub communication */ Index: uspace/drv/bus/usb/ohci/hc.h =================================================================== --- uspace/drv/bus/usb/ohci/hc.h (revision cc34f5f07a9c1f150a83050a986595ea7f21f3d5) +++ uspace/drv/bus/usb/ohci/hc.h (revision 09ace19264532b52287b4ee10cb23e6d9c1dcff8) @@ -53,9 +53,4 @@ /** Main OHCI driver structure */ typedef struct hc { - /** USB bus driver, devices and addresses */ - usb_device_keeper_t manager; - /** USB bus driver, endpoints */ - usb_endpoint_manager_t ep_manager; - /** Generic USB hc driver */ hcd_t generic; @@ -91,28 +86,10 @@ * @param[in] instance Host controller structure to use. */ -static inline void hc_fini(hc_t *instance) - { /* TODO: implement*/ }; +static inline void hc_fini(hc_t *instance) { /* TODO: implement*/ }; void hc_enqueue_endpoint(hc_t *instance, endpoint_t *ep); void hc_dequeue_endpoint(hc_t *instance, endpoint_t *ep); -int hc_add_endpoint(hc_t *instance, usb_address_t address, usb_endpoint_t ep, - usb_speed_t speed, usb_transfer_type_t type, usb_direction_t direction, - size_t max_packet_size, size_t size, unsigned interval); -int hc_remove_endpoint(hc_t *instance, usb_address_t address, - usb_endpoint_t endpoint, usb_direction_t direction); -endpoint_t * hc_get_endpoint(hc_t *instance, usb_address_t address, - usb_endpoint_t endpoint, usb_direction_t direction, size_t *bw); - -int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch); void hc_interrupt(hc_t *instance, uint32_t status); - -/** Get and cast pointer to the driver data - * - * @param[in] fun DDF function pointer - * @return cast pointer to driver_data - */ -static inline hc_t * fun_to_hc(ddf_fun_t *fun) - { return fun->driver_data; } #endif /** Index: pace/drv/bus/usb/ohci/iface.c =================================================================== --- uspace/drv/bus/usb/ohci/iface.c (revision cc34f5f07a9c1f150a83050a986595ea7f21f3d5) +++ (revision ) @@ -1,441 +1,0 @@ -/* - * Copyright (c) 2011 Vojtech Horky, 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 drvusbohci - * @{ - */ -/** @file - * @brief OHCI driver hc interface implementation - */ -#include -#include - -#include -#include - -#include "iface.h" -#include "hc.h" - -static inline int setup_batch( - ddf_fun_t *fun, usb_target_t target, usb_direction_t direction, - void *data, size_t size, void * setup_data, size_t setup_size, - usbhc_iface_transfer_in_callback_t in, - usbhc_iface_transfer_out_callback_t out, void *arg, const char* name, - hc_t **hc, usb_transfer_batch_t **batch) -{ - assert(hc); - assert(batch); - assert(fun); - *hc = fun_to_hc(fun); - assert(*hc); - - size_t res_bw; - endpoint_t *ep = hc_get_endpoint(*hc, - target.address, target.endpoint, direction, &res_bw); - if (ep == NULL) { - usb_log_error("Endpoint(%d:%d) not registered for %s.\n", - target.address, target.endpoint, name); - return ENOENT; - } - - usb_log_debug("%s %d:%d %zu(%zu).\n", - name, target.address, target.endpoint, size, ep->max_packet_size); - - const size_t bw = bandwidth_count_usb11( - ep->speed, ep->transfer_type, size, ep->max_packet_size); - if (res_bw < bw) { - usb_log_error("Endpoint(%d:%d) %s needs %zu bw " - "but only %zu is reserved.\n", - target.address, target.endpoint, name, bw, res_bw); - return ENOSPC; - } - - *batch = batch_get( - fun, ep, data, size, setup_data, setup_size, in, out, arg); - if (!*batch) - return ENOMEM; - return EOK; -} -/*----------------------------------------------------------------------------*/ -/** Request address interface function - * - * @param[in] fun DDF function that was called. - * @param[in] speed Speed to associate with the new default address. - * @param[out] address Place to write a new address. - * @return Error code. - */ -static int request_address( - ddf_fun_t *fun, usb_speed_t speed, usb_address_t *address) -{ - assert(fun); - hc_t *hc = fun_to_hc(fun); - assert(hc); - assert(address); - - usb_log_debug("Address request with speed %d.\n", speed); - *address = device_keeper_get_free_address(&hc->manager, speed); - usb_log_debug("Address request with result: %d.\n", *address); - if (*address <= 0) - return *address; - return EOK; -} -/*----------------------------------------------------------------------------*/ -/** Bind address interface function - * - * @param[in] fun DDF function that was called. - * @param[in] address Address of the device - * @param[in] handle Devman handle of the device driver. - * @return Error code. - */ -static int bind_address( - ddf_fun_t *fun, usb_address_t address, devman_handle_t handle) -{ - assert(fun); - hc_t *hc = fun_to_hc(fun); - assert(hc); - usb_log_debug("Address bind %d-%" PRIun ".\n", address, handle); - usb_device_keeper_bind(&hc->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) -{ - assert(fun); - hc_t *hc = fun_to_hc(fun); - assert(hc); - bool found = - usb_device_keeper_find_by_address(&hc->manager, address, handle); - return found ? EOK : ENOENT; -} - -/*----------------------------------------------------------------------------*/ -/** Release address interface function - * - * @param[in] fun DDF function that was called. - * @param[in] address USB address to be released. - * @return Error code. - */ -static int release_address(ddf_fun_t *fun, usb_address_t address) -{ - assert(fun); - hc_t *hc = fun_to_hc(fun); - assert(hc); - usb_log_debug("Address release %d.\n", address); - usb_device_keeper_release(&hc->manager, address); - return EOK; -} -/*----------------------------------------------------------------------------*/ -/** 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] ep_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_speed_t ep_speed, usb_endpoint_t endpoint, - usb_transfer_type_t transfer_type, usb_direction_t direction, - size_t max_packet_size, unsigned int interval) -{ - hc_t *hc = fun_to_hc(fun); - assert(hc); - - usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, address); - if (speed >= USB_SPEED_MAX) { - speed = ep_speed; - } - const size_t size = max_packet_size; - - usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n", - address, endpoint, usb_str_transfer_type(transfer_type), - usb_str_speed(speed), direction, size, max_packet_size, interval); - - return hc_add_endpoint(hc, address, endpoint, speed, transfer_type, - direction, max_packet_size, size, interval); -} -/*----------------------------------------------------------------------------*/ -static int unregister_endpoint( - ddf_fun_t *fun, usb_address_t address, - usb_endpoint_t endpoint, usb_direction_t direction) -{ - hc_t *hc = fun_to_hc(fun); - assert(hc); - usb_log_debug("Unregister endpoint %d:%d %d.\n", - address, endpoint, direction); - return hc_remove_endpoint(hc, address, endpoint, direction); -} -/*----------------------------------------------------------------------------*/ -/** Schedule interrupt out transfer. - * - * The callback is supposed to be called once the transfer (on the wire) is - * complete regardless of the outcome. - * However, the callback could be called only when this function returns - * with success status (i.e. returns EOK). - * - * @param[in] fun Device function the action was invoked on. - * @param[in] target Target pipe (address and endpoint number) specification. - * @param[in] data Data to be sent (in USB endianess, allocated and deallocated - * by the caller). - * @param[in] size Size of the @p data buffer in bytes. - * @param[in] callback Callback to be issued once the transfer is complete. - * @param[in] arg Pass-through argument to the callback. - * @return Error code. - */ -static int interrupt_out( - ddf_fun_t *fun, usb_target_t target, void *data, - size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg) -{ - usb_transfer_batch_t *batch = NULL; - hc_t *hc = NULL; - int ret = setup_batch(fun, target, USB_DIRECTION_OUT, data, size, - NULL, 0, NULL, callback, arg, "Interrupt OUT", &hc, &batch); - if (ret != EOK) - return ret; - batch_interrupt_out(batch); - ret = hc_schedule(hc, batch); - if (ret != EOK) { - usb_transfer_batch_dispose(batch); - } - return ret; -} -/*----------------------------------------------------------------------------*/ -/** Schedule interrupt in transfer. - * - * The callback is supposed to be called once the transfer (on the wire) is - * complete regardless of the outcome. - * However, the callback could be called only when this function returns - * with success status (i.e. returns EOK). - * - * @param[in] fun Device function the action was invoked on. - * @param[in] target Target pipe (address and endpoint number) specification. - * @param[in] data Buffer where to store the data (in USB endianess, - * allocated and deallocated by the caller). - * @param[in] size Size of the @p data buffer in bytes. - * @param[in] callback Callback to be issued once the transfer is complete. - * @param[in] arg Pass-through argument to the callback. - * @return Error code. - */ -static int interrupt_in( - ddf_fun_t *fun, usb_target_t target, void *data, - size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg) -{ - usb_transfer_batch_t *batch = NULL; - hc_t *hc = NULL; - int ret = setup_batch(fun, target, USB_DIRECTION_IN, data, size, - NULL, 0, callback, NULL, arg, "Interrupt IN", &hc, &batch); - if (ret != EOK) - return ret; - batch_interrupt_in(batch); - ret = hc_schedule(hc, batch); - if (ret != EOK) { - usb_transfer_batch_dispose(batch); - } - return ret; -} -/*----------------------------------------------------------------------------*/ -/** Schedule bulk out transfer. - * - * The callback is supposed to be called once the transfer (on the wire) is - * complete regardless of the outcome. - * However, the callback could be called only when this function returns - * with success status (i.e. returns EOK). - * - * @param[in] fun Device function the action was invoked on. - * @param[in] target Target pipe (address and endpoint number) specification. - * @param[in] data Data to be sent (in USB endianess, allocated and deallocated - * by the caller). - * @param[in] size Size of the @p data buffer in bytes. - * @param[in] callback Callback to be issued once the transfer is complete. - * @param[in] arg Pass-through argument to the callback. - * @return Error code. - */ -static int bulk_out( - ddf_fun_t *fun, usb_target_t target, void *data, - size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg) -{ - usb_transfer_batch_t *batch = NULL; - hc_t *hc = NULL; - int ret = setup_batch(fun, target, USB_DIRECTION_OUT, data, size, - NULL, 0, NULL, callback, arg, "Bulk OUT", &hc, &batch); - if (ret != EOK) - return ret; - batch_bulk_out(batch); - ret = hc_schedule(hc, batch); - if (ret != EOK) { - usb_transfer_batch_dispose(batch); - } - return ret; -} -/*----------------------------------------------------------------------------*/ -/** Schedule bulk in transfer. - * - * The callback is supposed to be called once the transfer (on the wire) is - * complete regardless of the outcome. - * However, the callback could be called only when this function returns - * with success status (i.e. returns EOK). - * - * @param[in] fun Device function the action was invoked on. - * @param[in] target Target pipe (address and endpoint number) specification. - * @param[in] data Buffer where to store the data (in USB endianess, - * allocated and deallocated by the caller). - * @param[in] size Size of the @p data buffer in bytes. - * @param[in] callback Callback to be issued once the transfer is complete. - * @param[in] arg Pass-through argument to the callback. - * @return Error code. - */ -static int bulk_in( - ddf_fun_t *fun, usb_target_t target, void *data, - size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg) -{ - usb_transfer_batch_t *batch = NULL; - hc_t *hc = NULL; - int ret = setup_batch(fun, target, USB_DIRECTION_IN, data, size, - NULL, 0, callback, NULL, arg, "Bulk IN", &hc, &batch); - if (ret != EOK) - return ret; - batch_bulk_in(batch); - ret = hc_schedule(hc, batch); - if (ret != EOK) { - usb_transfer_batch_dispose(batch); - } - return ret; -} -/*----------------------------------------------------------------------------*/ -/** Schedule control write transfer. - * - * The callback is supposed to be called once the transfer (on the wire) is - * complete regardless of the outcome. - * However, the callback could be called only when this function returns - * with success status (i.e. returns EOK). - * - * @param[in] fun Device function the action was invoked on. - * @param[in] target Target pipe (address and endpoint number) specification. - * @param[in] setup_packet Setup packet buffer (in USB endianess, allocated - * and deallocated by the caller). - * @param[in] setup_size Size of @p setup_packet buffer in bytes. - * @param[in] data_buffer Data buffer (in USB endianess, allocated and - * deallocated by the caller). - * @param[in] size Size of @p data_buffer buffer in bytes. - * @param[in] callback Callback to be issued once the transfer is complete. - * @param[in] arg Pass-through argument to the callback. - * @return Error code. - */ -static int control_write( - ddf_fun_t *fun, usb_target_t target, - void *setup_data, size_t setup_size, void *data, size_t size, - usbhc_iface_transfer_out_callback_t callback, void *arg) -{ - usb_transfer_batch_t *batch = NULL; - hc_t *hc = NULL; - int ret = setup_batch(fun, target, USB_DIRECTION_BOTH, data, size, - setup_data, setup_size, NULL, callback, arg, "Control WRITE", - &hc, &batch); - if (ret != EOK) - return ret; - usb_endpoint_manager_reset_if_need(&hc->ep_manager, target, setup_data); - batch_control_write(batch); - ret = hc_schedule(hc, batch); - if (ret != EOK) { - usb_transfer_batch_dispose(batch); - } - return ret; -} -/*----------------------------------------------------------------------------*/ -/** Schedule control read transfer. - * - * The callback is supposed to be called once the transfer (on the wire) is - * complete regardless of the outcome. - * However, the callback could be called only when this function returns - * with success status (i.e. returns EOK). - * - * @param[in] fun Device function the action was invoked on. - * @param[in] target Target pipe (address and endpoint number) specification. - * @param[in] setup_packet Setup packet buffer (in USB endianess, allocated - * and deallocated by the caller). - * @param[in] setup_size Size of @p setup_packet buffer in bytes. - * @param[in] data_buffer Buffer where to store the data (in USB endianess, - * allocated and deallocated by the caller). - * @param[in] size Size of @p data_buffer buffer in bytes. - * @param[in] callback Callback to be issued once the transfer is complete. - * @param[in] arg Pass-through argument to the callback. - * @return Error code. - */ -static int control_read( - ddf_fun_t *fun, usb_target_t target, - void *setup_data, size_t setup_size, void *data, size_t size, - usbhc_iface_transfer_in_callback_t callback, void *arg) -{ - usb_transfer_batch_t *batch = NULL; - hc_t *hc = NULL; - int ret = setup_batch(fun, target, USB_DIRECTION_BOTH, data, size, - setup_data, setup_size, callback, NULL, arg, "Control READ", - &hc, &batch); - if (ret != EOK) - return ret; - batch_control_read(batch); - ret = hc_schedule(hc, batch); - if (ret != EOK) { - usb_transfer_batch_dispose(batch); - } - return ret; -} -/*----------------------------------------------------------------------------*/ -usbhc_iface_t hc_iface = { - .request_address = request_address, - .bind_address = bind_address, - .find_by_address = find_by_address, - .release_address = release_address, - - .register_endpoint = register_endpoint, - .unregister_endpoint = unregister_endpoint, - - .interrupt_out = interrupt_out, - .interrupt_in = interrupt_in, - - .bulk_out = bulk_out, - .bulk_in = bulk_in, - - .control_write = control_write, - .control_read = control_read, -}; -/** - * @} - */ Index: pace/drv/bus/usb/ohci/iface.h =================================================================== --- uspace/drv/bus/usb/ohci/iface.h (revision cc34f5f07a9c1f150a83050a986595ea7f21f3d5) +++ (revision ) @@ -1,45 +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 drvusbohci - * @{ - */ -/** @file - * Common OHCI definitions. - */ -#ifndef DRV_OHCI_IFACE_H -#define DRV_OHCI_IFACE_H - -#include - -extern usbhc_iface_t hc_iface; - -#endif -/** - * @} - */ - Index: uspace/drv/bus/usb/ohci/ohci.c =================================================================== --- uspace/drv/bus/usb/ohci/ohci.c (revision cc34f5f07a9c1f150a83050a986595ea7f21f3d5) +++ uspace/drv/bus/usb/ohci/ohci.c (revision 09ace19264532b52287b4ee10cb23e6d9c1dcff8) @@ -42,5 +42,4 @@ #include "ohci.h" -#include "iface.h" #include "pci.h" #include "hc.h"