Changeset d59d0bb in mainline for uspace/drv

Timestamp:

2011-05-12T09:16:30Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

97cb542

Parents:

9e195e2c (diff), 9be8669 (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 changes to HID parser from maklf

Location:

uspace/drv/usbhid

Files:

• kbd/kbddev.c (modified) (4 diffs)
• multimedia/multimedia.c (modified) (3 diffs)
• usbhid.c (modified) (1 diff)

uspace/drv/usbhid/kbd/kbddev.c

@@ -313 +313 @@
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
             hid_dev->report, NULL, kbd_dev->led_path, 
-            USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY | USB_HID_PATH_COMPARE_END,
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
             USB_HID_REPORT_TYPE_OUTPUT);
         
-        while (field != NULL) {
-
+        while (field != NULL) {         
+                
                 if ((field->usage == USB_HID_LED_NUM_LOCK) 
                     && (kbd_dev->mods & KM_NUM_LOCK)){
@@ -334 +334 @@
                 
                 field = usb_hid_report_get_sibling(hid_dev->report, field,
-                    kbd_dev->led_path, USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY 
-                    | USB_HID_PATH_COMPARE_END, USB_HID_REPORT_TYPE_OUTPUT);
+                    kbd_dev->led_path,  
+                USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                        USB_HID_REPORT_TYPE_OUTPUT);
         }
         
@@ -865 +866 @@
         usb_hid_report_path_set_report_id(path, 0);
         
-        kbd_dev->key_count = usb_hid_report_input_length(
-            hid_dev->report, path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
+        kbd_dev->key_count = usb_hid_report_size(
+            hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT); 
         usb_hid_report_path_free(path);
         
@@ -908 +908 @@
             kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0);
         
-        kbd_dev->led_output_size = usb_hid_report_output_size(hid_dev->report, 
-            kbd_dev->led_path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
+        kbd_dev->led_output_size = usb_hid_report_size(hid_dev->report, 
+            0, USB_HID_REPORT_TYPE_OUTPUT);
         
         usb_log_debug("Output report size (in items): %zu\n", 

uspace/drv/usbhid/multimedia/multimedia.c

@@ -252 +252 @@
         usb_hid_report_path_set_report_id(path, 1);
         
-        multim_dev->key_count = usb_hid_report_input_length(
-            hid_dev->report, path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
+        multim_dev->key_count = usb_hid_report_size(
+            hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT);
+
         usb_hid_report_path_free(path);
         
@@ -347 +347 @@
             USB_HID_REPORT_TYPE_INPUT);
         
-        unsigned int key;
+//      unsigned int key;
         
         /*! @todo Is this iterating OK if done multiple times? 
@@ -353 +353 @@
          */
         while (field != NULL) {
-                usb_log_debug(NAME " KEY VALUE(%X) USAGE(%X)\n", field->value, 
-                    field->usage);
-                
-                key = usb_multimedia_map_usage(field->usage);
-                const char *key_str = usb_multimedia_usage_to_str(field->usage);
-                usb_log_info("Pressed key: %s\n", key_str);
-                usb_multimedia_push_ev(hid_dev, KEY_PRESS, key);
+                if(field->value != 0) {
+                        usb_log_debug(NAME " KEY VALUE(%X) USAGE(%X)\n", field->value, 
+                            field->usage);
+                        key = usb_multimedia_map_usage(field->usage);
+                        const char *key_str = 
+                            usb_multimedia_usage_to_str(field->usage);
+                        usb_log_info("Pressed key: %s\n", key_str);
+                        usb_multimedia_push_ev(hid_dev, KEY_PRESS, key);
+                }
                 
                 field = usb_hid_report_get_sibling(

uspace/drv/usbhid/usbhid.c

@@ -203 +203 @@
         
         usb_log_debug("Compare flags: %d\n", mapping->compare);
-        size_t size = usb_hid_report_input_length(hid_dev->report, usage_path, 
-            mapping->compare);
+//      size_t size = usb_hid_report_size(hid_dev->report, 0, 
+//          USB_HID_REPORT_TYPE_INPUT);
+        size_t size = 0;
+        usb_hid_report_field_t *field = usb_hid_report_get_sibling (hid_dev->report,
+                NULL, usage_path, mapping->compare, USB_HID_REPORT_TYPE_INPUT);
+        while(field != NULL) {
+                size++;
+                field = usb_hid_report_get_sibling (hid_dev->report,
+                                        field, usage_path, mapping->compare, 
+                            USB_HID_REPORT_TYPE_INPUT);
+        }
+        
         usb_log_debug("Size of the input report: %zuB\n", size);
-        
         usb_hid_report_path_free(usage_path);