Changeset 1f131fb9 in mainline for uspace/drv/bus/usb/usbhid/main.c

Timestamp:

2011-10-16T19:38:53Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22ceff3a, e5291e0

Parents:

98fb010 (diff), 93d2684 (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:

Minor USB changes.

Add more const qualifiers where possible.
Do not limit the number possible usbhid subdrivers.
This should not break anything. If it does feel free to revert this merge.

File:

• uspace/drv/bus/usb/usbhid/main.c (modified) (3 diffs)

uspace/drv/bus/usb/usbhid/main.c

@@ -92 +92 @@
         if (rc != EOK) {
                 usb_log_error("Failed to initialize USB/HID device.\n");
-                usb_hid_destroy(hid_dev);
+                usb_hid_deinit(hid_dev);
                 return rc;
         }
@@ -128 +128 @@
                 usb_log_error("Failed to start polling fibril for `%s'.\n",
                     dev->ddf_dev->name);
-                usb_hid_destroy(hid_dev);
+                usb_hid_deinit(hid_dev);
                 return rc;
         }
         hid_dev->running = true;
-        dev->driver_data = hid_dev;
 
         /*
@@ -204 +203 @@
 
         assert(!hid_dev->running);
-        usb_hid_destroy(hid_dev);
+        usb_hid_deinit(hid_dev);
         usb_log_debug2("%s destruction complete.\n", dev->ddf_dev->name);
         return EOK;