Index: uspace/drv/bus/usb/usbhid/kbd/kbddev.c =================================================================== --- uspace/drv/bus/usb/usbhid/kbd/kbddev.c (revision f3174909cb9e70d462a649143dd7e1430d9f6400) +++ uspace/drv/bus/usb/usbhid/kbd/kbddev.c (revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9) @@ -103,37 +103,36 @@ /*----------------------------------------------------------------------------*/ static const uint8_t USB_KBD_BOOT_REPORT_DESCRIPTOR[] = { - 0x05, 0x01, // Usage Page (Generic Desktop), - 0x09, 0x06, // Usage (Keyboard), - 0xA1, 0x01, // Collection (Application), - 0x75, 0x01, // Report Size (1), - 0x95, 0x08, // Report Count (8), - 0x05, 0x07, // Usage Page (Key Codes); - 0x19, 0xE0, // Usage Minimum (224), - 0x29, 0xE7, // Usage Maximum (231), - 0x15, 0x00, // Logical Minimum (0), - 0x25, 0x01, // Logical Maximum (1), - 0x81, 0x02, // Input (Data, Variable, Absolute), ; Modifier byte - 0x95, 0x01, // Report Count (1), - 0x75, 0x08, // Report Size (8), - 0x81, 0x01, // Input (Constant), ; Reserved byte - 0x95, 0x05, // Report Count (5), - 0x75, 0x01, // Report Size (1), - 0x05, 0x08, // Usage Page (Page# for LEDs), - 0x19, 0x01, // Usage Minimum (1), - 0x29, 0x05, // Usage Maxmimum (5), - 0x91, 0x02, // Output (Data, Variable, Absolute), ; LED report - 0x95, 0x01, // Report Count (1), - 0x75, 0x03, // Report Size (3), - 0x91, 0x01, // Output (Constant), ; LED report padding - 0x95, 0x06, // Report Count (6), - 0x75, 0x08, // Report Size (8), - 0x15, 0x00, // Logical Minimum (0), - 0x25, 0xff, // Logical Maximum (255), - 0x05, 0x07, // Usage Page (Key Codes), - 0x19, 0x00, // Usage Minimum (0), - 0x29, 0xff, // Usage Maximum (255), - 0x81, 0x00, // Input (Data, Array), ; Key arrays (6 bytes) - 0xC0 // End Collection - + 0x05, 0x01, /* Usage Page (Generic Desktop), */ + 0x09, 0x06, /* Usage (Keyboard), */ + 0xA1, 0x01, /* Collection (Application), */ + 0x75, 0x01, /* Report Size (1), */ + 0x95, 0x08, /* Report Count (8), */ + 0x05, 0x07, /* Usage Page (Key Codes); */ + 0x19, 0xE0, /* Usage Minimum (224), */ + 0x29, 0xE7, /* Usage Maximum (231), */ + 0x15, 0x00, /* Logical Minimum (0), */ + 0x25, 0x01, /* Logical Maximum (1), */ + 0x81, 0x02, /* Input (Data, Variable, Absolute), ; Modifier byte */ + 0x95, 0x01, /* Report Count (1), */ + 0x75, 0x08, /* Report Size (8), */ + 0x81, 0x01, /* Input (Constant), ; Reserved byte */ + 0x95, 0x05, /* Report Count (5), */ + 0x75, 0x01, /* Report Size (1), */ + 0x05, 0x08, /* Usage Page (Page# for LEDs), */ + 0x19, 0x01, /* Usage Minimum (1), */ + 0x29, 0x05, /* Usage Maxmimum (5), */ + 0x91, 0x02, /* Output (Data, Variable, Absolute), ; LED report */ + 0x95, 0x01, /* Report Count (1), */ + 0x75, 0x03, /* Report Size (3), */ + 0x91, 0x01, /* Output (Constant), ; LED report padding */ + 0x95, 0x06, /* Report Count (6), */ + 0x75, 0x08, /* Report Size (8), */ + 0x15, 0x00, /* Logical Minimum (0), */ + 0x25, 0xff, /* Logical Maximum (255), */ + 0x05, 0x07, /* Usage Page (Key Codes), */ + 0x19, 0x00, /* Usage Minimum (0), */ + 0x29, 0xff, /* Usage Maximum (255), */ + 0x81, 0x00, /* Input (Data, Array), ; Key arrays (6 bytes) */ + 0xC0 /* End Collection */ }; /*----------------------------------------------------------------------------*/ @@ -207,5 +206,4 @@ } - /*----------------------------------------------------------------------------*/ /* Key processing functions */ @@ -448,6 +446,5 @@ usb_hid_report_path_set_report_id(path, hid_dev->report_id); - // fill in the currently pressed keys - + /* Fill in the currently pressed keys. */ usb_hid_report_field_t *field = usb_hid_report_get_sibling( &hid_dev->report, NULL, path, @@ -462,5 +459,5 @@ assert(i < kbd_dev->key_count); - // save the key usage + /* Save the key usage. */ if (field->value != 0) { kbd_dev->keys[i] = field->usage; @@ -500,8 +497,6 @@ } - /* - * Store the initialized HID device and HID ops - * to the DDF function. - */ + /* Store the initialized HID device and HID ops + * to the DDF function. */ fun->ops = &kbd_dev->ops; fun->driver_data = kbd_dev; @@ -511,5 +506,5 @@ usb_log_error("Could not bind DDF function: %s.\n", str_error(rc)); - fun->driver_data = NULL; /* We need this later */ + fun->driver_data = NULL; /* We did not allocate this. */ ddf_fun_destroy(fun); return rc; @@ -527,5 +522,5 @@ HID_KBD_CLASS_NAME, str_error(rc)); if (ddf_fun_unbind(fun) == EOK) { - fun->driver_data = NULL; /* We need this later */ + fun->driver_data = NULL; /* We did not allocate this. */ ddf_fun_destroy(fun); } else { @@ -674,8 +669,6 @@ } - /* - * Set LEDs according to initial setup. - * Set Idle rate - */ + /* Set LEDs according to initial setup. + * Set Idle rate */ usb_kbd_set_led(hid_dev, kbd_dev); @@ -779,5 +772,5 @@ if (usb_kbd_is_initialized(kbd_dev)) { kbd_dev->initialized = USB_KBD_STATUS_TO_DESTROY; - /* wait for autorepeat */ + /* Wait for autorepeat */ async_usleep(CHECK_DELAY); } Index: uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c =================================================================== --- uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c (revision f3174909cb9e70d462a649143dd7e1430d9f6400) +++ uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c (revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9) @@ -45,7 +45,4 @@ #include "kbddev.h" - - -/*----------------------------------------------------------------------------*/ /** * Main loop handling the auto-repeat of keys. @@ -58,12 +55,12 @@ * If the same key is still pressed, it uses the delay between repeats stored * in the keyboard structure to wait until the key should be repeated. - * + * * If the currently repeated key is not pressed any more ( - * usb_kbd_repeat_stop() was called), it stops repeating it and starts + * usb_kbd_repeat_stop() was called), it stops repeating it and starts * checking again. * * @note For accessing the keyboard device auto-repeat information a fibril * mutex (repeat_mtx) from the @a kbd structure is used. - * + * * @param kbd Keyboard device structure. */ @@ -75,10 +72,10 @@ while (true) { - // check if the kbd structure is usable + /* Check if the kbd structure is usable. */ if (!usb_kbd_is_initialized(kbd)) { usb_log_warning("kbd not ready, exiting autorepeat.\n"); return; } - + fibril_mutex_lock(&kbd->repeat_mtx); @@ -105,9 +102,7 @@ } fibril_mutex_unlock(&kbd->repeat_mtx); - async_usleep(delay); } } - /*----------------------------------------------------------------------------*/ /** @@ -115,5 +110,5 @@ * * Starts the loop for checking changes in auto-repeat. - * + * * @param arg User-specified argument. Expects pointer to the keyboard device * structure representing the keyboard. @@ -131,5 +126,5 @@ } - usb_kbd_t *kbd = (usb_kbd_t *)arg; + usb_kbd_t *kbd = arg; usb_kbd_repeat_loop(kbd); @@ -137,5 +132,4 @@ return EOK; } - /*----------------------------------------------------------------------------*/ /** @@ -155,5 +149,4 @@ fibril_mutex_unlock(&kbd->repeat_mtx); } - /*----------------------------------------------------------------------------*/ /** @@ -161,5 +154,5 @@ * * @note Only one key is repeated at any time, but this function may be called - * even with key that is not currently repeated (in that case nothing + * even with key that is not currently repeated (in that case nothing * happens). * @@ -175,5 +168,4 @@ fibril_mutex_unlock(&kbd->repeat_mtx); } - /** * @} Index: uspace/drv/bus/usb/usbhid/usbhid.c =================================================================== --- uspace/drv/bus/usb/usbhid/usbhid.c (revision f3174909cb9e70d462a649143dd7e1430d9f6400) +++ uspace/drv/bus/usb/usbhid/usbhid.c (revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9) @@ -249,5 +249,5 @@ usb_log_debug("Comparing device against usage path.\n"); if (usb_hid_path_matches(hid_dev, mapping)) { - // does not matter if IDs were matched + /* Does not matter if IDs were matched. */ matched = true; }