Index: uspace/drv/usbhid/conv.c =================================================================== --- uspace/drv/usbhid/conv.c (revision f2ba5d9fd90821fb3fdff57ab4c39d07ff11010c) +++ uspace/drv/usbhid/conv.c (revision d972534030c0c8c8ff0b6e219a0562629b820016) @@ -36,4 +36,6 @@ #include #include +#include +#include #include "conv.h" @@ -207,4 +209,17 @@ key = map[scancode]; + + if (scancode == 0x53) { + usb_log_debug("\n\nWe have a NUM LOCK!, sending key %u\n\n", key); + } + + if (scancode == 0x47) { + usb_log_debug("\n\nWe have a SCROLL LOCK!, sending key %u\n\n", key); + } + + if (scancode == 0x39) { + usb_log_debug("\n\nWe have a CAPS LOCK!, sending key %u\n\n", key); + } + // if (key != 0) // kbd_push_ev(type, key); Index: uspace/drv/usbhid/main.c =================================================================== --- uspace/drv/usbhid/main.c (revision f2ba5d9fd90821fb3fdff57ab4c39d07ff11010c) +++ uspace/drv/usbhid/main.c (revision d972534030c0c8c8ff0b6e219a0562629b820016) @@ -59,4 +59,5 @@ #define BUFFER_SIZE 8 +#define BUFFER_OUT_SIZE 1 #define NAME "usbhid" @@ -122,5 +123,5 @@ static void dump_buffer(const char *msg, const uint8_t *buffer, size_t length) -{ +{uint8_t buffer[BUFFER_SIZE]; printf("%s\n", msg); @@ -161,5 +162,71 @@ static int active_layout = 0; -static void kbd_push_ev(int type, unsigned int key) +static void usbkbd_req_set_report(usb_hid_dev_kbd_t *kbd_dev, uint8_t *buffer, + size_t buf_size) +{ + int rc, sess_rc; + + sess_rc = usb_endpoint_pipe_start_session(&kbd_dev->ctrl_pipe); + if (sess_rc != EOK) { + usb_log_warning("Failed to start a session: %s.\n", + str_error(sess_rc)); + return; + } + + usb_log_debug("Sending Set_Report request to the device.\n"); + // TODO: determine what interface to use!! (now set to 1) + rc = usb_control_request_set(&kbd_dev->ctrl_pipe, + USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE, + USB_HIDREQ_SET_REPORT, USB_HID_REPORT_TYPE_OUTPUT, + 1, buffer, buf_size); + + sess_rc = usb_endpoint_pipe_end_session(&kbd_dev->ctrl_pipe); + + if (rc != EOK) { + usb_log_warning("Error sending output report to the keyboard: " + "%s.\n", str_error(rc)); + return; + } + + if (sess_rc != EOK) { + usb_log_warning("Error closing session: %s.\n", + str_error(sess_rc)); + return; + } +} + +static void usbkbd_set_led(unsigned mods, usb_hid_dev_kbd_t *kbd_dev) +{ + uint8_t buffer[BUFFER_SIZE]; + int rc= 0; + + uint8_t leds = 0; + + if (mods & KM_NUM_LOCK) { + leds |= USB_HID_LED_NUM_LOCK; + } + + if (mods & KM_CAPS_LOCK) { + leds |= USB_HID_LED_CAPS_LOCK; + } + + if (mods & KM_SCROLL_LOCK) { + leds |= USB_HID_LED_SCROLL_LOCK; + } + + // TODO: COMPOSE and KANA + + usb_log_debug("Creating output report.\n"); + if ((rc = usb_hid_boot_keyboard_output_report( + leds, buffer, BUFFER_SIZE)) != EOK) { + usb_log_warning("Error composing output report to the keyboard:" + "%s.\n", str_error(rc)); + return; + } + + usbkbd_req_set_report(kbd_dev, buffer, BUFFER_SIZE); +} + +static void kbd_push_ev(int type, unsigned int key, usb_hid_dev_kbd_t *kbd_dev) { console_event_t ev; @@ -185,11 +252,15 @@ switch (key) { - case KC_CAPS_LOCK: mod_mask = KM_CAPS_LOCK; break; - case KC_NUM_LOCK: mod_mask = KM_NUM_LOCK; break; - case KC_SCROLL_LOCK: mod_mask = KM_SCROLL_LOCK; break; + case KC_CAPS_LOCK: mod_mask = KM_CAPS_LOCK; usb_log_debug("\n\nPushing CAPS LOCK! (mask: %u)\n\n", mod_mask); break; + case KC_NUM_LOCK: mod_mask = KM_NUM_LOCK; usb_log_debug("\n\nPushing NUM LOCK! (mask: %u)\n\n", mod_mask); break; + case KC_SCROLL_LOCK: mod_mask = KM_SCROLL_LOCK; usb_log_debug("\n\nPushing SCROLL LOCK! (mask: %u)\n\n", mod_mask); break; default: mod_mask = 0; break; } if (mod_mask != 0) { + usb_log_debug("\n\nChanging mods and lock keys\n\n"); + usb_log_debug("\n\nmods before: 0x%x\n\n", mods); + usb_log_debug("\n\nLock keys before:0x%x\n\n", lock_keys); + if (type == KEY_PRESS) { /* @@ -202,6 +273,5 @@ /* Update keyboard lock indicator lights. */ - // TODO - //kbd_ctl_set_ind(mods); + usbkbd_set_led(mods, kbd_dev); } else { lock_keys = lock_keys & ~mod_mask; @@ -213,4 +283,6 @@ usb_log_debug2("keycode: %u\n", key); */ + usb_log_debug("\n\nmods after: 0x%x\n\n", mods); + usb_log_debug("\n\nLock keys after: 0x%x\n\n", lock_keys); if (type == KEY_PRESS && (mods & KM_LCTRL) && @@ -238,4 +310,8 @@ ev.key = key; ev.mods = mods; + + if (ev.mods & KM_NUM_LOCK) { + usb_log_debug("\n\nNum Lock turned on.\n\n"); + } ev.c = layout[active_layout]->parse_ev(&ev); @@ -288,5 +364,5 @@ if (usb_hid_modifiers_keycodes[i] != 0) { kbd_push_ev(KEY_PRESS, - usb_hid_modifiers_keycodes[i]); + usb_hid_modifiers_keycodes[i], kbd_dev); } } else if (!(modifiers & usb_hid_modifiers_consts[i]) && @@ -295,5 +371,5 @@ if (usb_hid_modifiers_keycodes[i] != 0) { kbd_push_ev(KEY_RELEASE, - usb_hid_modifiers_keycodes[i]); + usb_hid_modifiers_keycodes[i], kbd_dev); } } // no change @@ -323,5 +399,5 @@ // not found, i.e. the key was released key = usbkbd_parse_scancode(kbd_dev->keycodes[j]); - kbd_push_ev(KEY_RELEASE, key); + kbd_push_ev(KEY_RELEASE, key, kbd_dev); } else { // found, nothing happens @@ -343,5 +419,5 @@ // not found, i.e. new key pressed key = usbkbd_parse_scancode(key_codes[i]); - kbd_push_ev(KEY_PRESS, key); + kbd_push_ev(KEY_PRESS, key, kbd_dev); } else { // found, nothing happens @@ -621,5 +697,5 @@ while (true) { - async_usleep(1000 * 10); + async_usleep(1000 * 1000); sess_rc = usb_endpoint_pipe_start_session(&kbd_dev->poll_pipe); Index: uspace/lib/usb/include/usb/classes/hid.h =================================================================== --- uspace/lib/usb/include/usb/classes/hid.h (revision f2ba5d9fd90821fb3fdff57ab4c39d07ff11010c) +++ uspace/lib/usb/include/usb/classes/hid.h (revision d972534030c0c8c8ff0b6e219a0562629b820016) @@ -50,4 +50,10 @@ USB_HIDREQ_SET_PROTOCOL = 11 } usb_hid_request_t; + +typedef enum { + USB_HID_REPORT_TYPE_INPUT = 1, + USB_HID_REPORT_TYPE_OUTPUT = 2, + USB_HID_REPORT_TYPE_FEATURE = 3 +} usb_hid_report_type_t; /** USB/HID subclass constants. */ Index: uspace/lib/usb/include/usb/classes/hidparser.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidparser.h (revision f2ba5d9fd90821fb3fdff57ab4c39d07ff11010c) +++ uspace/lib/usb/include/usb/classes/hidparser.h (revision d972534030c0c8c8ff0b6e219a0562629b820016) @@ -83,4 +83,13 @@ } 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; + static const usb_hid_modifiers_t usb_hid_modifiers_consts[USB_HID_MOD_COUNT] = { @@ -94,4 +103,12 @@ USB_HID_MOD_RGUI }; + +//static const usb_hid_led_t usb_hid_led_consts[USB_HID_LED_COUNT] = { +// USB_HID_LED_NUM_LOCK, +// USB_HID_LED_CAPS_LOCK, +// USB_HID_LED_SCROLL_LOCK, +// USB_HID_LED_COMPOSE, +// USB_HID_LED_KANA +//}; //#define USB_HID_BOOT_KEYBOARD_NUM_LOCK 0x01 Index: uspace/lib/usb/src/hidparser.c =================================================================== --- uspace/lib/usb/src/hidparser.c (revision f2ba5d9fd90821fb3fdff57ab4c39d07ff11010c) +++ uspace/lib/usb/src/hidparser.c (revision d972534030c0c8c8ff0b6e219a0562629b820016) @@ -144,10 +144,9 @@ int usb_hid_boot_keyboard_output_report(uint8_t leds, uint8_t *data, size_t size) { - if(size != 1){ + if(size < 2){ return -1; } - /* used only first five bits, others are only padding*/ - *data = leds; + data[1] = leds; return EOK; }