Changeset c7dd69d in mainline for uspace/drv/usbhid

Timestamp:

2011-04-15T13:19:59Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

da1dd48

Parents:

e3b5129 (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:

Development changes

Location:

uspace/drv/usbhid

Files:

• main.c (modified) (1 diff)
• usbhid.c (modified) (5 diffs)

uspace/drv/usbhid/main.c

@@ -42 +42 @@
 
 #include <usb/devdrv.h>
+#include <usb/devpoll.h>
 
 #include "usbhid.h"

uspace/drv/usbhid/usbhid.c

@@ -379 +379 @@
         rc = usb_hid_check_pipes(hid_dev, dev);
         if (rc != EOK) {
-                usb_hid_free(&hid_dev);
+                //usb_hid_free(&hid_dev);
                 return rc;
         }
@@ -387 +387 @@
         if (rc != EOK) {
                 usb_log_error("Failed to initialize report parser.\n");
-                usb_hid_free(&hid_dev);
+                //usb_hid_free(&hid_dev);
                 return rc;
         }
@@ -405 +405 @@
                             " device.\n");
                         fallback = true;
+                        assert(hid_dev->subdrivers == NULL);
+                        assert(hid_dev->subdriver_count == 0);
                 }
         } else {
@@ -445 +447 @@
                 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;
@@ -569 +573 @@
         }
         
+        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);