Changes in uspace/lib/usb/src/hidparser.c [bd2394b:3b5d5b9d] in mainline

File:

• uspace/lib/usb/src/hidparser.c (modified) (3 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;
-        }
-}
 
 
@@ -230 +206 @@
 }
 
+/**
+ * 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 **/
 
@@ -282 +302 @@
                 free (output);
         }
+}
+
+/** 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;
+        
 }