Index: uspace/drv/usbhid/Makefile =================================================================== --- uspace/drv/usbhid/Makefile (revision a6610d45ae7feea1b33a3df019a3a86504051cf5) +++ uspace/drv/usbhid/Makefile (revision e3b5129ebae0dc9d7a8939f8c8b2bd713853b716) @@ -46,4 +46,5 @@ generic/hiddev.c \ mouse/mousedev.c \ + lgtch-ultrax/lgtch-ultrax.c \ $(STOLEN_LAYOUT_SOURCES) Index: uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c =================================================================== --- uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c (revision e3b5129ebae0dc9d7a8939f8c8b2bd713853b716) +++ uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c (revision e3b5129ebae0dc9d7a8939f8c8b2bd713853b716) @@ -0,0 +1,102 @@ +/* + * 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 Logitech UltraX Keyboard sample driver. + */ + + +#include "lgtch-ultrax.h" +#include "../usbhid.h" + +#include +#include +#include +#include + +#define NAME "lgtch-ultrax" + +/*----------------------------------------------------------------------------*/ + +static void usb_lgtch_process_keycodes(const uint8_t *key_codes, size_t count, + uint8_t report_id, void *arg); + +static const usb_hid_report_in_callbacks_t usb_lgtch_parser_callbacks = { + .keyboard = usb_lgtch_process_keycodes +}; + +/*----------------------------------------------------------------------------*/ + +static void usb_lgtch_process_keycodes(const uint8_t *key_codes, size_t count, + uint8_t report_id, void *arg) +{ + // TODO: checks + + usb_log_debug(NAME " Got keys from parser (report id: %u): %s\n", + report_id, usb_debug_str_buffer(key_codes, count, 0)); +} + +/*----------------------------------------------------------------------------*/ + +bool usb_lgtch_polling_callback(struct usb_hid_dev *hid_dev, + uint8_t *buffer, size_t buffer_size) +{ + // TODO: checks + + usb_log_debug(NAME " usb_lgtch_polling_callback(%p, %p, %zu)\n", + hid_dev, buffer, buffer_size); + + usb_log_debug(NAME " Calling usb_hid_parse_report() with " + "buffer %s\n", usb_debug_str_buffer(buffer, buffer_size, 0)); + + usb_hid_report_path_t *path = usb_hid_report_path(); + usb_hid_report_path_append_item(path, 0xc, 0); + usb_hid_report_path_set_report_id(path, 1); + + int rc = usb_hid_parse_report(hid_dev->parser, buffer, + buffer_size, path, + USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, + &usb_lgtch_parser_callbacks, hid_dev); + + usb_hid_report_path_free(path); + + if (rc != EOK) { + usb_log_warning("Error in usb_hid_boot_keyboard_input_report():" + "%s\n", str_error(rc)); + } + + return true; +} + +/** + * @} + */ Index: uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.h =================================================================== --- uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.h (revision e3b5129ebae0dc9d7a8939f8c8b2bd713853b716) +++ uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.h (revision e3b5129ebae0dc9d7a8939f8c8b2bd713853b716) @@ -0,0 +1,61 @@ +/* + * 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 Logitech UltraX Keyboard sample driver. + */ + +#ifndef USB_HID_LGTCH_ULTRAX_H_ +#define USB_HID_LGTCH_ULTRAX_H_ + +#include + +struct usb_hid_dev; +//struct usb_hid_subdriver_mapping; + +/*----------------------------------------------------------------------------*/ + +//extern struct usb_hid_subdriver_mapping usb_lgtch_mapping; + +/*----------------------------------------------------------------------------*/ + +//int usb_lgtch_init(struct usb_hid_dev *hid_dev); + +bool usb_lgtch_polling_callback(struct usb_hid_dev *hid_dev, uint8_t *buffer, + size_t buffer_size); + +/*----------------------------------------------------------------------------*/ + +#endif // USB_HID_LGTCH_ULTRAX_H_ + +/** + * @} + */ Index: uspace/drv/usbhid/subdrivers.c =================================================================== --- uspace/drv/usbhid/subdrivers.c (revision a6610d45ae7feea1b33a3df019a3a86504051cf5) +++ uspace/drv/usbhid/subdrivers.c (revision e3b5129ebae0dc9d7a8939f8c8b2bd713853b716) @@ -37,6 +37,13 @@ #include "usb/classes/hidut.h" +#include "lgtch-ultrax/lgtch-ultrax.h" + static usb_hid_subdriver_usage_t path_kbd[] = { {USB_HIDUT_PAGE_KEYBOARD, 0}, + {0, 0} +}; + +static usb_hid_subdriver_usage_t lgtch_path[] = { + {0xc, 0}, {0, 0} }; @@ -45,4 +52,5 @@ { path_kbd, + -1, USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, @@ -57,5 +65,19 @@ }, - {NULL, 0, 0, 0, {NULL, NULL, NULL, NULL}} + { + lgtch_path, + 1, + USB_HID_PATH_COMPARE_END + | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, + 0x046d, + 0xc30e, + { + .init = NULL, + .deinit = NULL, + .poll = usb_lgtch_polling_callback, + .poll_end = NULL + } + }, + {NULL, -1, 0, 0, 0, {NULL, NULL, NULL, NULL}} }; Index: uspace/drv/usbhid/subdrivers.h =================================================================== --- uspace/drv/usbhid/subdrivers.h (revision a6610d45ae7feea1b33a3df019a3a86504051cf5) +++ uspace/drv/usbhid/subdrivers.h (revision e3b5129ebae0dc9d7a8939f8c8b2bd713853b716) @@ -54,4 +54,5 @@ typedef struct usb_hid_subdriver_mapping { const usb_hid_subdriver_usage_t *usage_path; + int report_id; int compare; uint16_t vendor_id; Index: uspace/drv/usbhid/usbhid.c =================================================================== --- uspace/drv/usbhid/usbhid.c (revision a6610d45ae7feea1b33a3df019a3a86504051cf5) +++ uspace/drv/usbhid/usbhid.c (revision e3b5129ebae0dc9d7a8939f8c8b2bd713853b716) @@ -164,8 +164,8 @@ static bool usb_hid_path_matches(usb_hid_dev_t *hid_dev, - const usb_hid_subdriver_usage_t *path, int compare) + const usb_hid_subdriver_mapping_t *mapping) { assert(hid_dev != NULL); - assert(path != NULL); + assert(mapping != NULL); usb_hid_report_path_t *usage_path = usb_hid_report_path(); @@ -175,7 +175,9 @@ } int i = 0; - while (path[i].usage != 0 || path[i].usage_page != 0) { + while (mapping->usage_path[i].usage != 0 + || mapping->usage_path[i].usage_page != 0) { if (usb_hid_report_path_append_item(usage_path, - path[i].usage_page, path[i].usage) != EOK) { + mapping->usage_path[i].usage_page, + mapping->usage_path[i].usage) != EOK) { usb_log_debug("Failed to append to usage path.\n"); usb_hid_report_path_free(usage_path); @@ -185,9 +187,14 @@ } + if (mapping->report_id >= 0) { + usb_hid_report_path_set_report_id(usage_path, + mapping->report_id); + } + assert(hid_dev->parser != NULL); - usb_log_debug("Compare flags: %d\n", compare); + usb_log_debug("Compare flags: %d\n", mapping->compare); size_t size = usb_hid_report_input_length(hid_dev->parser, usage_path, - compare); + mapping->compare); usb_log_debug("Size of the input report: %d\n", size); @@ -273,6 +280,5 @@ if (mapping->usage_path != NULL) { usb_log_debug("Comparing device against usage path.\n"); - if (usb_hid_path_matches(hid_dev, - mapping->usage_path, mapping->compare)) { + if (usb_hid_path_matches(hid_dev, mapping)) { // does not matter if IDs were matched matched = true;