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

Timestamp:

2011-04-17T19:17:55Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

63517c2, cfbbe1d3

Parents:

ef354b6 (diff), 8595577b (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:

new report structure fixes

File:

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

uspace/lib/usb/src/hidparser.c

@@ -877 +877 @@
 
         offset = item->offset + (j * item->size);
-        
         // FIXME
         if((size_t)(offset/8) != (size_t)((offset+item->size-1)/8)) {
@@ -1352 +1351 @@
 
                 field = list_get_instance(field_it, usb_hid_report_field_t, link);
-                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);
+                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;
@@ -1536 +1537 @@
 
 /**
- * Clones given report item structure and returns the new one
- *
- * @param item Report item structure to clone
- * @return Clonned item
- */
-usb_hid_report_item_t *usb_hid_report_item_clone(const usb_hid_report_item_t *item)
-{
-        usb_hid_report_item_t *new_report_item;
-        
-        if(!(new_report_item = malloc(sizeof(usb_hid_report_item_t)))) {
-                return NULL;
-        }                                       
-        memcpy(new_report_item,item, sizeof(usb_hid_report_item_t));
-        link_initialize(&(new_report_item->link));
-
-        return new_report_item;
-}
-
-
-/**
  *
  *
@@ -1604 +1585 @@
 }
 
+
+usb_hid_report_item_t *usb_hid_report_item_clone(const usb_hid_report_item_t *item)
+{
+        usb_hid_report_item_t *new_report_item;
+        
+        if(!(new_report_item = malloc(sizeof(usb_hid_report_item_t)))) {
+                return NULL;
+        }                                       
+        memcpy(new_report_item,item, sizeof(usb_hid_report_item_t));
+        link_initialize(&(new_report_item->link));
+
+        return new_report_item;
+}
+
+
+usb_hid_report_field_t *usb_hid_report_get_sibling(usb_hid_report_t *report, 
+                                                        usb_hid_report_field_t *field, 
+                            usb_hid_report_path_t *path, int flags, 
+                            usb_hid_report_type_t type)
+{
+        usb_hid_report_description_t *report_des = usb_hid_report_find_description (report, path->report_id, type);
+        link_t *field_it;
+        
+        if(report_des == NULL){
+                return NULL;
+        }
+
+        if(field == NULL){
+                // vezmu prvni co mathuje podle path!!
+                field_it = report_des->report_items.next;
+        }
+        else {
+                field_it = field->link.next;
+        }
+
+        while(field_it != &report_des->report_items) {
+                field = list_get_instance(field_it, usb_hid_report_field_t, link);
+                        
+                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){
+                        usb_hid_report_remove_last_item (field->collection_path);
+                        usb_log_debug("....OK\n");
+                        return field;
+                }
+                usb_hid_report_remove_last_item (field->collection_path);
+
+                field_it = field_it->next;
+        }
+
+        return NULL;
+}
 /**
  * @}