Index: uspace/drv/usbhid/Makefile =================================================================== --- uspace/drv/usbhid/Makefile (revision 82e8861198aaeca72652a5c12ec48a9cfe1b3b32) +++ uspace/drv/usbhid/Makefile (revision dc4c19eec7ab88d6c2f595df00a7895fce1509fd) @@ -44,4 +44,5 @@ kbd/kbdrepeat.c \ generic/hiddev.c \ + mouse/mousedev.c \ $(STOLEN_LAYOUT_SOURCES) Index: uspace/drv/usbhid/generic/hiddev.c =================================================================== --- uspace/drv/usbhid/generic/hiddev.c (revision 82e8861198aaeca72652a5c12ec48a9cfe1b3b32) +++ uspace/drv/usbhid/generic/hiddev.c (revision dc4c19eec7ab88d6c2f595df00a7895fce1509fd) @@ -57,5 +57,6 @@ size_t buffer_size, void *arg) { - usb_log_debug("usb_hid_polling_callback()\n"); + usb_log_debug("usb_hid_polling_callback(%p, %p, %zu, %p)\n", + dev, buffer, buffer_size, arg); usb_debug_str_buffer(buffer, buffer_size, 0); return true; Index: uspace/drv/usbhid/generic/hiddev.h =================================================================== --- uspace/drv/usbhid/generic/hiddev.h (revision 82e8861198aaeca72652a5c12ec48a9cfe1b3b32) +++ uspace/drv/usbhid/generic/hiddev.h (revision dc4c19eec7ab88d6c2f595df00a7895fce1509fd) @@ -34,6 +34,6 @@ */ -#ifndef USB_HIDD_H_ -#define USB_HIDD_H_ +#ifndef USB_HIDDDEV_H_ +#define USB_HIDDDEV_H_ #include @@ -47,5 +47,5 @@ size_t buffer_size, void *arg); -#endif // USB_HIDD_H_ +#endif // USB_HIDDDEV_H_ /** Index: uspace/drv/usbhid/kbd/kbddev.c =================================================================== --- uspace/drv/usbhid/kbd/kbddev.c (revision 82e8861198aaeca72652a5c12ec48a9cfe1b3b32) +++ uspace/drv/usbhid/kbd/kbddev.c (revision dc4c19eec7ab88d6c2f595df00a7895fce1509fd) @@ -238,5 +238,5 @@ * @param icall Call data. */ -void default_connection_handler(ddf_fun_t *fun, +static void default_connection_handler(ddf_fun_t *fun, ipc_callid_t icallid, ipc_call_t *icall) { Index: uspace/drv/usbhid/kbd/kbddev.h =================================================================== --- uspace/drv/usbhid/kbd/kbddev.h (revision 82e8861198aaeca72652a5c12ec48a9cfe1b3b32) +++ uspace/drv/usbhid/kbd/kbddev.h (revision dc4c19eec7ab88d6c2f595df00a7895fce1509fd) @@ -65,8 +65,4 @@ */ typedef struct usb_kbd_t { - /** Structure holding generic USB device information. */ - //usbhid_dev_t *hid_dev; - //usb_device_t *usb_dev; - /** Currently pressed keys (not translated to key codes). */ uint8_t *keys; @@ -91,10 +87,4 @@ fibril_mutex_t *repeat_mtx; - /** Report descriptor. */ - //uint8_t *report_desc; - - /** Report descriptor size. */ - //size_t report_desc_size; - uint8_t *output_buffer; @@ -106,7 +96,4 @@ int32_t *led_data; - - /** HID Report parser. */ - //usb_hid_report_parser_t *parser; /** State of the structure (for checking before use). @@ -121,14 +108,4 @@ /*----------------------------------------------------------------------------*/ -//enum { -// USB_KBD_POLL_EP_NO = 0, -// USB_HID_POLL_EP_NO = 1, -// USB_KBD_POLL_EP_COUNT = 2 -//}; - -//usb_endpoint_description_t *usb_kbd_endpoints[USB_KBD_POLL_EP_COUNT + 1]; - -//ddf_dev_ops_t keyboard_ops; - usb_endpoint_description_t usb_hid_kbd_poll_endpoint_description; @@ -138,13 +115,8 @@ /*----------------------------------------------------------------------------*/ -//usb_kbd_t *usb_kbd_new(void); - int usb_kbd_init(struct usb_hid_dev_t *hid_dev); bool usb_kbd_polling_callback(usb_device_t *dev, uint8_t *buffer, size_t buffer_size, void *arg); - -//void usb_kbd_polling_ended_callback(usb_device_t *dev, bool reason, -// void *arg); int usb_kbd_is_initialized(const usb_kbd_t *kbd_dev); @@ -157,5 +129,4 @@ int type, unsigned int key); - void usb_kbd_deinit(struct usb_hid_dev_t *hid_dev); Index: uspace/drv/usbhid/mouse/mousedev.c =================================================================== --- uspace/drv/usbhid/mouse/mousedev.c (revision dc4c19eec7ab88d6c2f595df00a7895fce1509fd) +++ uspace/drv/usbhid/mouse/mousedev.c (revision dc4c19eec7ab88d6c2f595df00a7895fce1509fd) @@ -0,0 +1,325 @@ +/* + * Copyright (c) 2011 Lubos Slovak, 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 drvusbhid + * @{ + */ +/** + * @file + * USB Mouse driver API. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "mousedev.h" +#include "../usbhid.h" + +/*----------------------------------------------------------------------------*/ + +usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description = { + .transfer_type = USB_TRANSFER_INTERRUPT, + .direction = USB_DIRECTION_IN, + .interface_class = USB_CLASS_HID, + .interface_subclass = USB_HID_SUBCLASS_BOOT, + .interface_protocol = USB_HID_PROTOCOL_MOUSE, + .flags = 0 +}; + +const char *HID_MOUSE_FUN_NAME = "mouse"; +const char *HID_MOUSE_CLASS_NAME = "mouse"; + +/** Default idle rate for mouses. */ +static const uint8_t IDLE_RATE = 0; + +/*----------------------------------------------------------------------------*/ + +enum { + USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE = 63 +}; + +static const uint8_t USB_MOUSE_BOOT_REPORT_DESCRIPTOR[ + USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE] = { + 0x05, 0x01, // USAGE_PAGE (Generic Desktop) + 0x09, 0x02, // USAGE (Mouse) + 0xa1, 0x01, // COLLECTION (Application) + 0x09, 0x01, // USAGE (Pointer) + 0xa1, 0x00, // COLLECTION (Physical) + 0x95, 0x03, // REPORT_COUNT (3) + 0x75, 0x01, // REPORT_SIZE (1) + 0x05, 0x09, // USAGE_PAGE (Button) + 0x19, 0x01, // USAGE_MINIMUM (Button 1) + 0x29, 0x03, // USAGE_MAXIMUM (Button 3) + 0x15, 0x00, // LOGICAL_MINIMUM (0) + 0x25, 0x01, // LOGICAL_MAXIMUM (1) + 0x81, 0x02, // INPUT (Data,Var,Abs) + 0x95, 0x01, // REPORT_COUNT (1) + 0x75, 0x05, // REPORT_SIZE (5) + 0x81, 0x01, // INPUT (Cnst) + 0x75, 0x08, // REPORT_SIZE (8) + 0x95, 0x02, // REPORT_COUNT (2) + 0x05, 0x01, // USAGE_PAGE (Generic Desktop) + 0x09, 0x30, // USAGE (X) + 0x09, 0x31, // USAGE (Y) + 0x15, 0x81, // LOGICAL_MINIMUM (-127) + 0x25, 0x7f, // LOGICAL_MAXIMUM (127) + 0x81, 0x06, // INPUT (Data,Var,Rel) + 0xc0, // END_COLLECTION + 0xc0 // END_COLLECTION +}; + +/*----------------------------------------------------------------------------*/ + +/** Default handler for IPC methods not handled by DDF. + * + * @param fun Device function handling the call. + * @param icallid Call id. + * @param icall Call data. + */ +static void default_connection_handler(ddf_fun_t *fun, + ipc_callid_t icallid, ipc_call_t *icall) +{ + sysarg_t method = IPC_GET_IMETHOD(*icall); + + usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data; + + if (hid_dev == NULL || hid_dev->data == NULL) { + async_answer_0(icallid, EINVAL); + return; + } + + assert(hid_dev != NULL); + assert(hid_dev->data != NULL); + usb_mouse_t *mouse_dev = (usb_mouse_t *)hid_dev->data; + + if (method == IPC_M_CONNECT_TO_ME) { + int callback = IPC_GET_ARG5(*icall); + + if (mouse_dev->console_phone != -1) { + async_answer_0(icallid, ELIMIT); + return; + } + + mouse_dev->console_phone = callback; + usb_log_debug("Console phone to mouse set ok (%d).\n", callback); + async_answer_0(icallid, EOK); + return; + } + + async_answer_0(icallid, EINVAL); +} + +/*----------------------------------------------------------------------------*/ + +static usb_mouse_t *usb_mouse_new(void) +{ + usb_mouse_t *mouse = calloc(1, sizeof(usb_mouse_t)); + if (mouse == NULL) { + return NULL; + } + mouse->console_phone = -1; + + return mouse; +} + +/*----------------------------------------------------------------------------*/ + +static void usb_mouse_free(usb_mouse_t **mouse_dev) +{ + if (mouse_dev == NULL || *mouse_dev == NULL) { + return; + } + + // hangup phone to the console + async_hangup((*mouse_dev)->console_phone); + + free(*mouse_dev); + *mouse_dev = NULL; +} + +/*----------------------------------------------------------------------------*/ + +static bool usb_mouse_process_boot_report(usb_mouse_t *mouse_dev, + uint8_t *buffer, size_t buffer_size) +{ + usb_log_debug2("got buffer: %s.\n", + usb_debug_str_buffer(buffer, buffer_size, 0)); + + uint8_t butt = buffer[0]; + char str_buttons[4] = { + butt & 1 ? '#' : '.', + butt & 2 ? '#' : '.', + butt & 4 ? '#' : '.', + 0 + }; + + int shift_x = ((int) buffer[1]) - 127; + int shift_y = ((int) buffer[2]) - 127; + int wheel = ((int) buffer[3]) - 127; + + if (buffer[1] == 0) { + shift_x = 0; + } + if (buffer[2] == 0) { + shift_y = 0; + } + if (buffer[3] == 0) { + wheel = 0; + } + + if (mouse_dev->console_phone >= 0) { + usb_log_debug("Console phone: %d\n", mouse_dev->console_phone); + if ((shift_x != 0) || (shift_y != 0)) { + /* FIXME: guessed for QEMU */ + async_req_2_0(mouse_dev->console_phone, + MEVENT_MOVE, + - shift_x / 10, - shift_y / 10); + } else { + usb_log_error("No move reported\n"); + } + if (butt) { + /* FIXME: proper button clicking. */ + async_req_2_0(mouse_dev->console_phone, + MEVENT_BUTTON, 1, 1); + async_req_2_0(mouse_dev->console_phone, + MEVENT_BUTTON, 1, 0); + } + } else { + usb_log_error("No console phone in mouse!!\n"); + } + + usb_log_debug("buttons=%s dX=%+3d dY=%+3d wheel=%+3d\n", + str_buttons, shift_x, shift_y, wheel); + + /* Guess. */ + //async_usleep(1000); + // no sleep right now + + return true; +} + +/*----------------------------------------------------------------------------*/ + +int usb_mouse_init(struct usb_hid_dev_t *hid_dev) +{ + usb_log_debug("Initializing HID/Mouse structure...\n"); + + if (hid_dev == NULL) { + usb_log_error("Failed to init keyboard structure: no structure" + " given.\n"); + return EINVAL; + } + + usb_mouse_t *mouse_dev = usb_mouse_new(); + if (mouse_dev == NULL) { + usb_log_error("Error while creating USB/HID Mouse device " + "structure.\n"); + return ENOMEM; + } + + // save the Mouse device structure into the HID device structure + hid_dev->data = mouse_dev; + + // set handler for incoming calls + // TODO: now does this behave when we have more such handlers in + // one actual driver?? + hid_dev->ops.default_handler = default_connection_handler; + + // TODO: how to know if the device supports the request??? +// usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, +// hid_dev->usb_dev->interface_no, IDLE_RATE); + + return EOK; +} + +/*----------------------------------------------------------------------------*/ + +bool usb_mouse_polling_callback(usb_device_t *dev, uint8_t *buffer, + size_t buffer_size, void *arg) +{ + usb_log_debug("usb_mouse_polling_callback()\n"); + usb_debug_str_buffer(buffer, buffer_size, 0); + + if (arg == NULL) { + usb_log_error("Missing argument to the mouse polling callback." + "\n"); + return false; + } + + usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg; + if (hid_dev->data == NULL) { + usb_log_error("Wrong argument to the mouse polling callback." + "\n"); + return false; + } + usb_mouse_t *mouse_dev = (usb_mouse_t *)hid_dev->data; + + return usb_mouse_process_boot_report(mouse_dev, buffer, buffer_size); +} + +/*----------------------------------------------------------------------------*/ + +void usb_mouse_deinit(struct usb_hid_dev_t *hid_dev) +{ + usb_mouse_free((usb_mouse_t **)&hid_dev->data); +} + +/*----------------------------------------------------------------------------*/ + +int usb_mouse_set_boot_protocol(struct usb_hid_dev_t *hid_dev) +{ + int rc = usb_hid_parse_report_descriptor(hid_dev->parser, + USB_MOUSE_BOOT_REPORT_DESCRIPTOR, + USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE); + + if (rc != EOK) { + usb_log_error("Failed to parse boot report descriptor: %s\n", + str_error(rc)); + return rc; + } + + rc = usbhid_req_set_protocol(&hid_dev->usb_dev->ctrl_pipe, + hid_dev->usb_dev->interface_no, USB_HID_PROTOCOL_BOOT); + + if (rc != EOK) { + usb_log_warning("Failed to set boot protocol to the device: " + "%s\n", str_error(rc)); + return rc; + } + + return EOK; +} + +/** + * @} + */ Index: uspace/drv/usbhid/mouse/mousedev.h =================================================================== --- uspace/drv/usbhid/mouse/mousedev.h (revision dc4c19eec7ab88d6c2f595df00a7895fce1509fd) +++ uspace/drv/usbhid/mouse/mousedev.h (revision dc4c19eec7ab88d6c2f595df00a7895fce1509fd) @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2011 Lubos Slovak + * 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 drvusbhid + * @{ + */ +/** @file + * USB Mouse driver API. + */ + +#ifndef USB_MOUSEDEV_H_ +#define USB_MOUSEDEV_H_ + +#include + +struct usb_hid_dev_t; + +/*----------------------------------------------------------------------------*/ + +/** Container for USB mouse device. */ +typedef struct { + ///** Polling interval in microseconds. */ + //suseconds_t poll_interval_us; + /** IPC phone to console (consumer). */ + int console_phone; +} usb_mouse_t; + +/*----------------------------------------------------------------------------*/ + +usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description; + +const char *HID_MOUSE_FUN_NAME; +const char *HID_MOUSE_CLASS_NAME; + +/*----------------------------------------------------------------------------*/ + +int usb_mouse_init(struct usb_hid_dev_t *hid_dev); + +bool usb_mouse_polling_callback(usb_device_t *dev, uint8_t *buffer, + size_t buffer_size, void *arg); + +void usb_mouse_deinit(struct usb_hid_dev_t *hid_dev); + +int usb_mouse_set_boot_protocol(struct usb_hid_dev_t *hid_dev); + +/*----------------------------------------------------------------------------*/ + +#endif // USB_MOUSEDEV_H_ + +/** + * @} + */ Index: uspace/drv/usbhid/usbhid.c =================================================================== --- uspace/drv/usbhid/usbhid.c (revision 82e8861198aaeca72652a5c12ec48a9cfe1b3b32) +++ uspace/drv/usbhid/usbhid.c (revision dc4c19eec7ab88d6c2f595df00a7895fce1509fd) @@ -47,16 +47,7 @@ #include "kbd/kbddev.h" #include "generic/hiddev.h" - -/*----------------------------------------------------------------------------*/ - -/** Mouse polling endpoint description for boot protocol class. */ -static usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description = { - .transfer_type = USB_TRANSFER_INTERRUPT, - .direction = USB_DIRECTION_IN, - .interface_class = USB_CLASS_HID, - .interface_subclass = USB_HID_SUBCLASS_BOOT, - .interface_protocol = USB_HID_PROTOCOL_MOUSE, - .flags = 0 -}; +#include "mouse/mousedev.h" + +/*----------------------------------------------------------------------------*/ /* Array of endpoints expected on the device, NULL terminated. */ @@ -68,7 +59,4 @@ }; -static const char *HID_MOUSE_FUN_NAME = "mouse"; -static const char *HID_MOUSE_CLASS_NAME = "mouse"; - /*----------------------------------------------------------------------------*/ @@ -96,13 +84,4 @@ /*----------------------------------------------------------------------------*/ -static bool usb_dummy_polling_callback(usb_device_t *dev, uint8_t *buffer, - size_t buffer_size, void *arg) -{ - usb_log_debug("Dummy polling callback.\n"); - return false; -} - -/*----------------------------------------------------------------------------*/ - static int usb_hid_check_pipes(usb_hid_dev_t *hid_dev, usb_device_t *dev) { @@ -125,5 +104,5 @@ // set the polling callback - hid_dev->poll_callback = usb_dummy_polling_callback; + hid_dev->poll_callback = usb_mouse_polling_callback; } else if (dev->pipes[USB_HID_GENERIC_POLL_EP_NO].present) { @@ -161,15 +140,13 @@ hid_dev->parser); - if (rc != EOK) { + if (rc != EOK || hid_dev->device_type == USB_HID_PROTOCOL_MOUSE) { usb_log_warning("Could not process report descriptor.\n"); if (hid_dev->device_type == USB_HID_PROTOCOL_KEYBOARD) { usb_log_warning("Falling back to boot protocol.\n"); - rc = usb_kbd_set_boot_protocol(hid_dev); - } else if (hid_dev->device_type == USB_HID_PROTOCOL_MOUSE) { - usb_log_warning("No boot protocol for mouse yet.\n"); - rc = ENOTSUP; + usb_log_warning("Falling back to boot protocol.\n"); + rc = usb_mouse_set_boot_protocol(hid_dev); } } @@ -222,8 +199,11 @@ break; case USB_HID_PROTOCOL_MOUSE: - break; - default: -// usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, -// hid_dev->usb_dev->interface_no, 0); + rc = usb_mouse_init(hid_dev); + if (rc != EOK) { + usb_log_warning("Failed to initialize Mouse structure." + "\n"); + } + break; + default: break; } @@ -291,4 +271,5 @@ break; case USB_HID_PROTOCOL_MOUSE: + usb_mouse_deinit(*hid_dev); break; default: Index: uspace/drv/usbhid/usbhid.ma =================================================================== --- uspace/drv/usbhid/usbhid.ma (revision 82e8861198aaeca72652a5c12ec48a9cfe1b3b32) +++ uspace/drv/usbhid/usbhid.ma (revision dc4c19eec7ab88d6c2f595df00a7895fce1509fd) @@ -1,3 +1,3 @@ 100 usb&interface&class=HID&subclass=0x01&protocol=0x01 -100 usb&interface&class=HID&subclass=0x01&protocol=0x02 +1000 usb&interface&class=HID&subclass=0x01&protocol=0x02 100 usb&interface&class=HID