Changeset 22ded10 in mainline

Timestamp:

2011-05-06T10:26:33Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

04c1524, 674cf89

Parents:

3b5d5b9d (diff), 310c4df (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:

Usage path fix in HID parser

Location:

uspace

Files:

• drv/usbhid/kbd/kbddev.c (modified) (1 diff)
• lib/usb/include/usb/classes/hidpath.h (modified) (1 diff)
• lib/usb/include/usb/classes/hidtypes.h (modified) (1 diff)
• lib/usb/src/hiddescriptor.c (modified) (4 diffs)

uspace/drv/usbhid/kbd/kbddev.c

@@ -1046 +1046 @@
                 free((*kbd_dev)->led_data);
         }
-        if ((*kbd_dev)->output_buffer != NULL) {
-                free((*kbd_dev)->output_buffer);
-        }
         if ((*kbd_dev)->led_path != NULL) {
                 usb_hid_report_path_free((*kbd_dev)->led_path);

uspace/lib/usb/include/usb/classes/hidpath.h

@@ -43 +43 @@
  * Description of path of usage pages and usages in report descriptor
  */
+/** Wanted usage path must be exactly the same as the searched one */
 #define USB_HID_PATH_COMPARE_STRICT                             0
-#define USB_HID_PATH_COMPARE_END                                1
+/** Wanted usage path must be the suffix in the searched one */
+#define USB_HID_PATH_COMPARE_END                        1
+/** */
 #define USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY    4
 #define USB_HID_PATH_COMPARE_COLLECTION_ONLY    2 /* porovnava jenom cestu z Kolekci */
+/** Searched usage page must be prefix of the other one */
+#define USB_HID_PATH_COMPARE_BEGIN              8
+/** Searched couple of usage page and usage can be anywhere in usage path */
+#define USB_HID_PATH_COMPARE_WHERE              16
+/**
+ * TODO
+ *  * porovnani zacatek - neni to to samy jako COLLECTION ONLY?? -- TEST
+ *  * porovnani kdekoliv (jenom s delkou 1 at si to moc nekomplikujem)
+ */
 
 

uspace/lib/usb/include/usb/classes/hidtypes.h

@@ -165 +165 @@
         /** */  
         link_t link;
+
+        int in_delimiter;
 } usb_hid_report_item_t;
 

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){  
@@ -442 +448 @@
                         
                 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]);                                         
+                        //TODO: usage_path->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;
@@ -579 +596 @@
                         break;                  
                 case USB_HID_REPORT_TAG_DELIMITER:
-                        //report_item->delimiter = usb_hid_report_tag_data_uint32(data,item_size);
-                        //TODO: 
-                        //      DELIMITER STUFF
+                        if (report_item->in_delimiter == OUTSIDE_DELIMITER_SET) {
+                                report_item->in_delimiter = START_DELIMITER_SET;
+                        }
+                        else {
+                                report_item->in_delimiter = OUTSIDE_DELIMITER_SET;
+                        }
+                        
                         break;