Changeset eb393ad in mainline for uspace/drv

Timestamp:

2011-04-21T20:57:21Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

6513110

Parents:

36f737a (diff), c7c0984a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged fixes from maklf

Location:

uspace/drv

Files:

• usbhid/kbd/kbddev.c (modified) (2 diffs)
• usbhid/lgtch-ultrax/lgtch-ultrax.c (modified) (1 diff)
• usbkbd/kbddev.c (modified) (1 diff)

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: ");
-        for (i = 0; i < kbd_dev->led_output_size; ++i) {
-                usb_log_debug("%d ", kbd_dev->led_data[i]);
-        }
-        usb_log_debug("\n");
-
-        usb_hid_report_output_set_data(hid_dev->report, kbd_dev->led_path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
-            kbd_dev->led_data, kbd_dev->led_output_size);
-        int rc = usb_hid_report_output_translate(hid_dev->report, 0,
+        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);
         
@@ -671 +670 @@
         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->report, 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);
+
+        usb_hid_report_path_free(path);
         
         if (rc != EOK) {

uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c

@@ -81 +81 @@
         usb_hid_report_path_t *path = usb_hid_report_path();
         usb_hid_report_path_append_item(path, 0xc, 0);
-        usb_hid_report_path_set_report_id(path, 0);
-        
-        int rc = usb_hid_parse_report(hid_dev->report, buffer, buffer_size);
+
+        uint8_t report_id;
+        int rc = usb_hid_parse_report(hid_dev->parser, buffer, buffer_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->report, NULL, path, USB_HID_PATH_COMPARE_END , USB_HID_REPORT_TYPE_INPUT);

uspace/drv/usbkbd/kbddev.c

@@ -618 +618 @@
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
 
-        int rc = usb_hid_parse_report(kbd_dev->parser, buffer, actual_size);
+        uint8_t report_id;
+        int rc = usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, &report_id);
         usb_hid_descriptor_print (kbd_dev->parser);