Index: uspace/app/vuhid/Makefile =================================================================== --- uspace/app/vuhid/Makefile (revision 286286c5dfab310b2f006338cff4f2898bce1ca2) +++ uspace/app/vuhid/Makefile (revision 5dd4f77a06525a5efc7df7c0c4f192abe9159b81) @@ -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 286286c5dfab310b2f006338cff4f2898bce1ca2) +++ uspace/app/vuhid/hids/bootkbd.c (revision 5dd4f77a06525a5efc7df7c0c4f192abe9159b81) @@ -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 5dd4f77a06525a5efc7df7c0c4f192abe9159b81) +++ uspace/app/vuhid/hids/logitech_wireless.c (revision 5dd4f77a06525a5efc7df7c0c4f192abe9159b81) @@ -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 286286c5dfab310b2f006338cff4f2898bce1ca2) +++ uspace/app/vuhid/ifaces.c (revision 5dd4f77a06525a5efc7df7c0c4f192abe9159b81) @@ -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 5dd4f77a06525a5efc7df7c0c4f192abe9159b81) +++ uspace/app/vuhid/life.c (revision 5dd4f77a06525a5efc7df7c0c4f192abe9159b81) @@ -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 286286c5dfab310b2f006338cff4f2898bce1ca2) +++ uspace/app/vuhid/virthid.h (revision 5dd4f77a06525a5efc7df7c0c4f192abe9159b81) @@ -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 /**