Index: uspace/app/vuhid/Makefile =================================================================== --- uspace/app/vuhid/Makefile (revision f1a9e87dc2f053adc58f8f2e58688b6509c4d1b3) +++ uspace/app/vuhid/Makefile (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -47,5 +47,6 @@ SOURCES_INTERFACES = \ - hids/bootkbd.c + hids/bootkbd.c \ + hids/logitech_wireless.c SOURCES = \ @@ -53,4 +54,5 @@ device.c \ ifaces.c \ + life.c \ stdreq.c \ $(SOURCES_INTERFACES) Index: uspace/app/vuhid/hids/bootkbd.c =================================================================== --- uspace/app/vuhid/hids/bootkbd.c (revision f1a9e87dc2f053adc58f8f2e58688b6509c4d1b3) +++ uspace/app/vuhid/hids/bootkbd.c (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -93,34 +93,11 @@ 0, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -static size_t in_data_count = sizeof(in_data)/INPUT_SIZE; -// FIXME - locking -static size_t in_data_position = 0; - -static int on_data_in(vuhid_interface_t *iface, - void *buffer, size_t buffer_size, size_t *act_buffer_size) -{ - static size_t last_pos = (size_t) -1; - size_t pos = in_data_position; - if (pos >= in_data_count) { - return EBADCHECKSUM; - } - - if (last_pos == pos) { - return ENAK; - } - - if (buffer_size > INPUT_SIZE) { - buffer_size = INPUT_SIZE; - } - - if (act_buffer_size != NULL) { - *act_buffer_size = buffer_size; - } - - memcpy(buffer, in_data + pos * INPUT_SIZE, buffer_size); - last_pos = pos; - - return EOK; -} +static vuhid_interface_life_t boot_life = { + .data_in = in_data, + .data_in_count = sizeof(in_data)/INPUT_SIZE, + .data_in_pos_change_delay = 500, + .msg_born = "Boot keyboard comes to life...", + .msg_die = "Boot keyboard died." +}; static int on_data_out(vuhid_interface_t *iface, @@ -141,17 +118,4 @@ } - -static void live(vuhid_interface_t *iface) -{ - async_usleep(1000 * 1000 * 5); - usb_log_debug("Boot keyboard comes to life...\n"); - while (in_data_position < in_data_count) { - async_usleep(1000 * 500); - in_data_position++; - } - usb_log_debug("Boot keyboard died.\n"); -} - - vuhid_interface_t vuhid_interface_bootkbd = { .id = "boot", @@ -164,11 +128,12 @@ .in_data_size = INPUT_SIZE, - .on_data_in = on_data_in, + .on_data_in = interface_live_on_data_in, .out_data_size = 1, .on_data_out = on_data_out, - .live = live, + .live = interface_life_live, + .interface_data = &boot_life, .vuhid_data = NULL }; Index: uspace/app/vuhid/hids/logitech_wireless.c =================================================================== --- uspace/app/vuhid/hids/logitech_wireless.c (revision eb87adbd9708519e94619c1596800a813b945e66) +++ uspace/app/vuhid/hids/logitech_wireless.c (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -0,0 +1,99 @@ +/* + * 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 usbvirthid + * @{ + */ +/** @file + * Logitech wireless mouse-keyboard combo simulation (see issue 349). + */ +#include "../virthid.h" +#include +#include +#include +#include + +static uint8_t iface1_report_descriptor[] = { + 0x05, 0x01, 0x09, 0x02, 0xA1, 0x01, 0x85, 0x02, 0x09, 0x01, + 0xA1, 0x00, 0x05, 0x09, 0x19, 0x01, 0x29, 0x10, 0x15, 0x00, + 0x25, 0x01, 0x95, 0x10, 0x75, 0x01, 0x81, 0x02, 0x05, 0x01, + 0x16, 0x01, 0xF8, 0x26, 0xFF, 0x07, 0x75, 0x0C, 0x95, 0x02, + 0x09, 0x30, 0x09, 0x31, 0x81, 0x06, 0x15, 0x81, 0x25, 0x7F, + 0x75, 0x08, 0x95, 0x01, 0x09, 0x38, 0x81, 0x06, 0x05, 0x0C, + 0x0A, 0x38, 0x02, 0x95, 0x01, 0x81, 0x06, 0xC0, 0xC0, 0x05, + 0x0C, 0x09, 0x01, 0xA1, 0x01, 0x85, 0x03, 0x75, 0x10, 0x95, + 0x02, 0x15, 0x01, 0x26, 0x8C, 0x02, 0x19, 0x01, 0x2A, 0x8C, + 0x02, 0x81, 0x00, 0xC0, 0x05, 0x01, 0x09, 0x80, 0xA1, 0x01, + 0x85, 0x04, 0x75, 0x02, 0x95, 0x01, 0x15, 0x01, 0x25, 0x03, + 0x09, 0x82, 0x09, 0x81, 0x09, 0x83, 0x81, 0x60, 0x75, 0x06, + 0x81, 0x03, 0xC0, 0x06, 0xBC, 0xFF, 0x09, 0x88, 0xA1, 0x01, + 0x85, 0x08, 0x19, 0x01, 0x29, 0xFF, 0x15, 0x01, 0x26, 0xFF, + 0x00, 0x75, 0x08, 0x95, 0x01, 0x81, 0x00, 0xC0 +}; +#define iface1_input_size 8 +static uint8_t iface1_in_data[] = { + /*0, 0, 0, 0, 0, 0, 0, 0, + 0, 9, 0, 0, 0, 0, 0, 0, + 0, 0, 9, 0, 0, 0, 0, 0, + 0, 9, 9, 0, 0, 0, 0, 0,*/ + 0, 0, 0, 0, 0, 0, 0, 0 +}; + +static vuhid_interface_life_t iface1_life = { + .data_in = iface1_in_data, + .data_in_count = sizeof(iface1_in_data)/iface1_input_size, + .data_in_pos_change_delay = 50, + .msg_born = "Mouse of Logitech Unifying Receiver comes to life...", + .msg_die = "Mouse of Logitech Unifying Receiver disconnected." +}; + + +vuhid_interface_t vuhid_interface_logitech_wireless_1 = { + .id = "lw1", + .name = "Logitech Unifying Receiver, interface 1 (mouse)", + .usb_subclass = USB_HID_SUBCLASS_BOOT, + .usb_protocol = USB_HID_PROTOCOL_MOUSE, + + .report_descriptor = iface1_report_descriptor, + .report_descriptor_size = sizeof(iface1_report_descriptor), + + .in_data_size = iface1_input_size, + .on_data_in = interface_live_on_data_in, + + .out_data_size = 0, + .on_data_out = NULL, + + .live = interface_life_live, + + .interface_data = &iface1_life, + .vuhid_data = NULL +}; + +/** + * @} + */ Index: uspace/app/vuhid/ifaces.c =================================================================== --- uspace/app/vuhid/ifaces.c (revision f1a9e87dc2f053adc58f8f2e58688b6509c4d1b3) +++ uspace/app/vuhid/ifaces.c (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -38,7 +38,9 @@ extern vuhid_interface_t vuhid_interface_bootkbd; +extern vuhid_interface_t vuhid_interface_logitech_wireless_1; vuhid_interface_t *available_hid_interfaces[] = { &vuhid_interface_bootkbd, + &vuhid_interface_logitech_wireless_1, NULL }; Index: uspace/app/vuhid/life.c =================================================================== --- uspace/app/vuhid/life.c (revision eb87adbd9708519e94619c1596800a813b945e66) +++ uspace/app/vuhid/life.c (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -0,0 +1,86 @@ +/* + * 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 usbvirthid + * @{ + */ +/** + * @file + * + */ +#include +#include +#include "virthid.h" + + +void interface_life_live(vuhid_interface_t *iface) +{ + vuhid_interface_life_t *data = iface->interface_data; + data->data_in_pos = 0; + data->data_in_last_pos = (size_t) -1; + async_usleep(1000 * 1000 * 5); + usb_log_debug("%s\n", data->msg_born); + while (data->data_in_pos < data->data_in_count) { + async_usleep(1000 * data->data_in_pos_change_delay); + // FIXME: proper locking + data->data_in_pos++; + } + usb_log_debug("%s\n", data->msg_die); +} + + + +int interface_live_on_data_in(vuhid_interface_t *iface, + void *buffer, size_t buffer_size, size_t *act_buffer_size) +{ + vuhid_interface_life_t *life = iface->interface_data; + size_t pos = life->data_in_pos; + if (pos >= life->data_in_count) { + return EBADCHECKSUM; + } + + if (pos == life->data_in_last_pos) { + return ENAK; + } + + if (buffer_size > iface->in_data_size) { + buffer_size = iface->in_data_size; + } + + if (act_buffer_size != NULL) { + *act_buffer_size = buffer_size; + } + + memcpy(buffer, life->data_in + pos * iface->in_data_size, buffer_size); + life->data_in_last_pos = pos; + + return EOK; +} + +/** @} + */ Index: uspace/app/vuhid/virthid.h =================================================================== --- uspace/app/vuhid/virthid.h (revision f1a9e87dc2f053adc58f8f2e58688b6509c4d1b3) +++ uspace/app/vuhid/virthid.h (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -82,4 +82,27 @@ typedef struct { + /** Buffer with data from device to the host. */ + uint8_t *data_in; + /** Number of items in @c data_in. + * The total size of @c data_in buffer shall be + * data_in_count * vuhid_interface_t.in_data_size. + */ + size_t data_in_count; + + /** Current position in the data buffer. */ + size_t data_in_pos; + /** Previous position. */ + size_t data_in_last_pos; + + /** Delay between transition to "next" input buffer (in ms). */ + size_t data_in_pos_change_delay; + + /** Message to print when interface becomes alive. */ + const char *msg_born; + /** Message to print when interface dies. */ + const char *msg_die; +} vuhid_interface_life_t; + +typedef struct { uint8_t length; uint8_t type; @@ -94,4 +117,8 @@ void wait_for_interfaces_death(usbvirt_device_t *); +void interface_life_live(vuhid_interface_t *); +int interface_live_on_data_in(vuhid_interface_t *, void *, size_t, size_t *); + + #endif /** Index: uspace/drv/bus/usb/ohci/iface.c =================================================================== --- uspace/drv/bus/usb/ohci/iface.c (revision eb87adbd9708519e94619c1596800a813b945e66) +++ uspace/drv/bus/usb/ohci/iface.c (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -0,0 +1,441 @@ +/* + * 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: uspace/drv/bus/usb/ohci/iface.h =================================================================== --- uspace/drv/bus/usb/ohci/iface.h (revision eb87adbd9708519e94619c1596800a813b945e66) +++ uspace/drv/bus/usb/ohci/iface.h (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -0,0 +1,45 @@ +/* + * 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/uhci/iface.c =================================================================== --- uspace/drv/bus/usb/uhci/iface.c (revision eb87adbd9708519e94619c1596800a813b945e66) +++ uspace/drv/bus/usb/uhci/iface.c (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -0,0 +1,405 @@ +/* + * 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 drvusbuhcihc + * @{ + */ +/** @file + * @brief UHCI driver hc interface implementation + */ +#include +#include + +#include +#include + +#include "iface.h" +#include "batch.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 = usb_endpoint_manager_get_ep(&(*hc)->ep_manager, + 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_debug2("%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); + const 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; +} +/*----------------------------------------------------------------------------*/ +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) +{ + assert(fun); + hc_t *hc = fun_to_hc(fun); + assert(hc); + const size_t size = max_packet_size; + usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, address); + if (speed >= USB_SPEED_MAX) { + speed = ep_speed; + } + usb_log_debug("Register endpoint %d:%d %s-%s %s %zuB %ums.\n", + address, endpoint, usb_str_transfer_type(transfer_type), + usb_str_direction(direction), usb_str_speed(speed), + max_packet_size, interval); + + return usb_endpoint_manager_add_ep(&hc->ep_manager, address, endpoint, + direction, transfer_type, speed, max_packet_size, size); +} +/*----------------------------------------------------------------------------*/ +static int unregister_endpoint( + ddf_fun_t *fun, usb_address_t address, + usb_endpoint_t endpoint, usb_direction_t direction) +{ + assert(fun); + hc_t *hc = fun_to_hc(fun); + assert(hc); + usb_log_debug("Unregister endpoint %d:%d %s.\n", + address, endpoint, usb_str_direction(direction)); + return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address, + endpoint, direction); +} +/*----------------------------------------------------------------------------*/ +/** Interrupt out transaction interface function + * + * @param[in] fun DDF function that was called. + * @param[in] target USB device to write to. + * @param[in] data Source of data. + * @param[in] size Size of data source. + * @param[in] callback Function to call on transaction completion + * @param[in] arg Additional for callback function. + * @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; + assert(batch); + assert(hc); + batch_interrupt_out(batch); + ret = hc_schedule(hc, batch); + if (ret != EOK) { + usb_transfer_batch_dispose(batch); + } + return ret; +} +/*----------------------------------------------------------------------------*/ +/** Interrupt in transaction interface function + * + * @param[in] fun DDF function that was called. + * @param[in] target USB device to write to. + * @param[out] data Data destination. + * @param[in] size Size of data source. + * @param[in] callback Function to call on transaction completion + * @param[in] arg Additional for callback function. + * @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; + assert(batch); + assert(hc); + batch_interrupt_in(batch); + ret = hc_schedule(hc, batch); + if (ret != EOK) { + usb_transfer_batch_dispose(batch); + } + return ret; +} +/*----------------------------------------------------------------------------*/ +/** Bulk out transaction interface function + * + * @param[in] fun DDF function that was called. + * @param[in] target USB device to write to. + * @param[in] data Source of data. + * @param[in] size Size of data source. + * @param[in] callback Function to call on transaction completion + * @param[in] arg Additional for callback function. + * @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; + assert(batch); + assert(hc); + batch_bulk_out(batch); + ret = hc_schedule(hc, batch); + if (ret != EOK) { + usb_transfer_batch_dispose(batch); + } + return ret; +} +/*----------------------------------------------------------------------------*/ +/** Bulk in transaction interface function + * + * @param[in] fun DDF function that was called. + * @param[in] target USB device to write to. + * @param[out] data Data destination. + * @param[in] size Size of data source. + * @param[in] callback Function to call on transaction completion + * @param[in] arg Additional for callback function. + * @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; + assert(batch); + assert(hc); + batch_bulk_in(batch); + ret = hc_schedule(hc, batch); + if (ret != EOK) { + usb_transfer_batch_dispose(batch); + } + return ret; +} +/*----------------------------------------------------------------------------*/ +/** Control write transaction interface function + * + * @param[in] fun DDF function that was called. + * @param[in] target USB device to write to. + * @param[in] setup_data Data to send with SETUP transfer. + * @param[in] setup_size Size of data to send with SETUP transfer (always 8B). + * @param[in] data Source of data. + * @param[in] size Size of data source. + * @param[in] callback Function to call on transaction completion. + * @param[in] arg Additional for callback function. + * @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; + assert(batch); + assert(hc); + 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; +} +/*----------------------------------------------------------------------------*/ +/** Control read transaction interface function + * + * @param[in] fun DDF function that was called. + * @param[in] target USB device to write to. + * @param[in] setup_data Data to send with SETUP packet. + * @param[in] setup_size Size of data to send with SETUP packet (should be 8B). + * @param[out] data Source of data. + * @param[in] size Size of data source. + * @param[in] callback Function to call on transaction completion. + * @param[in] arg Additional for callback function. + * @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; + assert(batch); + assert(hc); + 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: uspace/drv/bus/usb/uhci/iface.h =================================================================== --- uspace/drv/bus/usb/uhci/iface.h (revision eb87adbd9708519e94619c1596800a813b945e66) +++ uspace/drv/bus/usb/uhci/iface.h (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -0,0 +1,45 @@ +/* + * 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 drvusbuhcihc + * @{ + */ +/** @file + * @brief UHCI driver iface + */ +#ifndef DRV_UHCI_IFACE_H +#define DRV_UHCI_IFACE_H + +#include + +extern usbhc_iface_t hc_iface; + +#endif +/** + * @} + */ Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.c =================================================================== --- uspace/drv/bus/usb/usbhid/mouse/mousedev.c (revision f1a9e87dc2f053adc58f8f2e58688b6509c4d1b3) +++ uspace/drv/bus/usb/usbhid/mouse/mousedev.c (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -75,5 +75,4 @@ /** Default idle rate for mouses. */ static const uint8_t IDLE_RATE = 0; -static const size_t USB_MOUSE_BUTTON_COUNT = 3; /*----------------------------------------------------------------------------*/ @@ -397,4 +396,46 @@ /*----------------------------------------------------------------------------*/ +/** Get highest index of a button mentioned in given report. + * + * @param report HID report. + * @param report_id Report id we are interested in. + * @return Highest button mentioned in the report. + * @retval 1 No button was mentioned. + * + */ +static size_t usb_mouse_get_highest_button(usb_hid_report_t *report, uint8_t report_id) +{ + size_t highest_button = 0; + + usb_hid_report_path_t *path = usb_hid_report_path(); + usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0); + usb_hid_report_path_set_report_id(path, report_id); + + usb_hid_report_field_t *field = NULL; + + /* Break from within. */ + while (1) { + field = usb_hid_report_get_sibling( + report, field, path, + USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, + USB_HID_REPORT_TYPE_INPUT); + /* No more buttons? */ + if (field == NULL) { + break; + } + + size_t current_button = field->usage - field->usage_minimum; + if (current_button > highest_button) { + highest_button = current_button; + } + } + + usb_hid_report_path_free(path); + + return highest_button; +} + +/*----------------------------------------------------------------------------*/ + int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data) { @@ -414,13 +455,21 @@ } - mouse_dev->buttons = (int32_t *)calloc(USB_MOUSE_BUTTON_COUNT, - sizeof(int32_t)); + // FIXME: This may not be optimal since stupid hardware vendor may + // use buttons 1, 2, 3 and 6000 and we would allocate array of + // 6001*4B and use only 4 items in it. + // Since I doubt that hardware producers would do that, I think + // that the current solution is good enough. + /* Adding 1 because we will be accessing buttons[highest]. */ + mouse_dev->buttons_count = usb_mouse_get_highest_button(hid_dev->report, + hid_dev->report_id) + 1; + mouse_dev->buttons = calloc(mouse_dev->buttons_count, sizeof(int32_t)); if (mouse_dev->buttons == NULL) { - usb_log_fatal("No memory!\n"); + usb_log_error(NAME ": out of memory, giving up on device!\n"); free(mouse_dev); return ENOMEM; } - + + // save the Mouse device structure into the HID device structure *data = mouse_dev; Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.h =================================================================== --- uspace/drv/bus/usb/usbhid/mouse/mousedev.h (revision f1a9e87dc2f053adc58f8f2e58688b6509c4d1b3) +++ uspace/drv/bus/usb/usbhid/mouse/mousedev.h (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -50,5 +50,7 @@ async_sess_t *wheel_sess; + /* Mouse buttons statuses. */ int32_t *buttons; + size_t buttons_count; ddf_dev_ops_t ops; Index: uspace/drv/bus/usb/usbmast/scsi.h =================================================================== --- uspace/drv/bus/usb/usbmast/scsi.h (revision eb87adbd9708519e94619c1596800a813b945e66) +++ uspace/drv/bus/usb/usbmast/scsi.h (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -0,0 +1,54 @@ +/* + * 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 drvusbmast + * @{ + */ +/** @file + * SCSI related structures. + */ + +#ifndef USB_USBMAST_SCSI_H_ +#define USB_USBMAST_SCSI_H_ + +#include +#include + +typedef struct { + uint8_t op_code; + uint8_t lun_evpd; + uint8_t page_code; + uint16_t alloc_length; + uint8_t ctrl; +} __attribute__((packed)) scsi_cmd_inquiry_t; + +#endif + +/** + * @} + */ Index: uspace/drv/bus/usb/vhc/connhost.c =================================================================== --- uspace/drv/bus/usb/vhc/connhost.c (revision f1a9e87dc2f053adc58f8f2e58688b6509c4d1b3) +++ uspace/drv/bus/usb/vhc/connhost.c (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -440,5 +440,7 @@ int rc = vhc_virtdev_add_transfer(vhc, transfer); if (rc != EOK) { - free(transfer->setup_buffer); + if (transfer->setup_buffer != NULL) { + free(transfer->setup_buffer); + } free(transfer); return rc; Index: uspace/lib/usbhid/src/hidpath.c =================================================================== --- uspace/lib/usbhid/src/hidpath.c (revision f1a9e87dc2f053adc58f8f2e58688b6509c4d1b3) +++ uspace/lib/usbhid/src/hidpath.c (revision eb87adbd9708519e94619c1596800a813b945e66) @@ -76,7 +76,8 @@ int32_t usage_page, int32_t usage) { - usb_hid_report_usage_path_t *item; - - if(!(item=malloc(sizeof(usb_hid_report_usage_path_t)))) { + usb_hid_report_usage_path_t *item + = malloc(sizeof(usb_hid_report_usage_path_t)); + + if (item == NULL) { return ENOMEM; }