Changeset ff76509 in mainline for uspace/drv/usbhid/usbhid.c

Timestamp:

2011-04-15T13:38:28Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

be11749

Parents:

9063484 (diff), 8fd4ba0 (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:

merge with usb/development

File:

• uspace/drv/usbhid/usbhid.c (modified) (5 diffs)

uspace/drv/usbhid/usbhid.c

@@ -360 +360 @@
         rc = usb_hid_check_pipes(hid_dev, dev);
         if (rc != EOK) {
-                usb_hid_free(&hid_dev);
+                //usb_hid_free(&hid_dev);
                 return rc;
         }
@@ -368 +368 @@
         if (rc != EOK) {
                 usb_log_error("Failed to initialize report parser.\n");
-                usb_hid_free(&hid_dev);
+                //usb_hid_free(&hid_dev);
                 return rc;
         }
@@ -386 +386 @@
                             " device.\n");
                         fallback = true;
+                        assert(hid_dev->subdrivers == NULL);
+                        assert(hid_dev->subdriver_count == 0);
                 }
         } else {
@@ -426 +428 @@
                 usb_log_error("No subdriver for handling this device could be"
                     " initialized: %s.\n", str_error(rc));
-                usb_hid_free(&hid_dev);
+                usb_log_debug("Subdriver count: %d\n", 
+                    hid_dev->subdriver_count);
+                //usb_hid_free(&hid_dev);
         } else {
                 bool ok = false;
@@ -550 +554 @@
         }
         
+        usb_log_debug("Subdrivers: %p, subdriver count: %d\n", 
+            (*hid_dev)->subdrivers, (*hid_dev)->subdriver_count);
+        
         assert((*hid_dev)->subdrivers != NULL 
             || (*hid_dev)->subdriver_count == 0);