Changes in uspace/lib/usb/src/hiddescriptor.c [3b5d5b9d:1be39e9] in mainline

File:

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

uspace/lib/usb/src/hiddescriptor.c

@@ -41 +41 @@
 #include <assert.h>
 
+
+#define OUTSIDE_DELIMITER_SET   0
+#define START_DELIMITER_SET     1
+#define INSIDE_DELIMITER_SET    2
+        
 /** The new report item flag. Used to determine when the item is completly
  * configured and should be added to the report structure
@@ -267 +272 @@
                 return ENOMEM;
         }
+        usb_hid_report_path_append_item(usage_path, 0, 0);      
         
         while(i<size){  
@@ -431 +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)
         {
@@ -442 +450 @@
                         
                 case USB_HID_REPORT_TAG_COLLECTION:
-                        // TODO usage_path->flags = *data;
-                        usb_hid_report_path_append_item(usage_path, report_item->usage_page, report_item->usages[report_item->usages_count-1]);                                         
+                        // store collection atributes
+                        path_item = list_get_instance(usage_path->head.prev, usb_hid_report_usage_path_t, link);
+                        path_item->flags = *data;       
+                        
+                        // 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_report_reset_local_items (report_item);
                         return USB_HID_NO_ACTION;
@@ -534 +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:
@@ -579 +604 @@
                         break;                  
                 case USB_HID_REPORT_TAG_DELIMITER:
-                        //report_item->delimiter = usb_hid_report_tag_data_uint32(data,item_size);
-                        //TODO: 
-                        //      DELIMITER STUFF
-                        break;
-                
+                        report_item->in_delimiter = usb_hid_report_tag_data_uint32(data,item_size);
+                        break;
+
                 default:
                         return USB_HID_NO_ACTION;
         }
-        
+
         return EOK;
 }