Changeset 1cbb4b7 in mainline

Timestamp:

2011-04-10T18:28:45Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

777e336, c7bdfa7

Parents:

f76153ce

Message:

Fixed freeing of subdrivers + some debug output.

Location:

uspace

Files:

• drv/usbhid/subdrivers.c (modified) (1 diff)
• drv/usbhid/usbhid.c (modified) (5 diffs)
• lib/usb/src/hidparser.c (modified) (1 diff)

uspace/drv/usbhid/subdrivers.c

@@ -35 +35 @@
 
 #include "subdrivers.h"
+#include "usb/classes/hidut.h"
 
-static usb_hid_subdriver_usage_t path_kbd[] = {{0, 7}};
+static usb_hid_subdriver_usage_t path_kbd[] = {{USB_HIDUT_PAGE_KEYBOARD, 0}};
 
 const usb_hid_subdriver_mapping_t usb_hid_subdrivers[] = {

uspace/drv/usbhid/usbhid.c

@@ -171 +171 @@
         usb_hid_report_path_t *usage_path = usb_hid_report_path();
         if (usage_path == NULL) {
+                usb_log_debug("Failed to create usage path.\n");
                 return false;
         }
@@ -177 +178 @@
                 if (usb_hid_report_path_append_item(usage_path, 
                     path[i].usage_page, path[i].usage) != EOK) {
+                        usb_log_debug("Failed to append to usage path.\n");
                         usb_hid_report_path_free(usage_path);
                         return false;
@@ -182 +184 @@
         }
         
-        bool matches = (usb_hid_report_input_length(hid_dev->parser, usage_path, 
-            compare) > 0);
+        assert(hid_dev->parser != NULL);
+        
+        usb_log_debug("Compare flags: %d\n", compare);
+        size_t size = usb_hid_report_input_length(hid_dev->parser, usage_path, 
+            compare);
+        usb_log_debug("Size of the input report: %d\n", size);
         
         usb_hid_report_path_free(usage_path);
         
-        return matches;
+        return (size > 0);
 }
 
@@ -260 +266 @@
                 
                 if (mapping->usage_path != NULL) {
+                        usb_log_debug("Comparing device against usage path.\n");
                         if (usb_hid_path_matches(hid_dev, 
                             mapping->usage_path, mapping->path_size,
                             mapping->compare)) {
                                 subdrivers[count++] = &mapping->subdriver;
+                        } else {
+                                usb_log_debug("Not matched.\n");
                         }
                 }
@@ -552 +561 @@
         // free the subdrivers info
         if ((*hid_dev)->subdrivers != NULL) {
-                free(subdrivers);
+                free((*hid_dev)->subdrivers);
         }
 

uspace/lib/usb/src/hidparser.c

@@ -900 +900 @@
         item->usage_page = usage_page;
         
+        usb_log_debug("Appending usage %d, usage page %d\n", usage, usage_page);
+        
         list_append (&usage_path->link, &item->link);
         usage_path->depth++;