Changeset 45a2688 in mainline for uspace/lib/usb/src/hiddescriptor.c

Timestamp:

2011-05-07T08:31:10Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

78dbf5b, c7fbb90

Parents:

1ce4189 (diff), 5f7b75a (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:

Changes from maklf - delimiters + usage paths comparison

File:

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

uspace/lib/usb/src/hiddescriptor.c

@@ -437 +437 @@
 int usb_hid_report_parse_main_tag(uint8_t tag, const uint8_t *data, size_t item_size,
                              usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path)
-{               
+{
+        usb_hid_report_usage_path_t *path_item;
+        
         switch(tag)
         {
@@ -448 +450 @@
                         
                 case USB_HID_REPORT_TAG_COLLECTION:
-                        //TODO: usage_path->flags = *data;
+                        // store collection atributes
+                        path_item = list_get_instance(usage_path->head.prev, usb_hid_report_usage_path_t, link);
+                        path_item->flags = *data;       
                         
-                        usb_log_debug("APPENDED ITEM TO USAGE PATH (PAGE %d, USAGE %d\n", report_item->usage_page, report_item->usages[report_item->usages_count-1]);
-                        usb_hid_print_usage_path(usage_path);
-
                         // set last item
                         usb_hid_report_set_last_item(usage_path, USB_HID_TAG_CLASS_GLOBAL, report_item->usage_page);
                         usb_hid_report_set_last_item(usage_path, USB_HID_TAG_CLASS_LOCAL, report_item->usages[report_item->usages_count-1]);
+                        
                         // append the new one which will be set by common
                         // usage/usage page
                         usb_hid_report_path_append_item(usage_path, report_item->usage_page, report_item->usages[report_item->usages_count-1]); 
-                        usb_hid_print_usage_path(usage_path);
-
                         usb_hid_report_reset_local_items (report_item);
                         return USB_HID_NO_ACTION;
@@ -551 +551 @@
                              usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path)
 {
-        switch(tag)
-        {
+        switch(tag) {
                 case USB_HID_REPORT_TAG_USAGE:
-                        report_item->usages[report_item->usages_count] = usb_hid_report_tag_data_uint32(data,item_size);
-                        report_item->usages_count++;
+                        switch(report_item->in_delimiter) {
+                                case INSIDE_DELIMITER_SET:
+                                        // nothing to do
+                                        break;
+                                case START_DELIMITER_SET:
+                                        report_item->in_delimiter = INSIDE_DELIMITER_SET;
+                                case OUTSIDE_DELIMITER_SET:
+                                        report_item->usages[report_item->usages_count] = usb_hid_report_tag_data_uint32(data,item_size);
+                                        report_item->usages_count++;
+                                        break;
+                        }
                         break;
                 case USB_HID_REPORT_TAG_USAGE_MINIMUM:
@@ -596 +604 @@
                         break;                  
                 case USB_HID_REPORT_TAG_DELIMITER:
-                        if (report_item->in_delimiter == OUTSIDE_DELIMITER_SET) {
-                                report_item->in_delimiter = START_DELIMITER_SET;
-                        }
-                        else {
-                                report_item->in_delimiter = OUTSIDE_DELIMITER_SET;
-                        }
-                        
-                        break;
-                
+                        report_item->in_delimiter = usb_hid_report_tag_data_uint32(data,item_size);
+                        break;
+
                 default:
                         return USB_HID_NO_ACTION;
         }
-        
+
         return EOK;
 }