Changeset 3a6e423 in mainline for uspace/lib/usb/src/hidparser.c

Timestamp:

2011-05-08T19:38:24Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

7aaf403e

Parents:

7b6f116

Message:

Parsing of usages in case of array items repaired

File:

• uspace/lib/usb/src/hidparser.c (modified) (7 diffs)

uspace/lib/usb/src/hidparser.c

@@ -69 +69 @@
 
 
+/** Returns size of report of specified report id and type in items
+ *
+ * @param parser Opaque report parser structure
+ * @param report_id 
+ * @param type
+ * @return Number of items in specified report
+ */
+size_t usb_hid_report_size(usb_hid_report_t *report, uint8_t report_id, 
+                           usb_hid_report_type_t type)
+{
+        usb_hid_report_description_t *report_des;
+
+        if(report == NULL) {
+                return 0;
+        }
+
+        report_des = usb_hid_report_find_description (report, report_id, type);
+        if(report_des == NULL){
+                return 0;
+        }
+        else {
+                return report_des->item_length;
+        }
+}
 
 
@@ -87 +111 @@
         usb_hid_report_description_t *report_des;
         usb_hid_report_type_t type = USB_HID_REPORT_TYPE_INPUT;
-
+        
         if(report == NULL) {
                 return EINVAL;
@@ -114 +138 @@
                                 // array
                                 item->value = usb_hid_translate_data(item, data);
-                            item->usage = (item->value - item->physical_minimum) + item->usage_minimum;
+                
+                                item->usage = USB_HID_EXTENDED_USAGE(item->usages[item->value - item->physical_minimum]);
+                                item->usage_page = USB_HID_EXTENDED_USAGE_PAGE(item->usages[item->value - item->physical_minimum]);                             
+
+                                usb_hid_report_set_last_item (item->collection_path, 
+                                                              USB_HID_TAG_CLASS_GLOBAL,
+                                                              item->usage_page);
+                                usb_hid_report_set_last_item (item->collection_path, 
+                                                              USB_HID_TAG_CLASS_LOCAL,
+                                                              item->usage);
+                                
                         }
                         else {
@@ -123 +157 @@
                 list_item = list_item->next;
         }
-           
+        
         return EOK;
         
@@ -206 +240 @@
 }
 
-/**
- * Returns number of items in input report which are accessible by given usage path
- *
- * @param parser Opaque report descriptor structure
- * @param path Usage path specification
- * @param flags Usage path comparison flags
- * @return Number of items in input report
- */
-size_t usb_hid_report_input_length(const usb_hid_report_t *report,
-        usb_hid_report_path_t *path, int flags)
-{       
-        
-        size_t ret = 0;
-
-        if(report == NULL) {
-                return 0;
-        }
-
-        usb_hid_report_description_t *report_des;
-        report_des = usb_hid_report_find_description (report, path->report_id, USB_HID_REPORT_TYPE_INPUT);
-        if(report_des == NULL) {
-                return 0;
-        }
-
-        link_t *field_it = report_des->report_items.next;
-        usb_hid_report_field_t *field;
-        while(field_it != &report_des->report_items) {
-
-                field = list_get_instance(field_it, usb_hid_report_field_t, link);
-                if(USB_HID_ITEM_FLAG_CONSTANT(field->item_flags) == 0) {
-                        
-                        usb_hid_report_path_append_item (field->collection_path, field->usage_page, field->usage);
-                        if(usb_hid_report_compare_usage_path (field->collection_path, path, flags) == EOK) {
-                                ret++;
-                        }
-                        usb_hid_report_remove_last_item (field->collection_path);
-                }
-                
-                field_it = field_it->next;
-        }
-
-        return ret;
-        }
-
 /*** OUTPUT API **/
 
@@ -304 +294 @@
 }
 
-/** Returns size of output for given usage path 
- *
- * @param parser Opaque report parser structure
- * @param path Usage path specified which items will be thought for the output
- * @param flags Flags of usage path structure comparison
- * @return Number of items matching the given usage path
- */
-size_t usb_hid_report_output_size(usb_hid_report_t *report,
-                                  usb_hid_report_path_t *path, int flags)
-{
-        size_t ret = 0; 
-        usb_hid_report_description_t *report_des;
-
-        if(report == NULL) {
-                return 0;
-        }
-
-        report_des = usb_hid_report_find_description (report, path->report_id, USB_HID_REPORT_TYPE_OUTPUT);
-        if(report_des == NULL){
-                return 0;
-        }
-        
-        link_t *field_it = report_des->report_items.next;
-        usb_hid_report_field_t *field;
-        while(field_it != &report_des->report_items) {
-
-                field = list_get_instance(field_it, usb_hid_report_field_t, link);
-                if(USB_HID_ITEM_FLAG_CONSTANT(field->item_flags) == 0){
-                        usb_hid_report_path_append_item (field->collection_path, field->usage_page, field->usage);
-                        if(usb_hid_report_compare_usage_path (field->collection_path, path, flags) == EOK) {
-                                ret++;
-                        }
-                        usb_hid_report_remove_last_item (field->collection_path);
-                }
-                
-                field_it = field_it->next;
-        }
-
-        return ret;
-        
-}
-
 /** Makes the output report buffer for data given in the report structure
  *
@@ -385 +333 @@
                 report_item = list_get_instance(item, usb_hid_report_field_t, link);
 
+                usb_log_debug("OUTPUT ITEM usage(%x), value(%x)\n", report_item->usage, report_item->value);
+                
                         if(USB_HID_ITEM_FLAG_VARIABLE(report_item->item_flags) == 0) {