Changeset cfbbe1d3 in mainline for uspace/drv/usbhid/kbd/kbddev.c

Timestamp:

2011-04-21T20:24:14Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

c7c0984a

Parents:

e50cd7f

Message:

new hid report structure bug fixes

File:

• uspace/drv/usbhid/kbd/kbddev.c (modified) (2 diffs)

uspace/drv/usbhid/kbd/kbddev.c

@@ -299 +299 @@
                 return;
         }
-        
-        unsigned i = 0;
-        
+                
         /* Reset the LED data. */
         memset(kbd_dev->led_data, 0, kbd_dev->led_output_size * sizeof(int32_t));
-        
-        if ((kbd_dev->mods & KM_NUM_LOCK) && (i < kbd_dev->led_output_size)) {
-                kbd_dev->led_data[i++] = 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;
-        }
-        
-        if ((kbd_dev->mods & KM_SCROLL_LOCK) 
-            && (i < kbd_dev->led_output_size)) {
-                kbd_dev->led_data[i++] = USB_HID_LED_SCROLL_LOCK;
-        }
-
-        // TODO: COMPOSE and KANA
-        
-        usb_log_debug("Creating output report: %s\n", usb_debug_str_buffer ((uint8_t *)kbd_dev->led_data, kbd_dev->led_output_size * 4, 0));
-
-        usb_hid_report_output_set_data(hid_dev->parser, kbd_dev->led_path, 
-                                       USB_HID_PATH_COMPARE_END , kbd_dev->led_data, 
-                                       kbd_dev->led_output_size);
+        usb_log_debug("Creating output report:\n");
+
+        usb_hid_report_field_t *field = usb_hid_report_get_sibling (hid_dev->parser, NULL,
+                kbd_dev->led_path, 
+                                USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY | USB_HID_PATH_COMPARE_END,
+                                USB_HID_REPORT_TYPE_OUTPUT);
+        while(field != NULL) {
+
+                if((field->usage == USB_HID_LED_NUM_LOCK) && (kbd_dev->mods & KM_NUM_LOCK)){
+                        field->value = 1;
+                }
+
+                if((field->usage == USB_HID_LED_CAPS_LOCK) && (kbd_dev->mods & KM_CAPS_LOCK)){
+                        field->value = 1;
+                }
+
+                if((field->usage == USB_HID_LED_SCROLL_LOCK) && (kbd_dev->mods & KM_SCROLL_LOCK)){
+                        field->value = 1;
+                }
+                
+                field = usb_hid_report_get_sibling (hid_dev->parser, field,
+                kbd_dev->led_path, 
+                                USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY | USB_HID_PATH_COMPARE_END,
+                                USB_HID_REPORT_TYPE_OUTPUT);
+        }
+                
         int rc = usb_hid_report_output_translate(hid_dev->parser, 0,
             kbd_dev->output_buffer, kbd_dev->output_size);
@@ -648 +651 @@
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
         //usb_hid_report_path_set_report_id(path, 0);
-        
-        int rc = usb_hid_parse_report(hid_dev->parser, buffer, actual_size);    
+
+        uint8_t report_id;
+        int rc = usb_hid_parse_report(hid_dev->parser, buffer, actual_size, &report_id);        
+        usb_hid_report_path_set_report_id (path, report_id);
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(hid_dev->parser, 
                             NULL, path, USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
                                                 USB_HID_REPORT_TYPE_INPUT);
-        
+
+        unsigned i=0;
+        usb_kbd_t *kbd_dev = (usb_kbd_t *)hid_dev->data;
+
+        memset(kbd_dev->keys, 0, kbd_dev->key_count);
         while(field != NULL) {
-                usb_log_debug("FIELD (%X) - VALUE(%X) USAGE(%X)\n", field, field->value, field->usage);
+                if((i < kbd_dev->key_count) && (field->value != 0)){
+                        kbd_dev->keys[i++] = (uint8_t)field->usage;
+                }
                 field = usb_hid_report_get_sibling(hid_dev->parser, field, path, 
                                                    USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
                                                    USB_HID_REPORT_TYPE_INPUT);
         }
-                
+        usb_kbd_process_keycodes(kbd_dev->keys, kbd_dev->key_count, report_id, hid_dev);
         
         usb_hid_report_path_free(path);