Index: uspace/drv/usbkbd/kbddev.c =================================================================== --- uspace/drv/usbkbd/kbddev.c (revision 2f4b3a44176313e40c4106704319c751b96ef337) +++ uspace/drv/usbkbd/kbddev.c (revision ad7bb42268707f9005f3e38681264d2e82c2ee16) @@ -56,4 +56,5 @@ #include #include +#include #include @@ -263,20 +264,31 @@ static void usb_kbd_set_led(usb_kbd_t *kbd_dev) { - uint8_t buffer[BOOTP_BUFFER_OUT_SIZE]; - int rc= 0; - - memset(buffer, 0, BOOTP_BUFFER_OUT_SIZE); - uint8_t leds = 0; - - if (kbd_dev->mods & KM_NUM_LOCK) { - leds |= USB_HID_LED_NUM_LOCK; - } - - if (kbd_dev->mods & KM_CAPS_LOCK) { - leds |= USB_HID_LED_CAPS_LOCK; - } - - if (kbd_dev->mods & KM_SCROLL_LOCK) { - leds |= USB_HID_LED_SCROLL_LOCK; +// uint8_t buffer[BOOTP_BUFFER_OUT_SIZE]; +// int rc= 0; + +// memset(buffer, 0, BOOTP_BUFFER_OUT_SIZE); +// uint8_t leds = 0; + + unsigned i = 0; + + if ((kbd_dev->mods & KM_NUM_LOCK) && (i < kbd_dev->led_output_size)) { + kbd_dev->led_data[i++] = USB_HID_LED_NUM_LOCK; +// leds |= USB_HID_LED_NUM_LOCK; + } + + if ((kbd_dev->mods & KM_CAPS_LOCK) && (i < kbd_dev->led_output_size)) { + kbd_dev->led_data[i++] = USB_HID_LED_CAPS_LOCK; +// leds |= USB_HID_LED_CAPS_LOCK; + } + + if ((kbd_dev->mods & KM_SCROLL_LOCK) + && (i < kbd_dev->led_output_size)) { + kbd_dev->led_data[i++] = USB_HID_LED_SCROLL_LOCK; +// leds |= USB_HID_LED_SCROLL_LOCK; + } + + usb_log_debug("Output report data: "); + for (i = 0; i < kbd_dev->led_output_size; ++i) { + usb_log_debug("%u: %d", i, kbd_dev->led_data[i]); } @@ -284,20 +296,29 @@ usb_log_debug("Creating output report.\n"); - usb_log_debug("Leds: 0x%x\n", leds); - if ((rc = usb_hid_boot_keyboard_output_report( - leds, buffer, BOOTP_BUFFER_OUT_SIZE)) != EOK) { - usb_log_warning("Error composing output report to the keyboard:" - "%s.\n", str_error(rc)); - return; - } + + int rc = usb_hid_report_output_translate(kbd_dev->parser, + kbd_dev->led_path, USB_HID_PATH_COMPARE_END, kbd_dev->output_buffer, + kbd_dev->output_size, kbd_dev->led_data, kbd_dev->led_output_size); + + if (rc != EOK) { + usb_log_warning("Error translating LED output to output report" + ".\n"); + return; + } + +// if ((rc = usb_hid_boot_keyboard_output_report( +// leds, buffer, BOOTP_BUFFER_OUT_SIZE)) != EOK) { +// usb_log_warning("Error composing output report to the keyboard:" +// "%s.\n", str_error(rc)); +// return; +// } usb_log_debug("Output report buffer: %s\n", - usb_debug_str_buffer(buffer, BOOTP_BUFFER_OUT_SIZE, 0)); - - assert(kbd_dev->usb_dev != NULL); + usb_debug_str_buffer(kbd_dev->output_buffer, kbd_dev->output_size, + 0)); usbhid_req_set_report(&kbd_dev->usb_dev->ctrl_pipe, kbd_dev->usb_dev->interface_no, USB_HID_REPORT_TYPE_OUTPUT, - buffer, BOOTP_BUFFER_OUT_SIZE); + kbd_dev->output_buffer, kbd_dev->output_size); } @@ -586,5 +607,5 @@ */ static void usb_kbd_process_data(usb_kbd_t *kbd_dev, - uint8_t *buffer, size_t actual_size) + uint8_t *buffer, size_t actual_size) { assert(kbd_dev->initialized == USB_KBD_STATUS_INITIALIZED); @@ -760,6 +781,5 @@ usb_log_debug("Size of the input report: %zu\n", kbd_dev->key_count); - kbd_dev->keys = (uint8_t *)calloc( - kbd_dev->key_count, sizeof(uint8_t)); + kbd_dev->keys = (uint8_t *)calloc(kbd_dev->key_count, sizeof(uint8_t)); if (kbd_dev->keys == NULL) { @@ -768,8 +788,49 @@ } + /* + * Output report + */ + kbd_dev->output_size = 0; + kbd_dev->output_buffer = usb_hid_report_output(kbd_dev->parser, + &kbd_dev->output_size); + if (kbd_dev->output_buffer == NULL) { + usb_log_warning("Error creating output report buffer.\n"); + free(kbd_dev->keys); + return ENOMEM; /* TODO: other error code */ + } + + usb_log_debug("Output buffer size: %zu\n", kbd_dev->output_size); + + kbd_dev->led_path = usb_hid_report_path(); + usb_hid_report_path_append_item( + kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0); + + kbd_dev->led_output_size = usb_hid_report_output_size(kbd_dev->parser, + kbd_dev->led_path, USB_HID_PATH_COMPARE_END); + + usb_log_debug("Output report size (in items): %zu\n", + kbd_dev->led_output_size); + + kbd_dev->led_data = (int32_t *)calloc( + kbd_dev->led_output_size, sizeof(int32_t)); + + if (kbd_dev->led_data == NULL) { + usb_log_warning("Error creating buffer for LED output report." + "\n"); + free(kbd_dev->keys); + usb_hid_report_output_free(kbd_dev->output_buffer); + return ENOMEM; + } + + /* + * Modifiers and locks + */ kbd_dev->modifiers = 0; kbd_dev->mods = DEFAULT_ACTIVE_MODS; kbd_dev->lock_keys = 0; + /* + * Autorepeat + */ kbd_dev->repeat.key_new = 0; kbd_dev->repeat.key_repeated = 0; @@ -879,4 +940,7 @@ } + // free the output buffer + usb_hid_report_output_free((*kbd_dev)->output_buffer); + /* TODO: what about the USB device structure?? */ Index: uspace/drv/usbkbd/kbddev.h =================================================================== --- uspace/drv/usbkbd/kbddev.h (revision 2f4b3a44176313e40c4106704319c751b96ef337) +++ uspace/drv/usbkbd/kbddev.h (revision ad7bb42268707f9005f3e38681264d2e82c2ee16) @@ -94,4 +94,14 @@ /** Report descriptor size. */ size_t report_desc_size; + + uint8_t *output_buffer; + + size_t output_size; + + size_t led_output_size; + + usb_hid_report_path_t *led_path; + + int32_t *led_data; /** HID Report parser. */ Index: uspace/lib/usb/include/usb/classes/hid/utled.h =================================================================== --- uspace/lib/usb/include/usb/classes/hid/utled.h (revision ad7bb42268707f9005f3e38681264d2e82c2ee16) +++ uspace/lib/usb/include/usb/classes/hid/utled.h (revision ad7bb42268707f9005f3e38681264d2e82c2ee16) @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2010 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 libusb + * @{ + */ +/** @file + * @brief USB HID Usage Tables - LED page. + */ +#ifndef LIBUSB_UTLED_H_ +#define LIBUSB_UTLED_H_ + +typedef enum { + USB_HID_LED_UNDEFINED = 0, + USB_HID_LED_NUM_LOCK, + USB_HID_LED_CAPS_LOCK, + USB_HID_LED_SCROLL_LOCK, + USB_HID_LED_COMPOSE, + USB_HID_LED_KANA, + USB_HID_LED_POWER, + USB_HID_LED_SHIFT, + USB_HID_LED_DND, + USB_HID_LED_MUTE, + USB_HID_LED_TONE_ENABLE, + USB_HID_LED_HIGH_CUT_FILTER, + USB_HID_LED_LOW_CUT_FILTER, + USB_HID_LED_EQ_ENABLE, + USB_HID_LED_SOUND_FIELD_ON, + USB_HID_LED_SURROUND_ON, + USB_HID_LED_REPEAT, + USB_HID_LED_STEREO, + USB_HID_LED_SAMPLING_RATE_DETECT, + USB_HID_LED_SPINNING, + USB_HID_LED_CAV, + USB_HID_LED_CLV, + USB_HID_LED_RECORDING_FORMAT_DETECT, + USB_HID_LED_OFF_HOOK, + USB_HID_LED_RING, + USB_HID_LED_MESSAGE_WAITING, + USB_HID_LED_DATA_MODE, + USB_HID_LED_BATTERY_OPERATION, + USB_HID_LED_BATTERY_OK, + USB_HID_LED_BATTERY_LOW, + USB_HID_LED_SPEAKER, + USB_HID_LED_HEAD_SET, + USB_HID_LED_HOLD, + USB_HID_LED_MICRO, + USB_HID_LED_COVERAGE, + USB_HID_LED_NIGHT_MODE, + USB_HID_LED_SEND_CALLS, + USB_HID_LED_CALL_PICKUP, + USB_HID_LED_CONFERENCE, + USB_HID_LED_STAND_BY, + USB_HID_LED_CAMERA_ON, + USB_HID_LED_CAMERA_OFF, + USB_HID_LED_ON_LINE, + USB_HID_LED_OFF_LINE, + USB_HID_LED_BUSY, + USB_HID_LED_READY, + USB_HID_LED_PAPER_OUT, + USB_HID_LED_PAPER_JAM, + USB_HID_LED_REMOTE, + USB_HID_LED_FORWARD, + USB_HID_LED_REVERSE, + USB_HID_LED_STOP, + USB_HID_LED_REWIND, + USB_HID_LED_FAST_FORWARD, + USB_HID_LED_PLAY, + USB_HID_LED_PAUSE, + USB_HID_LED_RECORD, + USB_HID_LED_ERROR, + USB_HID_LED_USAGE_SELECTED_IND, + USB_HID_LED_USAGE_IN_USE_IND, + USB_HID_LED_USAGE_MULTI_MODE_IND, + USB_HID_LED_IND_ON, + USB_HID_LED_IND_FLASH, + USB_HID_LED_IND_SLOW_BLINK, + USB_HID_LED_IND_FAST_BLINK, + USB_HID_LED_IND_OFF, + USB_HID_LED_FLASH_ON_TIME, + USB_HID_LED_SLOW_BLINK_ON_TIME, + USB_HID_LED_SLOW_BLINK_OFF_TIME, + USB_HID_LED_FAST_BLINK_ON_TIME, + USB_HID_LED_FAST_BLINK_OFF_TIME, + USB_HID_LED_USAGE_IND_COLOR, + USB_HID_LED_IND_RED, + USB_HID_LED_IND_GREEN, + USB_HID_LED_IND_AMBER, + USB_HID_LED_GENERIC_IND, + USB_HID_LED_SYSTEM_SUSPEND, + USB_HID_LED_EXTERNAL_POWER +} usb_hid_usage_led_t; + +#endif /* LIBUSB_UTLED_H_ */ +/** + * @} + */ Index: uspace/lib/usb/include/usb/classes/hidparser.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidparser.h (revision 2f4b3a44176313e40c4106704319c751b96ef337) +++ uspace/lib/usb/include/usb/classes/hidparser.h (revision ad7bb42268707f9005f3e38681264d2e82c2ee16) @@ -182,12 +182,12 @@ } usb_hid_modifiers_t; -typedef enum { - USB_HID_LED_NUM_LOCK = 0x1, - USB_HID_LED_CAPS_LOCK = 0x2, - USB_HID_LED_SCROLL_LOCK = 0x4, - USB_HID_LED_COMPOSE = 0x8, - USB_HID_LED_KANA = 0x10, - USB_HID_LED_COUNT = 5 -} usb_hid_led_t; +//typedef enum { +// USB_HID_LED_NUM_LOCK = 0x1, +// USB_HID_LED_CAPS_LOCK = 0x2, +// USB_HID_LED_SCROLL_LOCK = 0x4, +// USB_HID_LED_COMPOSE = 0x8, +// USB_HID_LED_KANA = 0x10, +// USB_HID_LED_COUNT = 5 +//} usb_hid_led_t; static const usb_hid_modifiers_t