Changeset d972534 in mainline for uspace/lib

Timestamp:

2011-02-24T23:32:04Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

54e682f

Parents:

f2ba5d9f

Message:

LED setting

• LEDs are determined from remembered modifiers (not good, as that doesn't work well).
• Added function for sending a Set_Report(Output) request (specific, have to make it generic later).
• Added a lot of debug output.
• Added HID Report Type constants to libusb (hid.h).
• Added constants for LEDs (hidparser.h).
• Modified function for composing output reports in hidparser.

Location:

uspace/lib/usb

Files:

• include/usb/classes/hid.h (modified) (1 diff)
• include/usb/classes/hidparser.h (modified) (2 diffs)
• src/hidparser.c (modified) (1 diff)

uspace/lib/usb/include/usb/classes/hid.h

@@ -50 +50 @@
         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. */

uspace/lib/usb/include/usb/classes/hidparser.h

@@ -83 +83 @@
 } 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 +103 @@
         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

uspace/lib/usb/src/hidparser.c

@@ -144 +144 @@
 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;
 }